diff -Nru osdlyrics-0.4.2/aclocal.m4 osdlyrics-0.4.3/aclocal.m4 --- osdlyrics-0.4.2/aclocal.m4 2012-01-18 23:23:38.000000000 +0000 +++ osdlyrics-0.4.3/aclocal.m4 2012-06-04 13:30:44.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,11 +14,11 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -260,6 +261,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -454,7 +459,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -467,13 +472,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -486,25 +489,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -550,7 +576,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then @@ -806,22 +832,24 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # 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.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.12], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -837,22 +865,85 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.12])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + ]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -871,7 +962,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -897,22 +988,21 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -931,16 +1021,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 16 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -963,12 +1052,12 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -976,8 +1065,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -1016,16 +1106,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -1034,16 +1124,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -1091,7 +1181,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -1101,28 +1191,34 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -1141,7 +1237,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -1153,21 +1249,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -1185,7 +1279,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -1195,14 +1289,13 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 18 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -1253,23 +1346,25 @@ AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -1283,28 +1378,28 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], + [_AM_DEPENDENCIES([CC])], [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], + [_AM_DEPENDENCIES([CXX])], [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], + [_AM_DEPENDENCIES([OBJC])], [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -1332,12 +1427,14 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1351,9 +1448,9 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1376,13 +1473,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MAKE_INCLUDE() # ----------------- @@ -1401,7 +1498,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -1426,8 +1523,7 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1463,14 +1559,13 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1500,19 +1595,21 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl @@ -1532,13 +1629,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1546,13 +1643,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1565,22 +1662,18 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 9 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1591,32 +1684,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1626,43 +1727,61 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1671,24 +1790,24 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1699,10 +1818,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1710,7 +1830,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in diff -Nru osdlyrics-0.4.2/ar-lib osdlyrics-0.4.3/ar-lib --- osdlyrics-0.4.2/ar-lib 1970-01-01 00:00:00.000000000 +0000 +++ osdlyrics-0.4.3/ar-lib 2012-05-14 12:40:59.000000000 +0000 @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2012 Free Software Foundation, Inc. +# Written by Peter Rosin . +# +# 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, 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, see . + +# 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. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,219 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +250,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +265,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +293,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +305,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru osdlyrics-0.4.2/configure osdlyrics-0.4.3/configure --- osdlyrics-0.4.2/configure 2012-01-18 23:23:39.000000000 +0000 +++ osdlyrics-0.4.3/configure 2012-06-04 13:30:47.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for osdlyrics 0.4.2. +# Generated by GNU Autoconf 2.69 for osdlyrics 0.4.3. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -560,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='osdlyrics' PACKAGE_TARNAME='osdlyrics' -PACKAGE_VERSION='0.4.2' -PACKAGE_STRING='osdlyrics 0.4.2' +PACKAGE_VERSION='0.4.3' +PACKAGE_STRING='osdlyrics 0.4.3' PACKAGE_BUGREPORT='http://code.google.com/p/osd-lyrics/issues/list' PACKAGE_URL='' @@ -642,6 +662,13 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE +AM_DEFAULT_VERBOSITY INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -685,6 +712,8 @@ build LIBOBJS RANLIB +ac_ct_AR +AR am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -697,6 +726,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1277,8 +1307,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1364,7 +1392,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 osdlyrics 0.4.2 to adapt to many kinds of systems. +\`configure' configures osdlyrics 0.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1466,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of osdlyrics 0.4.2:";; + short | recursive ) echo "Configuration of osdlyrics 0.4.3:";; esac cat <<\_ACEOF @@ -1446,8 +1474,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-rpath do not hardcode runtime library paths --enable-appindicator=[no/auto/yes] Build support for application indicators @@ -1578,10 +1608,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -osdlyrics configure 0.4.2 -generated by GNU Autoconf 2.68 +osdlyrics configure 0.4.3 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1694,7 +1724,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1994,7 +2024,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2010,7 +2041,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2113,8 +2145,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by osdlyrics $as_me 0.4.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by osdlyrics $as_me 0.4.3, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2461,7 +2493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2529,7 +2561,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2587,9 +2619,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2600,32 +2629,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2637,6 +2674,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2663,8 +2710,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2676,10 +2723,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2698,7 +2745,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2738,7 +2785,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2789,7 +2836,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2842,7 +2889,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2928,7 +2975,7 @@ # Define the identity of the package. PACKAGE='osdlyrics' - VERSION='0.4.2' + VERSION='0.4.3' cat >>confdefs.h <<_ACEOF @@ -2958,11 +3005,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2995,7 +3042,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3028,6 +3075,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3060,7 +3108,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3100,7 +3148,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3153,7 +3201,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3194,7 +3242,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3252,7 +3300,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3296,7 +3344,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3742,8 +3790,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3839,8 +3886,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3874,16 +3922,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3892,16 +3940,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4303,7 +4351,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4369,7 +4417,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4583,7 +4631,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4623,7 +4671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4676,7 +4724,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4717,7 +4765,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4775,7 +4823,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4819,7 +4867,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5015,8 +5063,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5112,8 +5159,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5147,16 +5195,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5165,16 +5213,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5256,7 +5304,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5300,7 +5348,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5496,8 +5544,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5531,16 +5580,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5549,16 +5598,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5770,6 +5819,166 @@ if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + 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 + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5786,7 +5995,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5826,7 +6035,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5873,60 +6082,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -5941,7 +6150,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF @@ -5951,6 +6160,7 @@ fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -7539,7 +7749,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7582,7 +7792,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8573,14 +8783,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.35.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 $as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -8605,7 +8813,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$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 @@ -8645,7 +8853,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$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 @@ -8685,7 +8893,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$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 @@ -8711,25 +8919,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -8846,7 +9077,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$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 @@ -8886,7 +9117,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$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 @@ -8926,7 +9157,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$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 @@ -8966,7 +9197,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9017,7 +9248,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$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 @@ -9048,7 +9279,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -9605,7 +9836,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9692,6 +9923,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -9940,6 +10175,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -10270,16 +10513,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10339,28 +10582,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10381,8 +10612,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by osdlyrics $as_me 0.4.2, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by osdlyrics $as_me 0.4.3, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10447,11 +10678,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -osdlyrics config.status 0.4.2 -configured by $0, generated by GNU Autoconf 2.68, +osdlyrics config.status 0.4.3 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10542,7 +10773,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -11198,7 +11429,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -11232,21 +11463,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru osdlyrics-0.4.2/configure.ac osdlyrics-0.4.3/configure.ac --- osdlyrics-0.4.2/configure.ac 2012-01-18 23:18:34.000000000 +0000 +++ osdlyrics-0.4.3/configure.ac 2012-06-04 13:29:49.000000000 +0000 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. m4_define([OL_MAJOR_VER], [0]) m4_define([OL_MINOR_VER], [4]) -m4_define([OL_MICRO_VER], [2]) +m4_define([OL_MICRO_VER], [3]) m4_define([OL_BUILD], []) m4_define(OL_BUILD_VER, m4_esyscmd([if test x]OL_BUILD[ == x-git; then git log -1 --format=format:%ad --date=short | sed 's/-//g'; fi])) @@ -23,6 +23,7 @@ AC_PROG_CXX AC_PROG_MAKE_SET AM_PROG_CC_C_O +AM_PROG_AR AC_PROG_RANLIB AC_CONFIG_FILES([ po/Makefile.in Makefile diff -Nru osdlyrics-0.4.2/data/Makefile.in osdlyrics-0.4.3/data/Makefile.in --- osdlyrics-0.4.2/data/Makefile.in 2012-01-18 23:23:38.000000000 +0000 +++ osdlyrics-0.4.3/data/Makefile.in 2012-06-04 13:30:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,6 +69,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,6 +95,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(animdir)" "$(DESTDIR)$(bgdir)" \ "$(DESTDIR)$(defaulticondir)" "$(DESTDIR)$(guidir)" \ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(menudir)" \ @@ -84,8 +112,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -130,6 +160,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -182,6 +216,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -211,6 +246,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -292,8 +329,11 @@ $(am__aclocal_m4_deps): install-dist_animDATA: $(dist_anim_DATA) @$(NORMAL_INSTALL) - test -z "$(animdir)" || $(MKDIR_P) "$(DESTDIR)$(animdir)" @list='$(dist_anim_DATA)'; test -n "$(animdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(animdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(animdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -307,13 +347,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_anim_DATA)'; test -n "$(animdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(animdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(animdir)" && rm -f $$files + dir='$(DESTDIR)$(animdir)'; $(am__uninstall_files_from_dir) install-dist_bgDATA: $(dist_bg_DATA) @$(NORMAL_INSTALL) - test -z "$(bgdir)" || $(MKDIR_P) "$(DESTDIR)$(bgdir)" @list='$(dist_bg_DATA)'; test -n "$(bgdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bgdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bgdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -327,13 +368,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_bg_DATA)'; test -n "$(bgdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bgdir)" && rm -f $$files + dir='$(DESTDIR)$(bgdir)'; $(am__uninstall_files_from_dir) install-dist_defaulticonDATA: $(dist_defaulticon_DATA) @$(NORMAL_INSTALL) - test -z "$(defaulticondir)" || $(MKDIR_P) "$(DESTDIR)$(defaulticondir)" @list='$(dist_defaulticon_DATA)'; test -n "$(defaulticondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(defaulticondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(defaulticondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -347,13 +389,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_defaulticon_DATA)'; test -n "$(defaulticondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(defaulticondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(defaulticondir)" && rm -f $$files + dir='$(DESTDIR)$(defaulticondir)'; $(am__uninstall_files_from_dir) install-dist_guiDATA: $(dist_gui_DATA) @$(NORMAL_INSTALL) - test -z "$(guidir)" || $(MKDIR_P) "$(DESTDIR)$(guidir)" @list='$(dist_gui_DATA)'; test -n "$(guidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(guidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(guidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -367,13 +410,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_gui_DATA)'; test -n "$(guidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(guidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(guidir)" && rm -f $$files + dir='$(DESTDIR)$(guidir)'; $(am__uninstall_files_from_dir) install-dist_iconDATA: $(dist_icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -387,13 +431,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icondir)" && rm -f $$files + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-dist_menuDATA: $(dist_menu_DATA) @$(NORMAL_INSTALL) - test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)" @list='$(dist_menu_DATA)'; test -n "$(menudir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(menudir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(menudir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -407,13 +452,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_menu_DATA)'; test -n "$(menudir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(menudir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(menudir)" && rm -f $$files + dir='$(DESTDIR)$(menudir)'; $(am__uninstall_files_from_dir) install-dist_osd_iconDATA: $(dist_osd_icon_DATA) @$(NORMAL_INSTALL) - test -z "$(osd_icondir)" || $(MKDIR_P) "$(DESTDIR)$(osd_icondir)" @list='$(dist_osd_icon_DATA)'; test -n "$(osd_icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(osd_icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(osd_icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -427,13 +473,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_osd_icon_DATA)'; test -n "$(osd_icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(osd_icondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(osd_icondir)" && rm -f $$files + dir='$(DESTDIR)$(osd_icondir)'; $(am__uninstall_files_from_dir) install-dist_trayiconDATA: $(dist_trayicon_DATA) @$(NORMAL_INSTALL) - test -z "$(trayicondir)" || $(MKDIR_P) "$(DESTDIR)$(trayicondir)" @list='$(dist_trayicon_DATA)'; test -n "$(trayicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(trayicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(trayicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -447,15 +494,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_trayicon_DATA)'; test -n "$(trayicondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(trayicondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(trayicondir)" && rm -f $$files + dir='$(DESTDIR)$(trayicondir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -504,10 +551,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru osdlyrics-0.4.2/debian/changelog osdlyrics-0.4.3/debian/changelog --- osdlyrics-0.4.2/debian/changelog 2012-02-16 12:39:47.000000000 +0000 +++ osdlyrics-0.4.3/debian/changelog 2012-06-05 07:01:03.000000000 +0000 @@ -1,4 +1,14 @@ -osdlyrics (0.4.2-1~oneiric1) oneiric; urgency=low +osdlyrics (0.4.3-1~oneiric1) oneiric; urgency=low + + * Player support: + - Add cmus support, thanks to alepulver + * Bug fix: + - Dir is not closed in _prepend_subdirs (ol_app_info.c) + - Show player chooser if connected player quits in 1 minute + + -- Tualatrix Chou Tue, 05 Jun 2012 15:00:45 +0800 + +osdlyrics (0.4.2-1~precise1) precise; urgency=low * UI improvements: - Player choose dialog redesigned @@ -20,7 +30,7 @@ - CUE sheets are supported now - Don't show invalid search result of Xiami engine - -- Tualatrix Chou Thu, 16 Feb 2012 20:38:18 +0800 + -- Tualatrix Chou Fri, 17 Feb 2012 10:10:35 +0800 osdlyrics (0.4.1-1~oneiric1) oneiric; urgency=low diff -Nru osdlyrics-0.4.2/debian/control osdlyrics-0.4.3/debian/control --- osdlyrics-0.4.2/debian/control 2011-06-05 03:26:22.000000000 +0000 +++ osdlyrics-0.4.3/debian/control 2012-06-05 06:45:05.000000000 +0000 @@ -6,7 +6,6 @@ intltool, autotools-dev, libtool, - libglade2-dev, libgtk2.0-dev, libdbus-glib-1-dev, libcurl3-dev | libcurl4-dev, @@ -21,7 +20,7 @@ Package: osdlyrics Architecture: any -Depends: libgtk2.0-0, libcurl3 | libcurl4, libdbus-glib-1-2, libglade2-0, ${shlibs:Depends} +Depends: libgtk2.0-0, libcurl3 | libcurl4, libdbus-glib-1-2, ${shlibs:Depends} Description: An OSD lyrics show compatible with various media players. OSD Lyrics is inspired by lrcdis. It is a third-party lyrics display program, and focus on OSD lyrics display. diff -Nru osdlyrics-0.4.2/depcomp osdlyrics-0.4.3/depcomp --- osdlyrics-0.4.2/depcomp 2012-01-18 22:55:58.000000000 +0000 +++ osdlyrics-0.4.3/depcomp 2012-05-22 02:52:55.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +27,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +95,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +167,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +213,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +233,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +273,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +288,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +316,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +366,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +381,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +429,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +499,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +519,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +579,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +602,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +671,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru osdlyrics-0.4.2/lib/chardetect/Makefile.in osdlyrics-0.4.3/lib/chardetect/Makefile.in --- osdlyrics-0.4.2/lib/chardetect/Makefile.in 2012-01-18 23:23:39.000000000 +0000 +++ osdlyrics-0.4.3/lib/chardetect/Makefile.in 2012-06-04 13:30:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,7 +54,7 @@ host_triplet = @host@ subdir = lib/chardetect DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -50,7 +67,6 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar ARFLAGS = cru libchardetect_a_AR = $(AR) $(ARFLAGS) libchardetect_a_LIBADD = @@ -93,6 +109,11 @@ -o $@ SOURCES = $(libchardetect_a_SOURCES) DIST_SOURCES = $(libchardetect_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -100,8 +121,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -146,6 +169,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -198,6 +225,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -227,6 +255,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -352,7 +382,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libchardetect.a: $(libchardetect_a_OBJECTS) $(libchardetect_a_DEPENDENCIES) +libchardetect.a: $(libchardetect_a_OBJECTS) $(libchardetect_a_DEPENDENCIES) $(EXTRA_libchardetect_a_DEPENDENCIES) -rm -f libchardetect.a $(libchardetect_a_AR) libchardetect.a $(libchardetect_a_OBJECTS) $(libchardetect_a_LIBADD) $(RANLIB) libchardetect.a @@ -817,6 +847,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -864,10 +908,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -951,14 +1000,14 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-noinstLIBRARIES cscopelist ctags distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am diff -Nru osdlyrics-0.4.2/lib/Makefile.in osdlyrics-0.4.3/lib/Makefile.in --- osdlyrics-0.4.2/lib/Makefile.in 2012-01-18 23:23:38.000000000 +0000 +++ osdlyrics-0.4.3/lib/Makefile.in 2012-06-04 13:30:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,6 +72,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -92,8 +114,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -138,6 +162,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -190,6 +218,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -219,6 +248,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -274,11 +305,11 @@ $(am__aclocal_m4_deps): # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. $(RECURSIVE_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ @@ -342,6 +373,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -405,6 +440,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -440,13 +489,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -481,10 +527,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -562,21 +613,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru osdlyrics-0.4.2/Makefile.in osdlyrics-0.4.3/Makefile.in --- osdlyrics-0.4.2/Makefile.in 2012-01-18 23:23:39.000000000 +0000 +++ osdlyrics-0.4.3/Makefile.in 2012-06-04 13:30:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,8 +54,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/dailydeb.sh.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ - config.rpath config.sub depcomp install-sh missing + AUTHORS COPYING ChangeLog INSTALL NEWS ar-lib compile \ + config.guess config.rpath config.sub depcomp install-sh \ + missing py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -61,21 +79,30 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -103,13 +130,18 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -154,6 +186,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -206,6 +242,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -235,6 +272,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -261,7 +300,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -297,10 +336,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -316,11 +353,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. $(RECURSIVE_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ @@ -384,6 +421,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -447,8 +488,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -484,13 +549,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -519,36 +581,36 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -559,8 +621,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -580,6 +642,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -603,13 +666,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -640,10 +711,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -725,20 +801,22 @@ uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic cscope cscopelist cscopelist-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am diff -Nru osdlyrics-0.4.2/missing osdlyrics-0.4.3/missing --- osdlyrics-0.4.2/missing 2012-01-18 22:55:58.000000000 +0000 +++ osdlyrics-0.4.3/missing 2012-05-22 02:52:54.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -Nru osdlyrics-0.4.2/NEWS osdlyrics-0.4.3/NEWS --- osdlyrics-0.4.2/NEWS 2012-01-18 23:19:10.000000000 +0000 +++ osdlyrics-0.4.3/NEWS 2012-06-04 13:29:35.000000000 +0000 @@ -1,3 +1,10 @@ +Version 0.4.3: 2012-06-04 + * Player support: + - Add cmus support, thanks to alepulver + * Bug fix: + - Dir is not closed in _prepend_subdirs (ol_app_info.c) + - Show player chooser if connected player quits in 1 minute + Version 0.4.2: 2012-01-19 * UI improvements: - Player choose dialog redesigned diff -Nru osdlyrics-0.4.2/po/de.po osdlyrics-0.4.3/po/de.po --- osdlyrics-0.4.2/po/de.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/de.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-02-25 17:51+0000\n" -"Last-Translator: Dennis Baudys \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-04-11 18:49+0000\n" +"Last-Translator: Daniel Winzen \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Wähle LRC Datei für die Zuweisung" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "Ausführlichkeit beim Protokollieren von Debug-Meldungen, entweder »none«, " "»error«, »debug« oder »info«" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Versionsinformationen anzeigen" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" -msgstr "Download fehlgeschlagen" +msgstr "Herunterladen gescheitert" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Suche auf %s nach Liedtexten" +msgstr "Liedtexte werden bei %s gesucht" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Liedtexte-Ordner kann nicht erstellt werden" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Liedtexte nicht gefunden" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Es laufen keine unterstützten Player, OSD Lyrics wird beendet.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" -msgstr "" -"Ausführlichkeit beim Protokollieren von Debug-Meldungen, entweder »none«, " -"»error«, »debug« oder »info«" +msgstr "Gültige Debug Level sind »none«, »error«, »debug« oder »info«" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "" "Eine andere Instanz von OSD Lyrics läuft bereits, das Programm wird beendet." @@ -82,20 +78,20 @@ msgid "Unknown artist" msgstr "Unbekannter Interpret" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Beim Starten auswählen" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Anpassen" @@ -103,13 +99,13 @@ msgid "Select a folder" msgstr "Verzeichnis auswählen" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" -msgstr "" +msgstr "ttPlayer" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -133,73 +129,81 @@ msgid "%d lyrics found :)" msgstr "%d Liedtexte gefunden :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Unterstützte Spieler" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Alle Spieler" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Der Befehl, der den Player startet" +msgstr "Wählen Sie einen Spieler zum starten" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "_Befehl" +msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Starten" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Merke meine Auswahl" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "Fehlgeschlagen %s zu starten" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Starte %s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Es laufen keine unterstützten Player, OSD Lyrics wird beendet.\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Der Befehl, der den Player startet" +msgstr "" + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "Fehlgeschlagen %s zu starten" + +#: ../src/ol_player_chooser.c:570 +#, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" -msgstr "" +msgstr "Unbenannt" #: ../src/ol_scroll_window.c:52 msgid "" @@ -211,520 +215,473 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Titel\n" -" %p - Interpret\n" -" %a - Album\n" -" %n - Titelnummer\n" -" %f - Dateiname (ohne Dateiendung)" +"Eine Anzeige von Liedtexten mit Unterstützung für diverse Media-Player und " +"unterstüzt das Herunterladen von Liedtexten.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Daniel Winzen https://launchpad.net/~q-d\n" +" Dennis Baudys https://launchpad.net/~thecondordb\n" +" Jarosław Ogrodnik https://launchpad.net/~goz\n" +" Jens Kammann https://launchpad.net/~info-jens-kammann\n" +" LibertyZero https://launchpad.net/~libertyzero\n" +" Max https://launchpad.net/~maxlp-deactivatedaccount\n" +" Philipp Stampfli https://launchpad.net/~phildst\n" +" Stefan Reichel https://launchpad.net/~bomret\n" +" Tiger Soldier https://launchpad.net/~tigersoldi\n" +" thoughtcrime https://launchpad.net/~thoughtcrime" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Album" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Dateiname" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Immer" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Stück" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Einstellungen" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Interpret" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Titel" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "_Player automatisch starten" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Spie_ler Befehl:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Text _Position" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Tex_t Farbe" +msgid "_General" +msgstr "_Allgemein" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Schriftart:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Dateiname" +msgid "Out_line:" +msgstr "_Umrandung:" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Pfad" +msgid "_Blur:" +msgstr "_Unschärfe:" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Schwach" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." +msgid "Strong" msgstr "" -"Ein einzelnes \"%\" steht für das Verzeichnis, in dem sich die Musik " -"befindet." #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Liedtextzeilen" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Aktuelle Lyrics:" +msgid "Si_ngle line" +msgstr "_eine" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Ändert die Verzögerung um +0,2 Sekunden" +msgid "_Double lines" +msgstr "_zwei" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Ändert die Verzögerung um -0,2 Sekunden" +msgid "Mode:" +msgstr "Modus:" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Eine Anzeige von Liedtexten mit Unterstützung für diverse Media-Player und " -"unterstüzt das Herunterladen von Liedtexten.\n" +msgid "Nor_mal" +msgstr "Nor_mal" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "_Transparent bei Mausberührung" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Der aktuellen Musik einen Liedtext zuweisen" +msgid "F_irst line:" +msgstr "_Erste Zeile:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "_Zweite Zeile:" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "_Player automatisch starten" +msgid "Lyric _Alignment" +msgstr "Text _Position" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "_Farbschema:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "Farben _anpassen" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Wähle die passenden Lyrics" +msgid "Acti_ve lyrics:" +msgstr "Aktuelle Lyrics:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "Oben" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "_Farbschema:" +msgid "middle" +msgstr "Mitte" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 OSD Lyrics Projekt" +msgid "bottom" +msgstr "Unten" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Inaktive Lyrics:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "_Nicht mehr nachfragen" +msgid "Lyric _Color" +msgstr "Tex_t Farbe" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "Ak_tive Farbe:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "_Immer das erste Ergebnis herunterladen" +msgid "_Inactive color:" +msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Dieser Musik keinen Liedtext zuweisen" +msgid "Lyrics" +msgstr "Lyrics" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "_Erste Zeile:" +msgid "Colo_r:" +msgstr "_Farbe:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "_Deckkraft:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "Transparent" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Versteckt die Lyrics" +msgid "Opaque" +msgstr "Deckend" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Wenn gesperrt, können die Lyrics nicht mit der Maus verschoben werden." +msgid "Background" +msgstr "Hintergrund" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -"Wenn die Suchmaschine mehr als eine LRC Datei vorschlägt, einfach die erste " -"herunterladen ohne den Benutzer zu fragen." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Inaktive Lyrics:" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Liedtextzeilen" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "" +"Ein einzelnes \"%\" steht für das Verzeichnis, in dem sich die Musik " +"befindet." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Verzögerung +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Verzögerung -" +msgid "_Path" +msgstr "_Pfad" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Liedtextzeilen" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Titel\n" +" %p - Interpret\n" +" %a - Album\n" +" %n - Titelnummer\n" +" %f - Dateiname (ohne Dateiendung)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Dateiname" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "_Speicherort" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "_Umrandung:" +msgid "Do_wnload the first candidate" +msgstr "_Immer das erste Ergebnis herunterladen" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "Download" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "_Befehl" +msgid "No _proxy" +msgstr "Kein _Proxy" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Einstellungen" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "" +msgid "_Host:" +msgstr "_Host:" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "Po_rt:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "" +msgid "_Type:" +msgstr "_Typ:" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "" +msgid "_Username:" +msgstr "_Benutzername:" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Nach Lyrics suchen" +msgid "Show passwor_d" +msgstr "Passwor_t anzeigen" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Suche im Internet nach Liedtexten" +msgid "Proxy" +msgstr "Proxy" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "" +msgid "_Network" +msgstr "_Netzwerk" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "" +msgid "OSD _mode" +msgstr "OSD _Modus" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "_eine" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Wenn gesperrt, können die Lyrics nicht mit der Maus verschoben werden." #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "_Transparent bei Mausberührung" +msgid "_Lock Position" +msgstr "_Position sperren" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Interpret des aktuellen Liedes" +msgid "Hide the OSD Window" +msgstr "Versteckt die Lyrics" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Der Dateiname des aktuellen Liedes" +msgid "_Hide" +msgstr "_Verbergen" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Die aktuellen Liednummer" +msgid "_Search lyric..." +msgstr "_Suche Liedtext..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Titel des aktuellen Albums" +msgid "Search lyrics from Internet" +msgstr "Suche im Internet nach Liedtexten" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Titel des aktuellen Liedes" +msgid "_Assign lyric..." +msgstr "_Liedtext zuweisen..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Der aktuellen Musik einen Liedtext zuweisen" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Kein Liedtext" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Dieser Musik keinen Liedtext zuweisen" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Interpret:" +msgid "Lyric delay -" +msgstr "Verzögerung -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Liedtext zuweisen..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Ändert die Verzögerung um -0,2 Sekunden" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Verzögerung +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_zwei" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Ändert die Verzögerung um +0,2 Sekunden" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Herunterladen" +msgid "Choose LRC file to download" +msgstr "Wähle die passenden Lyrics" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Schriftart:" +msgid "D_on't ask me again" +msgstr "_Nicht mehr nachfragen" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Wenn die Suchmaschine mehr als eine LRC Datei vorschlägt, einfach die erste " +"herunterladen ohne den Benutzer zu fragen." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Von:" +msgid "_Download" +msgstr "_Herunterladen" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Allgemein" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Verbergen" +msgid "The title of the current track" +msgstr "Titel des aktuellen Liedes" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Titel" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Position sperren" +msgid "The artist of the current track" +msgstr "Interpret des aktuellen Liedes" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "_Speicherort" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Interpret" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Kein Liedtext" +msgid "The title of album of the current track" +msgstr "Titel des aktuellen Albums" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Album" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Suche" +msgid "The number of the current track" +msgstr "Die aktuellen Liednummer" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Suche Liedtext..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Stück" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_Zweite Zeile:" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Titel:" +msgid "The filename of the current track" +msgstr "Der Dateiname des aktuellen Liedes" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Dateiname" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Nach Lyrics suchen" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "Unten" +msgid "_Title:" +msgstr "_Titel:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Interpret:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "Mitte" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "Oben" +msgid "_Search" +msgstr "_Suche" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Dennis Baudys https://launchpad.net/~thecondordb\n" -" Jarosław Ogrodnik https://launchpad.net/~goz\n" -" Jens Kammann https://launchpad.net/~info-jens-kammann\n" -" Jens Maucher https://launchpad.net/~jensmaucher\n" -" Max https://launchpad.net/~maxlp-deactivatedaccount\n" -" Philipp Stampfli https://launchpad.net/~phildst\n" -" Stefan Reichel https://launchpad.net/~bomret\n" -" Tiger Soldier https://launchpad.net/~tigersoldi\n" -" thoughtcrime https://launchpad.net/~thoughtcrime" - -#~ msgid "Searching lyrics" -#~ msgstr "Liedtexte werden gesucht" - -#~ msgid "Preview" -#~ msgstr "Vorschau" - -#~ msgid "None" -#~ msgstr "Kein(e)" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "_Width:" -#~ msgstr "_Breite:" - -#~ msgid "_Lock" -#~ msgstr "S_perren" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "" -#~ "Wähle aus, von welcher Webseite die Lyrics heruntergeladen werden sollen." - -#~ msgid "Download _engine:" -#~ msgstr "_Suchmaschine" - -#~ msgid "_Search lyric" -#~ msgstr "_Suchen" - -#~ msgid "_Player control" -#~ msgstr "_Player-Steuerung" - -#~ msgid "_Display notification" -#~ msgstr "_Benachrichtigung anzeigen" - -#~ msgid "If no player detected, launch the given player" -#~ msgstr "Falls kein Player gefunden wurde, wird dieser gestartet" - -#~ msgid "Scrolling" -#~ msgstr "Bildlauf" - -#~ msgid "OSD" -#~ msgstr "OSD" +msgid "_From:" +msgstr "_Von:" -#~ msgid "Display mode" -#~ msgstr "Anzeige-Modus" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Es laufen keine unterstützten Player, OSD Lyrics wird beendet.\n" -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" +#~ msgid "Failed to connect to %s" +#~ msgstr "Verbindung zu %s fehlgeschlagen" diff -Nru osdlyrics-0.4.2/po/es.po osdlyrics-0.4.3/po/es.po --- osdlyrics-0.4.2/po/es.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/es.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2010-11-15 19:25+0000\n" -"Last-Translator: Fitoschido \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-05-20 15:37+0000\n" +"Last-Translator: hhlp \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Elija el archivo LRC a asignar" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "El nivel de mensajes de depuración para el registro, puede ser «none», " "«error», «debug» o «info»" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Mostrar información de versión" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "La descarga ha fallado" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Buscando letras de canciones de %s..." +msgstr "Buscando letras desde %s" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "No se puede crear el directorio de letras" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "No se encontraron letras" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Ningún reproductor soportado está en ejecución, saliendo.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"El nivel de mensajes de depuración para el registro, puede ser «none», " -"«error», «debug» o «info»" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Ya ha otro OSD Lyrics en ejecución, saliendo." @@ -81,20 +77,20 @@ msgid "Unknown artist" msgstr "Artista desconocido" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "Letras de canciones OSD" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Escoger al inicio" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Personalizar" @@ -102,13 +98,13 @@ msgid "Select a folder" msgstr "Seleccione una carpeta" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -121,7 +117,7 @@ #: ../src/ol_search_dialog.c:31 #, c-format msgid "Searching lyrics from %s..." -msgstr "Buscando letras de canciones de %s..." +msgstr "Buscando letras de canciones desde %s..." #: ../src/ol_search_dialog.c:32 msgid "Ooops, no lyric found :(" @@ -132,603 +128,570 @@ msgid "%d lyrics found :)" msgstr "letras encontrado %d :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Reproductores soportados" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Todos los reproductores" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "la orden del ereproductor a lanzar" +msgstr "Elija qué reproductor iniciar" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Or_den del reproductor:" +msgstr "Usar orden:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Iniciar" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Recordar mi elección" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "Error al iniciar %s" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Iniciando %s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" +"OSD Lyrics está intentando conectarse a %s. Por favor esperar unos segundos" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Ningún reproductor soportado está en ejecución, saliendo.\n" +msgstr "No está en funcionamiento un reproductor compatible" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "la orden del ereproductor a lanzar" +msgstr "Por favor, escoga uno de los siguientes reproductores" + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "Error al iniciar %s" + +#: ../src/ol_player_chooser.c:570 +#, fuzzy, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" +"%s No está soportado por OSD Lyrics, o no está en funcionamiento. Por favor " +"inicie otro reproductor" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" -msgstr "" +msgstr "Sin nombre" #: ../src/ol_scroll_window.c:52 msgid "" "Drag to move the window\n" "Hold CTRL to seek" msgstr "" +"Arrastre la ventana para moverla\n" +"Oprima CTRL para buscarla" #: ../src/ol_scroll_window.c:53 msgid "Drag to move the window" -msgstr "" +msgstr "Arrastre la ventana para moverla" + +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Copyright 2009-2011 El proyecto OSD Lyrics." #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Título\n" -" %p - Artista\n" -" %a - Album\n" -" %n - Número de pista\n" -" %f - Nombre del archivo (sin extensión)" +"Una función de letras de canciones en OSD compatible con varios " +"reproductores multimedia y que soporta la descarga de letras.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" 51114u9 https://launchpad.net/~marcoantoniofrias\n" +" Albert Abril https://launchpad.net/~abrilc\n" +" Andrés Margffoy https://launchpad.net/~andfoy\n" +" DiegoJ https://launchpad.net/~diegojromerolopez\n" +" Feder Sáiz https://launchpad.net/~federsaiz-deactivatedaccount\n" +" Fitoschido https://launchpad.net/~fitoschido\n" +" Francisco Castillo https://launchpad.net/~panchokoster\n" +" Jonay https://launchpad.net/~jonay-santana\n" +" José A. Fuentes Santiago https://launchpad.net/~joanfusan\n" +" Juan L Rodas https://launchpad.net/~jlrodasr\n" +" Macafyc https://launchpad.net/~macafyc\n" +" Monkey https://launchpad.net/~monkey-libre\n" +" Paco Molinero https://launchpad.net/~franciscomol\n" +" Rodribuntu https://launchpad.net/~rajc-56\n" +" Tiger Soldier https://launchpad.net/~tigersoldi\n" +" alakran https://launchpad.net/~alakran-1\n" +" hhlp https://launchpad.net/~hhlp" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Álbum" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nombre_del_archivo" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Siempre" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Número de la pista actual" +msgid "By lines" +msgstr "Por líneas" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Preferencias" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artista" +msgid "Display mode:" +msgstr "Modo de visualización" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Título" +msgid "Sc_rolling" +msgstr "Desplazando" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Lanzar el reprodutior automáticamente:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Or_den del reproductor:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Alineación de la letra" +msgid "Show _bubble notification" +msgstr "Mostrar notificación burbuja" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Color de letra" +msgid "_General" +msgstr "_General" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Fuente:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Nombre del archivo" +msgid "Out_line:" +msgstr "Borde" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Ruta" +msgid "_Blur:" +msgstr "_Desenfoque:" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Débil" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "" -"Un único símbolo \"%\" indica el directorio donde se encuentran las canciones" +msgid "Strong" +msgstr "Fuerte" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Líneas de la letra:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Letras acti_vas:" +msgid "Si_ngle line" +msgstr "U_na línea" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Ajustar desfase de la letra en +0.2[s]" +msgid "_Double lines" +msgstr "Lineas dobles" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Ajustar desfase de la letra en -0.2[s]" +msgid "Mode:" +msgstr "Modo:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "" +msgid "Doc_k" +msgstr "Doc_k" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Una función de letras de canciones en OSD compatible con varios " -"reproductores multimedia y que soporta la descarga de letras.\n" +msgid "Nor_mal" +msgstr "Nor_mal" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "T_ransparente al tener el ratón encima" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Asignar archivo LRC local a la canción actual" +msgid "F_irst line:" +msgstr "Pr_imera línea:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "_Segunda línea" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Lanzar el reprodutior automáticamente:" +msgid "Lyric _Alignment" +msgstr "Alineación de la letra" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "Color del _Tema" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "Personalizar colores" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Escoger el archivo LRC para descargar" +msgid "Acti_ve lyrics:" +msgstr "Letras acti_vas:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "arriba" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Color del _Tema" +msgid "middle" +msgstr "en medio" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 El proyecto OSD Lyrics" +msgid "bottom" +msgstr "abajo" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Letras inactiv_as:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "No volver a preguntar" +msgid "Lyric _Color" +msgstr "Color de letra" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "Color ac_tivo:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Descargar el primer candidato" +msgid "_Inactive color:" +msgstr "_Color inactivo" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "" +msgid "Scroll _mode:" +msgstr "Modo de desplazamiento" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "No asignar letra a esta canción" +msgid "Lyrics" +msgstr "Letra" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "Pr_imera línea:" +msgid "Colo_r:" +msgstr "Colo_r:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "O_pacidad:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "Transparente" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Ocultar la ventana OSD" +msgid "Opaque" +msgstr "Opaco" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Si está bloqueada, no podrás mover la ventana OSD con el ratón." +msgid "Background" +msgstr "Fondo" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "" -"Si hay mas de un archivo lrc que cumpla con las condiciones de búsqueda, " -"descargar el primero sin notificar al usuario." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Letras inactiv_as:" +msgid "_Scrolling" +msgstr "_Desplazamiento" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Líneas de la letra:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "" +"Un único símbolo \"%\" indica el directorio donde se encuentran las canciones" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Desfasar la letra [+]" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Desfasar la letra [-]" +msgid "_Path" +msgstr "_Ruta" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Líneas de la letra:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Título\n" +" %p - Artista\n" +" %a - Album\n" +" %n - Número de pista\n" +" %f - Nombre del archivo (sin extensión)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Nombre del archivo" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Ubicación de la letra" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "" +msgid "Lyric _sites:" +msgstr "Sitios de letras" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Borde" +msgid "Do_wnload the first candidate" +msgstr "Descargar el primer candidato" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "Descargar" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Or_den del reproductor:" +msgid "No _proxy" +msgstr "Sin _proxy" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "" +msgid "Au_to-detect system settings" +msgstr "De_tectar automáticamente la configuración del sistema" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Preferencias" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "Pu_erto:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "" +msgid "_Type:" +msgstr "_Tipo" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "" +msgid "_Username:" +msgstr "_Nombre de usuario" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "" +msgid "Passwo_rd:" +msgstr "Cont_raseña:" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Buscar letras" +msgid "Show passwor_d" +msgstr "Mostrar contraseñ_a" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Buscar letras desde internet" +msgid "Proxy" +msgstr "Proxy" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "" +msgid "_Network" +msgstr "_Red" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "" +msgid "OSD _mode" +msgstr "Modo OSD" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "U_na línea" +msgid "Scrolling _mode" +msgstr "_Modo de desplazamiento" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Si está bloqueada, no podrá mover la ventana del OSD con el ratón." #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "T_ransparente al tener el ratón encima" +msgid "_Lock Position" +msgstr "_Bloquear posición" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "El artista de la pista actual" +msgid "Hide the OSD Window" +msgstr "Ocultar la ventana OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "El nombre del archivo de la pista actual" +msgid "_Hide" +msgstr "_Ocultar" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "El número de la pista actual" +msgid "_Search lyric..." +msgstr "_Buscar letra..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "El título del álbum de la canción actual" +msgid "Search lyrics from Internet" +msgstr "Buscar letras desde internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "El título de la pista actual" +msgid "_Assign lyric..." +msgstr "_Asignar letra..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Asignar archivo LRC local a la canción actual" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "Si_n letra" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "No asignar letra a esta canción" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artista:" +msgid "Lyric delay -" +msgstr "Desfasar la letra [-]" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Asignar letra..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Ajustar desfase de la letra en -0.2[s]" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Desfasar la letra [+]" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "Lineas dobles" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Ajustar desfase de la letra en +0.2[s]" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Descargar" +msgid "Choose LRC file to download" +msgstr "Escoger el archivo LRC para descargar" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Fuente:" +msgid "D_on't ask me again" +msgstr "No volver a preguntar" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Si hay mas de un archivo lrc que cumpla con las condiciones de búsqueda, " +"descargar el primero sin notificar al usuario." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Desde:" +msgid "_Download" +msgstr "_Descargar" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_General" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Ocultar" +msgid "The title of the current track" +msgstr "El título de la pista actual" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Título" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Bloquear posición" +msgid "The artist of the current track" +msgstr "El artista de la pista actual" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Ubicación de la letra" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artista" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "Si_n letra" +msgid "The title of album of the current track" +msgstr "El título del álbum de la canción actual" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Álbum" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Buscar" +msgid "The number of the current track" +msgstr "El número de la pista actual" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Buscar letra..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Número de la pista actual" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_Segunda línea" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Título:" +msgid "The filename of the current track" +msgstr "El nombre del archivo de la pista actual" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nombre_del_archivo" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Buscar letras" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "abajo" +msgid "_Title:" +msgstr "_Título:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artista:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "en medio" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "arriba" +msgid "_Search" +msgstr "_Búsqueda" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Albert Abril https://launchpad.net/~abrilc\n" -" DiegoJ https://launchpad.net/~diegojromerolopez\n" -" Feder Sáiz https://launchpad.net/~federsaiz-deactivatedaccount\n" -" Fitoschido https://launchpad.net/~fitoschido\n" -" Francisco Castillo https://launchpad.net/~panchokoster\n" -" Jonay https://launchpad.net/~jonay-santana\n" -" José A. Fuentes Santiago https://launchpad.net/~joanfusan\n" -" Juan L Rodas https://launchpad.net/~jlrodasr\n" -" Macafyc https://launchpad.net/~macafyc\n" -" Monkey https://launchpad.net/~monkey-libre\n" -" Paco Molinero https://launchpad.net/~franciscomol\n" -" Rodribuntu https://launchpad.net/~rajc-56\n" -" Tiger Soldier https://launchpad.net/~tigersoldi\n" -" alakran https://launchpad.net/~alakran-1\n" -" hhlp https://launchpad.net/~hhlp\n" -" smaug https://launchpad.net/~marcoantoniofrias" - -#~ msgid "Searching lyrics" -#~ msgstr "Buscando letras" - -#~ msgid "Preview" -#~ msgstr "Vista previa" - -#~ msgid "None" -#~ msgstr "Ninguno" - -#~ msgid "_Lock" -#~ msgstr "B_loquear" - -#~ msgid "Download _engine:" -#~ msgstr "Motor de d_escarga:" - -#~ msgid "TODO: Add options here" -#~ msgstr "Añadir opciones aqui" - -#~ msgid "_Width:" -#~ msgstr "_Ancho:" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "_Download lyric" -#~ msgstr "_Descargar letras" - -#~ msgid "_Display notification" -#~ msgstr "_Mostrar las notifiaciones" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Elija desde que sitio desea descargar las letras." - -#~ msgid "If no player detected, launch the given player" -#~ msgstr "Si no se detecta ningún reproductor, lanza el reproductor dado" - -#~ msgid "Display mode" -#~ msgstr "Modo de pantalla" +msgid "_From:" +msgstr "_Desde:" -#~ msgid "Scrolling" -#~ msgstr "Desplazamiento" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Ningún reproductor soportado está en ejecución, saliendo.\n" -#~ msgid "OSD" -#~ msgstr "OSD" +#~ msgid "Failed to connect to %s" +#~ msgstr "Falló al intentar conectarse con %s" diff -Nru osdlyrics-0.4.2/po/fr.po osdlyrics-0.4.3/po/fr.po --- osdlyrics-0.4.2/po/fr.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/fr.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-04-05 22:41+0000\n" -"Last-Translator: Nabil Psychoman \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-03-18 14:29+0000\n" +"Last-Translator: Marc Na \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Assigner un fichier LRC" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "Le quantité de messages à enregistrer, peut-être " "'none' (aucun),'error' (erreurs), 'debug' (débogage) ou 'info' (informations)" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Afficher les informations sur la version" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Échec du téléchargement" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" msgstr "Recherche de paroles à partir de %s..." -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Impossible de créer le dossier de paroles" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Paroles introuvables" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Pas de lecteur pris en charge détecté, arrêt.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Le quantité de messages à enregistrer, peut-être " -"'none' (aucun),'error' (erreurs), 'debug' (débogage) ou 'info' (informations)" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "" "Une autre instance de OSD Lyrics est en cours d'exécution, arrêt en cours." @@ -82,20 +78,20 @@ msgid "Unknown artist" msgstr "Artiste inconnu" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "Paroles OSD" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Sélectionner au démarrage" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Personnaliser" @@ -103,11 +99,11 @@ msgid "Select a folder" msgstr "Sélectionner un dossier" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -133,73 +129,86 @@ msgid "%d lyrics found :)" msgstr "%d paroles trouvées =)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Lecteurs pris en charge" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Assigner un fichier LRC" +msgstr "" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Commandes du Lec_teur:" +msgstr "Utiliser cette commande :" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Exécuter" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Mémoriser cette sélection" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "Échec lors de l'exécution de %s" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Exécution de %s..." -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" +"OSD Lyrics va tenter d'exécuter %s et de s'y connecter. Veuillez patienter " +"quelques instants." -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Pas de lecteur pris en charge détecté, arrêt.\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Assigner un fichier LRC" +msgstr "" +"Choisissez un lecteur pris en charge à exécuter parmi la liste suivante" + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "Échec lors de l'exécution de %s" + +#: ../src/ol_player_chooser.c:570 +#, fuzzy, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" +"%s n'est pas pris en charge par OSD Lyrics, ou n'est pas en cours " +"d'exécution. Veuillez choisir un autre lecteur." -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" -msgstr "" +msgstr "Sans nom" #: ../src/ol_scroll_window.c:52 msgid "" @@ -211,520 +220,471 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Titre\n" -" %p - Artiste\n" -" %a - Album\n" -" %n - Numéro de piste\n" -" %f - Nom du fichier (sans extension)" +"Un afficheur de paroles OSD compatible avec différents lecteurs de musique " +"et prenant en charge le téléchargement de paroles.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" BELATAR Mohammed Ousama https://launchpad.net/~bel3atar\n" +" Belenyx https://launchpad.net/~bele-nyx\n" +" Floriang https://launchpad.net/~floriang\n" +" Jeremy Moiny https://launchpad.net/~joliegrenouille2\n" +" Marc Na https://launchpad.net/~marcna\n" +" Pierre Slamich https://launchpad.net/~pierre-slamich\n" +" Thibault Févry https://launchpad.net/~thibaultfevry" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Album" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nom du fichier" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Numéro de piste" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Préférences" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artiste" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Titre" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "La_ncement automatique du lecteur :" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Commandes du Lec_teur:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "_Alignement des paroles" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "_Couleur des paroles" +msgid "_General" +msgstr "_Général" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Police :" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "Nom de _fichier" +msgid "Out_line:" +msgstr "Contour" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Chemin" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." +msgid "Strong" msgstr "" -"Un seul « % » indique le répertoire dans lequel se trouve la musique lue " -"actuellement." #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "lignes de paroles" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Paroles acti_ves :" +msgid "Si_ngle line" +msgstr "Simple lig_ne" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Retarder les paroles de +0.2 secondes" +msgid "_Double lines" +msgstr "_Double lignes" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Ajuster le délai des paroles de -0.2 s" +msgid "Mode:" +msgstr "Mode:" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" +msgid "Nor_mal" msgstr "" -"Un afficheur de paroles OSD compatible avec différents lecteurs de musique " -"et prenant en charge le téléchargement de paroles.\n" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "T_ransparent au passage de la souris" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "" -"Assigner un fichier LRC sur votre ordinateur à la musique lue actuellement" +msgid "F_irst line:" +msgstr "Prem_ière ligne" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "Deu_xième ligne" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "La_ncement automatique du lecteur :" +msgid "Lyric _Alignment" +msgstr "_Alignement des paroles" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "Couleur du _Thème :" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "Personnaliser les co_uleurs" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Choisissez le fichier LRC à télécharger" +msgid "Acti_ve lyrics:" +msgstr "Paroles acti_ves :" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "haut" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Couleur du _Thème :" +msgid "middle" +msgstr "milieu" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 Le projet OSD Lyrics." +msgid "bottom" +msgstr "bas" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Paroles inactiv_e :" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "_Ne me le redemande pas" +msgid "Lyric _Color" +msgstr "_Couleur des paroles" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" msgstr "" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Té_lécharger le résultat le plus cohérent" +msgid "_Inactive color:" +msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Ne pas assigner de paroles à cette musique" +msgid "Lyrics" +msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "Prem_ière ligne" +msgid "Colo_r:" +msgstr "" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" +msgid "Transparent" msgstr "" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Cacher la fenètre OSD" +msgid "Opaque" +msgstr "" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Si bloqué, impossible de déplacer la fenètre OSD avec la souris" +msgid "Background" +msgstr "" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -"S'il existe plus d'un fichier lrc qui correspond à la recherche, télécharger " -"le premier automatiquement." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Paroles inactiv_e :" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "lignes de paroles" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "" +"Un seul « % » indique le répertoire dans lequel se trouve la musique lue " +"actuellement." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Retarder les paroles +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Retarder les paroles -" +msgid "_Path" +msgstr "_Chemin" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "lignes de paroles" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "Mode:" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Titre\n" +" %p - Artiste\n" +" %a - Album\n" +" %n - Numéro de piste\n" +" %f - Nom du fichier (sans extension)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "Nom de _fichier" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Emplacement des paro_les" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Contour" +msgid "Do_wnload the first candidate" +msgstr "Té_lécharger le résultat le plus cohérent" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" +msgid "Download" msgstr "" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Commandes du Lec_teur:" +msgid "No _proxy" +msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Préférences" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" +msgid "Po_rt:" msgstr "" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Recherche de Paroles" +msgid "Show passwor_d" +msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Recherche de paroles depuis Internet" +msgid "Proxy" +msgstr "" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Simple lig_ne" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Si bloqué, impossible de déplacer la fenètre OSD avec la souris" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "T_ransparent au passage de la souris" +msgid "_Lock Position" +msgstr "_Verrouiller Position" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "L'artiste de la piste en cours" +msgid "Hide the OSD Window" +msgstr "Cacher la fenètre OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Le nom de fichier du morceau en cours" +msgid "_Hide" +msgstr "Cac_her" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Le numéro de la piste en cours" +msgid "_Search lyric..." +msgstr "_Recherche de paroles..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Le titre de l'album de la piste en cours" +msgid "Search lyrics from Internet" +msgstr "Recherche de paroles depuis Internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Le titre de la piste en cours" +msgid "_Assign lyric..." +msgstr "_Assigner paroles..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" +msgid "Assign local LRC file to current music" msgstr "" +"Assigner un fichier LRC sur votre ordinateur à la musique lue actuellement" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Pas de paroles" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Ne pas assigner de paroles à cette musique" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artiste :" +msgid "Lyric delay -" +msgstr "Retarder les paroles -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Assigner paroles..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Ajuster le délai des paroles de -0.2 s" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Retarder les paroles +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_Double lignes" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Retarder les paroles de +0.2 secondes" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Téléchargement" +msgid "Choose LRC file to download" +msgstr "Choisissez le fichier LRC à télécharger" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Police :" +msgid "D_on't ask me again" +msgstr "_Ne me le redemande pas" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"S'il existe plus d'un fichier lrc qui correspond à la recherche, télécharger " +"le premier automatiquement." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Depuis :" +msgid "_Download" +msgstr "_Téléchargement" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Général" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "Cac_her" +msgid "The title of the current track" +msgstr "Le titre de la piste en cours" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Titre" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Verrouiller Position" +msgid "The artist of the current track" +msgstr "L'artiste de la piste en cours" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Emplacement des paro_les" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artiste" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Pas de paroles" +msgid "The title of album of the current track" +msgstr "Le titre de l'album de la piste en cours" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Album" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Recherche" +msgid "The number of the current track" +msgstr "Le numéro de la piste en cours" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Recherche de paroles..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Numéro de piste" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "Deu_xième ligne" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Titre :" +msgid "The filename of the current track" +msgstr "Le nom de fichier du morceau en cours" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nom du fichier" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Recherche de Paroles" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "bas" +msgid "_Title:" +msgstr "_Titre :" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artiste :" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "milieu" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "haut" +msgid "_Search" +msgstr "_Recherche" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" BELATAR Mohammed Ousama https://launchpad.net/~bel3atar\n" -" Floriang https://launchpad.net/~floriang\n" -" Jeremy Moiny https://launchpad.net/~joliegrenouille2\n" -" Nabil Psychoman https://launchpad.net/~bele-nyx\n" -" Pierre Slamich https://launchpad.net/~pierre-slamich\n" -" Thibault Févry https://launchpad.net/~thibaultfevry" - -#~ msgid "Searching lyrics" -#~ msgstr "Recherche des paroles en cours" - -#~ msgid "Preview" -#~ msgstr "Aperçu" - -#~ msgid "_Site:" -#~ msgstr "_Site:" - -#~ msgid "None" -#~ msgstr "Aucun" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "_Width:" -#~ msgstr "Lar_geur :" - -#~ msgid "_Lock" -#~ msgstr "Verroui_ller" - -#~ msgid "Download _engine:" -#~ msgstr "Mot_eur de téléchargement :" - -#~ msgid "_Download lyric" -#~ msgstr "_Télécharger les paroles" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Display mode" -#~ msgstr "Mode d'affichage" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Choisissez le site d'origine des paroles." - -#~ msgid "OSD" -#~ msgstr "Menu à l'écran (OSD)" - -#~ msgid "Scrolling" -#~ msgstr "Défilement" - -#~ msgid "_Display notification" -#~ msgstr "_Afficher notification" +msgid "_From:" +msgstr "_Depuis :" -#~ msgid "Dock" -#~ msgstr "Dock" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Pas de lecteur pris en charge détecté, arrêt.\n" -#~ msgid "Normal" -#~ msgstr "Standard" +#~ msgid "Failed to connect to %s" +#~ msgstr "Échec de la connexion à %s" diff -Nru osdlyrics-0.4.2/po/it.po osdlyrics-0.4.3/po/it.po --- osdlyrics-0.4.2/po/it.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/it.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,27 +7,26 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-04-12 04:14+0000\n" -"Last-Translator: Milo Casagrande \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-04-05 11:24+0000\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" -msgstr "Documenti LRC" +msgstr "File LRC" #: ../src/ol_menu.c:125 msgid "Choose LRC file to assign" msgstr "Scegli il file LRC da assegnare" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "Il livello di messaggi di debug da registrare, può essere 'nessuno', " "'errori', 'debug', o 'info'" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" msgstr "" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Download non riuscito" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Ricerco i testi da %s..." +msgstr "" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Impossibile creare la cartella dei testi" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Testi non trovato" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Nessun lettore supportato sta andando, uscita\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Il livello di messaggi di debug da registrare, può essere 'nessuno', " -"'errori', 'debug', o 'info'" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Un altro OSD Lyrics è in esecuzione, esco." @@ -81,7 +77,7 @@ msgid "Unknown artist" msgstr "Artista sconosciuto" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "Testi OSD" @@ -94,7 +90,7 @@ #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Personalizza" @@ -102,11 +98,11 @@ msgid "Select a folder" msgstr "Seleziona una cartella" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -132,71 +128,79 @@ msgid "%d lyrics found :)" msgstr "%d testi trovati :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" msgstr "" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Scegli il file LRC da assegnare" +msgstr "" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Comando Pla_yer" +msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" msgstr "" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" msgstr "" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Nessun lettore supportato sta andando, uscita\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Scegli il file LRC da assegnare" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." +msgstr "" + +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." +msgstr "" + +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -210,625 +214,467 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Titolo\n" -"%p - Artista\n" -"%a - Album\n" -"%n - Numero di traccia\n" -"%f - Nome File (senza estensione)\n" -"\tNota: \tThere are line breaks here. Each one represents a line break. " -"Start a new line in the equivalent position in the translation.\n" -"\tNote: \tThere are leading/trailing spaces here. Each one represents a " -"space character. Enter a space in the equivalent position in the translation." +"OSD lyric è compatibile con vari lettori multimediali e supporta lo " +"scaricamento dei testi\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Davide Lunghi https://launchpad.net/~davide-lunghi\n" +" Martino Barbon https://launchpad.net/~martins999\n" +" Milo Casagrande https://launchpad.net/~milo\n" +" morphine https://launchpad.net/~maledettopc\n" +" simone.sandri https://launchpad.net/~lexluxsox" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Album" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nome file" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Numero traccia" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Preferenze" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artista" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Titolo" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Avvia a_utomaticamente il player:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Comando Pla_yer" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Allineamento testo" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Colore testo" +msgid "_General" +msgstr "_Generale" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "Tipo di carattere" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "Nome file" +msgid "Out_line:" +msgstr "Profilo" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "Percorso" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "Un singolo \"%\" significa la cartella dove si trova la musica" +msgid "Strong" +msgstr "" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Riga del testo" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Testi attivi" +msgid "Si_ngle line" +msgstr "Linea singola" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Regola il ritardo del testo di +0,2 s" +msgid "_Double lines" +msgstr "Linea doppia" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Regola il ritardo del testo di -0,2 s" +msgid "Mode:" +msgstr "Modalità:" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" +msgid "Nor_mal" msgstr "" -"OSD lyric è compatibile con vari lettori multimediali e supporta lo " -"scaricamento dei testi\n" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "Traslucido quando passa il mouse" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Assegna file locale LRC alla musica corrente" +msgid "F_irst line:" +msgstr "Prima linea" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "Seconda linea" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Avvia a_utomaticamente il player:" +msgid "Lyric _Alignment" +msgstr "Allineamento testo" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "Tema colore" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "Personalizza colori" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Scegli il testo da scaricare" +msgid "Acti_ve lyrics:" +msgstr "Testi attivi" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "Alto" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Tema colore" +msgid "middle" +msgstr "Medio" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 The OSD Lyrics project." +msgid "bottom" +msgstr "Basso" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Testi inattivi" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "N_on chiedermelo più" +msgid "Lyric _Color" +msgstr "Colore testo" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" +msgid "_OSD" +msgstr "OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" msgstr "" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Scarica il primo candidato" +msgid "_Inactive color:" +msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Non assegnare un testo a questa musica" +msgid "Lyrics" +msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "Prima linea" +msgid "Colo_r:" +msgstr "" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" +msgid "Transparent" msgstr "" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Nascondi la finestra OSD" +msgid "Opaque" +msgstr "" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "se bloccato, non puoi muovere la finestra OSD con il mouse" +msgid "Background" +msgstr "" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -"Se piu' di un file Irc combacia con la condizione di ricerca, scarico il " -"primo senza suggerire l'utente" - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Testi inattivi" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Riga del testo" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "Un singolo \"%\" significa la cartella dove si trova la musica" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Ritardo del testo +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Ritardo del testo -" +msgid "_Path" +msgstr "Percorso" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Riga del testo" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "Modalita':" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Titolo\n" +"%p - Artista\n" +"%a - Album\n" +"%n - Numero di traccia\n" +"%f - Nome File (senza estensione)\n" +"\tNota: \tThere are line breaks here. Each one represents a line break. " +"Start a new line in the equivalent position in the translation.\n" +"\tNote: \tThere are leading/trailing spaces here. Each one represents a " +"space character. Enter a space in the equivalent position in the translation." #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "Nome file" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Posizione testo" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Profilo" +msgid "Do_wnload the first candidate" +msgstr "Scarica il primo candidato" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" +msgid "Download" msgstr "" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Comando Pla_yer" +msgid "No _proxy" +msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Preferenze" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" +msgid "Po_rt:" msgstr "" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Cerca testi" +msgid "Show passwor_d" +msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Cerca testi da Internet" +msgid "Proxy" +msgstr "" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Linea singola" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "se bloccato, non puoi muovere la finestra OSD con il mouse" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "Traslucido quando passa il mouse" +msgid "_Lock Position" +msgstr "B_locca Posizione" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "L'artista della traccia corrente" +msgid "Hide the OSD Window" +msgstr "Nascondi la finestra OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Il nome del file della traccia corrente" +msgid "_Hide" +msgstr "Nascondi" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Il numero della traccia corrente" +msgid "_Search lyric..." +msgstr "Cerca testo..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Il titolo dell'album della traccia corrente" +msgid "Search lyrics from Internet" +msgstr "Cerca testi da Internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Il titolo della traccia corrente" +msgid "_Assign lyric..." +msgstr "_Assegna testo..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Assegna file locale LRC alla musica corrente" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Nessun testo" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Non assegnare un testo a questa musica" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artista:" +msgid "Lyric delay -" +msgstr "Ritardo del testo -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Assegna testo..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Regola il ritardo del testo di -0,2 s" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Ritardo del testo +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "Linea doppia" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Regola il ritardo del testo di +0,2 s" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "Scarica" +msgid "Choose LRC file to download" +msgstr "Scegli il testo da scaricare" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "Tipo di carattere" +msgid "D_on't ask me again" +msgstr "N_on chiedermelo più" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Se piu' di un file Irc combacia con la condizione di ricerca, scarico il " +"primo senza suggerire l'utente" -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Da:" +msgid "_Download" +msgstr "Scarica" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Generale" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "Nascondi" +msgid "The title of the current track" +msgstr "Il titolo della traccia corrente" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Titolo" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "B_locca Posizione" +msgid "The artist of the current track" +msgstr "L'artista della traccia corrente" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Posizione testo" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artista" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Nessun testo" +msgid "The title of album of the current track" +msgstr "Il titolo dell'album della traccia corrente" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Album" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "Cerca" +msgid "The number of the current track" +msgstr "Il numero della traccia corrente" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "Cerca testo..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Numero traccia" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "Seconda linea" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Titolo" +msgid "The filename of the current track" +msgstr "Il nome del file della traccia corrente" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nome file" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Cerca testi" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "Basso" +msgid "_Title:" +msgstr "_Titolo" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artista:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "Medio" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "Alto" +msgid "_Search" +msgstr "Cerca" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Davide Lunghi https://launchpad.net/~davide-lunghi\n" -" Martino Barbon https://launchpad.net/~martins999\n" -" Milo Casagrande https://launchpad.net/~milo\n" -" morphine https://launchpad.net/~maledettopc\n" -" simone.sandri https://launchpad.net/~lexluxsox" - -#~ msgid "Searching lyrics" -#~ msgstr "Ricerca testi" - -#~ msgid "Preview" -#~ msgstr "Anteprima" - -#~ msgid "_Site:" -#~ msgstr "_Sito" - -#~ msgid "None" -#~ msgstr "Nulla" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "_Lock" -#~ msgstr "Blocca" - -#~ msgid "_Width:" -#~ msgstr "Larghezza" - -#~ msgid "Download _engine:" -#~ msgstr "Motore di ricerca" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Scegli da quale sito scaricare." - -#~ msgid "Normal" -#~ msgstr "Standard" - -#~ msgid "OSD" -#~ msgstr "OSD" - -#~ msgid "Scrolling" -#~ msgstr "Scorrimento verticale" - -#~ msgid "_Display notification" -#~ msgstr "_Mostra notifica" - -#~ msgid "Dock" -#~ msgstr "Barra Principale" - -#~ msgid "Display mode" -#~ msgstr "Modalita' Display" - -#~ msgid "Eject" -#~ msgstr "Espelli" - -#~ msgid "Trash" -#~ msgstr "Cestino" - -#~ msgid "%n item in trash" -#~ msgid_plural "%n items in trash" -#~ msgstr[0] "%n elemento nel cestino" -#~ msgstr[1] "%n elementi nel cestino" - -#~ msgid "Empty Trash" -#~ msgstr "Svuota cestino" - -#~ msgid "Keep In Launcher" -#~ msgstr "Mantieni nel Launcher" - -#~ msgid "Remove From Launcher" -#~ msgstr "Rimuovi dal Launcher" - -#~ msgid "Quit" -#~ msgstr "Esci" - -#~ msgid "Workspaces" -#~ msgstr "Spazi di lavoro" - -#~ msgid "Find Media Apps" -#~ msgstr "Trova applicazioni multimediali" - -#~ msgid "Find Internet Apps" -#~ msgstr "Trova applicazioni per Internet" - -#~ msgid "Find More Apps" -#~ msgstr "Trova altre applicazioni" - -#~ msgid "Find Files" -#~ msgstr "Trova file" - -#~ msgid "Browse the Web" -#~ msgstr "Esplora il web" - -#~ msgid "View Photos" -#~ msgstr "Visualizza foto" - -#~ msgid "Check Email" -#~ msgstr "Controlla email" - -#~ msgid "Listen to Music" -#~ msgstr "Ascolta musica" - -#~ msgid "See %1 more results" -#~ msgstr "Mostra altri %1 risultati" - -#~ msgid "See fewer results" -#~ msgstr "Mostra meno risultati" - -#~ msgid "Type" -#~ msgstr "Tipo" - -#~ msgid "%n item(s) in trash" -#~ msgstr "%n oggetto/i nel cestino" - -#~ msgid "Search for %1" -#~ msgstr "Cerca %1" - -#~ msgid "Search" -#~ msgstr "Cerca" - -#~ msgid "Open" -#~ msgstr "Apri" - -#~ msgid "Workspace Switcher" -#~ msgstr "Selettore spazio di lavoro" - -#~ msgid "Empty all items from Trash?" -#~ msgstr "Svuotare il cestino da tutti gli oggetti presenti?" - -#~ msgid "All items in the Trash will be permanently deleted." -#~ msgstr "" -#~ "Tutti gli oggetti nel cestino verranno eliminati in modo definitivo." - -#~ msgid "Keep in Launcher" -#~ msgstr "Mantieni nei lanciatori" - -#~ msgid "Office" -#~ msgstr "Ufficio" - -#~ msgid "Games" -#~ msgstr "Giochi" - -#~ msgid "Email & Chat" -#~ msgstr "Email e chat" - -#~ msgid "Music" -#~ msgstr "Musica" - -#~ msgid "Photos & Videos" -#~ msgstr "Foto e video" - -#~ msgid "Web" -#~ msgstr "Web" - -#~ msgid "Get New Apps" -#~ msgstr "Nuove applicazioni" +msgid "_From:" +msgstr "_Da:" -#~ msgid "Files & Folders" -#~ msgstr "File e cartelle" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Nessun lettore supportato sta andando, uscita\n" diff -Nru osdlyrics-0.4.2/po/Makefile.in.in osdlyrics-0.4.3/po/Makefile.in.in --- osdlyrics-0.4.2/po/Makefile.in.in 2011-10-04 23:18:24.000000000 +0000 +++ osdlyrics-0.4.3/po/Makefile.in.in 2012-04-03 01:17:33.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru osdlyrics-0.4.2/po/ms.po osdlyrics-0.4.3/po/ms.po --- osdlyrics-0.4.2/po/ms.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/ms.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2010-10-21 03:15+0000\n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-05-21 15:00+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay \n" "Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Pilih fail LRC untuk ditentukan" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,40 @@ "Aras mesej nyahpepijat untuk dilog, boleh jadi 'tiada', 'ralat', " "'nyapepijat', atau 'info'" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Papar maklumat versi" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Muat turun gagal" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Menggelintar lirik dari %s..." +msgstr "Menggelintar lirik dari %s" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Tidak dapat mencipta direktori lirik" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Lirik tidak ditemui" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Pemain yang disokong tidak dijalankan, tutup.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Aras mesej nyahpepijat untuk dilog, boleh jadi 'tiada', 'ralat', " -"'nyapepijat', atau 'info'" +"aras nyahpepijat patut salah satu dari ``tiada'', ``ralat'', " +"``nyahpepijat'', or ``maklumat''" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Lirik OSD yang lain sedang dijalankan, tutup." @@ -81,20 +79,20 @@ msgid "Unknown artist" msgstr "Artis tidak diketahui" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "Lirik OSD" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Pilih semasa permulaan" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Suaikan" @@ -102,13 +100,13 @@ msgid "Select a folder" msgstr "Pilih folder" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" -msgstr "" +msgstr "ttplayer" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -132,576 +130,553 @@ msgid "%d lyrics found :)" msgstr "%d lirik ditemui :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Pemain disokong" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Semua pemain" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Pilih fail LRC untuk ditentukan" +msgstr "Pilih pemain untuk dilancarkan" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Perintah pe_main:" +msgstr "Perintah digunakan:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Lancarkan" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Ingat pilihan saya" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "Gagal lancarkan %s" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Melancarkan %s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." -msgstr "" +msgstr "Lirik OSD cuba dilancar dan disambungkan ke %s. Tunggu sebentar" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Pemain yang disokong tidak dijalankan, tutup.\n" +msgstr "Tiada pemain tersokong berjalan" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Pilih fail LRC untuk ditentukan" +msgstr "Sila pilih pemain dibawah untuk dilancarkan" + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "Gagal lancarkan %s" + +#: ../src/ol_player_chooser.c:570 +#, fuzzy, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" +"%s tidak disokong oleh Lirik OSD, atau tidak berjalan, Sila lancarkan " +"pemain lain" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" -msgstr "" +msgstr "Tanpa nama" #: ../src/ol_scroll_window.c:52 msgid "" "Drag to move the window\n" "Hold CTRL to seek" msgstr "" +"Seret untuk alihkan tetingkap\n" +"Tahan CTRL untuk jangkau" #: ../src/ol_scroll_window.c:53 msgid "Drag to move the window" -msgstr "" +msgstr "Seret untuk alihkan tetingkap" + +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Hakcipta 2009-2011 Porjek Lirik OSD" #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Tajuk\n" -" %p - Artis\n" -" %a - Álbum\n" -" %n - Nombor trek\n" -" %f - Nama fail (tanpa sambungan)" +"Paparan Lirik OSD dengan pelbagai jenis pemain media dan menyokong muat " +"turun lirik.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" abuyop https://launchpad.net/~abuyop" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Álbum" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nama Fail" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Sentiasa" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Nombor trek" +msgid "By lines" +msgstr "Mengikut baris" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Keutamaan" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artis" +msgid "Display mode:" +msgstr "Mod papar:" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Tajuk" +msgid "Sc_rolling" +msgstr "Pe_natalan" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Lancar pemain secara automatik:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Perintah pe_main:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "_jajaran Lirik" +msgid "Show _bubble notification" +msgstr "Papar _bebuih pemberitahuan" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Wa_rna Lirik" +msgid "_General" +msgstr "_Am" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Fon:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Nama Fail" +msgid "Out_line:" +msgstr "Garis Bentuk:" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Laluan" +msgid "_Blur:" +msgstr "_Kabur:" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Lemah" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "\"%\" tunggal menunjukkan dimana direktori muzik dimainkan." +msgid "Strong" +msgstr "Kuat" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Baris lirik:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Lirik akti_f:" +msgid "Si_ngle line" +msgstr "S_atu baris" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Laras lengahan lirik ke +0.2 s" +msgid "_Double lines" +msgstr "_Dua baris" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Laras lengahan lirik ke -0.2 s" +msgid "Mode:" +msgstr "Mod:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "" +msgid "Doc_k" +msgstr "La_buh" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Paparan Lirik OSD dengan pelbagai jenis pemain media dan menyokong muat " -"turun lirik.\n" +msgid "Nor_mal" +msgstr "Bi_asa" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "L_utsinar bila penuding diatas" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Tetapkan fail lirik setempat dengan muzik semasa" +msgid "F_irst line:" +msgstr "_Baris pertama:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "Ba_ris kedua:" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Lancar pemain secara automatik:" +msgid "Lyric _Alignment" +msgstr "_jajaran Lirik" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "_Warna Tema:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "Sua_ikan warna" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Pilih fail LRC untuk dimuat turun" +msgid "Acti_ve lyrics:" +msgstr "Lirik akti_f:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "atas" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "_Warna Tema:" +msgid "middle" +msgstr "tengah" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Hakcipta 2010 Projek OSD Lyrics." +msgid "bottom" +msgstr "bawah" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Lirik ti_dak aktif:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "Jan_gan tanya saya lagi" +msgid "Lyric _Color" +msgstr "Wa_rna Lirik" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "Warna ak_tif:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Muat turun pilihan pertama" +msgid "_Inactive color:" +msgstr "Warna _tidak aktif:" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "" +msgid "Scroll _mode:" +msgstr "_mod tatal:" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Jangan tetapkan lirik kepada muzik ini" +msgid "Lyrics" +msgstr "Lirik" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "_Baris pertama:" +msgid "Colo_r:" +msgstr "_Warna:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "K_elegapan:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "Lutsinar" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Sembunyi Tetingkap OSD" +msgid "Opaque" +msgstr "Legap" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "" -"Jika dikunci, anda tidak boleh alihkan tetingkap OSD menggunakan tetikus" +msgid "Background" +msgstr "LatarBelakang" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "" -"Jika terdapat lebih dari satu fail lrc yang sepadan dengan syarat " -"penggelintaran, muat turun yang pertama dahulu tanpa maklumkan pengguna." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Lirik ti_dak aktif:" +msgid "_Scrolling" +msgstr "_Penatalan" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Baris lirik:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "\"%\" tunggal menunjukkan dimana direktori muzik dimainkan." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Lengah lirik +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Lengah lirik -" +msgid "_Path" +msgstr "_Laluan" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Baris lirik:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Tajuk\n" +" %p - Artis\n" +" %a - Álbum\n" +" %n - Nombor trek\n" +" %f - Nama fail (tanpa sambungan)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Nama Fail" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "_Lokasi Lirik" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "" +msgid "Lyric _sites:" +msgstr "_Laman lirik:" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Garis Bentuk:" +msgid "Do_wnload the first candidate" +msgstr "Muat turun pilihan pertama" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "Muat Turun" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Perintah pe_main:" +msgid "No _proxy" +msgstr "Tiada _proksi" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "" +msgid "Au_to-detect system settings" +msgstr "Tetapan sistem kesan-s_endiri" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Keutamaan" +msgid "Use _manual settings" +msgstr "Guna tetapan _manual" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "" +msgid "_Host:" +msgstr "_Hos:" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "Po_rt:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "" +msgid "_Type:" +msgstr "_Jenis:" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "" +msgid "_Username:" +msgstr "_Nama Pengguna:" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "" +msgid "Passwo_rd:" +msgstr "Kata _laluan:" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Gelintar lirik" +msgid "Show passwor_d" +msgstr "Papar kata lal_uan" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Gelintar lirik dari internet" +msgid "Proxy" +msgstr "Proksi" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "" +msgid "_Network" +msgstr "_Rangkaian" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "" +msgid "OSD _mode" +msgstr "_Mod OSD" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "S_atu baris" +msgid "Scrolling _mode" +msgstr "_Mod penatalan" #: ../data/dialogs.glade.h:84 -msgid "Strong" +msgid "If locked, you can't move OSD window by mouse" msgstr "" +"Jika dikunci, anda tidak boleh alihkan tetingkap OSD menggunakan tetikus" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "L_utsinar bila penuding diatas" +msgid "_Lock Position" +msgstr "_Kunci Kedudukan" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Artis bagi trek semasa" +msgid "Hide the OSD Window" +msgstr "Sembunyi Tetingkap OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Nama fail bagi trek semasa" +msgid "_Hide" +msgstr "_Sembunyi" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Nombor trek semasa" +msgid "_Search lyric..." +msgstr "_Gelintar lirik..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Tajuk album bagi trek semasa" +msgid "Search lyrics from Internet" +msgstr "Gelintar lirik dari internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Tajuk trek semasa" +msgid "_Assign lyric..." +msgstr "_Tetapkan lirik..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Tetapkan fail lirik setempat dengan muzik semasa" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Tiada lirik" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Jangan tetapkan lirik kepada muzik ini" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artis:" +msgid "Lyric delay -" +msgstr "Lengah lirik -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Tetapkan lirik..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Laras lengahan lirik ke -0.2 s" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Lengah lirik +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_Dua baris" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Laras lengahan lirik ke +0.2 s" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Muat Turun" +msgid "Choose LRC file to download" +msgstr "Pilih fail LRC untuk dimuat turun" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Fon:" +msgid "D_on't ask me again" +msgstr "Jan_gan tanya saya lagi" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Jika terdapat lebih dari satu fail lrc yang sepadan dengan syarat " +"penggelintaran, muat turun yang pertama dahulu tanpa maklumkan pengguna." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Dari:" +msgid "_Download" +msgstr "_Muat Turun" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Am" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Sembunyi" +msgid "The title of the current track" +msgstr "Tajuk trek semasa" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Tajuk" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Kunci Kedudukan" +msgid "The artist of the current track" +msgstr "Artis bagi trek semasa" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "_Lokasi Lirik" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artis" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Tiada lirik" +msgid "The title of album of the current track" +msgstr "Tajuk album bagi trek semasa" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Álbum" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Gelintar" +msgid "The number of the current track" +msgstr "Nombor trek semasa" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Gelintar lirik..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Nombor trek" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "Ba_ris kedua:" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Tajuk:" +msgid "The filename of the current track" +msgstr "Nama fail bagi trek semasa" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nama Fail" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Gelintar lirik" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "bawah" +msgid "_Title:" +msgstr "_Tajuk:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artis:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "tengah" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "atas" +msgid "_Search" +msgstr "_Gelintar" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" abuyop https://launchpad.net/~abuyop" - -#~ msgid "Searching lyrics" -#~ msgstr "Menggelintar lirik" - -#~ msgid "Preview" -#~ msgstr "Pratonton" - -#~ msgid "None" -#~ msgstr "Tiada" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Display mode" -#~ msgstr "Mod paparan judul" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Pilih laman yang anda ingin muat turun lirik." - -#~ msgid "Download _engine:" -#~ msgstr "_Enjin muat turun:" - -#~ msgid "OSD" -#~ msgstr "_OSD" - -#~ msgid "Scrolling" -#~ msgstr "Penatalan" +msgid "_From:" +msgstr "_Dari:" -#~ msgid "_Display notification" -#~ msgstr "_Papar pemberitahuan" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Pemain yang disokong tidak dijalankan, ditutup.\n" -#~ msgid "_Width:" -#~ msgstr "_Lebar:" +#~ msgid "Failed to connect to %s" +#~ msgstr "Gagal sambung ke %s" diff -Nru osdlyrics-0.4.2/po/pt_BR.po osdlyrics-0.4.3/po/pt_BR.po --- osdlyrics-0.4.2/po/pt_BR.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/pt_BR.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2010-08-30 16:48+0000\n" -"Last-Translator: Guilherme Lindner \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2011-09-23 11:51+0000\n" +"Last-Translator: Otto Robba \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Escolha o arquivo LRC para atribuir" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "O nível das mensagens do log de depuração, podem ser 'none', 'error', " "'debug', ou 'info'" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Mostrar informações sobre a versão" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Falha ao baixar" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Procurando por letras de %s..." +msgstr "Buscando letra de %s" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Não é possível criar a pasta da letra" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Letras não encontradas" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Player em execução não suportado, sair.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"O nível das mensagens do log de depuração, podem ser 'none', 'error', " -"'debug', ou 'info'" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Outro Lyrics OSD está sendo executado, sair." @@ -81,20 +77,20 @@ msgid "Unknown artist" msgstr "Artista desconhecido" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "Letras OSD (exibição na tela)" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Escolher ao abrir" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Personalize" @@ -102,13 +98,13 @@ msgid "Select a folder" msgstr "Selecione uma pasta" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" -msgstr "" +msgstr "ttPlayer" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -132,71 +128,79 @@ msgid "%d lyrics found :)" msgstr "%d letras encontradas :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Tocadores suportados" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Todos os tocadores" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "O comando para abrir o player" +msgstr "Escolher um tocador para executar" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Comando do pla_yer:" +msgstr "Usar comando:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Executar" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Lembrar minha decisão" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Player em execução não suportado, sair.\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "O comando para abrir o player" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" +msgstr "" + +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." +msgstr "" + +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -210,506 +214,464 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Copyright 2009-2011 Projeto OSD Lyrics." + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Título\n" -" %p - Artista\n" -" %a - Álbum\n" -" %n - Numero da faxa\n" -" %f - Nome do aquivo (sem extenção)" +"Um mostrador de letras de música OSD compatível com vários reprodutores, que " +"suporta baixar letras.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Douglas Santos https://launchpad.net/~douglasrpg\n" +" Otto Robba https://launchpad.net/~otto-ottorobba\n" +" Pedro Folha https://launchpad.net/~pedrovi\n" +" Sam Samuels https://launchpad.net/~gemini-sam-samuels\n" +" Teylo Laundos Aguiar https://launchpad.net/~teylo.aguiar" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Álbum" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nome do arquivo" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Sempre" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Numero da faixa" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Preferências" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artista" +msgid "Display mode:" +msgstr "Modo de visualização:" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Título" +msgid "Sc_rolling" +msgstr "_Rolagem" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Abrir player automaticamente:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Comando do pla_yer:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "_Alinhamento da Linha" +msgid "Show _bubble notification" +msgstr "Mostrar _bolha de notificação" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "_Cor da letra" +msgid "_General" +msgstr "_Geral" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Fonte:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Nome do arquivo" +msgid "Out_line:" +msgstr "Cont_orno" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Pasta" +msgid "_Blur:" +msgstr "_Borrar:" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Fraco" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "" -"Um único \"%\" significa a pasta onde se encontra a música que está tocando" +msgid "Strong" +msgstr "Forte" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Linhas da letra:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Ati_var letras:" +msgid "Si_ngle line" +msgstr "Ú_nica linha" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Ajusta o atraso da letra em +0.2 s" +msgid "_Double lines" +msgstr "_Duas linhas" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Ajusta o atraso da letra em -0.2 s" +msgid "Mode:" +msgstr "Modo:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "" +msgid "Doc_k" +msgstr "Doc_k" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Um mostrador de letras de música OSD compatível com vários reprodutores, que " -"suporta baixar letras.\n" +msgid "Nor_mal" +msgstr "Nor_mal" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "T_ransparente quando o mouse estiver em cima" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Atribuir arquivo LRC local a musica em execução" +msgid "F_irst line:" +msgstr "P_rimeira linha:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "_Segunda linha:" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Abrir player automaticamente:" +msgid "Lyric _Alignment" +msgstr "_Alinhamento da Linha" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "_Tema de Cores:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "P_ersonalisa as cores" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Escolha o arquivo LRC para baixar" +msgid "Acti_ve lyrics:" +msgstr "Ati_var letras:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "em cima" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "_Tema de Cores:" +msgid "middle" +msgstr "meio" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 The OSD Lyrics project." +msgid "bottom" +msgstr "em baixo" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Letras inati_vas:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "Nã_o perguntar novamente" +msgid "Lyric _Color" +msgstr "_Cor da letra" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "Cor A_tiva:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Bai_xar o primeiro candidato" +msgid "_Inactive color:" +msgstr "Cor _inativa:" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "" +msgid "Scroll _mode:" +msgstr "_Modo de rolagem" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Não atribuir letra para a musica em execução" +msgid "Lyrics" +msgstr "Letra" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "P_rimeira linha:" +msgid "Colo_r:" +msgstr "Co_r:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "O_pacidade:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "Transparente" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Ocultar a janela OSD" +msgid "Opaque" +msgstr "Opaco" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Se travado, você não poderá mover a janela OSD pelo mouse" +msgid "Background" +msgstr "Plano de fundo" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "" -"Se houver mas de um arquivo de letra de música que corresponda à condição da " -"pesquisa, baixar a primeira da lista sem perguntar ao usuário." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Letras inati_vas:" +msgid "_Scrolling" +msgstr "_Rolagem" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Linhas da letra:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "" +"Um único \"%\" significa a pasta onde se encontra a música que está tocando" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Atraso da letra +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Atraso da letra -" +msgid "_Path" +msgstr "_Pasta" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Linhas da letra:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Título\n" +" %p - Artista\n" +" %a - Álbum\n" +" %n - Numero da faxa\n" +" %f - Nome do aquivo (sem extenção)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Nome do arquivo" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "_Local da letra" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "" +msgid "Lyric _sites:" +msgstr "_Sites de Letras:" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Cont_orno" +msgid "Do_wnload the first candidate" +msgstr "Bai_xar o primeiro candidato" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "Download" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Comando do pla_yer:" +msgid "No _proxy" +msgstr "Sem _proxy" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "" +msgid "Au_to-detect system settings" +msgstr "Au_to-detectar as configurações do sistema" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Preferências" +msgid "Use _manual settings" +msgstr "Usar configurações _manuais" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "" +msgid "_Host:" +msgstr "_Host:" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "Po_rta:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "" +msgid "_Type:" +msgstr "_Tipo:" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "" +msgid "_Username:" +msgstr "Nome de _Usuário:" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "" +msgid "Passwo_rd:" +msgstr "Senha:" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Pesquisar letras" +msgid "Show passwor_d" +msgstr "Mostrar senha" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Pesquisar letras da internet" +msgid "Proxy" +msgstr "Proxy" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "" +msgid "_Network" +msgstr "_Rede" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "" +msgid "OSD _mode" +msgstr "_Modo OSD" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Ú_nica linha" +msgid "Scrolling _mode" +msgstr "_Modo de rolagem" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Se travado, você não poderá mover a janela OSD pelo mouse" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "T_ransparente quando o mouse estiver em cima" +msgid "_Lock Position" +msgstr "_Travar Posição" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "O artista da faixa em execução" +msgid "Hide the OSD Window" +msgstr "Ocultar a janela OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "O nome do aquivo da faixa em execução" +msgid "_Hide" +msgstr "_Ocultar" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "O numero da faixa em execução" +msgid "_Search lyric..." +msgstr "_Pesquisar letra..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "O título do album da faixa em execução" +msgid "Search lyrics from Internet" +msgstr "Pesquisar letras da internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "O título da faixa em execução" +msgid "_Assign lyric..." +msgstr "_Atribuir letra..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Atribuir arquivo LRC local a musica em execução" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Nenhuma letra" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Não atribuir letra para a musica em execução" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artista:" +msgid "Lyric delay -" +msgstr "Atraso da letra -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Atribuir letra..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Ajusta o atraso da letra em -0.2 s" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Atraso da letra +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_Duas linhas" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Ajusta o atraso da letra em +0.2 s" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Baixar" +msgid "Choose LRC file to download" +msgstr "Escolha o arquivo LRC para baixar" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Fonte:" +msgid "D_on't ask me again" +msgstr "Nã_o perguntar novamente" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Se houver mas de um arquivo de letra de música que corresponda à condição da " +"pesquisa, baixar a primeira da lista sem perguntar ao usuário." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_De:" +msgid "_Download" +msgstr "_Baixar" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Geral" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Ocultar" +msgid "The title of the current track" +msgstr "O título da faixa em execução" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Título" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Travar Posição" +msgid "The artist of the current track" +msgstr "O artista da faixa em execução" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "_Local da letra" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artista" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Nenhuma letra" +msgid "The title of album of the current track" +msgstr "O título do album da faixa em execução" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Álbum" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "Pe_squisar" +msgid "The number of the current track" +msgstr "O numero da faixa em execução" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Pesquisar letra..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Numero da faixa" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_Segunda linha:" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Título:" +msgid "The filename of the current track" +msgstr "O nome do aquivo da faixa em execução" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nome do arquivo" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Pesquisar letras" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "em baixo" +msgid "_Title:" +msgstr "_Título:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artista:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "meio" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "em cima" +msgid "_Search" +msgstr "Pe_squisar" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Douglas Santos https://launchpad.net/~douglasrpg\n" -" Emerson Vinicius https://launchpad.net/~emersonvinicius\n" -" Guilherme Lindner https://launchpad.net/~gui666\n" -" Pedro Folha https://launchpad.net/~pedrovi\n" -" Sam Samuels https://launchpad.net/~gemini-sam-samuels\n" -" Teylo Laundos Aguiar https://launchpad.net/~teylo.aguiar" - -#~ msgid "Searching lyrics" -#~ msgstr "Pesquisando letras" - -#~ msgid "Preview" -#~ msgstr "Pré-visualização" - -#~ msgid "None" -#~ msgstr "Nenhuma" - -#~ msgid "If no player detected, launch the given player" -#~ msgstr "Se não for encontrado nenhum palyer, abrir o padrão" - -#~ msgid "_Display notification" -#~ msgstr "_Mostrar notificação" - -#~ msgid "_Width:" -#~ msgstr "_Largura:" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Escolha o site do qual as letras serão baixadas." - -#~ msgid "Download _engine:" -#~ msgstr "_Motor de busca:" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Scrolling" -#~ msgstr "Rolagem" - -#~ msgid "OSD" -#~ msgstr "Mensagem na tela" +msgid "_From:" +msgstr "_De:" -#~ msgid "Display mode" -#~ msgstr "Modo de exibição" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Player em execução não suportado, sair.\n" diff -Nru osdlyrics-0.4.2/po/ro.po osdlyrics-0.4.3/po/ro.po --- osdlyrics-0.4.2/po/ro.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/ro.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,18 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-05-14 04:13+0000\n" -"Last-Translator: Tuhut Vladut Emanuel \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-04-01 10:38+0000\n" +"Last-Translator: Ithreexas \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " -"== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -28,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Alegeți fișierul LRC pentru atribuire" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -36,41 +34,40 @@ "Nivelul de depanare a mesajelor din jurnal, poate fi \"nici unul\", \"eroare" "\", \"debug\", sau \"info\"" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Afișează informații despre versiune" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Descărcare eșuată" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Se caută versuri pentru %s..." +msgstr "Se caută versuri de la %s" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Nu se poate crea directorul cu versuri" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Nu s-au găsit versuri" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Un player nesuportat rulează, ișire\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Nivelul de depanare a mesajelor din jurnal, poate fi \"nici unul\", \"eroare" -"\", \"debug\", sau \"info\"" +"Nivelul de depanare ar trebui să fie unul dintre " +"'niciunul','erori','depanare', sau 'info'" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Un alt OSD Lyrics rulează, ieșire" @@ -82,20 +79,20 @@ msgid "Unknown artist" msgstr "Artist necunoscut" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Alegeți la pornire" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Personalizează" @@ -103,13 +100,13 @@ msgid "Select a folder" msgstr "Selectați un director" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "ttPlayer" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -126,576 +123,561 @@ #: ../src/ol_search_dialog.c:32 msgid "Ooops, no lyric found :(" -msgstr "Ooops, versuri negăsite :(" +msgstr "Ooops, nu s-au găsit versuri :(" #: ../src/ol_search_dialog.c:33 #, c-format msgid "%d lyrics found :)" -msgstr "%d versuri găsite :)" +msgstr "%d versurile au fost găsite :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Playere suportate" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Toate playerele" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Alegeți fișierul LRC pentru atribuire" +msgstr "Alegeți un player pentru pornire" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Comandă pla_yer:" +msgstr "Se utilizează comanda:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Lansare" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Se reține alegerea" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "%s nu a putut fi pornit" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Se pornește %s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" +"OSD Lyrics încearcă să pornească și să se conecteze la %s. Vă rog să " +"așteptați." -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Un player nesuportat rulează, ișire\n" +msgstr "Nu rulează nici un player suportat." -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Alegeți fișierul LRC pentru atribuire" +msgstr "Alegeți un player pentru pornire." + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "%s nu a putut fi pornit" + +#: ../src/ol_player_chooser.c:570 +#, fuzzy, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" +"%s nu este suportat de OSD Lyrics sau nu rulează. Vă rug să porniți un alt " +"player." -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" -msgstr "" +msgstr "Nedenumit" #: ../src/ol_scroll_window.c:52 msgid "" "Drag to move the window\n" "Hold CTRL to seek" msgstr "" +"Trageți pentru a muta fereastra\n" +"Țineți CTRL pentru a căuta" #: ../src/ol_scroll_window.c:53 msgid "Drag to move the window" -msgstr "" +msgstr "Trageți pentru a muta fereastra" + +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Drepturi de autor 2009-2011 The OSD Lyrics" #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Titlu\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Număr melodie\n" -" %f - Nume fișier (fără extensie)" +"Un vizualizator de versuri compatibil cu o varietate de playere si suportă " +"descărcarea versurilor.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Ithreexas https://launchpad.net/~ithreexas" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Album" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Nume fișier" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Întotdeauna" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Număr melodie" +msgid "By lines" +msgstr "De linii" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Preferințe" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Artist" +msgid "Display mode:" +msgstr "Mod afișare" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Titlu" +msgid "Sc_rolling" +msgstr "De_rulare" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "Fundal" +msgid "Auto la_unch player:" +msgstr "Auto ru_lează player:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "Descarcă" +msgid "Pla_yer command:" +msgstr "Comandă pla_yer:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Aliniere_versuri" +msgid "Show _bubble notification" +msgstr "Afișează_notificarea balon" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Culoare versuri" +msgid "_General" +msgstr "_General" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "Versuri" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "Proxy" +msgid "_Font:" +msgstr "_Font:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Nume Fișier" +msgid "Out_line:" +msgstr "Con_tur" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Cale" +msgid "_Blur:" +msgstr "_Estompare" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Slab" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "Un singur \"%\" reprezintă directorul de unde se află muzica" +msgid "Strong" +msgstr "Aldin" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "Culoare ac_tivă" +msgid "Lyric lines:" +msgstr "Linii versuri:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Versuri acty_ve" +msgid "Si_ngle line" +msgstr "O linie" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Ajustează sincronizarea versurilor cu +0.2 s" +msgid "_Double lines" +msgstr "_Linii duble" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Ajustează sincronizarea versurilor cu -0.2 s" +msgid "Mode:" +msgstr "Mod:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "Întotdeauna" +msgid "Doc_k" +msgstr "Doc_k" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Un vizualizator de versuri compatibil cu o varietate de playere si suportă " -"descărcarea versurilor.\n" +msgid "Nor_mal" +msgstr "Nor_mal" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "T_ranslucid sub cursor" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Asociază fișierul LRC local cu melodia curentă" +msgid "F_irst line:" +msgstr "P_rima linie" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "Au_to-detectează setătile sistemului" +msgid "_Second line:" +msgstr "_A doua linie" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Auto ru_lează player:" +msgid "Lyric _Alignment" +msgstr "Aliniere_versuri" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "De linii" +msgid "Color _Theme:" +msgstr "Culoare_Temă" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "P_ersonalizează culorile" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Alegeți fișierul LRC pentru descărcare" +msgid "Acti_ve lyrics:" +msgstr "Versuri acti_ve" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "Culoa_re:" +msgid "top" +msgstr "sus" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Culoare_Temă" +msgid "middle" +msgstr "mijloc" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Drepturi de autor 2009 Proiectul OSD Lyrics." +msgid "bottom" +msgstr "jos" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Versuri inactiv_e" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "N_u mă mai întreba" +msgid "Lyric _Color" +msgstr "Culoare versuri" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "Mod afișare" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "Culoare ac_tivă" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "De_scarcă primul fișier" +msgid "_Inactive color:" +msgstr "_Culoare inactiv" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "Doc_k" +msgid "Scroll _mode:" +msgstr "Mod_derulare" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Nu asocia versuri melodiei" +msgid "Lyrics" +msgstr "Versuri" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "P_rima linie" +msgid "Colo_r:" +msgstr "Culoa_re:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "O_pacitate:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "HTTP" +msgid "Transparent" +msgstr "Transparent" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Ascunde fereastra OSD" +msgid "Opaque" +msgstr "Opac" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Dacă este blocat, nu puteți muta fereastra OSD cu mausul" +msgid "Background" +msgstr "Fundal" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "" -"Dacă sunt mai multe fișiere LRC se potrivesc căutării, descarcă primul " -"fișier fără a interoga utilizatorul." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Versuri inactiv_e" +msgid "_Scrolling" +msgstr "_Derulare" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Linii versuri:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "Un singur \"%\" reprezintă directorul de unde se află muzica" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Sincronizare versuri +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Sincronizare versuri -" +msgid "_Path" +msgstr "_Cale" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Linii versuri:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "Mod:" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "Fără_proxy" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "Nor_mal" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" -msgstr "mod_OSD" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" +msgstr "" +" %t - Titlu\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Număr melodie\n" +" %f - Nume fișier (fără extensie)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "OS_D" +msgid "_Filename" +msgstr "_Nume Fișier" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "O_pacitate:" +msgid "_Lyric Location" +msgstr "_Locația versurilor" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "Opac" +msgid "Lyric _sites:" +msgstr "Site-uri versuri" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Con_tur" +msgid "Do_wnload the first candidate" +msgstr "De_scarcă primul fișier" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "Parol_ă" +msgid "Download" +msgstr "Descarcă" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Comandă pla_yer:" +msgid "No _proxy" +msgstr "Fără_proxy" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "Po_rt:" +msgid "Au_to-detect system settings" +msgstr "Au_to-detectează setătile sistemului" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Preferințe" +msgid "Use _manual settings" +msgstr "Setătile utilizatorului" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "SOCKS4" +msgid "_Host:" +msgstr "_Gazdă" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "SOCKS5" +msgid "Po_rt:" +msgstr "Po_rt:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "De_rulare" +msgid "_Type:" +msgstr "_Tip:" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "Mod_derulare" +msgid "_Username:" +msgstr "_Utilizator:" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "Mod_derulare" +msgid "Passwo_rd:" +msgstr "Parol_ă" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Se caută versuri" +msgid "Show passwor_d" +msgstr "Arată parol_a" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Se caută versuri pe Internet" +msgid "Proxy" +msgstr "Proxy" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "Afișează_notificarea balon" +msgid "_Network" +msgstr "_Rețea" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "Arată parol_a" +msgid "OSD _mode" +msgstr "mod_OSD" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "O linie" +msgid "Scrolling _mode" +msgstr "Mod_derulare" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Dacă este blocat, nu puteți muta fereastra OSD cu mausul" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "T_ranslucid sub cursor" +msgid "_Lock Position" +msgstr "_Poziție blocată" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Artistul melodiei curente" +msgid "Hide the OSD Window" +msgstr "Ascunde fereastra OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Numele fișierului melodiei curente" +msgid "_Hide" +msgstr "A_scunde" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Numărul melodiei curente" +msgid "_Search lyric..." +msgstr "Căutare versuri" #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Numele albumului melodiei curente" +msgid "Search lyrics from Internet" +msgstr "Se caută versuri pe Internet" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Titlul melodiei curente" +msgid "_Assign lyric..." +msgstr "_Asociere versuri..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "Transparent" +msgid "Assign local LRC file to current music" +msgstr "Asociază fișierul LRC local cu melodia curentă" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "Setătile utilizatorului" +msgid "_No lyric" +msgstr "_Fără versuri" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Nu asocia versuri melodiei" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Artist:" +msgid "Lyric delay -" +msgstr "Sincronizare versuri -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "_Asociere versuri..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Ajustează sincronizarea versurilor cu -0.2 s" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Sincronizare versuri +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_Linii duble" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Ajustează sincronizarea versurilor cu +0.2 s" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Descărcare" +msgid "Choose LRC file to download" +msgstr "Alegeți fișierul LRC pentru descărcare" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Font:" +msgid "D_on't ask me again" +msgstr "N_u mă mai întreba" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Dacă sunt mai multe fișiere LRC se potrivesc căutării, descarcă primul " +"fișier fără a interoga utilizatorul." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_De la:" +msgid "_Download" +msgstr "_Descărcare" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_General" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "A_scunde" +msgid "The title of the current track" +msgstr "Titlul melodiei curente" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "_Gazdă" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Titlu" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "_Culoare inactiv" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Poziție blocată" +msgid "The artist of the current track" +msgstr "Artistul melodiei curente" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "_Locația versurilor" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Artist" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "_Rețea" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Fără versuri" +msgid "The title of album of the current track" +msgstr "Numele albumului melodiei curente" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Album" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "_Derulare" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Caută" +msgid "The number of the current track" +msgstr "Numărul melodiei curente" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Se caută versuri" +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Număr melodie" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_A doua linie" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Titlu:" +msgid "The filename of the current track" +msgstr "Numele fișierului melodiei curente" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "_Tip:" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Nume fișier" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "_Utilizator:" +msgid "Search lyrics" +msgstr "Căutare versuri" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "jos" +msgid "_Title:" +msgstr "_Titlu:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Artist:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "mijloc" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "sus" +msgid "_Search" +msgstr "_Caută" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Tuhut Vladut Emanuel https://launchpad.net/~ithreexas" - -#~ msgid "Searching lyrics" -#~ msgstr "Se caută versurile" - -#~ msgid "Preview" -#~ msgstr "Previzualizare" - -#~ msgid "_Site:" -#~ msgstr "_Site:" - -#~ msgid "None" -#~ msgstr "Nespecificat" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Display mode" -#~ msgstr "Mod afișare" - -#~ msgid "OSD" -#~ msgstr "OSD" +msgid "_From:" +msgstr "_De la:" -#~ msgid "Scrolling" -#~ msgstr "Derulare" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Un player nesuportat rulează, ișire\n" -#~ msgid "_Display notification" -#~ msgstr "_Arată notificare" +#~ msgid "Failed to connect to %s" +#~ msgstr "Conectarea la %s a eșuat" diff -Nru osdlyrics-0.4.2/po/ru.po osdlyrics-0.4.3/po/ru.po --- osdlyrics-0.4.2/po/ru.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/ru.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,18 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-01-27 13:29+0000\n" -"Last-Translator: Stanislav Hanzhin \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-04-17 14:22+0000\n" +"Last-Translator: Sergey Popov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -26,9 +24,9 @@ #: ../src/ol_menu.c:125 msgid "Choose LRC file to assign" -msgstr "Выверите назначаемый файл LRC" +msgstr "Выберите назначаемый файл LRC" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -36,41 +34,40 @@ "Уровень отладочных сообщений в логе может быть 'none', 'error', 'debug' или " "'info'" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Показать информацию о версии программы" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Ошибка загрузки данных" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Поиск текстов в %s..." +msgstr "Искать песни в %s" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Невозможно создать папку лирики" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Текст песни не найден" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Нет доступных плееров.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Уровень отладочных сообщений в логе может быть 'none', 'error', 'debug' или " -"'info'" +"уровень отладки должен быть одним из ``none'', ``error'', ``debug'', or " +"``info''" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Приложение уже запущено." @@ -82,20 +79,20 @@ msgid "Unknown artist" msgstr "Неизвестный исполнитель" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD-показ текстов." #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Выбрать при запуске" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Настроить" @@ -103,13 +100,13 @@ msgid "Select a folder" msgstr "Выберите каталог" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" -msgstr "" +msgstr "ttPlayer" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" -msgstr "" +msgstr "Xiami" #: ../src/ol_lrc_candidate_list.c:43 msgid "Title" @@ -133,71 +130,81 @@ msgid "%d lyrics found :)" msgstr "%d текст найден." -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Поддерживаемые плееры" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Все плееры" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Выверите назначаемый файл LRC" +msgstr "Выбрать плеер при запуске" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Команда плеера:" +msgstr "Использовать команду:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "Запуск" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Запомнить мой выбор" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" -msgstr "" +msgstr "Не удалось запустить %s" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" -msgstr "" +msgstr "Запуск %s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Нет доступных плееров.\n" +msgstr "Не запущено совместимых проигрывателей" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Выверите назначаемый файл LRC" +msgstr "Выберите проигрыватель из списка ниже для запуска" + +#: ../src/ol_player_chooser.c:568 +#, fuzzy, c-format +msgid "Fail to launch %s" +msgstr "Не удалось запустить %s" + +#: ../src/ol_player_chooser.c:570 +#, fuzzy, c-format +msgid "" +"%s is not supported by OSD Lyrics, or not running. Please launch another " +"player." +msgstr "" +"%s не поддерживается OSD Lyrics или не запущен. Пожалуйста, запустите дрегой " +"проигрыватель" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:580 #, c-format -msgid "Failed to connect to %s" +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:582 #, c-format msgid "" -"%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -211,524 +218,474 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Copyright 2009-2011 The OSD Lyrics project." + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Название\n" -" %p - Исполнитель\n" -" %a - Альбом\n" -" %n - Номер дорожки\n" -" %f - Имя файла (без расширения)" +"Вывод текста песен на экран (OSD) совместим с различными медиа-" +"проигрывателями и поддерживает загрузку текстов из сети.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Alexander Sapronov https://launchpad.net/~warmonger\n" +" Alexey Dokuchaev https://launchpad.net/~danfe\n" +" Alexey Kotlyarov https://launchpad.net/~koterpillar\n" +" Ivan Ysh https://launchpad.net/~gadjin\n" +" Klim https://launchpad.net/~klim\n" +" Nkolay Parukhin https://launchpad.net/~parukhin\n" +" Sergey Popov https://launchpad.net/~fil0soff\n" +" Stanislav Hanzhin https://launchpad.net/~hanzhin-stas\n" +" Tiger Soldier https://launchpad.net/~tigersoldi\n" +" Vitaly Antonov https://launchpad.net/~legidium\n" +" gruzdev https://launchpad.net/~gruzdev\n" +" Андрей Моисеев https://launchpad.net/~o2" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Альбом" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - имя файла" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Всегда" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - номер дорожки" +msgid "By lines" +msgstr "По линии" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Настройки" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Исполнитель" +msgid "Display mode:" +msgstr "Режим отображения:" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "OS_D" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Заголовок" +msgid "Sc_rolling" +msgstr "Прокр_утка" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Автоматически запускаемый плеер:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Команда плеера:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "_Выравнивание лирики" +msgid "Show _bubble notification" +msgstr "Показывать всплывающие подсказки" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "_Цвет лирики" +msgid "_General" +msgstr "_Общие" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Шрифт:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "Имя _файла" +msgid "Out_line:" +msgstr "Отступ" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Путь" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "Тише" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "" -"Просто \"%\" означает каталог, в котором расположена играющая сейчас музыка." +msgid "Strong" +msgstr "Громче" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Строки текста произведения" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "_Активная лирика:" +msgid "Si_ngle line" +msgstr "Одинарня линия" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Установить задержку лирики +0.2 с." +msgid "_Double lines" +msgstr "Двойные линии" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Установить задержку лирики -0.2 с." +msgid "Mode:" +msgstr "Режим:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "" +msgid "Doc_k" +msgstr "Пан_ель" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "" -"Вывод текста песен на экран (OSD) совместим с различными медиа-" -"проигрывателями и поддерживает загрузку текстов из сети.\n" +msgid "Nor_mal" +msgstr "_Нормально" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "Полупрозрачный при наведением курсором мышки" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Назначить локальный LRC-файл текущей музыке" +msgid "F_irst line:" +msgstr "_Первая строка:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "_Вторая строка:" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Автоматически запускаемый плеер:" +msgid "Lyric _Alignment" +msgstr "_Выравнивание лирики" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "Цветовая _тема:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "_Настроить цвета" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Выберите LRC-файл для загрузки" +msgid "Acti_ve lyrics:" +msgstr "_Активная лирика:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "сверху" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Цветовая _тема:" +msgid "middle" +msgstr "по середине" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 Проект OSD Lyrics." +msgid "bottom" +msgstr "снизу" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "_Неактивная лирика:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "Больше не спрашивать" +msgid "Lyric _Color" +msgstr "_Цвет лирики" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "А_ктивный цвет:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "Загрузить первого кандидата" +msgid "_Inactive color:" +msgstr "_Неактивный цвет:" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "" +msgid "Scroll _mode:" +msgstr "Режим прокрутки" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Не назначать лирики этой музыке" +msgid "Lyrics" +msgstr "Песни" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "_Первая строка:" +msgid "Colo_r:" +msgstr "_Цвет:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "Непрозрачность:" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "Прозрачный" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Скрыть OSD" +msgid "Opaque" +msgstr "Непрозрачный" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Когда окно OSD закрепленно, вы не можете перемещать его мышкой" +msgid "Background" +msgstr "Фон" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "" -"Если два и более LRC-файлов соответствуют условию поиска, загружать первый, " -"не спрашивая пользователя" - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "_Неактивная лирика:" +msgid "_Scrolling" +msgstr "Про_крутка" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Строки текста произведения" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "" +"Просто \"%\" означает каталог, в котором расположена играющая сейчас музыка." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Задержка лирики +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Задержка лирики -" +msgid "_Path" +msgstr "_Путь" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Строки текста произведения" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Название\n" +" %p - Исполнитель\n" +" %a - Альбом\n" +" %n - Номер дорожки\n" +" %f - Имя файла (без расширения)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "Имя _файла" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Распо_ложение текста" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "" +msgid "Lyric _sites:" +msgstr "_Сайты с песнями:" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "Отступ" +msgid "Do_wnload the first candidate" +msgstr "Загрузить первого кандидата" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "Загрузка" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Команда плеера:" +msgid "No _proxy" +msgstr "Без _прокси" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "" +msgid "Au_to-detect system settings" +msgstr "Ав_томатическое определение параметров системы" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Настройки" +msgid "Use _manual settings" +msgstr "Использовать ручные настройки" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "" +msgid "_Host:" +msgstr "_Узел:" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "П_орт:" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "" +msgid "_Type:" +msgstr "_Тип:" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "" +msgid "_Username:" +msgstr "И_мя пользователя:" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "" +msgid "Passwo_rd:" +msgstr "_Пароль:" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Искать лирику" +msgid "Show passwor_d" +msgstr "_Показывать пароль" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Поиск текстов в Интернет" +msgid "Proxy" +msgstr "Прокси" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "" +msgid "_Network" +msgstr "_Сеть" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "" +msgid "OSD _mode" +msgstr "OSD _режим" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Одинарня линия" +msgid "Scrolling _mode" +msgstr "_Режим прокрутки:" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Когда окно OSD закрепленно, вы не можете перемещать его мышкой" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "Полупрозрачный при наведением курсором мышки" +msgid "_Lock Position" +msgstr "Запомниить расположение" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Исполнитель текущей дорожки" +msgid "Hide the OSD Window" +msgstr "Скрыть OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Файловое имя текущей дорожки" +msgid "_Hide" +msgstr "_Скрыть" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Номер текущей дорожки" +msgid "_Search lyric..." +msgstr "_Поиск текста ..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Альбом текущей дорожки" +msgid "Search lyrics from Internet" +msgstr "Поиск текстов в Интернет" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Заголовок текущей песни" +msgid "_Assign lyric..." +msgstr "Назначить лирику..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Назначить локальный LRC-файл текущей музыке" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "Нет текста" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Не назначать лирики этой музыке" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Исполнитель:" +msgid "Lyric delay -" +msgstr "Задержка лирики -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "Назначить лирику..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Установить задержку лирики -0.2 с." #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Задержка лирики +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "Двойные линии" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Установить задержку лирики +0.2 с." #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Скачать" +msgid "Choose LRC file to download" +msgstr "Выберите LRC-файл для загрузки" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Шрифт:" +msgid "D_on't ask me again" +msgstr "Больше не спрашивать" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Если два и более LRC-файлов соответствуют условию поиска, загружать первый, " +"не спрашивая пользователя" -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_От:" +msgid "_Download" +msgstr "_Скачать" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Общие" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Скрыть" +msgid "The title of the current track" +msgstr "Заголовок текущей песни" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Заголовок" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "Запомниить расположение" +msgid "The artist of the current track" +msgstr "Исполнитель текущей дорожки" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Распо_ложение текста" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Исполнитель" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "Нет текста" +msgid "The title of album of the current track" +msgstr "Альбом текущей дорожки" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Альбом" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Поиск" +msgid "The number of the current track" +msgstr "Номер текущей дорожки" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "_Поиск текста ..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - номер дорожки" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_Вторая строка:" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "Н_азвание:" +msgid "The filename of the current track" +msgstr "Файловое имя текущей дорожки" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - имя файла" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Искать лирику" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "снизу" +msgid "_Title:" +msgstr "Н_азвание:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Исполнитель:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "по середине" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "сверху" +msgid "_Search" +msgstr "_Поиск" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Alexey Kotlyarov https://launchpad.net/~koterpillar\n" -" Ivan Ysh https://launchpad.net/~gadjin\n" -" Klim https://launchpad.net/~klim\n" -" Nkolay Parukhin https://launchpad.net/~parukhin\n" -" Stanislav Hanzhin https://launchpad.net/~hanzhin-stas\n" -" Tiger Soldier https://launchpad.net/~tigersoldi\n" -" Vitaly Antonov https://launchpad.net/~legidium\n" -" gruzdev https://launchpad.net/~gruzdev\n" -" Андрей Моисеев https://launchpad.net/~o2" - -#~ msgid "Searching lyrics" -#~ msgstr "Поиск текста" - -#~ msgid "Preview" -#~ msgstr "Предварительный просмотр" - -#~ msgid "None" -#~ msgstr "Пусто" - -#~ msgid "_Lock" -#~ msgstr "_Заблокировать" - -#~ msgid "_Width:" -#~ msgstr "Ширина:" - -#~ msgid "gtk-cancel" -#~ msgstr "Отмена" - -#~ msgid "gtk-ok" -#~ msgstr "ОК" - -#~ msgid "TODO: Add options here" -#~ msgstr "TODO: Добавить сюда параметры" - -#~ msgid "" -#~ "An OSD lyric show supporting multiple media players and downloading.\n" -#~ msgstr "" -#~ "OSD lyric поддерживает различные мультимедиа проигрыватели и скачивание " -#~ "лирики.\n" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Download _engine:" -#~ msgstr "Система для поиска текстов:" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Выберите сайт с которого вы хотите скачать." - -#~ msgid "Display mode" -#~ msgstr "Режим отображения" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "OSD" -#~ msgstr "Экранное меню" +msgid "_From:" +msgstr "_От:" -#~ msgid "Scrolling" -#~ msgstr "Прокрутка" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Нет доступных плееров.\n" -#~ msgid "_Display notification" -#~ msgstr "Показать уведомление" +#~ msgid "Failed to connect to %s" +#~ msgstr "Не удалось подключиться к %s" diff -Nru osdlyrics-0.4.2/po/tr.po osdlyrics-0.4.3/po/tr.po --- osdlyrics-0.4.2/po/tr.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/tr.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2010-11-27 04:10+0000\n" -"Last-Translator: Engin BAHADIR \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2011-07-29 06:23+0000\n" +"Last-Translator: Irmak Bıçakçıgil \n" "Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,7 +26,7 @@ msgid "Choose LRC file to assign" msgstr "Atamak için LRC dosyası seçin" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -35,41 +34,38 @@ "Kayda alınacak hata iletilerinin seviyesi, 'none', 'error', 'debug', veya " "'info' olarak belirtilebilir" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" -msgstr "" +msgstr "Sürüm bilgisini göster" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "İndirme başarısız" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "%s içinde şarkı sözleri aranıyor..." +msgstr "" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" -msgstr "Şarkı Sözleri dizini oluşturulamıyor" +msgstr "Şarkı sözleri dizini oluşturulamıyor" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Şarkı sözleri bulunamadı" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Desteklenen bir ortam oynatıcı yok, çık.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Kayda alınacak hata iletilerinin seviyesi, 'none', 'error', 'debug', veya " -"'info' olarak belirtilebilir" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Başka bir OSD Lyrics çalışıyor, çık." @@ -81,20 +77,20 @@ msgid "Unknown artist" msgstr "Bilinmeyen sanatçı" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" #: ../src/ol_option.c:1631 msgid "Choose on startup" -msgstr "" +msgstr "Başlangıçta seç" #. gtk_list_store_append (liststore, &iter); #. gtk_list_store_set (liststore, &iter, #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Özelleştir" @@ -102,11 +98,11 @@ msgid "Select a folder" msgstr "Bir klasör seçiniz" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -132,71 +128,79 @@ msgid "%d lyrics found :)" msgstr "%d adet şarkı sözü bulundu :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" -msgstr "" +msgstr "Desteklenen oynatıcılar" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" -msgstr "" +msgstr "Tüm oynatıcılar" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Atamak için LRC dosyası seçin" +msgstr "Çalıştırmak için bir oynatıcı seç" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "Oynatıcı komutu:" +msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" msgstr "" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" -msgstr "" +msgstr "Seçimimi hatırla" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Desteklenen bir ortam oynatıcı yok, çık.\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Atamak için LRC dosyası seçin" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." +msgstr "" + +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" +msgstr "" + +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -210,500 +214,463 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "Telif Hakkı 2009-2011 OSD Lyrics projesi." + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" msgstr "" -" %t - Başlık\n" -"%p - Sanatçı\n" -"%a - Albüm\n" -"%n - Parça Numarası\n" -"%f - Dosya Adı (uzantı olmadan)" +"OSD lyric birçok ortam yürütücü ile uyumludur ve şarkı sözlerini indirmeyi " +"destekler.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Engin BAHADIR https://launchpad.net/~enginbah\n" +" GüneyTekfidan https://launchpad.net/~ubuntuturk-hotmail\n" +" Irmak Bıçakçıgil https://launchpad.net/~irmak\n" +" Tiger Soldier https://launchpad.net/~tigersoldi\n" +" zeugma https://launchpad.net/~sunder67" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - Albüm" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - Dosya Adı" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "Her zaman" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - Parça numarası" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Tercihler" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - Sanatçı" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - Başlık" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "Oynatıcı_yı otomatik başlat:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "Oynatıcı komutu:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Şarkı Sözü Hiz_ası" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "Şarkı Sözü Ren_gi" +msgid "_General" +msgstr "_Genel" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Yazı tipi:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Dosya Adı" +msgid "Out_line:" +msgstr "_Çıkış satırı:" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Yol" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "Tekil \"%\" işareti çalınan müziğin dizinini tanımlar." +msgid "Strong" +msgstr "" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Şarkı sözü satırları:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Etkin şarkı sö_zleri:" +msgid "Si_ngle line" +msgstr "Tekil satır" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Şarkı sözü gecikmesini +0.2 s olarak ayarla" +msgid "_Double lines" +msgstr "Çi_fte satırlar" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Şarkı sözü gecikmesini -0.2 s olarak ayarla" +msgid "Mode:" +msgstr "" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" +msgid "Nor_mal" msgstr "" -"OSD lyric birçok ortam yürütücü ile uyumludur ve şarkı sözlerini indirmeyi " -"destekler.\n" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "Fa_re üzerindeyken saydamlaştır" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Güncel parçaya yerel bir LRC dosyası ata" +msgid "F_irst line:" +msgstr "_İlk satır" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "İkinci Dize" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "Oynatıcı_yı otomatik başlat:" +msgid "Lyric _Alignment" +msgstr "Şarkı Sözü Hiz_ası" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "Renk _Teması:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" -msgstr "_Renkleri özelleştir" +msgstr "Renkleri _özelleştir" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "İndirilecek LRC Dosyasını Seçin" +msgid "Acti_ve lyrics:" +msgstr "Etkin şarkı sö_zleri:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "üst" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "Renk _Teması:" +msgid "middle" +msgstr "orta" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Copyright 2009 The OSD Lyrics project." +msgid "bottom" +msgstr "alt" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Etkin olmayan şarkı sözl_eri:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "Tekrar s_orma" +msgid "Lyric _Color" +msgstr "Şarkı Sözü Ren_gi" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "_Etkin renk:" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "İlk sürümü in_dir" +msgid "_Inactive color:" +msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Bu şarkıya şarkı sözü atama" +msgid "Lyrics" +msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "_İlk satır" +msgid "Colo_r:" +msgstr "_Renk:" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" +msgid "Transparent" msgstr "" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "OSD Penceresini Gizle" +msgid "Opaque" +msgstr "" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "Eğer kilitliyse, OSD penceresini hareket ettiremezsiniz" +msgid "Background" +msgstr "Arka Plan" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -"Eğer arama kalıbınıza uyan birden fazla lrc dosyası varsa, kullanıcıyı " -"uyarmadan ilkini indir." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Etkin olmayan şarkı sözl_eri:" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Şarkı sözü satırları:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "Tekil \"%\" işareti çalınan müziğin dizinini tanımlar." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Şarkı sözü gecikmesi +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Şarkı sözü gecikmesi -" +msgid "_Path" +msgstr "_Yol" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Şarkı sözü satırları:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Başlık\n" +" %p - Sanatçı\n" +" %a - Albüm\n" +" %n - Parça Numarası\n" +" %f - Dosya Adı (uzantı olmadan)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Dosya Adı" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Şarkı Sözü _Dizini" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "_Çıkış satırı:" +msgid "Do_wnload the first candidate" +msgstr "İlk sürümü in_dir" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "İndir" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "Oynatıcı komutu:" +msgid "No _proxy" +msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Tercihler" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" +msgid "Po_rt:" msgstr "" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Şarkı Sözü Ara" +msgid "Show passwor_d" +msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Şarkı sözlerini internette ara" +msgid "Proxy" +msgstr "Vekil Sunucu" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Tekil satır" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "Eğer kilitliyse, OSD penceresini hareket ettiremezsiniz" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "Fa_re üzerindeyken saydamlaştır" +msgid "_Lock Position" +msgstr "Konumu Ki_litle" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Güncel parçanın solisti" +msgid "Hide the OSD Window" +msgstr "OSD Penceresini Gizle" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Güncel parçanın dosya adı" +msgid "_Hide" +msgstr "_Gizle" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Güncel parçanın numarası" +msgid "_Search lyric..." +msgstr "Şarkı _sözü ara..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Güncel parçanın albüm başlığı" +msgid "Search lyrics from Internet" +msgstr "Şarkı sözlerini internette ara" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Güncel parçanın başlığı" +msgid "_Assign lyric..." +msgstr "Ş_arkı sözü ata..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Güncel parçaya yerel bir LRC dosyası ata" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "Şarkı sözü _yok" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Bu şarkıya şarkı sözü atama" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "S_anatçı:" +msgid "Lyric delay -" +msgstr "Şarkı sözü gecikmesi -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "Ş_arkı sözü ata..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Şarkı sözü gecikmesini -0.2 s olarak ayarla" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Şarkı sözü gecikmesi +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "Çi_fte satırlar" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Şarkı sözü gecikmesini +0.2 s olarak ayarla" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "İn_dir" +msgid "Choose LRC file to download" +msgstr "İndirilecek LRC Dosyasını Seçin" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Yazı tipi:" +msgid "D_on't ask me again" +msgstr "Tekrar s_orma" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Eğer arama kalıbınıza uyan birden fazla lrc dosyası varsa, kullanıcıyı " +"uyarmadan ilkini indir." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_Kaynak:" +msgid "_Download" +msgstr "İn_dir" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Genel" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Gizle" +msgid "The title of the current track" +msgstr "Güncel parçanın başlığı" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - Başlık" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "Konumu Ki_litle" +msgid "The artist of the current track" +msgstr "Güncel parçanın solisti" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Şarkı Sözü _Dizini" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - Sanatçı" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "Şarkı sözü _yok" +msgid "The title of album of the current track" +msgstr "Güncel parçanın albüm başlığı" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - Albüm" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "Ara_ma" +msgid "The number of the current track" +msgstr "Güncel parçanın numarası" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "Şarkı _sözü ara..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - Parça numarası" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "İkinci Dize" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Başlık:" +msgid "The filename of the current track" +msgstr "Güncel parçanın dosya adı" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - Dosya Adı" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Şarkı Sözü Ara" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "alt" +msgid "_Title:" +msgstr "_Başlık:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "S_anatçı:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "orta" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "üst" +msgid "_Search" +msgstr "Ara_ma" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Engin BAHADIR https://launchpad.net/~enginbah\n" -" GüneyTekfidan https://launchpad.net/~ubuntuturk-hotmail\n" -" Tiger Soldier https://launchpad.net/~tigersoldi\n" -" zeugma https://launchpad.net/~sunder67" - -#~ msgid "Searching lyrics" -#~ msgstr "Şarkı Sözleri aranıyor" - -#~ msgid "Preview" -#~ msgstr "Önizleme" - -#~ msgid "None" -#~ msgstr "Hiçbiri" - -#~ msgid "_Width:" -#~ msgstr "_Genişlik:" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Hangi Siteden İndirmek İstediğinizi Seçin" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Display mode" -#~ msgstr "Görünüm kipi" - -#~ msgid "OSD" -#~ msgstr "OSD" - -#~ msgid "Scrolling" -#~ msgstr "Kaydırma" - -#~ msgid "_Display notification" -#~ msgstr "Bilgilen_dirmeyi görüntüle" +msgid "_From:" +msgstr "_Kaynak:" -#~ msgid "Download _engine:" -#~ msgstr "İndirm_e motoru:" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Desteklenen bir ortam oynatıcı yok, çık.\n" diff -Nru osdlyrics-0.4.2/po/uk.po osdlyrics-0.4.3/po/uk.po --- osdlyrics-0.4.2/po/uk.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/uk.po 2012-06-04 13:29:35.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: osd-lyrics\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" "PO-Revision-Date: 2010-07-14 15:11+0000\n" "Last-Translator: Sergiy Gavrylov \n" "Language-Team: Ukrainian \n" @@ -16,10 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -29,7 +27,7 @@ msgid "Choose LRC file to assign" msgstr "Вибрати файли LRC для призначення" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" @@ -37,41 +35,38 @@ "Рівень налагоджувальних повідомлень у журналі може бути як «немає», " "«помилка», «налагодження» та «інфо»" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" msgstr "" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "Завантаження не вдалось" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "Пошук текстів пісень на %s..." +msgstr "" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "Не вдається створити теку для текстів пісень" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "Текст пісні не знайдений" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "Працює не підтримуваний програвач, вихід.\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 -#, fuzzy +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -"Рівень налагоджувальних повідомлень у журналі може бути як «немає», " -"«помилка», «налагодження» та «інфо»" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "Працює інший OSD Lyrics, вихід." @@ -83,7 +78,7 @@ msgid "Unknown artist" msgstr "Невідомий виконавець" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" @@ -96,7 +91,7 @@ #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "Налаштувати" @@ -104,11 +99,11 @@ msgid "Select a folder" msgstr "Вибрати теку" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -134,71 +129,79 @@ msgid "%d lyrics found :)" msgstr "Текст %d знайдений :)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" msgstr "" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "Команда для запуску програвача" +msgstr "" -#: ../src/ol_player_chooser.c:264 -#, fuzzy +#: ../src/ol_player_chooser.c:270 msgid "Use command:" -msgstr "_Команда програвача:" +msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" msgstr "" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" msgstr "" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "Працює не підтримуваний програвач, вихід.\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "Команда для запуску програвача" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." +msgstr "" + +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." +msgstr "" + +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -212,501 +215,458 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" +msgstr "" +"Програма OSD lyric сумісна з різними медіа-плеєрами і підтримує завантаження " +"текстів пісень.\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "Ліцензія GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" msgstr "" -" %t - Назва\n" -" %p - Виконавець\n" -" %a - Альбом\n" -" %n - Номер доріжки\n" -" %f - Назва файла (без розширення)" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - альбом" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - назва файла" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - номер доріжки" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "Налаштування" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - виконавець" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - назва" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "" +msgid "Auto la_unch player:" +msgstr "_Автозапуск програвача:" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "" +msgid "Pla_yer command:" +msgstr "_Команда програвача:" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "Вир_івнювання тексту пісні" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "_Колір тексту" +msgid "_General" +msgstr "_Загальне" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "_Шрифт:" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "_Назва файла" +msgid "Out_line:" +msgstr "С_хема:" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "_Шлях:" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "Окремий \"%\" означає теку з відтворюваною музикою." +msgid "Strong" +msgstr "" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "Рядки тексту:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "Акти_вні тексти:" +msgid "Si_ngle line" +msgstr "Оди_н рядок" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "Встановити затримку тексту +0.2 с" +msgid "_Double lines" +msgstr "_Два рядки" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "Встановити затримку тексту -0.2 с" +msgid "Mode:" +msgstr "" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" +msgid "Nor_mal" msgstr "" -"Програма OSD lyric сумісна з різними медіа-плеєрами і підтримує завантаження " -"текстів пісень.\n" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "Н_апівпрозоре під вказівником" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "Призначає локальний LRC-файл для поточної пісні" +msgid "F_irst line:" +msgstr "П_ерший рядок:" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "_Другий рядок:" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "_Автозапуск програвача:" +msgid "Lyric _Alignment" +msgstr "Вир_івнювання тексту пісні" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "_Тема кольорів:" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "На_лаштування кольорів" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "Вибрати LRC-файл для завантаження" +msgid "Acti_ve lyrics:" +msgstr "Акти_вні тексти:" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "вгорі" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "_Тема кольорів:" +msgid "middle" +msgstr "в середині" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "Авторське право: 2009 Проект OSD Lyrics." +msgid "bottom" +msgstr "внизу" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "Н_еактивні тексти:" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "Не _питати знову" +msgid "Lyric _Color" +msgstr "_Колір тексту" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" +msgid "_OSD" +msgstr "_OSD" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" msgstr "" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "За_вантажити перший варіант" +msgid "_Inactive color:" +msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "Не призначати текст для цієї музики" +msgid "Lyrics" +msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "П_ерший рядок:" +msgid "Colo_r:" +msgstr "" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "Ліцензія GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" +msgid "Transparent" msgstr "" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "Приховати вікно OSD" +msgid "Opaque" +msgstr "" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" +msgid "Background" msgstr "" -"Не можливо перемістити вказівником миші вікно OSD, якщо воно заблоковане" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -"Якщо є кілька LRC-файлів, які відповідають умовам пошуку, завантажувати " -"першої варіант без підтвердження користувачем." - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "Н_еактивні тексти:" #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "Рядки тексту:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "Окремий \"%\" означає теку з відтворюваною музикою." #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "Затримка тексту +" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "Затримка тексту -" +msgid "_Path" +msgstr "_Шлях:" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "Рядки тексту:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - Назва\n" +" %p - Виконавець\n" +" %a - Альбом\n" +" %n - Номер доріжки\n" +" %f - Назва файла (без розширення)" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "_Назва файла" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "Мі_сце розташування текстів" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "С_хема:" +msgid "Do_wnload the first candidate" +msgstr "За_вантажити перший варіант" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" +msgid "Download" msgstr "" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "_Команда програвача:" +msgid "No _proxy" +msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "Налаштування" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" +msgid "Po_rt:" msgstr "" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "Пошук текстів пісень" +msgid "Show passwor_d" +msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "Пошук текстів пісень в Інтернеті" +msgid "Proxy" +msgstr "" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "Оди_н рядок" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" +msgid "If locked, you can't move OSD window by mouse" msgstr "" +"Не можливо перемістити вказівником миші вікно OSD, якщо воно заблоковане" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "Н_апівпрозоре під вказівником" +msgid "_Lock Position" +msgstr "_Заблокувати положення" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "Виконавець поточної доріжки" +msgid "Hide the OSD Window" +msgstr "Приховати вікно OSD" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "Назва файла поточної доріжки" +msgid "_Hide" +msgstr "_Приховати" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "Номер поточної доріжки" +msgid "_Search lyric..." +msgstr "П_ошук тексту пісні..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "Назва альбому поточної доріжки" +msgid "Search lyrics from Internet" +msgstr "Пошук текстів пісень в Інтернеті" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "Назва поточної доріжки" +msgid "_Assign lyric..." +msgstr "Призн_ачити текст..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "" +msgid "Assign local LRC file to current music" +msgstr "Призначає локальний LRC-файл для поточної пісні" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "" +msgid "_No lyric" +msgstr "_Немає тексту" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "" +msgid "Don't assign lyric to this music" +msgstr "Не призначати текст для цієї музики" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "_Виконавець:" +msgid "Lyric delay -" +msgstr "Затримка тексту -" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "Призн_ачити текст..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "Встановити затримку тексту -0.2 с" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "" +msgid "Lyric delay +" +msgstr "Затримка тексту +" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "_Два рядки" +msgid "Adjust lyric delay by +0.2 s" +msgstr "Встановити затримку тексту +0.2 с" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "_Завантажити" +msgid "Choose LRC file to download" +msgstr "Вибрати LRC-файл для завантаження" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "_Шрифт:" +msgid "D_on't ask me again" +msgstr "Не _питати знову" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "" +"Якщо є кілька LRC-файлів, які відповідають умовам пошуку, завантажувати " +"першої варіант без підтвердження користувачем." -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "_З:" +msgid "_Download" +msgstr "_Завантажити" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "_Загальне" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "_Приховати" +msgid "The title of the current track" +msgstr "Назва поточної доріжки" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - назва" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "_Заблокувати положення" +msgid "The artist of the current track" +msgstr "Виконавець поточної доріжки" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "Мі_сце розташування текстів" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - виконавець" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "_Немає тексту" +msgid "The title of album of the current track" +msgstr "Назва альбому поточної доріжки" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "_OSD" +#, no-c-format +msgid "%a - Album" +msgstr "%a - альбом" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "_Пошук" +msgid "The number of the current track" +msgstr "Номер поточної доріжки" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "П_ошук тексту пісні..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - номер доріжки" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "_Другий рядок:" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "_Назва:" +msgid "The filename of the current track" +msgstr "Назва файла поточної доріжки" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - назва файла" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "" +msgid "Search lyrics" +msgstr "Пошук текстів пісень" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "внизу" +msgid "_Title:" +msgstr "_Назва:" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "_Виконавець:" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "в середині" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "вгорі" +msgid "_Search" +msgstr "_Пошук" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Sergiy Gavrylov https://launchpad.net/~gavro" - -#~ msgid "Searching lyrics" -#~ msgstr "Пошук тексту пісні" - -#~ msgid "Preview" -#~ msgstr "Попередній перегляд" - -#~ msgid "None" -#~ msgstr "Немає" - -#~ msgid "Qianqian" -#~ msgstr "Qianqian" - -#~ msgid "Sogou" -#~ msgstr "Sogou" - -#~ msgid "MiniLyrics" -#~ msgstr "MiniLyrics" - -#~ msgid "If no player detected, launch the given player" -#~ msgstr "Якщо програвач не знайдений, запускається заданий" - -#~ msgid "_Display notification" -#~ msgstr "_Показувати сповіщення" - -#~ msgid "_Width:" -#~ msgstr "_Ширина:" - -#~ msgid "Choose witch site you want to download from." -#~ msgstr "Виберіть веб-сайт для завантаження текстів." - -#~ msgid "Download _engine:" -#~ msgstr "Ру_шій завантаження:" - -#~ msgid "OSD" -#~ msgstr "OSD" - -#~ msgid "Display mode" -#~ msgstr "Режим показу" +msgid "_From:" +msgstr "_З:" -#~ msgid "Scrolling" -#~ msgstr "Гортання" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "Працює не підтримуваний програвач, вихід.\n" diff -Nru osdlyrics-0.4.2/po/zh_CN.po osdlyrics-0.4.3/po/zh_CN.po --- osdlyrics-0.4.2/po/zh_CN.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/zh_CN.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: osd-lyrics 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2011-11-17 23:26+0800\n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2012-06-04 17:44+0800\n" "Last-Translator: Tiger Soldier \n" "Language-Team: Simplified Chinese \n" "Language: \n" @@ -26,44 +26,44 @@ msgid "Choose LRC file to assign" msgstr "选择要关联的LRC文件" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" msgstr "要记录的调试信息级别，可以为'none'、'error'、'debug'或'info'" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" msgstr "显示版本信息" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "下载失败" -#: ../src/ol_main.c:162 +#: ../src/ol_main.c:168 #, c-format msgid "Searching lyrics from %s" msgstr "正在从%s搜索歌词" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "无法创建歌词目录" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "找不到匹配的歌词" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "没有检测到支持的播放器，程序自动退出。\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "播放器已退出，程序自动退出。\n" -#: ../src/ol_main.c:652 +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "调试级别应该为\"none\"、\"error\"、\"debug\"或\"info\"" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "OSD Lyrics已经运行，程序自动退出。" @@ -75,7 +75,7 @@ msgid "Unknown artist" msgstr "未知歌手" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" @@ -88,7 +88,7 @@ #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "自定义" @@ -96,11 +96,11 @@ msgid "Select a folder" msgstr "选择文件夹" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "千千静听" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "虾米" @@ -126,67 +126,81 @@ msgid "%d lyrics found :)" msgstr "找到%d个歌词:)" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" msgstr "支持的播放器" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "所有播放器" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" msgstr "选择要启动的播放器" -#: ../src/ol_player_chooser.c:264 +#: ../src/ol_player_chooser.c:270 msgid "Use command:" msgstr "自定义命令:" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" msgstr "启动" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" msgstr "记住我的选择" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "启动%s失败" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "正在启动%s" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "OSD Lyrics正在启动%s并与其进行通信，请稍候。" -#: ../src/ol_player_chooser.c:510 +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" msgstr "没有检测到支持的播放器" -#: ../src/ol_player_chooser.c:511 +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" msgstr "请从下方选择要启动的播放器" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" -msgstr "无法与%s进行通信" +msgid "Fail to launch %s" +msgstr "启动%s失败" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" -msgstr "%s不受OSD Lyrics或没有正常启动。请启动其他播放器" +"player." +msgstr "可能OSD Lyrics无法支持%s，也可能它没有正常启动。请启动其他播放器。" + +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" +msgstr "%s出问题了" + +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." +msgstr "" +"有可能%s自己崩溃了，也有可能它拒绝连接OSD Lyrics。请尝试重新运行它，或者换一" +"个播放器。" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "未知名称" @@ -202,455 +216,461 @@ msgid "Drag to move the window" msgstr "用鼠标移动窗口" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "版权所有 2009-2011 OSD Lyrics 项目组。" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" +msgstr "支持多种播放器和自动歌词下载的桌面歌词秀\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" msgstr "" -" %t - 歌名\n" -" %p - 歌手\n" -" %a - 专辑\n" -" %n - 曲目编号\n" -" %f - 文件名" +"Launchpad Contributions:\n" +" Tiger Soldier https://launchpad.net/~tigersoldi" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - 专辑" +msgid "HTTP" +msgstr "HTTP" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "SOCKS4" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - 音乐文件名" +msgid "SOCKS5" +msgstr "SOCKS5" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "总是滚动" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - 曲目编号" +msgid "By lines" +msgstr "按行滚动" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "首选项" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - 歌手" +msgid "Display mode:" +msgstr "显示模式:" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "桌面歌词(_D)" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - 歌名" +msgid "Sc_rolling" +msgstr "滚动歌词(_R)" #: ../data/dialogs.glade.h:17 -msgid "Background" -msgstr "背景" +msgid "Auto la_unch player:" +msgstr "自动启动播放器(_U):" #: ../data/dialogs.glade.h:18 -msgid "Download" -msgstr "下载" +msgid "Pla_yer command:" +msgstr "播放器命令(_P):" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "歌词对齐(_A)" +msgid "Show _bubble notification" +msgstr "显示气泡通知(_B)" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "歌词配色(_C)" +msgid "_General" +msgstr "常规(_G)" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "歌词" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "代理" +msgid "_Font:" +msgstr "字体(_F):" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "文件名(_F)" +msgid "Out_line:" +msgstr "轮廓(_L):" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "路径(_P)" +msgid "_Blur:" +msgstr "模糊(_B):" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "弱" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "“%”表示当前播放歌曲所在目录。" +msgid "Strong" +msgstr "强" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "已唱颜色(_U):" +msgid "Lyric lines:" +msgstr "歌词行数:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "已唱歌词(_V):" +msgid "Si_ngle line" +msgstr "单行(_N)" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "将歌词延后0.2秒" +msgid "_Double lines" +msgstr "双行(_D)" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" -msgstr "将歌词提前0.2秒" +msgid "Mode:" +msgstr "模式:" #: ../data/dialogs.glade.h:31 -msgid "Always" -msgstr "总是滚动" +msgid "Doc_k" +msgstr "Doc_k" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "支持多种播放器和自动歌词下载的桌面歌词秀\n" +msgid "Nor_mal" +msgstr "普通(_M)" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "鼠标移到歌词上时半透明(_R)" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "将本机LRC文件关联到当前音乐" +msgid "F_irst line:" +msgstr "首行(_I):" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "自动检测系统设置(_T)" +msgid "_Second line:" +msgstr "次行(_S):" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "自动启动播放器(_U):" +msgid "Lyric _Alignment" +msgstr "歌词对齐(_A)" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "按行滚动" +msgid "Color _Theme:" +msgstr "配色方案(_T):" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "自行配色(_U)" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "选择要下载的歌词" +msgid "Acti_ve lyrics:" +msgstr "已唱歌词(_V):" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "颜色(_R):" +msgid "top" +msgstr "上" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "配色方案(_T):" +msgid "middle" +msgstr "中" #: ../data/dialogs.glade.h:42 -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "版权所有 2009-2011 OSD Lyrics 项目组。" +msgid "bottom" +msgstr "下" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "未唱歌词(_E):" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "以后不再提示我(_O)" +msgid "Lyric _Color" +msgstr "歌词配色(_C)" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" -msgstr "显示模式:" +msgid "_OSD" +msgstr "桌面歌词(_O)" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" +msgstr "已唱颜色(_U):" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" -msgstr "下载第一个匹配歌词(_W)" +msgid "_Inactive color:" +msgstr "未唱颜色(_I):" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" -msgstr "Doc_k" +msgid "Scroll _mode:" +msgstr "滚动方式(_M):" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" -msgstr "不要给这首歌关联任何歌词" +msgid "Lyrics" +msgstr "歌词" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "首行(_I):" +msgid "Colo_r:" +msgstr "颜色(_R):" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "透明度(_P):" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "HTTP" +msgid "Transparent" +msgstr "透明" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "隐藏桌面歌词窗口" +msgid "Opaque" +msgstr "不透明" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "锁定后将无法用鼠标移动桌面歌词" +msgid "Background" +msgstr "背景" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." -msgstr "如果有多个LRC歌词匹配搜索条件，直接下载第一个，不再进行提示。" - -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "未唱歌词(_E):" +msgid "_Scrolling" +msgstr "滚动歌词(_S)" #: ../data/dialogs.glade.h:57 -msgid "Lyric _sites:" -msgstr "歌词站点(_S):" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "“%”表示当前播放歌曲所在目录。" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "延后歌词" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "提前歌词" +msgid "_Path" +msgstr "路径(_P)" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "歌词行数:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "模式:" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "不使用代理(_P)" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "普通(_M)" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" -msgstr "桌面歌词模式(M)" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" +msgstr "" +" %t - 歌名\n" +" %p - 歌手\n" +" %a - 专辑\n" +" %n - 曲目编号\n" +" %f - 文件名" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "桌面歌词(_D)" +msgid "_Filename" +msgstr "文件名(_F)" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "透明度(_P):" +msgid "_Lyric Location" +msgstr "歌词位置(_L)" #: ../data/dialogs.glade.h:67 -msgid "Opaque" -msgstr "不透明" +msgid "Lyric _sites:" +msgstr "歌词站点(_S):" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" -msgstr "轮廓(_L):" +msgid "Do_wnload the first candidate" +msgstr "下载第一个匹配歌词(_W)" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "密码(_R):" +msgid "Download" +msgstr "下载" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" -msgstr "播放器命令(_P):" +msgid "No _proxy" +msgstr "不使用代理(_P)" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" -msgstr "端口(_R):" +msgid "Au_to-detect system settings" +msgstr "自动检测系统设置(_T)" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "首选项" +msgid "Use _manual settings" +msgstr "手动设置代理(_M)" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" -msgstr "SOCKS4" +msgid "_Host:" +msgstr "主机(_H):" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "SOCKS5" +msgid "Po_rt:" +msgstr "端口(_R):" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" -msgstr "滚动歌词(_R)" +msgid "_Type:" +msgstr "类型(_T):" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" -msgstr "滚动方式(_M):" +msgid "_Username:" +msgstr "用户名(_U):" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" -msgstr "滚动歌词模式(_M)" +msgid "Passwo_rd:" +msgstr "密码(_R):" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" -msgstr "搜索歌词" +msgid "Show passwor_d" +msgstr "显示密码(_D)" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "从网上搜索歌词" +msgid "Proxy" +msgstr "代理" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" -msgstr "显示气泡通知(_B)" +msgid "_Network" +msgstr "网络(_N)" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" -msgstr "显示密码(_D)" +msgid "OSD _mode" +msgstr "桌面歌词模式(M)" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "单行(_N)" +msgid "Scrolling _mode" +msgstr "滚动歌词模式(_M)" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "强" +msgid "If locked, you can't move OSD window by mouse" +msgstr "锁定后将无法用鼠标移动桌面歌词" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "鼠标移到歌词上时半透明(_R)" +msgid "_Lock Position" +msgstr "锁定位置(_L)" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "当前歌曲歌手" +msgid "Hide the OSD Window" +msgstr "隐藏桌面歌词窗口" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "当前歌曲的文件名" +msgid "_Hide" +msgstr "隐藏(_H)" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "当前歌曲的编号" +msgid "_Search lyric..." +msgstr "搜索歌词(_S)..." #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "当前歌曲的专辑名" +msgid "Search lyrics from Internet" +msgstr "从网上搜索歌词" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "当前歌曲名" +msgid "_Assign lyric..." +msgstr "关联歌词(_A)..." #: ../data/dialogs.glade.h:91 -msgid "Transparent" -msgstr "透明" +msgid "Assign local LRC file to current music" +msgstr "将本机LRC文件关联到当前音乐" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" -msgstr "手动设置代理(_M)" +msgid "_No lyric" +msgstr "不要歌词(_N)" #: ../data/dialogs.glade.h:93 -msgid "Weak" -msgstr "弱" +msgid "Don't assign lyric to this music" +msgstr "不要给这首歌关联任何歌词" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" -msgstr "歌手(_A):" +msgid "Lyric delay -" +msgstr "提前歌词" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." -msgstr "关联歌词(_A)..." +msgid "Adjust lyrics delay by -0.2 s" +msgstr "将歌词提前0.2秒" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" -msgstr "模糊(_B):" +msgid "Lyric delay +" +msgstr "延后歌词" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "双行(_D)" +msgid "Adjust lyric delay by +0.2 s" +msgstr "将歌词延后0.2秒" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "下载(_D)" +msgid "Choose LRC file to download" +msgstr "选择要下载的歌词" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "字体(_F):" +msgid "D_on't ask me again" +msgstr "以后不再提示我(_O)" + +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." +msgstr "如果有多个LRC歌词匹配搜索条件，直接下载第一个，不再进行提示。" -#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:101 -msgid "_From:" -msgstr "下载自(_F):" +msgid "_Download" +msgstr "下载(_D)" #: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "常规(_G)" - -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "隐藏(_H)" +msgid "The title of the current track" +msgstr "当前歌曲名" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "主机(_H):" +#, no-c-format +msgid "%t - Title" +msgstr "%t - 歌名" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "未唱颜色(_I):" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "锁定位置(_L)" +msgid "The artist of the current track" +msgstr "当前歌曲歌手" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "歌词位置(_L)" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - 歌手" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "网络(_N)" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "不要歌词(_N)" +msgid "The title of album of the current track" +msgstr "当前歌曲的专辑名" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "桌面歌词(_O)" +#, no-c-format +msgid "%a - Album" +msgstr "%a - 专辑" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "滚动歌词(_S)" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "搜索(_S)" +msgid "The number of the current track" +msgstr "当前歌曲的编号" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "搜索歌词(_S)..." +#, no-c-format +msgid "%n - Track number" +msgstr "%n - 曲目编号" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "次行(_S):" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "歌名(_T):" +msgid "The filename of the current track" +msgstr "当前歌曲的文件名" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "类型(_T):" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - 音乐文件名" #: ../data/dialogs.glade.h:117 -msgid "_Username:" -msgstr "用户名(_U):" +msgid "Search lyrics" +msgstr "搜索歌词" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "下" +msgid "_Title:" +msgstr "歌名(_T):" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "歌手(_A):" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "中" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "上" +msgid "_Search" +msgstr "搜索(_S)" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Tiger Soldier https://launchpad.net/~tigersoldi" +msgid "_From:" +msgstr "下载自(_F):" + +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "没有检测到支持的播放器，程序自动退出。\n" + +#~ msgid "Failed to connect to %s" +#~ msgstr "无法与%s进行通信" #~ msgid "Preview" #~ msgstr "预览" diff -Nru osdlyrics-0.4.2/po/zh_HK.po osdlyrics-0.4.3/po/zh_HK.po --- osdlyrics-0.4.2/po/zh_HK.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/zh_HK.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" "PO-Revision-Date: 2010-01-04 19:10+0000\n" -"Last-Translator: Tiger Soldier \n" +"Last-Translator: Tiger Soldier \n" "Language-Team: Simplified Chinese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,44 +26,44 @@ msgid "Choose LRC file to assign" msgstr "" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" msgstr "" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" msgstr "" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "下載失敗" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "正在搜尋歌詞" +msgstr "" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "無法建立歌詞資料夾" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "找不到符合的歌詞" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "沒有偵測到支援的播放器，程式自動結束。\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "" @@ -76,7 +75,7 @@ msgid "Unknown artist" msgstr "" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" @@ -89,7 +88,7 @@ #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "自訂" @@ -97,11 +96,11 @@ msgid "Select a folder" msgstr "" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -127,70 +126,79 @@ msgid "%d lyrics found :)" msgstr "" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" msgstr "" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "選取要下載的歌詞" +msgstr "" -#: ../src/ol_player_chooser.c:264 +#: ../src/ol_player_chooser.c:270 msgid "Use command:" msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" msgstr "" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" msgstr "" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "沒有偵測到支援的播放器，程式自動結束。\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "選取要下載的歌詞" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." +msgstr "" + +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" +msgstr "" + +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -204,484 +212,455 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" +msgstr "支援多種播放器和自動歌詞下載的桌面歌詞秀\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" msgstr "" -" %t - 歌名\n" -" %p - 歌手\n" -" %a - 專輯\n" -" %n - 曲目編號\n" -" %f - 檔名" +"Launchpad Contributions:\n" +" Tiger Soldier https://launchpad.net/~tigersoldi" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - 專輯" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - 音樂檔名" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - 曲目編號" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "個人偏好" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - 歌手" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - 歌名" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" +msgid "Auto la_unch player:" msgstr "" #: ../data/dialogs.glade.h:18 -msgid "Download" +msgid "Pla_yer command:" msgstr "" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "歌詞對齊(_A)" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "歌詞配色(_C)" +msgid "_General" +msgstr "常規(_G)" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "字型(_F):" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "檔名(_F)" +msgid "Out_line:" +msgstr "" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "路徑(_P)" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "“%”表示目前播放歌曲所在目錄。" +msgid "Strong" +msgstr "" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "歌詞行數:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "已唱歌詞(_V):" +msgid "Si_ngle line" +msgstr "單行(_N)" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "" +msgid "_Double lines" +msgstr "雙行(_D)" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" +msgid "Mode:" msgstr "" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "支援多種播放器和自動歌詞下載的桌面歌詞秀\n" +msgid "Nor_mal" +msgstr "" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "滑鼠移到歌詞上時半透通(_R)" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "" +msgid "F_irst line:" +msgstr "首行(_I):" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "次行(_S)" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "" +msgid "Lyric _Alignment" +msgstr "歌詞對齊(_A)" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "配色方案(_T):" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "自行配色(_U)" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "選取要下載的歌詞" +msgid "Acti_ve lyrics:" +msgstr "已唱歌詞(_V):" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "上" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "配色方案(_T):" +msgid "middle" +msgstr "中" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "版權所有 2009 OSD Lyrics 項目組。" +msgid "bottom" +msgstr "下" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "未唱歌詞(_E):" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "" +msgid "Lyric _Color" +msgstr "歌詞配色(_C)" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" +msgid "_OSD" +msgstr "桌面歌詞(_O)" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" msgstr "" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" +msgid "_Inactive color:" msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" +msgid "Lyrics" msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "首行(_I):" +msgid "Colo_r:" +msgstr "" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" +msgid "Transparent" msgstr "" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "隱藏桌面歌詞視窗" +msgid "Opaque" +msgstr "" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "鎖定后將無法用滑鼠移動桌面歌詞" +msgid "Background" +msgstr "" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "未唱歌詞(_E):" - #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "歌詞行數:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "“%”表示目前播放歌曲所在目錄。" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "" +msgid "_Path" +msgstr "路徑(_P)" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "歌詞行數:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - 歌名\n" +" %p - 歌手\n" +" %a - 專輯\n" +" %n - 曲目編號\n" +" %f - 檔名" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "檔名(_F)" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "歌詞位置(_L)" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" +msgid "Do_wnload the first candidate" msgstr "" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" +msgid "Download" msgstr "" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" +msgid "No _proxy" msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "個人偏好" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" +msgid "Po_rt:" msgstr "" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" +msgid "Show passwor_d" msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" +msgid "Proxy" msgstr "" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "單行(_N)" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "鎖定后將無法用滑鼠移動桌面歌詞" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "滑鼠移到歌詞上時半透通(_R)" +msgid "_Lock Position" +msgstr "" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "目前歌曲歌手" +msgid "Hide the OSD Window" +msgstr "隱藏桌面歌詞視窗" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "目前歌曲的檔名" +msgid "_Hide" +msgstr "隱藏(_H)" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "目前歌曲的編號" +msgid "_Search lyric..." +msgstr "" #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "目前歌曲的專輯名" +msgid "Search lyrics from Internet" +msgstr "" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "目前歌曲名" +msgid "_Assign lyric..." +msgstr "" #: ../data/dialogs.glade.h:91 -msgid "Transparent" +msgid "Assign local LRC file to current music" msgstr "" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" +msgid "_No lyric" msgstr "" #: ../data/dialogs.glade.h:93 -msgid "Weak" +msgid "Don't assign lyric to this music" msgstr "" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" +msgid "Lyric delay -" msgstr "" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." +msgid "Adjust lyrics delay by -0.2 s" msgstr "" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" +msgid "Lyric delay +" msgstr "" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "雙行(_D)" +msgid "Adjust lyric delay by +0.2 s" +msgstr "" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "下載(_D)" +msgid "Choose LRC file to download" +msgstr "選取要下載的歌詞" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "字型(_F):" +msgid "D_on't ask me again" +msgstr "" -#. From witch web site to search and download lyrics -#: ../data/dialogs.glade.h:101 -msgid "_From:" +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." msgstr "" -#: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "常規(_G)" +#: ../data/dialogs.glade.h:101 +msgid "_Download" +msgstr "下載(_D)" -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "隱藏(_H)" +#: ../data/dialogs.glade.h:102 +msgid "The title of the current track" +msgstr "目前歌曲名" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - 歌名" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "" +msgid "The artist of the current track" +msgstr "目前歌曲歌手" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "歌詞位置(_L)" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - 歌手" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "" +msgid "The title of album of the current track" +msgstr "目前歌曲的專輯名" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "桌面歌詞(_O)" +#, no-c-format +msgid "%a - Album" +msgstr "%a - 專輯" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "" +msgid "The number of the current track" +msgstr "目前歌曲的編號" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "" +#, no-c-format +msgid "%n - Track number" +msgstr "%n - 曲目編號" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "次行(_S)" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "" +msgid "The filename of the current track" +msgstr "目前歌曲的檔名" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - 音樂檔名" #: ../data/dialogs.glade.h:117 -msgid "_Username:" +msgid "Search lyrics" msgstr "" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "下" +msgid "_Title:" +msgstr "" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "中" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "上" +msgid "_Search" +msgstr "" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" +msgid "_From:" msgstr "" -"Launchpad Contributions:\n" -" Tiger Soldier https://launchpad.net/~tigersoldi" - -#~ msgid "Preview" -#~ msgstr "預覽" - -#~ msgid "Qianqian" -#~ msgstr "千千" - -#~ msgid "Sogou" -#~ msgstr "搜狗" - -#~ msgid "_Width:" -#~ msgstr "寬度(_W):" - -#~ msgid "Download _engine:" -#~ msgstr "下載引擎(_E):" - -#~ msgid "_Lock" -#~ msgstr "鎖定(_L)" - -#~ msgid "_Download lyric" -#~ msgstr "下載歌詞(_D)" - -#~ msgid "TODO: Add options here" -#~ msgstr "TODO: Add options here" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "沒有偵測到支援的播放器，程式自動結束。\n" diff -Nru osdlyrics-0.4.2/po/zh_TW.po osdlyrics-0.4.3/po/zh_TW.po --- osdlyrics-0.4.2/po/zh_TW.po 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/po/zh_TW.po 2012-06-04 13:29:35.000000000 +0000 @@ -7,17 +7,16 @@ msgstr "" "Project-Id-Version: osd-lyrics 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 23:18+0800\n" -"PO-Revision-Date: 2010-01-04 19:10+0000\n" -"Last-Translator: Tiger Soldier \n" +"POT-Creation-Date: 2012-06-04 21:07+0800\n" +"PO-Revision-Date: 2011-07-12 06:26+0000\n" +"Last-Translator: Tiger Soldier \n" "Language-Team: Simplified Chinese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-06-04 13:40+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"X-Launchpad-Export-Date: 2012-06-04 12:16+0000\n" +"X-Generator: Launchpad (build 15353)\n" #: ../src/ol_menu.c:119 msgid "LRC files" @@ -27,44 +26,44 @@ msgid "Choose LRC file to assign" msgstr "" -#: ../src/ol_main.c:60 +#: ../src/ol_main.c:61 msgid "" "The level of debug messages to log, can be 'none', 'error', 'debug', or " "'info'" msgstr "" -#: ../src/ol_main.c:62 +#: ../src/ol_main.c:63 msgid "Show version information" msgstr "" -#: ../src/ol_main.c:147 +#: ../src/ol_main.c:153 msgid "Download failed" msgstr "下載失敗" -#: ../src/ol_main.c:162 -#, fuzzy, c-format +#: ../src/ol_main.c:168 +#, c-format msgid "Searching lyrics from %s" -msgstr "正在搜尋歌詞" +msgstr "" -#: ../src/ol_main.c:185 +#: ../src/ol_main.c:191 msgid "Cannot create the lyric directory" msgstr "無法建立歌詞資料夾" -#: ../src/ol_main.c:201 +#: ../src/ol_main.c:207 msgid "Lyrics not found" msgstr "找不到符合的歌詞" -#: ../src/ol_main.c:507 +#: ../src/ol_main.c:561 #, c-format -msgid "No supported player is running, exit.\n" -msgstr "沒有偵測到支援的播放器，程式自動結束。\n" +msgid "Player is not running. OSD Lyrics exits now.\n" +msgstr "" -#: ../src/ol_main.c:652 +#: ../src/ol_main.c:710 msgid "" "debug level should be one of ``none'', ``error'', ``debug'', or ``info''" msgstr "" -#: ../src/ol_main.c:675 +#: ../src/ol_main.c:733 msgid "Another OSD Lyrics is running, exit." msgstr "" @@ -76,7 +75,7 @@ msgid "Unknown artist" msgstr "" -#: ../src/ol_trayicon.c:71 ../src/ol_trayicon.c:149 +#: ../src/ol_trayicon.c:71 msgid "OSD Lyrics" msgstr "OSD Lyrics" @@ -89,19 +88,19 @@ #. 0, "Customize", #. 1, "", #. -1); -#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:43 +#: ../src/ol_option.c:1651 ../data/dialogs.glade.h:7 msgid "Customize" msgstr "自訂" #: ../src/ol_option.c:1713 msgid "Select a folder" -msgstr "" +msgstr "選擇資料夾" -#: ../src/ol_lrc_fetch_ttplayer.c:274 +#: ../src/ol_lrc_fetch_ttplayer.c:276 msgid "ttPlayer" msgstr "" -#: ../src/ol_lrc_fetch_xiami.c:237 +#: ../src/ol_lrc_fetch_xiami.c:242 msgid "Xiami" msgstr "" @@ -127,70 +126,79 @@ msgid "%d lyrics found :)" msgstr "" -#: ../src/ol_player_chooser.c:243 +#: ../src/ol_player_chooser.c:249 msgid "Supported players" msgstr "" -#: ../src/ol_player_chooser.c:244 +#: ../src/ol_player_chooser.c:250 msgid "All players" msgstr "" -#: ../src/ol_player_chooser.c:248 ../src/ol_player_chooser.c:319 -#, fuzzy +#: ../src/ol_player_chooser.c:254 ../src/ol_player_chooser.c:326 msgid "Choose a player to launch" -msgstr "選取要下載的歌詞" +msgstr "" -#: ../src/ol_player_chooser.c:264 +#: ../src/ol_player_chooser.c:270 msgid "Use command:" msgstr "" -#: ../src/ol_player_chooser.c:268 +#: ../src/ol_player_chooser.c:275 msgid "Launch" -msgstr "" +msgstr "啟動" -#: ../src/ol_player_chooser.c:281 +#: ../src/ol_player_chooser.c:288 msgid "Remember my choice" msgstr "" -#: ../src/ol_player_chooser.c:387 +#: ../src/ol_player_chooser.c:440 #, c-format msgid "Failed to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:397 +#: ../src/ol_player_chooser.c:450 #, c-format msgid "Launching %s" msgstr "" -#: ../src/ol_player_chooser.c:399 +#: ../src/ol_player_chooser.c:452 #, c-format msgid "" "OSD Lyrics is trying to launch and connect to %s. Please wait for a second." msgstr "" -#: ../src/ol_player_chooser.c:510 -#, fuzzy +#: ../src/ol_player_chooser.c:563 msgid "There is no supported player running" -msgstr "沒有偵測到支援的播放器，程式自動結束。\n" +msgstr "" -#: ../src/ol_player_chooser.c:511 -#, fuzzy +#: ../src/ol_player_chooser.c:564 msgid "Please choose a player below to launch" -msgstr "選取要下載的歌詞" +msgstr "" -#: ../src/ol_player_chooser.c:515 +#: ../src/ol_player_chooser.c:568 #, c-format -msgid "Failed to connect to %s" +msgid "Fail to launch %s" msgstr "" -#: ../src/ol_player_chooser.c:517 +#: ../src/ol_player_chooser.c:570 #, c-format msgid "" "%s is not supported by OSD Lyrics, or not running. Please launch another " -"player" +"player." msgstr "" -#: ../src/ol_app_info.c:183 ../src/ol_app_info.c:193 +#: ../src/ol_player_chooser.c:580 +#, c-format +msgid "Something wrong with %s" +msgstr "" + +#: ../src/ol_player_chooser.c:582 +#, c-format +msgid "" +"It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. " +"Please try launching it again, or launch another player instead." +msgstr "" + +#: ../src/ol_app_info.c:179 ../src/ol_app_info.c:189 msgid "Unnamed" msgstr "" @@ -204,484 +212,455 @@ msgid "Drag to move the window" msgstr "" +#: ../data/dialogs.glade.h:1 +msgid "Copyright 2009-2011 The OSD Lyrics project." +msgstr "" + #: ../data/dialogs.glade.h:2 -#, no-c-format msgid "" -" %t - Title\n" -" %p - Artist\n" -" %a - Album\n" -" %n - Track number\n" -" %f - File name (without extension)" +"An OSD lyric show compatible with various media players and supports lyrics " +"downloading.\n" +msgstr "支援多種播放器和自動歌詞下載的桌面歌詞秀\n" + +#: ../data/dialogs.glade.h:4 +msgid "http://code.google.com/p/osd-lyrics/" +msgstr "http://code.google.com/p/osd-lyrics/" + +#: ../data/dialogs.glade.h:5 +msgid "GPL v3" +msgstr "GPL v3" + +#: ../data/dialogs.glade.h:6 +msgid "translator-credits" msgstr "" -" %t - 歌名\n" -" %p - 歌手\n" -" %a - 專輯\n" -" %n - 曲目編號\n" -" %f - 檔名" +"Launchpad Contributions:\n" +" Tiger Soldier https://launchpad.net/~tigersoldi" #: ../data/dialogs.glade.h:8 -#, no-c-format -msgid "%a - Album" -msgstr "%a - 專輯" +msgid "HTTP" +msgstr "" + +#: ../data/dialogs.glade.h:9 +msgid "SOCKS4" +msgstr "" #: ../data/dialogs.glade.h:10 -#, no-c-format -msgid "%f - Filename" -msgstr "%f - 音樂檔名" +msgid "SOCKS5" +msgstr "" + +#: ../data/dialogs.glade.h:11 +msgid "Always" +msgstr "" #: ../data/dialogs.glade.h:12 -#, no-c-format -msgid "%n - Track number" -msgstr "%n - 曲目編號" +msgid "By lines" +msgstr "" + +#: ../data/dialogs.glade.h:13 +msgid "Preferences" +msgstr "個人偏好" #: ../data/dialogs.glade.h:14 -#, no-c-format -msgid "%p - Artist" -msgstr "%p - 歌手" +msgid "Display mode:" +msgstr "" + +#: ../data/dialogs.glade.h:15 +msgid "OS_D" +msgstr "" #: ../data/dialogs.glade.h:16 -#, no-c-format -msgid "%t - Title" -msgstr "%t - 歌名" +msgid "Sc_rolling" +msgstr "" #: ../data/dialogs.glade.h:17 -msgid "Background" +msgid "Auto la_unch player:" msgstr "" #: ../data/dialogs.glade.h:18 -msgid "Download" +msgid "Pla_yer command:" msgstr "" #: ../data/dialogs.glade.h:19 -msgid "Lyric _Alignment" -msgstr "歌詞對齊(_A)" +msgid "Show _bubble notification" +msgstr "" #: ../data/dialogs.glade.h:20 -msgid "Lyric _Color" -msgstr "歌詞配色(_C)" +msgid "_General" +msgstr "常規(_G)" #: ../data/dialogs.glade.h:21 -msgid "Lyrics" -msgstr "" - -#: ../data/dialogs.glade.h:22 -msgid "Proxy" -msgstr "" +msgid "_Font:" +msgstr "字型(_F):" +#. The outline width of text in OSD window #: ../data/dialogs.glade.h:23 -msgid "_Filename" -msgstr "檔名(_F)" +msgid "Out_line:" +msgstr "" #: ../data/dialogs.glade.h:24 -msgid "_Path" -msgstr "路徑(_P)" +msgid "_Blur:" +msgstr "" + +#: ../data/dialogs.glade.h:25 +msgid "Weak" +msgstr "" #: ../data/dialogs.glade.h:26 -#, no-c-format -msgid "A single \"%\" means the directory where the playing music is." -msgstr "“%”表示目前播放歌曲所在目錄。" +msgid "Strong" +msgstr "" #: ../data/dialogs.glade.h:27 -msgid "Ac_tive color:" -msgstr "" +msgid "Lyric lines:" +msgstr "歌詞行數:" #: ../data/dialogs.glade.h:28 -msgid "Acti_ve lyrics:" -msgstr "已唱歌詞(_V):" +msgid "Si_ngle line" +msgstr "單行(_N)" #: ../data/dialogs.glade.h:29 -msgid "Adjust lyric delay by +0.2 s" -msgstr "" +msgid "_Double lines" +msgstr "雙行(_D)" #: ../data/dialogs.glade.h:30 -msgid "Adjust lyrics delay by -0.2 s" +msgid "Mode:" msgstr "" #: ../data/dialogs.glade.h:31 -msgid "Always" +msgid "Doc_k" msgstr "" #: ../data/dialogs.glade.h:32 -msgid "" -"An OSD lyric show compatible with various media players and supports lyrics " -"downloading.\n" -msgstr "支援多種播放器和自動歌詞下載的桌面歌詞秀\n" +msgid "Nor_mal" +msgstr "" + +#: ../data/dialogs.glade.h:33 +msgid "T_ranslucent on mouse over" +msgstr "滑鼠移到歌詞上時半透通(_R)" #: ../data/dialogs.glade.h:34 -msgid "Assign local LRC file to current music" -msgstr "" +msgid "F_irst line:" +msgstr "首行(_I):" #: ../data/dialogs.glade.h:35 -msgid "Au_to-detect system settings" -msgstr "" +msgid "_Second line:" +msgstr "次行(_S)" #: ../data/dialogs.glade.h:36 -msgid "Auto la_unch player:" -msgstr "" +msgid "Lyric _Alignment" +msgstr "歌詞對齊(_A)" #: ../data/dialogs.glade.h:37 -msgid "By lines" -msgstr "" +msgid "Color _Theme:" +msgstr "配色方案(_T):" #: ../data/dialogs.glade.h:38 msgid "C_ustomize colors" msgstr "自行配色(_U)" #: ../data/dialogs.glade.h:39 -msgid "Choose LRC file to download" -msgstr "選取要下載的歌詞" +msgid "Acti_ve lyrics:" +msgstr "已唱歌詞(_V):" #: ../data/dialogs.glade.h:40 -msgid "Colo_r:" -msgstr "" +msgid "top" +msgstr "上" #: ../data/dialogs.glade.h:41 -msgid "Color _Theme:" -msgstr "配色方案(_T):" +msgid "middle" +msgstr "中" #: ../data/dialogs.glade.h:42 -#, fuzzy -msgid "Copyright 2009-2011 The OSD Lyrics project." -msgstr "版權所有 2009 OSD Lyrics 項目組。" +msgid "bottom" +msgstr "下" + +#: ../data/dialogs.glade.h:43 +msgid "Inactiv_e lyrics:" +msgstr "未唱歌詞(_E):" #: ../data/dialogs.glade.h:44 -msgid "D_on't ask me again" -msgstr "" +msgid "Lyric _Color" +msgstr "歌詞配色(_C)" #: ../data/dialogs.glade.h:45 -msgid "Display mode:" +msgid "_OSD" +msgstr "桌面歌詞(_O)" + +#: ../data/dialogs.glade.h:46 +msgid "Ac_tive color:" msgstr "" -#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:47 -msgid "Do_wnload the first candidate" +msgid "_Inactive color:" msgstr "" #: ../data/dialogs.glade.h:48 -msgid "Doc_k" +msgid "Scroll _mode:" msgstr "" #: ../data/dialogs.glade.h:49 -msgid "Don't assign lyric to this music" +msgid "Lyrics" msgstr "" #: ../data/dialogs.glade.h:50 -msgid "F_irst line:" -msgstr "首行(_I):" +msgid "Colo_r:" +msgstr "顏色(_R):" #: ../data/dialogs.glade.h:51 -msgid "GPL v3" -msgstr "GPL v3" +msgid "O_pacity:" +msgstr "" #: ../data/dialogs.glade.h:52 -msgid "HTTP" -msgstr "" +msgid "Transparent" +msgstr "透明" #: ../data/dialogs.glade.h:53 -msgid "Hide the OSD Window" -msgstr "隱藏桌面歌詞視窗" +msgid "Opaque" +msgstr "不透明" #: ../data/dialogs.glade.h:54 -msgid "If locked, you can't move OSD window by mouse" -msgstr "鎖定后將無法用滑鼠移動桌面歌詞" +msgid "Background" +msgstr "背景" #: ../data/dialogs.glade.h:55 -msgid "" -"If there are more than one lrc files matched with the search condition, " -"download the first one without prompting the user." +msgid "_Scrolling" msgstr "" -#: ../data/dialogs.glade.h:56 -msgid "Inactiv_e lyrics:" -msgstr "未唱歌詞(_E):" - #: ../data/dialogs.glade.h:57 -#, fuzzy -msgid "Lyric _sites:" -msgstr "歌詞行數:" +#, no-c-format +msgid "A single \"%\" means the directory where the playing music is." +msgstr "“%”表示目前播放歌曲所在目錄。" #: ../data/dialogs.glade.h:58 -msgid "Lyric delay +" -msgstr "" - -#: ../data/dialogs.glade.h:59 -msgid "Lyric delay -" -msgstr "" +msgid "_Path" +msgstr "路徑(_P)" #: ../data/dialogs.glade.h:60 -msgid "Lyric lines:" -msgstr "歌詞行數:" - -#: ../data/dialogs.glade.h:61 -msgid "Mode:" -msgstr "" - -#: ../data/dialogs.glade.h:62 -msgid "No _proxy" -msgstr "" - -#: ../data/dialogs.glade.h:63 -msgid "Nor_mal" -msgstr "" - -#: ../data/dialogs.glade.h:64 -msgid "OSD _mode" +#, no-c-format +msgid "" +" %t - Title\n" +" %p - Artist\n" +" %a - Album\n" +" %n - Track number\n" +" %f - File name (without extension)" msgstr "" +" %t - 歌名\n" +" %p - 歌手\n" +" %a - 專輯\n" +" %n - 曲目編號\n" +" %f - 檔名" #: ../data/dialogs.glade.h:65 -msgid "OS_D" -msgstr "" +msgid "_Filename" +msgstr "檔名(_F)" #: ../data/dialogs.glade.h:66 -msgid "O_pacity:" -msgstr "" +msgid "_Lyric Location" +msgstr "歌詞位置(_L)" #: ../data/dialogs.glade.h:67 -msgid "Opaque" +msgid "Lyric _sites:" msgstr "" -#. The outline width of text in OSD window +#. In preference/download, automately download the most matched lyric #: ../data/dialogs.glade.h:69 -msgid "Out_line:" +msgid "Do_wnload the first candidate" msgstr "" #: ../data/dialogs.glade.h:70 -msgid "Passwo_rd:" -msgstr "" +msgid "Download" +msgstr "下載" #: ../data/dialogs.glade.h:71 -msgid "Pla_yer command:" +msgid "No _proxy" msgstr "" #: ../data/dialogs.glade.h:72 -msgid "Po_rt:" +msgid "Au_to-detect system settings" msgstr "" #: ../data/dialogs.glade.h:73 -msgid "Preferences" -msgstr "個人偏好" +msgid "Use _manual settings" +msgstr "" #: ../data/dialogs.glade.h:74 -msgid "SOCKS4" +msgid "_Host:" msgstr "" #: ../data/dialogs.glade.h:75 -msgid "SOCKS5" -msgstr "" +msgid "Po_rt:" +msgstr "連接埠 _r :" #: ../data/dialogs.glade.h:76 -msgid "Sc_rolling" +msgid "_Type:" msgstr "" #: ../data/dialogs.glade.h:77 -msgid "Scroll _mode:" +msgid "_Username:" msgstr "" #: ../data/dialogs.glade.h:78 -msgid "Scrolling _mode" +msgid "Passwo_rd:" msgstr "" #: ../data/dialogs.glade.h:79 -msgid "Search lyrics" +msgid "Show passwor_d" msgstr "" #: ../data/dialogs.glade.h:80 -msgid "Search lyrics from Internet" -msgstr "" +msgid "Proxy" +msgstr "代理伺服器" #: ../data/dialogs.glade.h:81 -msgid "Show _bubble notification" +msgid "_Network" msgstr "" #: ../data/dialogs.glade.h:82 -msgid "Show passwor_d" +msgid "OSD _mode" msgstr "" #: ../data/dialogs.glade.h:83 -msgid "Si_ngle line" -msgstr "單行(_N)" +msgid "Scrolling _mode" +msgstr "" #: ../data/dialogs.glade.h:84 -msgid "Strong" -msgstr "" +msgid "If locked, you can't move OSD window by mouse" +msgstr "鎖定后將無法用滑鼠移動桌面歌詞" #: ../data/dialogs.glade.h:85 -msgid "T_ranslucent on mouse over" -msgstr "滑鼠移到歌詞上時半透通(_R)" +msgid "_Lock Position" +msgstr "" #: ../data/dialogs.glade.h:86 -msgid "The artist of the current track" -msgstr "目前歌曲歌手" +msgid "Hide the OSD Window" +msgstr "隱藏桌面歌詞視窗" #: ../data/dialogs.glade.h:87 -msgid "The filename of the current track" -msgstr "目前歌曲的檔名" +msgid "_Hide" +msgstr "隱藏(_H)" #: ../data/dialogs.glade.h:88 -msgid "The number of the current track" -msgstr "目前歌曲的編號" +msgid "_Search lyric..." +msgstr "" #: ../data/dialogs.glade.h:89 -msgid "The title of album of the current track" -msgstr "目前歌曲的專輯名" +msgid "Search lyrics from Internet" +msgstr "" #: ../data/dialogs.glade.h:90 -msgid "The title of the current track" -msgstr "目前歌曲名" +msgid "_Assign lyric..." +msgstr "" #: ../data/dialogs.glade.h:91 -msgid "Transparent" +msgid "Assign local LRC file to current music" msgstr "" #: ../data/dialogs.glade.h:92 -msgid "Use _manual settings" +msgid "_No lyric" msgstr "" #: ../data/dialogs.glade.h:93 -msgid "Weak" +msgid "Don't assign lyric to this music" msgstr "" #: ../data/dialogs.glade.h:94 -msgid "_Artist:" +msgid "Lyric delay -" msgstr "" #: ../data/dialogs.glade.h:95 -msgid "_Assign lyric..." +msgid "Adjust lyrics delay by -0.2 s" msgstr "" #: ../data/dialogs.glade.h:96 -msgid "_Blur:" +msgid "Lyric delay +" msgstr "" #: ../data/dialogs.glade.h:97 -msgid "_Double lines" -msgstr "雙行(_D)" +msgid "Adjust lyric delay by +0.2 s" +msgstr "" #: ../data/dialogs.glade.h:98 -msgid "_Download" -msgstr "下載(_D)" +msgid "Choose LRC file to download" +msgstr "選取要下載的歌詞" #: ../data/dialogs.glade.h:99 -msgid "_Font:" -msgstr "字型(_F):" +msgid "D_on't ask me again" +msgstr "" -#. From witch web site to search and download lyrics -#: ../data/dialogs.glade.h:101 -msgid "_From:" +#: ../data/dialogs.glade.h:100 +msgid "" +"If there are more than one lrc files matched with the search condition, " +"download the first one without prompting the user." msgstr "" -#: ../data/dialogs.glade.h:102 -msgid "_General" -msgstr "常規(_G)" +#: ../data/dialogs.glade.h:101 +msgid "_Download" +msgstr "下載(_D)" -#: ../data/dialogs.glade.h:103 -msgid "_Hide" -msgstr "隱藏(_H)" +#: ../data/dialogs.glade.h:102 +msgid "The title of the current track" +msgstr "目前歌曲名" #: ../data/dialogs.glade.h:104 -msgid "_Host:" -msgstr "" +#, no-c-format +msgid "%t - Title" +msgstr "%t - 歌名" #: ../data/dialogs.glade.h:105 -msgid "_Inactive color:" -msgstr "" - -#: ../data/dialogs.glade.h:106 -msgid "_Lock Position" -msgstr "" +msgid "The artist of the current track" +msgstr "目前歌曲歌手" #: ../data/dialogs.glade.h:107 -msgid "_Lyric Location" -msgstr "歌詞位置(_L)" +#, no-c-format +msgid "%p - Artist" +msgstr "%p - 歌手" #: ../data/dialogs.glade.h:108 -msgid "_Network" -msgstr "" - -#: ../data/dialogs.glade.h:109 -msgid "_No lyric" -msgstr "" +msgid "The title of album of the current track" +msgstr "目前歌曲的專輯名" #: ../data/dialogs.glade.h:110 -msgid "_OSD" -msgstr "桌面歌詞(_O)" +#, no-c-format +msgid "%a - Album" +msgstr "%a - 專輯" #: ../data/dialogs.glade.h:111 -msgid "_Scrolling" -msgstr "" - -#: ../data/dialogs.glade.h:112 -msgid "_Search" -msgstr "" +msgid "The number of the current track" +msgstr "目前歌曲的編號" #: ../data/dialogs.glade.h:113 -msgid "_Search lyric..." -msgstr "" +#, no-c-format +msgid "%n - Track number" +msgstr "%n - 曲目編號" #: ../data/dialogs.glade.h:114 -msgid "_Second line:" -msgstr "次行(_S)" - -#: ../data/dialogs.glade.h:115 -msgid "_Title:" -msgstr "" +msgid "The filename of the current track" +msgstr "目前歌曲的檔名" #: ../data/dialogs.glade.h:116 -msgid "_Type:" -msgstr "" +#, no-c-format +msgid "%f - Filename" +msgstr "%f - 音樂檔名" #: ../data/dialogs.glade.h:117 -msgid "_Username:" +msgid "Search lyrics" msgstr "" #: ../data/dialogs.glade.h:118 -msgid "bottom" -msgstr "下" +msgid "_Title:" +msgstr "" #: ../data/dialogs.glade.h:119 -msgid "http://code.google.com/p/osd-lyrics/" -msgstr "http://code.google.com/p/osd-lyrics/" +msgid "_Artist:" +msgstr "" #: ../data/dialogs.glade.h:120 -msgid "middle" -msgstr "中" - -#: ../data/dialogs.glade.h:121 -msgid "top" -msgstr "上" +msgid "_Search" +msgstr "" +#. From witch web site to search and download lyrics #: ../data/dialogs.glade.h:122 -msgid "translator-credits" +msgid "_From:" msgstr "" -"Launchpad Contributions:\n" -" Tiger Soldier https://launchpad.net/~tigersoldi" - -#~ msgid "Preview" -#~ msgstr "預覽" - -#~ msgid "Qianqian" -#~ msgstr "千千" - -#~ msgid "Sogou" -#~ msgstr "搜狗" - -#~ msgid "_Width:" -#~ msgstr "寬度(_W):" - -#~ msgid "Download _engine:" -#~ msgstr "下載引擎(_E):" - -#~ msgid "_Lock" -#~ msgstr "鎖定(_L)" - -#~ msgid "_Download lyric" -#~ msgstr "下載歌詞(_D)" - -#~ msgid "TODO: Add options here" -#~ msgstr "TODO: Add options here" - -#~ msgid "gtk-cancel" -#~ msgstr "gtk-cancel" -#~ msgid "gtk-ok" -#~ msgstr "gtk-ok" +#~ msgid "No supported player is running, exit.\n" +#~ msgstr "沒有偵測到支援的播放器，程式自動結束。\n" diff -Nru osdlyrics-0.4.2/py-compile osdlyrics-0.4.3/py-compile --- osdlyrics-0.4.2/py-compile 1970-01-01 00:00:00.000000000 +0000 +++ osdlyrics-0.4.3/py-compile 2012-05-22 02:52:55.000000000 +0000 @@ -0,0 +1,160 @@ +#!/bin/sh +# py-compile - Compile a Python program + +scriptversion=2011-06-08.12; # UTC + +# Copyright (C) 2000-2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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, see . + +# 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. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +if [ -z "$PYTHON" ]; then + PYTHON=python +fi + +me=py-compile + +usage_error () +{ + echo "$me: $*" >&2 + echo "Try \`$me --help' for more information." >&2 + exit 1 +} + +basedir= +destdir= +while test $# -ne 0; do + case "$1" in + --basedir) + if test $# -lt 2; then + usage_error "option '--basedir' requires an argument" + else + basedir=$2 + fi + shift + ;; + --destdir) + if test $# -lt 2; then + usage_error "option '--destdir' requires an argument" + else + destdir=$2 + fi + shift + ;; + -h|--help) + cat <<\EOF +Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." + +Byte compile some python scripts FILES. Use --destdir to specify any +leading directory path to the FILES that you don't want to include in the +byte compiled file. Specify --basedir for any additional path information you +do want to be shown in the byte compiled file. + +Example: + py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py + +Report bugs to . +EOF + exit $? + ;; + -v|--version) + echo "$me $scriptversion" + exit $? + ;; + --) + shift + break + ;; + -*) + usage_error "unrecognized option '$1'" + ;; + *) + break + ;; + esac + shift +done + +files=$* +if test -z "$files"; then + usage_error "no files given" +fi + +# if basedir was given, then it should be prepended to filenames before +# byte compilation. +if [ -z "$basedir" ]; then + pathtrans="path = file" +else + pathtrans="path = os.path.join('$basedir', file)" +fi + +# if destdir was given, then it needs to be prepended to the filename to +# byte compile but not go into the compiled file. +if [ -z "$destdir" ]; then + filetrans="filepath = path" +else + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" +fi + +$PYTHON -c " +import sys, os, py_compile + +files = '''$files''' + +sys.stdout.write('Byte-compiling python modules...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + py_compile.compile(filepath, filepath + 'c', path) +sys.stdout.write('\n')" || exit $? + +# this will fail for python < 1.5, but that doesn't matter ... +$PYTHON -O -c " +import sys, os, py_compile + +files = '''$files''' +sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + py_compile.compile(filepath, filepath + 'o', path) +sys.stdout.write('\n')" 2>/dev/null || : + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru osdlyrics-0.4.2/src/Makefile.am osdlyrics-0.4.3/src/Makefile.am --- osdlyrics-0.4.2/src/Makefile.am 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/Makefile.am 2012-06-04 13:29:35.000000000 +0000 @@ -86,6 +86,7 @@ ol_player_juk.h \ ol_player_listen.h \ ol_player_moc.h \ + ol_player_cmus.h \ ol_player_mpd.h \ ol_player_mpris.h \ ol_player_muine.h \ @@ -137,6 +138,7 @@ ol_player_xmms2.c \ ol_player_juk.c \ ol_player_moc.c \ + ol_player_cmus.c \ ol_player_mpd.c \ ol_player_muine.c \ ol_player_listen.c \ diff -Nru osdlyrics-0.4.2/src/Makefile.in osdlyrics-0.4.3/src/Makefile.in --- osdlyrics-0.4.2/src/Makefile.in 2012-01-18 23:23:39.000000000 +0000 +++ osdlyrics-0.4.3/src/Makefile.in 2012-06-04 13:30:46.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,7 +55,7 @@ bin_PROGRAMS = osdlyrics$(EXEEXT) subdir = src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -65,12 +82,12 @@ ol_player_amarok1.$(OBJEXT) ol_player_mpris.$(OBJEXT) \ ol_player_quodlibet.$(OBJEXT) ol_player_xmms2.$(OBJEXT) \ ol_player_juk.$(OBJEXT) ol_player_moc.$(OBJEXT) \ - ol_player_mpd.$(OBJEXT) ol_player_muine.$(OBJEXT) \ - ol_player_listen.$(OBJEXT) ol_player_gmusicbrowser.$(OBJEXT) \ - ol_player_mpris2.$(OBJEXT) ol_player_utils.$(OBJEXT) \ - ol_player_rhythmbox.$(OBJEXT) ol_player_rhythmcat.$(OBJEXT) \ - ol_elapse_emulator.$(OBJEXT) ol_md5.$(OBJEXT) \ - ol_utils.$(OBJEXT) ol_utils_dbus.$(OBJEXT) \ + ol_player_cmus.$(OBJEXT) ol_player_mpd.$(OBJEXT) \ + ol_player_muine.$(OBJEXT) ol_player_listen.$(OBJEXT) \ + ol_player_gmusicbrowser.$(OBJEXT) ol_player_mpris2.$(OBJEXT) \ + ol_player_utils.$(OBJEXT) ol_player_rhythmbox.$(OBJEXT) \ + ol_player_rhythmcat.$(OBJEXT) ol_elapse_emulator.$(OBJEXT) \ + ol_md5.$(OBJEXT) ol_utils.$(OBJEXT) ol_utils_dbus.$(OBJEXT) \ ol_utils_dcop.$(OBJEXT) ol_utils_cmdline.$(OBJEXT) \ ol_utils_network.$(OBJEXT) ol_lrc_parser.$(OBJEXT) \ ol_lrc.$(OBJEXT) ol_search_dialog.$(OBJEXT) \ @@ -106,6 +123,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -144,8 +166,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -190,6 +214,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -242,6 +270,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -271,6 +300,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = $(datadir)/locale @@ -377,6 +408,7 @@ ol_player_juk.h \ ol_player_listen.h \ ol_player_moc.h \ + ol_player_cmus.h \ ol_player_mpd.h \ ol_player_mpris.h \ ol_player_muine.h \ @@ -428,6 +460,7 @@ ol_player_xmms2.c \ ol_player_juk.c \ ol_player_moc.c \ + ol_player_cmus.c \ ol_player_mpd.c \ ol_player_muine.c \ ol_player_listen.c \ @@ -514,8 +547,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -549,7 +585,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -osdlyrics$(EXEEXT): $(osdlyrics_OBJECTS) $(osdlyrics_DEPENDENCIES) +osdlyrics$(EXEEXT): $(osdlyrics_OBJECTS) $(osdlyrics_DEPENDENCIES) $(EXTRA_osdlyrics_DEPENDENCIES) @rm -f osdlyrics$(EXEEXT) $(LINK) $(osdlyrics_OBJECTS) $(osdlyrics_LDADD) $(LIBS) @@ -604,6 +640,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_amarok1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_banshee.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_chooser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_cmus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_exaile02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_exaile03.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_gmusicbrowser.Po@am__quote@ @@ -646,11 +683,11 @@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. $(RECURSIVE_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ @@ -714,6 +751,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -777,6 +818,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -812,13 +867,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -856,10 +908,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -940,23 +997,24 @@ uninstall-am: uninstall-binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS + clean-generic cscopelist cscopelist-recursive ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru osdlyrics-0.4.2/src/ol_app_info.c osdlyrics-0.4.3/src/ol_app_info.c --- osdlyrics-0.4.2/src/ol_app_info.c 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_app_info.c 2012-06-04 13:29:35.000000000 +0000 @@ -773,5 +773,6 @@ g_free (filepath); } } + g_dir_close (dir); return list; } diff -Nru osdlyrics-0.4.2/src/ol_keybinder.h osdlyrics-0.4.3/src/ol_keybinder.h --- osdlyrics-0.4.2/src/ol_keybinder.h 2012-01-18 23:17:59.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_keybinder.h 2012-05-15 14:04:12.000000000 +0000 @@ -24,7 +24,7 @@ #ifndef __DO_KEY_BINDER_H__ #define __DO_KEY_BINDER_H__ -#include +#include G_BEGIN_DECLS diff -Nru osdlyrics-0.4.2/src/ol_main.c osdlyrics-0.4.3/src/ol_main.c --- osdlyrics-0.4.2/src/ol_main.c 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_main.c 2012-06-04 13:29:35.000000000 +0000 @@ -17,6 +17,7 @@ * along with OSD Lyrics. If not, see . */ #include +#include #include #include #include @@ -65,6 +66,7 @@ static guint refresh_source = 0; static guint info_timer = 0; +static guint _lost_action_delay_timer = 0; static struct OlPlayer *player = NULL; static OlMusicInfo music_info = {0}; static gchar *previous_title = NULL; @@ -81,6 +83,7 @@ ACTION_NONE = 0, ACTION_LAUNCH_DEFAULT, ACTION_CHOOSE_PLAYER, + ACTION_CHOOSE_PLAYER_DISCONNECTED, ACTION_WAIT_LAUNCH, ACTION_QUIT, } player_lost_action = ACTION_LAUNCH_DEFAULT; @@ -93,6 +96,9 @@ static void _stop_refresh_music_info (void); static void _start_refresh_player_info (void); static void _wait_for_player_launch (void); +static void _set_player_lost_action (enum _PlayerLostAction action); +static void _set_player_lost_action_delay (enum _PlayerLostAction action, + guint delay_ms); static void _player_lost_cb (void); static void _player_chooser_response_cb (GtkDialog *dialog, gint response_id, @@ -419,18 +425,50 @@ return TRUE; } +static void +_set_player_lost_action (enum _PlayerLostAction action) +{ + if (_lost_action_delay_timer) + { + g_source_remove (_lost_action_delay_timer); + _lost_action_delay_timer = 0; + } + player_lost_action = action; +} + +static gboolean +_player_lost_action_delay_cb (gpointer userdata) +{ + enum _PlayerLostAction action = GPOINTER_TO_INT (userdata); + _set_player_lost_action (action); + return FALSE; +} + +static void +_set_player_lost_action_delay (enum _PlayerLostAction action, + guint delay_seconds) +{ + if (_lost_action_delay_timer) + { + g_source_remove (_lost_action_delay_timer); + } + _lost_action_delay_timer = g_timeout_add_seconds (delay_seconds, + _player_lost_action_delay_cb, + GINT_TO_POINTER ((int) action)); +} + static gboolean _player_launch_timeout (gpointer userdata) { if (player_lost_action == ACTION_WAIT_LAUNCH) - player_lost_action = ACTION_CHOOSE_PLAYER; + _set_player_lost_action (ACTION_CHOOSE_PLAYER); return FALSE; } static void _wait_for_player_launch (void) { - player_lost_action = ACTION_WAIT_LAUNCH; + _set_player_lost_action (ACTION_WAIT_LAUNCH); g_timeout_add (TIMEOUT_WAIT_LAUNCH, _player_launch_timeout, NULL); } @@ -459,10 +497,22 @@ static void _player_lost_cb (void) { + if (_lost_action_delay_timer > 0) + { + g_source_remove (_lost_action_delay_timer); + _lost_action_delay_timer = 0; + } + ol_music_info_clear (&music_info); + if (module != NULL) + { + ol_display_module_free (module); + module = NULL; + } switch (player_lost_action) { case ACTION_LAUNCH_DEFAULT: case ACTION_CHOOSE_PLAYER: + case ACTION_CHOOSE_PLAYER_DISCONNECTED: { if (player_lost_action == ACTION_LAUNCH_DEFAULT) { @@ -496,15 +546,19 @@ } else { - ol_player_chooser_set_info_by_state (player_chooser, - OL_PLAYER_CHOOSER_STATE_LAUNCH_FAIL); + if (player_lost_action == ACTION_CHOOSE_PLAYER_DISCONNECTED) + ol_player_chooser_set_info_by_state (player_chooser, + OL_PLAYER_CHOOSER_STATE_DISCONNECTED); + else + ol_player_chooser_set_info_by_state (player_chooser, + OL_PLAYER_CHOOSER_STATE_LAUNCH_FAIL); } gtk_widget_show (GTK_WIDGET (player_chooser)); - player_lost_action = ACTION_NONE; + _set_player_lost_action (ACTION_NONE); break; } case ACTION_QUIT: - printf (_("No supported player is running, exit.\n")); + printf (_("Player is not running. OSD Lyrics exits now.\n")); gtk_main_quit (); break; default: @@ -527,7 +581,11 @@ display_mode = ol_config_get_string (config, "General", "display-mode"); module = ol_display_module_new (display_mode); } - player_lost_action = ACTION_QUIT; + /* If the player lost in 1 minute, it is possible that the player crashed or + something bad happen to the D-Bus connection. In this case, we should let + our use to choose another player rather than simply exit */ + _set_player_lost_action (ACTION_CHOOSE_PLAYER_DISCONNECTED); + _set_player_lost_action_delay (ACTION_QUIT, 60); } static gboolean diff -Nru osdlyrics-0.4.2/src/ol_player.c osdlyrics-0.4.3/src/ol_player.c --- osdlyrics-0.4.2/src/ol_player.c 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_player.c 2012-06-04 13:29:35.000000000 +0000 @@ -28,6 +28,7 @@ #include "ol_player_listen.h" #include "ol_player_gmusicbrowser.h" #include "ol_player_moc.h" +#include "ol_player_cmus.h" #include "ol_player_quodlibet.h" #include "ol_player_juk.h" #include "ol_player_muine.h" @@ -63,6 +64,7 @@ ol_player_register (ol_player_rhythmbox_get ()); ol_player_register (ol_player_mpris2_get ()); ol_player_register (ol_player_moc_get ()); + ol_player_register (ol_player_cmus_get ()); ol_player_register (ol_player_quodlibet_get ()); ol_player_register (ol_player_juk_get ()); ol_player_register (ol_player_muine_get ()); @@ -141,6 +143,7 @@ ol_debugf ("trying %s\n", controller->name); if (controller && controller->get_activated ()) { + ol_debugf ("Connected to %s\n", controller->name); return controller; } } @@ -345,6 +348,8 @@ const char * ol_player_get_icon_path (struct OlPlayer *player) { + if (player == NULL) + return NULL; if (player->get_icon_path != NULL) return player->get_icon_path (); else diff -Nru osdlyrics-0.4.2/src/ol_player_chooser.c osdlyrics-0.4.3/src/ol_player_chooser.c --- osdlyrics-0.4.2/src/ol_player_chooser.c 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_player_chooser.c 2012-06-04 13:29:35.000000000 +0000 @@ -33,6 +33,7 @@ static const guint ALL_CHOOSER_INDEX = 1; static const guint MAX_CHOOSER_HEIGHT = 96 * 3; /* about 3 lines of apps */ static const guint DEFAULT_APP_COLUMNS = 4; +static const guint WINDOW_BORDER_SIZE = 5; G_DEFINE_TYPE(OlPlayerChooser, ol_player_chooser, GTK_TYPE_DIALOG) @@ -224,6 +225,7 @@ _setup_ui (OlPlayerChooser *window) { OlPlayerChooserPrivate *priv = OL_PLAYER_CHOOSER_GET_PRIVATE (window); + gtk_container_set_border_width (GTK_CONTAINER (window), WINDOW_BORDER_SIZE); /* Setup info widgets */ priv->info_label = GTK_LABEL (gtk_label_new (NULL)); gtk_label_set_line_wrap (priv->info_label, TRUE); @@ -563,9 +565,21 @@ ol_player_chooser_set_image_by_name (window, GTK_STOCK_DIALOG_INFO); break; case OL_PLAYER_CHOOSER_STATE_LAUNCH_FAIL: { - gchar *title = g_strdup_printf (_("Failed to connect to %s"), + gchar *title = g_strdup_printf (_("Fail to launch %s"), g_app_info_get_name (priv->launch_app)); - gchar *desc = g_strdup_printf (_("%s is not supported by OSD Lyrics, or not running. Please launch another player"), + gchar *desc = g_strdup_printf (_("%s is not supported by OSD Lyrics, or not running. Please launch another player."), + g_app_info_get_name (priv->launch_app)); + ol_player_chooser_set_info (window, title, desc); + ol_player_chooser_set_image_by_name (window, GTK_STOCK_DIALOG_ERROR); + g_free (title); + g_free (desc); + _set_launch_app (window, NULL); + break; + } + case OL_PLAYER_CHOOSER_STATE_DISCONNECTED: { + gchar *title = g_strdup_printf (_("Something wrong with %s"), + g_app_info_get_name (priv->launch_app)); + gchar *desc = g_strdup_printf (_("It is possible that %s has crashed, or it refuse to connect with OSD Lyrics. Please try launching it again, or launch another player instead."), g_app_info_get_name (priv->launch_app)); ol_player_chooser_set_info (window, title, desc); ol_player_chooser_set_image_by_name (window, GTK_STOCK_DIALOG_ERROR); diff -Nru osdlyrics-0.4.2/src/ol_player_chooser.h osdlyrics-0.4.3/src/ol_player_chooser.h --- osdlyrics-0.4.2/src/ol_player_chooser.h 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_player_chooser.h 2012-06-04 13:29:35.000000000 +0000 @@ -34,6 +34,7 @@ OL_PLAYER_CHOOSER_STATE_NO_PLAYER, OL_PLAYER_CHOOSER_STATE_CONNECTED, OL_PLAYER_CHOOSER_STATE_LAUNCH_FAIL, + OL_PLAYER_CHOOSER_STATE_DISCONNECTED, }; typedef struct _OlPlayerChooser OlPlayerChooser; diff -Nru osdlyrics-0.4.2/src/ol_player_cmus.c osdlyrics-0.4.3/src/ol_player_cmus.c --- osdlyrics-0.4.2/src/ol_player_cmus.c 1970-01-01 00:00:00.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_player_cmus.c 2012-06-04 13:29:35.000000000 +0000 @@ -0,0 +1,277 @@ +/* -*- mode: C; c-basic-offset: 2; indent-tabs-mode: nil; -*- */ +/* + * Copyright (C) 2012 alepulver + * + * This file is part of OSD Lyrics. + * + * OSD Lyrics 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 3 of the License, or + * (at your option) any later version. + * + * OSD Lyrics 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 OSD Lyrics. If not, see . + */ +#include +#include +#include + +#include "ol_player_cmus.h" +#include "ol_player.h" +#include "ol_utils_cmdline.h" +#include "ol_elapse_emulator.h" +#include "ol_utils.h" +#include "ol_debug.h" + +static gboolean ol_player_cmus_get_music_info (OlMusicInfo *info); +static gboolean ol_player_cmus_get_played_time (int *played_time); +static gboolean ol_player_cmus_get_music_length (int *len); +static gboolean ol_player_cmus_get_activated (); +static enum OlPlayerStatus ol_player_cmus_get_status (); +static int ol_player_cmus_get_capacity (); +static gboolean ol_player_cmus_play (); +static gboolean ol_player_cmus_pause (); +static gboolean ol_player_cmus_stop (); +static gboolean ol_player_cmus_prev (); +static gboolean ol_player_cmus_next (); +static gboolean ol_player_cmus_seek (int pos_ms); +static gboolean ol_player_cmus_get_activated (); + +enum CMUS_CfgLabel { + CSI_STATUS, CSI_URI, CSI_POS, CSI_DURATION, + CSI_TITLE, CSI_ARTIST, CSI_ALBUM +}; + +#define CMUS_CfgSize (CSI_ALBUM+1) +static const int CMUS_ELAPSE_ACCURACY = 1000; + +// The order must match CMUS_CfgLabel +static const char *CMUS_CfgStrings[] = { + "status ", "file ", "position ", "duration ", + "tag title ", "tag artist ", "tag album " +}; + +static char *CMUS_CfgValues[CMUS_CfgSize]; + +static OlElapseEmulator elapse_emulator = {0}; + +/* + * There is a single command to obtain song information, + * so it is ran once and parsed for all variables. + */ +static gboolean +cmus_update_info () +{ + char *output = NULL; + int result = ol_cmd_get_string ("cmus-remote -C status", &output); + char *p_cur, *p_next; + int i; + for (i = 0; i < CMUS_CfgSize; i++) + { + if (CMUS_CfgValues[i] != NULL) + g_free (CMUS_CfgValues[i]); + CMUS_CfgValues[i] = NULL; + } + if (output == NULL || !result) + return FALSE; + p_cur = output; + while ((p_next = ol_split_a_line (p_cur)) != NULL) + { + int i; + for (i = 0; i < CMUS_CfgSize; i++) + { + const char *key = CMUS_CfgStrings[i]; + const int klen = strlen (key); + if (klen < strlen (p_cur) && strncmp (p_cur, key, klen) == 0) + { + CMUS_CfgValues[i] = g_strdup (p_cur + klen); + break; + } + } + p_cur = p_next; + } + g_free (output); + return TRUE; +} + +static enum OlPlayerStatus cmus_get_status () +{ + char *stat = CMUS_CfgValues[CSI_STATUS]; + if (stat != NULL) + { + if (strcmp (stat, "playing") == 0) + return OL_PLAYER_PLAYING; + else if (strcmp (stat, "paused") == 0) + return OL_PLAYER_PAUSED; + else if (strcmp (stat, "stopped") == 0) + return OL_PLAYER_STOPPED; + else + return OL_PLAYER_UNKNOWN; + } + return OL_PLAYER_ERROR; +} + +static gboolean +ol_player_cmus_get_activated () +{ + return ol_cmd_exec ("cmus-remote"); +} + +static gboolean +ol_player_cmus_get_music_info (OlMusicInfo *info) +{ + ol_assert_ret (info != NULL, FALSE); + if (!cmus_update_info ()) + return FALSE; + + int status = cmus_get_status(); + if (status != OL_PLAYER_PLAYING + && status != OL_PLAYER_PAUSED + && status != OL_PLAYER_STOPPED) + { + ol_music_info_clear (info); + return TRUE; + } + + ol_music_info_clear (info); + info->title = g_strdup (CMUS_CfgValues[CSI_TITLE]); + info->artist = g_strdup (CMUS_CfgValues[CSI_ARTIST]); + info->album = g_strdup (CMUS_CfgValues[CSI_ALBUM]); + info->uri = g_strdup (CMUS_CfgValues[CSI_URI]); + + return TRUE; +} + +static gboolean +ol_player_cmus_get_music_length (int *len) +{ + ol_assert_ret (len != NULL, FALSE); + if (!cmus_update_info ()) + return FALSE; + int status = cmus_get_status (); + if (status != OL_PLAYER_PLAYING && status != OL_PLAYER_PAUSED) + { + *len = -1; + return TRUE; + } + *len = 500 + strtol (CMUS_CfgValues[CSI_DURATION], NULL, 10) * 1000; + return TRUE; +} + +static gboolean +ol_player_cmus_get_played_time (int *played_time) +{ + ol_assert_ret (played_time != NULL, FALSE); + if (!cmus_update_info ()) + return FALSE; + int status = cmus_get_status (); + gint64 cmus_time = strtol (CMUS_CfgValues[CSI_POS], NULL, 10) * 1000; + switch (status) + { + case OL_PLAYER_PLAYING: + *played_time = ol_elapse_emulator_get_real_ms (&elapse_emulator, + cmus_time); + break; + case OL_PLAYER_PAUSED: + *played_time = ol_elapse_emulator_get_last_ms (&elapse_emulator, + cmus_time); + break; + default: + ol_elapse_emulator_init (&elapse_emulator, 0, CMUS_ELAPSE_ACCURACY); + *played_time = 0; + } + return TRUE; +} + +static enum OlPlayerStatus +ol_player_cmus_get_status () +{ + if (!cmus_update_info ()) + return OL_PLAYER_ERROR; + + return cmus_get_status (); +} + +static int +ol_player_cmus_get_capacity () +{ + return OL_PLAYER_STATUS | OL_PLAYER_PLAY | OL_PLAYER_PAUSE | + OL_PLAYER_STOP | OL_PLAYER_PREV | OL_PLAYER_NEXT | OL_PLAYER_SEEK; +} + +static gboolean +ol_player_cmus_play () +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + return ol_cmd_exec ("cmus-remote -C player-play"); +} + +static gboolean +ol_player_cmus_pause () +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + return ol_cmd_exec ("cmus-remote -C player-pause"); +} + +static gboolean +ol_player_cmus_stop () +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + return ol_cmd_exec ("cmus-remote -C player-stop"); +} + +static gboolean +ol_player_cmus_prev () +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + return ol_cmd_exec ("cmus-remote -C player-prev"); +} + +static gboolean +ol_player_cmus_next () +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + return ol_cmd_exec ("cmus-remote -C player-next"); +} + +static gboolean +ol_player_cmus_seek (int pos_ms) +{ + if (!ol_player_cmus_get_activated ()) + return FALSE; + char *cmd = g_strdup_printf ("cmus-remote -C \"seek %d\"", pos_ms / 1000); + gboolean ret = ol_cmd_exec (cmd); + g_free (cmd); + return ret; +} + +struct OlPlayer* +ol_player_cmus_get () +{ + ol_log_func (); + ol_elapse_emulator_init (&elapse_emulator, 0, CMUS_ELAPSE_ACCURACY); + struct OlPlayer *controller = ol_player_new ("cmus"); + controller->get_music_info = ol_player_cmus_get_music_info; + controller->get_activated = ol_player_cmus_get_activated; + controller->get_played_time = ol_player_cmus_get_played_time; + controller->get_music_length = ol_player_cmus_get_music_length; + controller->get_capacity = ol_player_cmus_get_capacity; + controller->get_status = ol_player_cmus_get_status; + controller->play = ol_player_cmus_play; + controller->pause = ol_player_cmus_pause; + controller->stop = ol_player_cmus_stop; + controller->prev = ol_player_cmus_prev; + controller->next = ol_player_cmus_next; + controller->seek = ol_player_cmus_seek; + return controller; +} diff -Nru osdlyrics-0.4.2/src/ol_player_cmus.h osdlyrics-0.4.3/src/ol_player_cmus.h --- osdlyrics-0.4.2/src/ol_player_cmus.h 1970-01-01 00:00:00.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_player_cmus.h 2012-06-04 13:29:35.000000000 +0000 @@ -0,0 +1,33 @@ +/* -*- mode: C; c-basic-offset: 2; indent-tabs-mode: nil; -*- */ +/* + * Copyright (C) 2012 alepulver + * + * This file is part of OSD Lyrics. + * + * OSD Lyrics 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 3 of the License, or + * (at your option) any later version. + * + * OSD Lyrics 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 OSD Lyrics. If not, see . + */ +#ifndef _OL_PLAYER_CMUS_H_ +#define _OL_PLAYER_CMUS_H_ + +#include "ol_player.h" + +/** + * @brief Creates a controller of CMUS + * + * @return The controller of CMUS. It's allocated by g_new, so use g_free to free the memory + */ +struct OlPlayer* ol_player_cmus_get (); + + +#endif /* _OL_PLAYER_CMUS_H_ */ diff -Nru osdlyrics-0.4.2/src/ol_trayicon.c osdlyrics-0.4.3/src/ol_trayicon.c --- osdlyrics-0.4.2/src/ol_trayicon.c 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/ol_trayicon.c 2012-06-04 13:29:35.000000000 +0000 @@ -97,7 +97,9 @@ g_free (markup); struct OlPlayer *player = ol_app_get_player (); - const char *icon_path = ol_player_get_icon_path (player); + const char *icon_path = NULL; + if (player != NULL) + icon_path = ol_player_get_icon_path (player); GdkPixbuf *icon = NULL; if (icon_path != NULL) { diff -Nru osdlyrics-0.4.2/src/tests/Makefile.am osdlyrics-0.4.3/src/tests/Makefile.am --- osdlyrics-0.4.2/src/tests/Makefile.am 2012-01-18 23:18:19.000000000 +0000 +++ osdlyrics-0.4.3/src/tests/Makefile.am 2012-06-04 13:29:35.000000000 +0000 @@ -71,6 +71,7 @@ $(top_srcdir)/src/ol_player.c \ $(top_srcdir)/src/ol_player_amarok1.c \ $(top_srcdir)/src/ol_player_banshee.c \ + $(top_srcdir)/src/ol_player_cmus.c \ $(top_srcdir)/src/ol_player_mpris.c \ $(top_srcdir)/src/ol_player_mpris2.c \ $(top_srcdir)/src/ol_player_exaile02.c \ diff -Nru osdlyrics-0.4.2/src/tests/Makefile.in osdlyrics-0.4.3/src/tests/Makefile.in --- osdlyrics-0.4.2/src/tests/Makefile.in 2012-01-18 23:23:39.000000000 +0000 +++ osdlyrics-0.4.3/src/tests/Makefile.in 2012-06-04 13:30:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -45,7 +62,7 @@ ol_gussian_blur_test$(EXEEXT) ol_app_info_test$(EXEEXT) subdir = src/tests DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -161,12 +178,13 @@ am_ol_player_test_OBJECTS = ol_player_test.$(OBJEXT) \ ol_debug.$(OBJEXT) ol_player.$(OBJEXT) \ ol_player_amarok1.$(OBJEXT) ol_player_banshee.$(OBJEXT) \ - ol_player_mpris.$(OBJEXT) ol_player_mpris2.$(OBJEXT) \ - ol_player_exaile02.$(OBJEXT) ol_player_exaile03.$(OBJEXT) \ - ol_player_muine.$(OBJEXT) ol_player_mpd.$(OBJEXT) \ - ol_player_moc.$(OBJEXT) ol_player_xmms2.$(OBJEXT) \ - ol_player_quodlibet.$(OBJEXT) ol_player_juk.$(OBJEXT) \ - ol_player_listen.$(OBJEXT) ol_player_gmusicbrowser.$(OBJEXT) \ + ol_player_cmus.$(OBJEXT) ol_player_mpris.$(OBJEXT) \ + ol_player_mpris2.$(OBJEXT) ol_player_exaile02.$(OBJEXT) \ + ol_player_exaile03.$(OBJEXT) ol_player_muine.$(OBJEXT) \ + ol_player_mpd.$(OBJEXT) ol_player_moc.$(OBJEXT) \ + ol_player_xmms2.$(OBJEXT) ol_player_quodlibet.$(OBJEXT) \ + ol_player_juk.$(OBJEXT) ol_player_listen.$(OBJEXT) \ + ol_player_gmusicbrowser.$(OBJEXT) \ ol_player_rhythmbox.$(OBJEXT) ol_player_rhythmcat.$(OBJEXT) \ ol_player_utils.$(OBJEXT) ol_elapse_emulator.$(OBJEXT) \ ol_config.$(OBJEXT) ol_marshal.$(OBJEXT) ol_utils.$(OBJEXT) \ @@ -220,6 +238,11 @@ $(ol_osd_window_test_SOURCES) $(ol_path_test_SOURCES) \ $(ol_player_test_SOURCES) $(ol_utils_cmdline_test_SOURCES) \ $(ol_utils_dbus_test_SOURCES) $(ol_utils_test_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -227,8 +250,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -273,6 +298,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ @@ -325,6 +354,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ @@ -354,6 +384,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -426,6 +458,7 @@ $(top_srcdir)/src/ol_player.c \ $(top_srcdir)/src/ol_player_amarok1.c \ $(top_srcdir)/src/ol_player_banshee.c \ + $(top_srcdir)/src/ol_player_cmus.c \ $(top_srcdir)/src/ol_player_mpris.c \ $(top_srcdir)/src/ol_player_mpris2.c \ $(top_srcdir)/src/ol_player_exaile02.c \ @@ -605,58 +638,58 @@ clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) -ol_app_info_test$(EXEEXT): $(ol_app_info_test_OBJECTS) $(ol_app_info_test_DEPENDENCIES) +ol_app_info_test$(EXEEXT): $(ol_app_info_test_OBJECTS) $(ol_app_info_test_DEPENDENCIES) $(EXTRA_ol_app_info_test_DEPENDENCIES) @rm -f ol_app_info_test$(EXEEXT) $(LINK) $(ol_app_info_test_OBJECTS) $(ol_app_info_test_LDADD) $(LIBS) -ol_color_test$(EXEEXT): $(ol_color_test_OBJECTS) $(ol_color_test_DEPENDENCIES) +ol_color_test$(EXEEXT): $(ol_color_test_OBJECTS) $(ol_color_test_DEPENDENCIES) $(EXTRA_ol_color_test_DEPENDENCIES) @rm -f ol_color_test$(EXEEXT) $(LINK) $(ol_color_test_OBJECTS) $(ol_color_test_LDADD) $(LIBS) -ol_config_test$(EXEEXT): $(ol_config_test_OBJECTS) $(ol_config_test_DEPENDENCIES) +ol_config_test$(EXEEXT): $(ol_config_test_OBJECTS) $(ol_config_test_DEPENDENCIES) $(EXTRA_ol_config_test_DEPENDENCIES) @rm -f ol_config_test$(EXEEXT) $(LINK) $(ol_config_test_OBJECTS) $(ol_config_test_LDADD) $(LIBS) -ol_fork_test$(EXEEXT): $(ol_fork_test_OBJECTS) $(ol_fork_test_DEPENDENCIES) +ol_fork_test$(EXEEXT): $(ol_fork_test_OBJECTS) $(ol_fork_test_DEPENDENCIES) $(EXTRA_ol_fork_test_DEPENDENCIES) @rm -f ol_fork_test$(EXEEXT) $(LINK) $(ol_fork_test_OBJECTS) $(ol_fork_test_LDADD) $(LIBS) -ol_gussian_blur_test$(EXEEXT): $(ol_gussian_blur_test_OBJECTS) $(ol_gussian_blur_test_DEPENDENCIES) +ol_gussian_blur_test$(EXEEXT): $(ol_gussian_blur_test_OBJECTS) $(ol_gussian_blur_test_DEPENDENCIES) $(EXTRA_ol_gussian_blur_test_DEPENDENCIES) @rm -f ol_gussian_blur_test$(EXEEXT) $(LINK) $(ol_gussian_blur_test_OBJECTS) $(ol_gussian_blur_test_LDADD) $(LIBS) -ol_lrc_fetch_module_test$(EXEEXT): $(ol_lrc_fetch_module_test_OBJECTS) $(ol_lrc_fetch_module_test_DEPENDENCIES) +ol_lrc_fetch_module_test$(EXEEXT): $(ol_lrc_fetch_module_test_OBJECTS) $(ol_lrc_fetch_module_test_DEPENDENCIES) $(EXTRA_ol_lrc_fetch_module_test_DEPENDENCIES) @rm -f ol_lrc_fetch_module_test$(EXEEXT) $(LINK) $(ol_lrc_fetch_module_test_OBJECTS) $(ol_lrc_fetch_module_test_LDADD) $(LIBS) -ol_lrc_fetch_test$(EXEEXT): $(ol_lrc_fetch_test_OBJECTS) $(ol_lrc_fetch_test_DEPENDENCIES) +ol_lrc_fetch_test$(EXEEXT): $(ol_lrc_fetch_test_OBJECTS) $(ol_lrc_fetch_test_DEPENDENCIES) $(EXTRA_ol_lrc_fetch_test_DEPENDENCIES) @rm -f ol_lrc_fetch_test$(EXEEXT) $(LINK) $(ol_lrc_fetch_test_OBJECTS) $(ol_lrc_fetch_test_LDADD) $(LIBS) -ol_lrc_fetch_ui_test$(EXEEXT): $(ol_lrc_fetch_ui_test_OBJECTS) $(ol_lrc_fetch_ui_test_DEPENDENCIES) +ol_lrc_fetch_ui_test$(EXEEXT): $(ol_lrc_fetch_ui_test_OBJECTS) $(ol_lrc_fetch_ui_test_DEPENDENCIES) $(EXTRA_ol_lrc_fetch_ui_test_DEPENDENCIES) @rm -f ol_lrc_fetch_ui_test$(EXEEXT) $(LINK) $(ol_lrc_fetch_ui_test_OBJECTS) $(ol_lrc_fetch_ui_test_LDADD) $(LIBS) -ol_lrc_parser_test$(EXEEXT): $(ol_lrc_parser_test_OBJECTS) $(ol_lrc_parser_test_DEPENDENCIES) +ol_lrc_parser_test$(EXEEXT): $(ol_lrc_parser_test_OBJECTS) $(ol_lrc_parser_test_DEPENDENCIES) $(EXTRA_ol_lrc_parser_test_DEPENDENCIES) @rm -f ol_lrc_parser_test$(EXEEXT) $(LINK) $(ol_lrc_parser_test_OBJECTS) $(ol_lrc_parser_test_LDADD) $(LIBS) -ol_lrc_test$(EXEEXT): $(ol_lrc_test_OBJECTS) $(ol_lrc_test_DEPENDENCIES) +ol_lrc_test$(EXEEXT): $(ol_lrc_test_OBJECTS) $(ol_lrc_test_DEPENDENCIES) $(EXTRA_ol_lrc_test_DEPENDENCIES) @rm -f ol_lrc_test$(EXEEXT) $(LINK) $(ol_lrc_test_OBJECTS) $(ol_lrc_test_LDADD) $(LIBS) -ol_lrclib_test$(EXEEXT): $(ol_lrclib_test_OBJECTS) $(ol_lrclib_test_DEPENDENCIES) +ol_lrclib_test$(EXEEXT): $(ol_lrclib_test_OBJECTS) $(ol_lrclib_test_DEPENDENCIES) $(EXTRA_ol_lrclib_test_DEPENDENCIES) @rm -f ol_lrclib_test$(EXEEXT) $(LINK) $(ol_lrclib_test_OBJECTS) $(ol_lrclib_test_LDADD) $(LIBS) -ol_music_info_test$(EXEEXT): $(ol_music_info_test_OBJECTS) $(ol_music_info_test_DEPENDENCIES) +ol_music_info_test$(EXEEXT): $(ol_music_info_test_OBJECTS) $(ol_music_info_test_DEPENDENCIES) $(EXTRA_ol_music_info_test_DEPENDENCIES) @rm -f ol_music_info_test$(EXEEXT) $(LINK) $(ol_music_info_test_OBJECTS) $(ol_music_info_test_LDADD) $(LIBS) -ol_osd_window_test$(EXEEXT): $(ol_osd_window_test_OBJECTS) $(ol_osd_window_test_DEPENDENCIES) +ol_osd_window_test$(EXEEXT): $(ol_osd_window_test_OBJECTS) $(ol_osd_window_test_DEPENDENCIES) $(EXTRA_ol_osd_window_test_DEPENDENCIES) @rm -f ol_osd_window_test$(EXEEXT) $(LINK) $(ol_osd_window_test_OBJECTS) $(ol_osd_window_test_LDADD) $(LIBS) -ol_path_test$(EXEEXT): $(ol_path_test_OBJECTS) $(ol_path_test_DEPENDENCIES) +ol_path_test$(EXEEXT): $(ol_path_test_OBJECTS) $(ol_path_test_DEPENDENCIES) $(EXTRA_ol_path_test_DEPENDENCIES) @rm -f ol_path_test$(EXEEXT) $(LINK) $(ol_path_test_OBJECTS) $(ol_path_test_LDADD) $(LIBS) -ol_player_test$(EXEEXT): $(ol_player_test_OBJECTS) $(ol_player_test_DEPENDENCIES) +ol_player_test$(EXEEXT): $(ol_player_test_OBJECTS) $(ol_player_test_DEPENDENCIES) $(EXTRA_ol_player_test_DEPENDENCIES) @rm -f ol_player_test$(EXEEXT) $(LINK) $(ol_player_test_OBJECTS) $(ol_player_test_LDADD) $(LIBS) -ol_utils_cmdline_test$(EXEEXT): $(ol_utils_cmdline_test_OBJECTS) $(ol_utils_cmdline_test_DEPENDENCIES) +ol_utils_cmdline_test$(EXEEXT): $(ol_utils_cmdline_test_OBJECTS) $(ol_utils_cmdline_test_DEPENDENCIES) $(EXTRA_ol_utils_cmdline_test_DEPENDENCIES) @rm -f ol_utils_cmdline_test$(EXEEXT) $(LINK) $(ol_utils_cmdline_test_OBJECTS) $(ol_utils_cmdline_test_LDADD) $(LIBS) -ol_utils_dbus_test$(EXEEXT): $(ol_utils_dbus_test_OBJECTS) $(ol_utils_dbus_test_DEPENDENCIES) +ol_utils_dbus_test$(EXEEXT): $(ol_utils_dbus_test_OBJECTS) $(ol_utils_dbus_test_DEPENDENCIES) $(EXTRA_ol_utils_dbus_test_DEPENDENCIES) @rm -f ol_utils_dbus_test$(EXEEXT) $(LINK) $(ol_utils_dbus_test_OBJECTS) $(ol_utils_dbus_test_LDADD) $(LIBS) -ol_utils_test$(EXEEXT): $(ol_utils_test_OBJECTS) $(ol_utils_test_DEPENDENCIES) +ol_utils_test$(EXEEXT): $(ol_utils_test_OBJECTS) $(ol_utils_test_DEPENDENCIES) $(EXTRA_ol_utils_test_DEPENDENCIES) @rm -f ol_utils_test$(EXEEXT) $(LINK) $(ol_utils_test_OBJECTS) $(ol_utils_test_LDADD) $(LIBS) @@ -708,6 +741,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_amarok1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_banshee.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_cmus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_exaile02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_exaile03.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ol_player_gmusicbrowser.Po@am__quote@ @@ -1152,6 +1186,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ol_player_banshee.obj `if test -f '$(top_srcdir)/src/ol_player_banshee.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ol_player_banshee.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ol_player_banshee.c'; fi` +ol_player_cmus.o: $(top_srcdir)/src/ol_player_cmus.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ol_player_cmus.o -MD -MP -MF $(DEPDIR)/ol_player_cmus.Tpo -c -o ol_player_cmus.o `test -f '$(top_srcdir)/src/ol_player_cmus.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ol_player_cmus.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ol_player_cmus.Tpo $(DEPDIR)/ol_player_cmus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ol_player_cmus.c' object='ol_player_cmus.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ol_player_cmus.o `test -f '$(top_srcdir)/src/ol_player_cmus.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ol_player_cmus.c + +ol_player_cmus.obj: $(top_srcdir)/src/ol_player_cmus.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ol_player_cmus.obj -MD -MP -MF $(DEPDIR)/ol_player_cmus.Tpo -c -o ol_player_cmus.obj `if test -f '$(top_srcdir)/src/ol_player_cmus.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ol_player_cmus.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ol_player_cmus.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ol_player_cmus.Tpo $(DEPDIR)/ol_player_cmus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ol_player_cmus.c' object='ol_player_cmus.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ol_player_cmus.obj `if test -f '$(top_srcdir)/src/ol_player_cmus.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ol_player_cmus.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ol_player_cmus.c'; fi` + ol_player_mpris.o: $(top_srcdir)/src/ol_player_mpris.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ol_player_mpris.o -MD -MP -MF $(DEPDIR)/ol_player_mpris.Tpo -c -o ol_player_mpris.o `test -f '$(top_srcdir)/src/ol_player_mpris.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ol_player_mpris.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ol_player_mpris.Tpo $(DEPDIR)/ol_player_mpris.Po @@ -1453,6 +1501,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1501,10 +1563,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1588,7 +1655,7 @@ .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-checkPROGRAMS clean-generic ctags distclean \ + clean-checkPROGRAMS clean-generic cscopelist ctags distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \