diff -Nru udevil-0.4.1/aclocal.m4 udevil-0.4.3/aclocal.m4 --- udevil-0.4.1/aclocal.m4 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/aclocal.m4 2013-12-09 13:59:27.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 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. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 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. @@ -1990,7 +1990,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -2354,7 +2361,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -9261,7 +9269,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9453,25 +9461,22 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # 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.14' 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.6], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9487,24 +9492,22 @@ # 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.6])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $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 @@ -9523,7 +9526,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, @@ -9549,22 +9552,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 - # 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 @@ -9583,16 +9583,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 12 -# 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 @@ -9602,7 +9600,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -9615,12 +9613,13 @@ 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], [OBJCXX], [depcc="$OBJCXX" 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], @@ -9628,8 +9627,8 @@ # 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 @@ -9669,16 +9668,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 @@ -9687,8 +9686,8 @@ 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 @@ -9696,7 +9695,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -9744,7 +9743,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 @@ -9754,9 +9753,13 @@ # 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='\' @@ -9771,20 +9774,18 @@ # 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-2013 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 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9797,7 +9798,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. @@ -9809,21 +9810,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 + 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"])` @@ -9841,7 +9840,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], @@ -9849,32 +9848,23 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # 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-2013 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 - # 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. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -9887,7 +9877,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9916,31 +9906,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl 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 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -9951,34 +9950,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - 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 is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro 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 +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +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], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -10000,15 +10043,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -10022,16 +10062,14 @@ 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-2013 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 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -10048,20 +10086,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -10072,10 +10107,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -10083,18 +10119,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -10112,7 +10144,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 @@ -10137,52 +10169,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# 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 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # 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__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # 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-2013 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 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -10190,11 +10184,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -10207,54 +10200,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " 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, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 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 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -10264,7 +10225,7 @@ # -------------------- # 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) # ------------------------ @@ -10278,24 +10239,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 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. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # 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__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 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 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 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. # 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=' @@ -10306,32 +10325,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 @@ -10341,46 +10368,118 @@ 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, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 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. # 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, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -10394,18 +10493,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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_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 @@ -10415,76 +10512,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_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='$${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]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _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 `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru udevil-0.4.1/autogen.sh udevil-0.4.3/autogen.sh --- udevil-0.4.1/autogen.sh 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/autogen.sh 2013-12-09 13:59:27.000000000 +0000 @@ -152,6 +152,9 @@ conf_flags="--enable-maintainer-mode " #--enable-compile-warnings" #--enable-iso-c +# ensure pot file is not deleted by make clean +sed -i 's/\(.*rm -f.*\)\$(GETTEXT_PACKAGE)\.pot \(.*\)/\1 \2/' po/Makefile.in.in + cd "$ORIGDIR" if test x$NOCONFIGURE = x; then diff -Nru udevil-0.4.1/ChangeLog udevil-0.4.3/ChangeLog --- udevil-0.4.1/ChangeLog 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/ChangeLog 2013-12-09 13:59:27.000000000 +0000 @@ -1,3 +1,16 @@ +0.4.3 2013-12-09: + fix default udevil.conf allowed_options missing fmask=0133 #35 +0.4.2 2013-12-04: + move packages to pkg branch + debian pkgs libudev0 | libudev1 + update translations; add es fr pl sv + fix building with automake-1.13 + autogen.sh ensure pot not deleted + improve denied 94 msg #24 + default fmask=0133 for vfat ntfs msdos umsdos #25 + [devmon 1.1.7] support raid /dev/mda in partition detection #28 + fix identify empty optical drive + [devmon 1.1.7] add option --enumerate-device-files #26 0.4.1 2013-03-17: update Russian translation added translation files to transifex.com diff -Nru udevil-0.4.1/compile udevil-0.4.3/compile --- udevil-0.4.1/compile 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/compile 2013-12-09 13:59:27.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru udevil-0.4.1/config.guess udevil-0.4.3/config.guess --- udevil-0.4.1/config.guess 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/config.guess 2013-12-09 13:59:27.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,11 +786,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -828,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1586,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru udevil-0.4.1/configure udevil-0.4.3/configure --- udevil-0.4.1/configure 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/configure 2013-12-09 13:59:27.000000000 +0000 @@ -738,11 +738,14 @@ INTLTOOL__v_MERGE_0 INTLTOOL__v_MERGE_ INTLTOOL_V_MERGE -AM_DEFAULT_VERBOSITY INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE USE_NLS +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -807,6 +810,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_nls enable_dependency_tracking enable_maintainer_mode @@ -1455,11 +1459,16 @@ --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] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --disable-nls do not use Native Language Support - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -2286,7 +2295,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2412,9 +2421,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=' @@ -2425,32 +2431,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 @@ -2462,6 +2476,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. @@ -2484,12 +2508,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " 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 @@ -2501,10 +2525,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. @@ -2643,12 +2667,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2731,6 +2749,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2752,8 +2809,9 @@ # Define the identity of the package. + PACKAGE=udevil - VERSION=0.4.1 + VERSION=0.4.3 cat >>confdefs.h <<_ACEOF @@ -2781,12 +2839,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2794,6 +2862,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -2827,7 +2937,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 @@ -3660,6 +3770,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # 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__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3671,8 +3840,8 @@ # 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 @@ -3707,16 +3876,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 @@ -3725,8 +3894,8 @@ 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 @@ -3734,7 +3903,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -4434,131 +4603,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # 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__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5695,7 +5739,8 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -7231,7 +7276,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -13436,6 +13488,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='#' @@ -14940,7 +15000,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -14953,7 +15013,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. @@ -14987,21 +15047,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 + 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 udevil-0.4.1/configure.ac udevil-0.4.3/configure.ac --- udevil-0.4.1/configure.ac 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/configure.ac 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,9 @@ AC_PREREQ(2.52) AC_INIT(src/udevil.c) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE(udevil, 0.4.1) +AM_INIT_AUTOMAKE(udevil, 0.4.3) AC_PROG_INTLTOOL([0.21]) diff -Nru udevil-0.4.1/debian/changelog udevil-0.4.3/debian/changelog --- udevil-0.4.1/debian/changelog 2014-01-13 13:22:13.000000000 +0000 +++ udevil-0.4.3/debian/changelog 2014-02-11 02:46:31.000000000 +0000 @@ -1,3 +1,13 @@ +udevil (0.4.3-1) unstable; urgency=medium + + * New upstream release. + * Update debian/copyright. + * debian/control: + + build only on Linux. + * Update manpage file: debian/udevil.1. + + -- Mateusz Łukasik Sat, 01 Feb 2014 10:30:34 +0100 + udevil (0.4.1-1) unstable; urgency=low * Initial release. (Closes: #691812) diff -Nru udevil-0.4.1/debian/control udevil-0.4.3/debian/control --- udevil-0.4.1/debian/control 2014-01-13 13:21:01.000000000 +0000 +++ udevil-0.4.3/debian/control 2014-01-09 15:53:53.000000000 +0000 @@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/mati75/udevil.git Package: udevil -Architecture: any +Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: udisks | udisks2, zenity, pmount Suggests: eject, cifs-utils, curlftpfs, sshfs diff -Nru udevil-0.4.1/debian/copyright udevil-0.4.3/debian/copyright --- udevil-0.4.1/debian/copyright 2014-01-13 13:19:35.000000000 +0000 +++ udevil-0.4.3/debian/copyright 2014-01-09 16:15:39.000000000 +0000 @@ -15,6 +15,29 @@ 2012 IgnorantGuru License: GPL-3+ +Files: po/Makefile.in.in +Copyright: 1995-1997 Ulrich Drepper + 2004-2008 Rodney Dawes +License: permissive + This file may be copied and used freely without restrictions. It may + be used in projects which are not available under a GNU General Public License, + but which still want to provide support for the GNU gettext functionality. + +Files: Makefile.in + etc/Makefile.in + man/Makefile.in + src/Makefile.in +Copyright: 1994-2013 Free Software Foundation, Inc. +License: permissive + 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. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY, to the extent permitted by law; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. + Files: debian/* Copyright: 2013-2014 Mateusz Łukasik License: GPL-3+ diff -Nru udevil-0.4.1/debian/udevil.1 udevil-0.4.3/debian/udevil.1 --- udevil-0.4.1/debian/udevil.1 2013-06-14 17:52:33.000000000 +0000 +++ udevil-0.4.3/debian/udevil.1 2014-02-01 09:20:11.000000000 +0000 @@ -35,7 +35,7 @@ .TP .B udevil umount /dev/sdd1 .B udevil umount /media/disk -.B udevil umount -l /media/disk +.B udevil umount \-l /media/disk .B udevil umount /tmp/example.iso .TP .B udevil info /dev/sdd1 @@ -64,9 +64,9 @@ .B udevil umount|unmount|-\-unmount|-\-umount [UNMOUNT-OPTIONS] .B {[\-b|-\-block-device] DEVICE}|DIR .B UNMOUNT-OPTIONS: -.B \-\l +.B \-l lazy unmount (see man umount) -.B \-\f +.B \-f force unmount (see man umount) .B \-\-no-user-interaction ignored (for compatibility) @@ -74,14 +74,14 @@ .B INFO \- Show information about DEVICE emulating udisks v1 output: .B udevil info|-\-show-info|-\-info [-b|-\-block-device] DEVICE .TP -.B MONITOR - Display device events emulating udisks v1 output: +.B MONITOR \- Display device events emulating udisks v1 output: udevil monitor|\-\-monitor .TP -.B CLEAN - Remove unmounted udevil-created mount dirs in media dirs +.B CLEAN \- Remove unmounted udevil-created mount dirs in media dirs .B udevil clean .TP HELP - Show this help -.B udevil help|--help|-h +.B udevil help|\-\-help|\-h .SH AUTHOR This manual page was written by Mateusz Łukasik , for the Debian GNU/Linux system (but may be used by others). diff -Nru udevil-0.4.1/depcomp udevil-0.4.3/depcomp --- udevil-0.4.1/depcomp 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/depcomp 2013-12-09 13:59:27.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # 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' - depmode=msvisualcpp + # 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' + 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 + # 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 + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # 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. @@ -174,15 +232,15 @@ ## 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 ' ' "$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. 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 "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # 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|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # 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:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$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 - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # 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 - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 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 : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" 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 -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$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" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; 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'. - # 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. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # 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. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # 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. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - 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" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # 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" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru udevil-0.4.1/distros/debian/changelog udevil-0.4.3/distros/debian/changelog --- udevil-0.4.1/distros/debian/changelog 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/distros/debian/changelog 2013-12-09 13:59:27.000000000 +0000 @@ -1,5 +1,5 @@ -udevil (0.4.1-1) unstable; urgency=low +udevil (0.4.3-1) unstable; urgency=low * release - -- IgnorantGuru Sun, 17 Mar 2013 17:57:49 +0000 + -- IgnorantGuru Mon, 09 Dec 2013 13:59:09 +0000 diff -Nru udevil-0.4.1/distros/debian/control udevil-0.4.3/distros/debian/control --- udevil-0.4.1/distros/debian/control 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/distros/debian/control 2013-12-09 13:59:27.000000000 +0000 @@ -4,13 +4,13 @@ Maintainer: IgnorantGuru Build-Depends: debhelper (>= 7.0.50~), autotools-dev, build-essential, libc6, libglib2.0-0, intltool, pkg-config, libglib2.0-dev, fakeroot, - libudev0 (>=143), libudev-dev + libudev0 (>=143) | libudev1, libudev-dev Standards-Version: 3.9.1 Homepage: http://ignorantguru.github.com/udevil/ Package: udevil Architecture: any -Depends: libc6, libglib2.0-0, libudev0 (>=143) +Depends: libc6, libglib2.0-0, libudev0 (>=143) | libudev1 Recommends: Suggests: eject, cifs-utils, curlftpfs, sshfs, davfs2, spacefm Conflicts: devmon diff -Nru udevil-0.4.1/etc/Makefile.in udevil-0.4.3/etc/Makefile.in --- udevil-0.4.1/etc/Makefile.in 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/etc/Makefile.in 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = etc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -60,6 +88,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -67,6 +107,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -261,11 +302,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -402,16 +443,17 @@ .MAKE: install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook 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-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook 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-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am install-data-hook: diff -Nru udevil-0.4.1/etc/udevil.conf udevil-0.4.3/etc/udevil.conf --- udevil-0.4.1/etc/udevil.conf 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/etc/udevil.conf 2013-12-09 13:59:27.000000000 +0000 @@ -217,10 +217,10 @@ # mount iso9660 with 'ro' to prevent mount read-only warning default_options_iso9660 = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro, utf8 default_options_udf = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID -default_options_vfat = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, utf8 -default_options_msdos = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID -default_options_umsdos = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID -default_options_ntfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, utf8 +default_options_vfat = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID, utf8 +default_options_msdos = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID +default_options_umsdos = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID +default_options_ntfs = nosuid, noexec, nodev, noatime, fmask=0133, uid=$UID, gid=$GID, utf8 default_options_cifs = nosuid, noexec, nodev, uid=$UID, gid=$GID default_options_smbfs = nosuid, noexec, nodev, uid=$UID, gid=$GID default_options_sshfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, nonempty, allow_other @@ -241,7 +241,7 @@ # and GID. # If you want to forbid remounts, remove 'remount' from here. # WARNING: OPTIONS HERE CAN CAUSE SERIOUS SECURITY PROBLEMS - CHOOSE CAREFULLY -allowed_options = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, ro, rw, sync, flush, iocharset=*, utf8, remount +allowed_options = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID, ro, rw, sync, flush, iocharset=*, utf8, remount allowed_options_nfs = nosuid, noexec, nodev, noatime, ro, rw, sync, remount, port=*, rsize=*, wsize=*, hard, proto=*, timeo=*, retrans=* allowed_options_cifs = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=* allowed_options_smbfs = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=* diff -Nru udevil-0.4.1/INSTALL udevil-0.4.3/INSTALL --- udevil-0.4.1/INSTALL 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/INSTALL 2013-12-09 13:59:27.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru udevil-0.4.1/install-sh udevil-0.4.3/install-sh --- udevil-0.4.1/install-sh 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/install-sh 2013-12-09 13:59:27.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru udevil-0.4.1/ltmain.sh udevil-0.4.3/ltmain.sh --- udevil-0.4.1/ltmain.sh 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/ltmain.sh 2013-12-09 13:59:27.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.1" +VERSION="2.4.2 Debian-2.4.2-1.3" TIMESTAMP="" package_revision=1.3337 diff -Nru udevil-0.4.1/Makefile.in udevil-0.4.3/Makefile.in --- udevil-0.4.1/Makefile.in 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/Makefile.in 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,11 +78,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in mkinstalldirs COPYING compile \ + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -66,15 +93,28 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,11 +122,33 @@ 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 +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -97,6 +159,7 @@ && 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,'; \ @@ -124,6 +187,7 @@ 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$$' @@ -331,8 +395,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -355,22 +419,25 @@ -rm -f libtool config.lt # 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. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# 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. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -385,57 +452,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -451,12 +473,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -468,15 +485,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -485,9 +498,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(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 +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + 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) @@ -555,40 +590,42 @@ || 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=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 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 @@ -599,8 +636,6 @@ 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*) \ @@ -612,9 +647,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -646,7 +681,7 @@ && $(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' @@ -782,24 +817,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool 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 mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool 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 \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru udevil-0.4.1/man/Makefile.in udevil-0.4.3/man/Makefile.in --- udevil-0.4.1/man/Makefile.in 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/man/Makefile.in 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -60,6 +88,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -98,6 +138,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -337,27 +378,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -495,16 +523,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool 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-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool 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-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru udevil-0.4.1/missing udevil-0.4.3/missing --- udevil-0.4.1/missing 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/missing 2013-12-09 13:59:27.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # 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 -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --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' - 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 - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -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 $? @@ -99,228 +70,141 @@ ;; -*) - 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 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - 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 - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -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 - 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 - 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 - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - 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. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -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 - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - 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 - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - 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 - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -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." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - 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 - 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." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -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, - 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." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru udevil-0.4.1/po/ChangeLog udevil-0.4.3/po/ChangeLog --- udevil-0.4.1/po/ChangeLog 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/ChangeLog 2013-12-09 13:59:27.000000000 +0000 @@ -1,3 +1,7 @@ +2013-10-31 IgnorantGuru + + * added es fr pl sv + 2013-02-16 delix * added de.po diff -Nru udevil-0.4.1/po/de.po udevil-0.4.3/po/de.po --- udevil-0.4.1/po/de.po 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/de.po 2013-12-09 13:59:27.000000000 +0000 @@ -3,15 +3,16 @@ # package. # # Translators: -# , 2013. +# delix, 2013 +# , 2013 msgid "" msgstr "" "Project-Id-Version: udevil\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-22 13:49+0000\n" -"PO-Revision-Date: 2013-03-08 00:22+0000\n" -"Last-Translator: jup \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: delix\n" +"Language-Team: German (http://www.transifex.com/projects/p/udevil/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,7 @@ #, c-format msgid "" "udevil: error 1: unable to drop priviledges - please report this problem\n" -msgstr "" +msgstr "udevil: Fehler 1: Berechtigungen zurücknehmen nicht möglich -- bitte dieses Problem melden\n" #: ../src/udevil.c:804 #, c-format @@ -68,20 +69,20 @@ #: ../src/udevil.c:1635 #, c-format msgid "udevil: warning 9: unable to run losetup (%s)\n" -msgstr "" +msgstr "udevil: Warnung 9: Ausführen von Iosetup (%s) nicht möglich\n" #: ../src/udevil.c:1543 msgid "udevil: error 147: unable to get free loop device\n" -msgstr "" +msgstr "udevil: Fehler 147: kein freies Dateiblockgerät zu finden\n" #: ../src/udevil.c:1552 msgid "udevil: error 150: path changed\n" -msgstr "udevil: Fehler 150:Pfad worde geändert\n" +msgstr "udevil: Fehler 150: Pfad wurde geändert\n" #: ../src/udevil.c:1692 #, c-format msgid "udevil: warning 10: unable to run losetup (%s)\n" -msgstr "" +msgstr "udevil: Warnung 10: Ausführen von Iosetup (%s) nicht möglich\n" #: ../src/udevil.c:1926 #, c-format @@ -96,17 +97,17 @@ #: ../src/udevil.c:1984 #, c-format msgid "udevil: error 13: unable to run %s\n" -msgstr "" +msgstr "udevil: Fehler 13: Ausführen von %s nicht möglich\n" #: ../src/udevil.c:1996 #, c-format msgid " %s exit status = %d\n" -msgstr "" +msgstr " %s Exitstatus = %d\n" #: ../src/udevil.c:2001 #, c-format msgid "udevil: denied 14: %s returned exit status %d\n" -msgstr "" +msgstr "udevil: verweigert 14: %s gab Exotstatu %d zurück\n" #. log #: ../src/udevil.c:2039 @@ -116,12 +117,12 @@ #: ../src/udevil.c:2052 #, c-format msgid "udevil: warning 15: unable to run umount (%s)\n" -msgstr "" +msgstr "udevil: Warnung 15: Aushängen (%s) nicht möglich\n" #: ../src/udevil.c:2057 ../src/udevil.c:2130 #, c-format msgid " umount exit status = %d\n" -msgstr "" +msgstr " Exitstatus AUshängen = %d\n" #. success - show output #: ../src/udevil.c:2066 @@ -135,26 +136,26 @@ #: ../src/udevil.c:2120 #, c-format msgid "udevil: error 16: unable to run umount (%s)\n" -msgstr "" +msgstr "udevil: Fehler 16: Aushängen (%s) nicht möglich\n" #: ../src/udevil.c:2193 #, c-format msgid "udevil: error 17: unable to run mount (%s)\n" -msgstr "" +msgstr "udevil: Fehler 17: Einhängen (%s) nicht möglich\n" #: ../src/udevil.c:2206 #, c-format msgid " mount exit status = %d\n" -msgstr "" +msgstr " Exitstatus Einhängen = %d\n" #: ../src/udevil.c:2220 msgid "udevil: error 148: unable to attach file to loop device\n" -msgstr "" +msgstr "udevil: Fehler 148: Datei hinzufügen zu Dateiblockgerät nicht möglich\n" #: ../src/udevil.c:2264 #, c-format msgid "udevil: warning 18: unable to run mount (%s)\n" -msgstr "" +msgstr "udevil: Warnung 18: Einhängen (%s) nicht möglich\n" #: ../src/udevil.c:2281 #, c-format @@ -174,7 +175,7 @@ #: ../src/udevil.c:2293 #, c-format msgid "udevil: denied 22: cannot stat '%s': %s\n" -msgstr "" +msgstr "udevil: verweigert 22: keine Statistik '%s' erstellbar: %s\n" #: ../src/udevil.c:2295 #, c-format @@ -184,92 +185,92 @@ #: ../src/udevil.c:2332 #, c-format msgid "udevil: warning 24: unable to run setfacl (%s)\n" -msgstr "" +msgstr "udevil: Warnung 24: Ausführen setfacl (%s) nicht möglich\n" #. setfacl apparently failed so fallback to normal permissions #: ../src/udevil.c:2340 #, c-format msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" -msgstr "" +msgstr "udevil: Warnung 25: setfacl auf %s gescheitert, zurückgesetzt auf 'rwxr-xr-x'\n" #: ../src/udevil.c:2446 #, c-format msgid "" "udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" -msgstr "" +msgstr "udevil: Fehler 26: ungültiger Typ '%s' für SMB Freigabeordner - muß cifs oder smbfs sein\n" #: ../src/udevil.c:2461 #, c-format msgid "" "udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" -msgstr "" +msgstr "udevil: Fehler 27: ungültiger Typ '%s' für NFS Freigabeordner - muß nfs oder nfs4 sein\n" #: ../src/udevil.c:2474 #, c-format msgid "" "udevil: error 28: invalid type '%s' for curlftpfs share - must be " "curlftpfs\n" -msgstr "" +msgstr "udevil: Fehler 28: ungültiger Typ '%s' für curlftpfs Freigabeordner - muß curlftpfs sein\n" #: ../src/udevil.c:2486 #, c-format msgid "" "udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " "ftpfs\n" -msgstr "" +msgstr "udevil: Fehler 29: ungültiger Typ '%s' für FTP Freigabeordner - muß curlftpfs oder ftpfs sein\n" #: ../src/udevil.c:2511 #, c-format msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: Fehler 30: ungültiger Typ '%s' für sshfs Freigabeordner - muß sshfs sein\n" #: ../src/udevil.c:2524 #, c-format msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: Fehler 31: ungültiger Typ '%s' für sshfs Freigabeordner - muß sshfs sein\n" #: ../src/udevil.c:2536 #, c-format msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" -msgstr "" +msgstr "udevil: Fehler 151: ungültiger Typ '%s' für WebDAV Freigabeordner - muß davfs sein\n" #: ../src/udevil.c:2551 #, c-format msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: Fehler 32: ungültiger Typ '%s' für sshfs Freigabeordner - muß sshfs sein\n" #: ../src/udevil.c:2562 #, c-format msgid "" "udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" -msgstr "" +msgstr "udevil: Fehler 33: ungültiger Typ '%s' für NFS Freigabeordner - muß nfs oder nfs4 sein\n" #: ../src/udevil.c:2679 #, c-format msgid "udevil: error 34: '%s' is not a recognized network url\n" -msgstr "" +msgstr "udevil: Fehler 34: '%s' ist keine erkennbare Netzwerk-URL\n" #: ../src/udevil.c:2688 msgid "udevil: error 35: invalid network url\n" -msgstr "" +msgstr "udevil: Fehler 35: ungültige Netzwerk-URL\n" #: ../src/udevil.c:2695 #, c-format msgid "udevil: error 36: lookup host '%s' failed\n" -msgstr "" +msgstr "udevil: Fehler 36: Namensauslösung für Host '%s' gescheitert\n" #: ../src/udevil.c:2743 #, c-format msgid "udevil: error 37: %s\n" -msgstr "" +msgstr "udevil: Fehler 37: %s\n" #: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 msgid "udevil was not run suid root" -msgstr "" +msgstr "undevil ohne SUID root ausgeführt" #: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 msgid "To correct this problem" -msgstr "" +msgstr "Problembehebung:" #: ../src/udevil.c:2763 msgid "udevil: error 38: mount requires DEVICE argument\n" @@ -282,76 +283,76 @@ #: ../src/udevil.c:2810 #, c-format msgid "udevil: error 40: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 40: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:2822 msgid "udevil: error 41: cannot canonicalize device path\n" -msgstr "" +msgstr "udevil: Fehler 41: der Pfad zum Gerät kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:2829 #, c-format msgid "udevil: error 42: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 42: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:2840 #, c-format msgid "udevil: error 43: '%s' is not a regular file or directory\n" -msgstr "" +msgstr "udevil: Fehler 43: '%s' ist keine reguläre Datei oder Verzeichnis\n" #. mount knows (in fstab) so mount as normal user with only specified opts #: ../src/udevil.c:2879 ../src/udevil.c:3809 #, c-format msgid "udevil: %s is known to mount - running mount as current user\n" -msgstr "" +msgstr "udevil: %s ist erfahrungsgemäß einhängbar - Ausführung des Einhängebefehls als aktueller Nutzer\n" #: ../src/udevil.c:2882 msgid "" "udevil: warning 44: fstype ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: Warnung 44: Dateisystemtyp wird für dieses Gerät in fstab ignoriert (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:2885 msgid "" "udevil: warning 45: options ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: Warnung 45: Optionen werden für dieses Gerät in fstab ignoriert (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:2956 #, c-format msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: Fehler 46: '%s' in mtab nicht als eingehängt auffindbar\n" #: ../src/udevil.c:2970 msgid "udevil: error 47: cannot canonicalize attached loop device\n" -msgstr "" +msgstr "udevil: Fehler 47: angehängtes Dateiblockgerät kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:2976 msgid "udevil: denied 48: 'file' is not an allowed type\n" -msgstr "" +msgstr "udevil: verweigert 48: 'Datei' ist kein erlaubter Typ\n" #: ../src/udevil.c:2984 #, c-format msgid "udevil: denied 49: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: verweigert 49: '%s' ist keine erlaubte Datei\n" #: ../src/udevil.c:2991 #, c-format msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: Fehler 50: '%s' in mtab nicht als eingehängt auffindbar\n" #: ../src/udevil.c:3010 #, c-format msgid "udevil: warning 51: attached device %s is not a loop device\n" -msgstr "" +msgstr "udevil: Warnung 51: angeschlossenes Gerät %s ist kein Dateiblockgerät\n" #: ../src/udevil.c:3035 #, c-format msgid "udevil: error 52: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 52: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:3054 msgid "udevil: error 53: cannot canonicalize path\n" -msgstr "" +msgstr "udevil: Fehler 53: Pfad kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:3070 #, c-format @@ -361,54 +362,54 @@ #: ../src/udevil.c:3079 #, c-format msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: Fehler 55: '%s' in mtab nicht als eingehängt auffindbar\n" #: ../src/udevil.c:3086 #, c-format msgid "udevil: error 56: cannot find device %s fstype in mtab\n" -msgstr "" +msgstr "udevil: Fehler 56: Dateisystemtyp bei Gerät %s in mtab nicht auffindbar\n" #: ../src/udevil.c:3097 #, c-format msgid "udevil: error 57: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 57: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:3106 #, c-format msgid "udevil: error 58: %s is not a block device\n" -msgstr "" +msgstr "udevil: Fehler 58: %s ist kein Blockgerät\n" #: ../src/udevil.c:3115 msgid "udevil: error 59: error initializing libudev\n" -msgstr "" +msgstr "udevil: Fehler 59: Fehler beim Initialisieren von libudev\n" #: ../src/udevil.c:3123 #, c-format msgid "udevil: error 60: no udev device for device %s\n" -msgstr "" +msgstr "udevil: Fehler 60: kein udev Gerät für Gerät %s\n" #: ../src/udevil.c:3134 #, c-format msgid "udevil: error 61: unable to get device info for device %s\n" -msgstr "" +msgstr "udevil: Fehler 61: Geräteinfos für Gerät %s nicht zu bekommen\n" #: ../src/udevil.c:3157 #, c-format msgid "udevil: error 62: type %s is invalid for block device\n" -msgstr "" +msgstr "udevil: Fehler 62: Typ %s ist für Blockgerät ungültig\n" #: ../src/udevil.c:3177 msgid "udevil: error 143: unable to determine device fstype\n" -msgstr "" +msgstr "udevil: Fehler 143: Dateisystemtyp für Gerät nicht zu bestimmen\n" #: ../src/udevil.c:3180 #, c-format msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" -msgstr "" +msgstr "udevil: Fehler 63: kein Medium im Gerät %s (oder Typ mit -t festlegen)\n" #: ../src/udevil.c:3183 msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" -msgstr "" +msgstr "udevil: Fehler 64: Dateisystemtyp beim Gerät nicht zu bestimmen - mit -t festlegen\n" #: ../src/udevil.c:3243 #, c-format @@ -422,83 +423,83 @@ #: ../src/udevil.c:3266 msgid "udevil: error 67: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: Fehler 67: Pfad zum Einhängepunkt kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:3277 #, c-format msgid "udevil: error 68: cannot stat '%s'\n" -msgstr "" +msgstr "udevil: Fehler 68: keine Statistik '%s' erstellbar\n" #: ../src/udevil.c:3295 msgid "udevil: error 69: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: Fehler 69: Pfad zum Einhängepunkt kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:3306 msgid "udevil: error 70: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: Fehler 70: Pfad zum Einhängepunkt kann nicht normgerecht gemacht werden\n" #: ../src/udevil.c:3316 #, c-format msgid "udevil: denied 71: '%s' is not an allowed media directory\n" -msgstr "" +msgstr "udevil: verweigert 71: '%s' ist kein erlaubtes Medienverzeichnis\n" #: ../src/udevil.c:3328 msgid "udevil: error 72: multiple fstypes not allowed\n" -msgstr "" +msgstr "udevil: Fehler 72: mehrere Dateisystemtypen nicht erlaubt\n" #: ../src/udevil.c:3334 #, c-format msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" -msgstr "" +msgstr "udevil: verweigert 73: Dateisystemtyp '%s' ist kein erlaubter Typ\n" #: ../src/udevil.c:3343 msgid "udevil: error 74: could not get username\n" -msgstr "" +msgstr "udevil: Fehler 74: Nutzername nicht zu bekommen\n" #: ../src/udevil.c:3351 #, c-format msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" -msgstr "" +msgstr "udevil: verweigert 75: Nutzer '%s' (%s) gehört nicht zu den erlaubten Nutzer\n" #: ../src/udevil.c:3373 #, c-format msgid "udevil: denied 77: user %s is not in allowed groups\n" -msgstr "" +msgstr "udevil: verweigert 78: Nutzer %s gehört zu keiner erlaubten Gruppe\n" #: ../src/udevil.c:3385 #, c-format msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" -msgstr "" +msgstr "udevil: verweigert 78: Host '%s' (%s) ist kein erlaubtes Netzwerk\n" #: ../src/udevil.c:3391 #, c-format msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" -msgstr "" +msgstr "udevil: verweigert 79: Host '%s' (%s) ist ein verbotenes Netzwerk\n" #: ../src/udevil.c:3406 #, c-format msgid "udevil: denied 80: device %s is not an allowed device\n" -msgstr "" +msgstr "udevil: verweigert 80: Gerät %s ist kein erlaubtes Gerät\n" #: ../src/udevil.c:3413 #, c-format msgid "udevil: denied 81: device %s is a forbidden device\n" -msgstr "" +msgstr "udevil: verweigert 81: Gerät %s ist ein verbotenes Gerät\n" #: ../src/udevil.c:3429 #, c-format msgid "udevil: denied 82: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: verweigert 82: '%s' ist keine erlaubte Datei\n" #: ../src/udevil.c:3436 #, c-format msgid "udevil: denied 83: you don't have read permission for file '%s'\n" -msgstr "" +msgstr "udevil: verweigert 83: keine Leserechte für Datei '%s'\n" #: ../src/udevil.c:3447 #, c-format msgid "udevil: denied 145: cannot open '%s'\n" -msgstr "" +msgstr "udevil: verweigert 145: '%s' nicht zu öffnen\n" #: ../src/udevil.c:3460 msgid "udevil: error 146: path changed\n" @@ -506,342 +507,342 @@ #: ../src/udevil.c:3468 msgid "udevil: error 84: cannot specify mount point for directory\n" -msgstr "" +msgstr "udevil: Fehler 84: Einhängepunkt für Verzeichnis nicht festlegbar\n" #: ../src/udevil.c:3488 #, c-format msgid "udevil: denied 85: %s is attached to an invalid file\n" -msgstr "" +msgstr "udevil: verweigert 85: %s ist einer ungültigen Datei zugeordnet\n" #: ../src/udevil.c:3496 #, c-format msgid "udevil: denied 86: '%s' is not a permitted file\n" -msgstr "" +msgstr "udevil: verweigert 86: '%s' ist keine erlaubte Datei\n" #: ../src/udevil.c:3506 #, c-format msgid "udevil: denied 87: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: verweigert 87: '%s' ist keine erlaubte Datei\n" #: ../src/udevil.c:3527 #, c-format msgid "udevil: denied 88: device %s is an internal device and you're not root\n" -msgstr "" +msgstr "udevil: verweigert 88: Gerät %s ist ein internes Gerät und Sie habe keine Root-Rechte\n" #: ../src/udevil.c:3729 #, c-format msgid "udevil: error 89: options contain an invalid character ('%c')\n" -msgstr "" +msgstr "udevil: Fehler 89: Optionen enthalten ungültiges Zeichen ('%c')\n" #: ../src/udevil.c:3738 #, c-format msgid "udevil: denied 90: option '%s' is not an allowed option\n" -msgstr "" +msgstr "udevil: verweigert 90: Option '%s' ist keine erlaubte Option\n" #: ../src/udevil.c:3749 msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" -msgstr "" +msgstr "udevil: verweigert 91: die Option nochmaliges Einhängen ist bei FTP oder sshfs Freigabeordnern nicht benutzbar\n" #: ../src/udevil.c:3758 msgid "udevil: denied 149: cannot use remount option with file\n" -msgstr "" +msgstr "udevil: verweigert 149: die Option nochmaliges Einhängen ist bei der Datei nicht benutzbar\n" #: ../src/udevil.c:3777 #, c-format msgid "" "udevil: denied 92: device %s is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: verweigert 92: Gerät %s ist bereits eingehängt (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3788 #, c-format msgid "" "udevil: denied 93: file %s is already mounted at %s (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: verweigert 93: Datei %s ist bereits eingehängt auf %s (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3792 #, c-format -msgid "udevil: denied 94: file %s is already mounted (or specify mount point)\n" -msgstr "" +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "udevil: verweigert 94: Datei %s ist bereits dem Dateiblockgerät zugeordnet\n" #: ../src/udevil.c:3800 #, c-format msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: verweigert 95: %s ist bereits eingehängt (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3812 msgid "" "udevil: warning 96: fstype ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: Warnung 96: Dateisystemtyp wird für dieses Gerät in fstab ignoriert (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3815 msgid "" "udevil: warning 97: options ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: Warnung 97: Optionen werden für dieses Gerät in fstab ignoriert (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3857 #, c-format msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: verweigert 98: '%s' ist bereits eingehängt (oder Einhängepunkt festlegen)\n" #: ../src/udevil.c:3860 #, c-format msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" -msgstr "" +msgstr "udevil: verweigert 99: '%s' einhängen nicht möglich (nicht in fstab ?)\n" #: ../src/udevil.c:3874 msgid "udevil: denied 100: must specify device or network for remount\n" -msgstr "" +msgstr "udevil: verweigert 100: Gerät oder Netzwerk zum Nochmaleinhängen muß festgelegt werden\n" #: ../src/udevil.c:3880 msgid "udevil: warning 101: specified mount point with remount ignored\n" -msgstr "" +msgstr "udevil: Warnung 101: festgelegter Einhängepunkt zum Nochmaleinhängen wird ignoriert\n" #: ../src/udevil.c:3925 #, c-format msgid "udevil: warning 102: device %s is already mounted on %s\n" -msgstr "" +msgstr "udevil: Warnung 102: Gerät %s ist bereits eingehängt auf %s\n" #: ../src/udevil.c:3937 msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" -msgstr "" +msgstr "udevil: Fehler 103: kein gültig existierendes Verzeichnis in erlaubte_Medien_Verzeichnisse\n" #: ../src/udevil.c:4051 #, c-format msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" -msgstr "" +msgstr "udevil: Fehler 104: Einhängepunkt '%s' ist keine gültige UTF8-Zeichenkette\n" #: ../src/udevil.c:4073 #, c-format msgid "udevil: error 105: mkdir '%s' failed\n" -msgstr "" +msgstr "udevil: Fehler 105: mkdir '%s' fehlgeschlagen\n" #. try cifs as guest first #: ../src/udevil.c:4106 #, c-format msgid "udevil: trying %s as guest\n" -msgstr "" +msgstr "udevil: %s Versuch als Gast\n" #: ../src/udevil.c:4117 #, c-format msgid "udevil: trying with %s\n" -msgstr "" +msgstr "udevil: Versuch mit %s\n" #: ../src/udevil.c:4164 msgid "" "udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" -msgstr "" +msgstr "udevil: Warnung 106: ungültiger mount_point_mode in udevil.conf - es wird 0755 verwendet\n" #: ../src/udevil.c:4229 #, c-format msgid "udevil: error 107: %s\n" -msgstr "" +msgstr "udevil: Fehler 107: %s\n" #: ../src/udevil.c:4244 msgid "udevil: error 108: remove requires DEVICE argument\n" -msgstr "" +msgstr "udevil: Fehler 108: der Befehl remove benötigt ein GERÄT Argument\n" #: ../src/udevil.c:4250 #, c-format msgid "udevil: error 109: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 109: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:4258 #, c-format msgid "udevil: error 110: %s is not a block device\n" -msgstr "" +msgstr "udevil: Fehler 110: %s ist kein Blockgerät\n" #: ../src/udevil.c:4265 msgid "udevil: error 111: error initializing libudev\n" -msgstr "" +msgstr "udevil: Fehler 111: Fehler beim Initialisieren von libudev\n" #: ../src/udevil.c:4272 #, c-format msgid "udevil: error 112: no udev device for device %s\n" -msgstr "" +msgstr "udevil: Fehler 112: kein udev Gerät für Gerät %s\n" #: ../src/udevil.c:4281 msgid "udevil: error 113: unable to get device info\n" -msgstr "" +msgstr "udevil: Fehler 113: Geräteinfo nicht zu bekommen\n" #: ../src/udevil.c:4293 #, c-format msgid "" "udevil: warning 114: device %s is an internal device - not unbinding " "driver\n" -msgstr "" +msgstr "udevil: Warnung 114: Gerät %s ist eine internes Gerät - Treiber nicht abkoppeln\n" #: ../src/udevil.c:4304 msgid "" "udevil: warning 115: interface is not usb, firewire, sdio, esata - not " "unbinding driver\n" -msgstr "" +msgstr "udevil: Warnung 115: Schnittstelle ist kein usb, firewire, sdio, esata - Treiber nicht abkoppeln\n" #: ../src/udevil.c:4312 #, c-format msgid "udevil: denied 116: device %s is not an allowed device\n" -msgstr "" +msgstr "udevil: verweigert 116: Gerät %s ist kein erlaubtes Gerät\n" #: ../src/udevil.c:4318 #, c-format msgid "udevil: denied 117: device %s is a forbidden device\n" -msgstr "" +msgstr "udevil: verweigert 117: Gerät %s ist en verbotenes Gerät\n" #: ../src/udevil.c:4356 #, c-format msgid "udevil: unmount %s\n" -msgstr "" +msgstr "udevil: Aushängen %s\n" #: ../src/udevil.c:4390 #, c-format msgid "udevil: error 118: unable to access dir %s\n" -msgstr "" +msgstr "udevil: Fehler 118: Zugriff auf Verzeichnis %s nicht möglich\n" #: ../src/udevil.c:4415 #, c-format msgid "udevil: examining partition %s\n" -msgstr "" +msgstr "udevil: Überprüfung Partition %s\n" #. unmount partition #: ../src/udevil.c:4420 #, c-format msgid "udevil: unmount partition %s\n" -msgstr "" +msgstr "udevil: Aushängen Partition %s\n" #: ../src/udevil.c:4472 #, c-format msgid "udevil: error 119: unable to find host for %s\n" -msgstr "" +msgstr "udevil: Fehler 119: Host für %s nicht auffindbar\n" #: ../src/udevil.c:4478 #, c-format msgid "udevil: error 120: unable to find host for %s\n" -msgstr "" +msgstr "udevil: Fehler 120: Host für %s nicht auffindbar\n" #: ../src/udevil.c:4487 #, c-format msgid "udevil: error 121: unable to find last component for %s\n" -msgstr "" +msgstr "udevil: Fehler 121: letzte Komponente für %s nicht auffindbar\n" #: ../src/udevil.c:4511 #, c-format msgid "udevil: warning 122: missing power autosuspend %s\n" -msgstr "" +msgstr "udevil: Warnung 122: Möglichkeit zum automatischen Aussetzen der Stromversorgung von %s fehlt\n" #: ../src/udevil.c:4523 #, c-format msgid "udevil: warning 123: missing power control %s\n" -msgstr "" +msgstr "udevil: Warnung 123: Möglichkeit zum Steuern der Stromversorgung von %s fehlt\n" #: ../src/udevil.c:4552 #, c-format msgid "udevil: error 124: %s\n" -msgstr "" +msgstr "udevil: Fehler 124: %s\n" #: ../src/udevil.c:4633 msgid "udevil: error 126: info requires DEVICE argument\n" -msgstr "" +msgstr "udevil: Fehler 126: Info benötigt GERÄT Argument\n" #: ../src/udevil.c:4639 #, c-format msgid "udevil: error 127: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: Fehler 127: keine Statistik %s erstellbar: %s\n" #: ../src/udevil.c:4647 #, c-format msgid "udevil: error 128: %s is not a block device\n" -msgstr "" +msgstr "udevil: Fehler 128: %s ist kein Blockgerät\n" #: ../src/udevil.c:4654 msgid "udevil: error 129: error initializing libudev\n" -msgstr "" +msgstr "udevil: Fehler 129: Fehler beim Initialisieren von libudev\n" #: ../src/udevil.c:4661 #, c-format msgid "udevil: error 130: no udev device for device %s\n" -msgstr "" +msgstr "udevil: Fehler 130: kein udev Gerät für Gerät %s\n" #: ../src/udevil.c:4677 msgid "udevil: error 131: unable to get device info\n" -msgstr "" +msgstr "udevil: Fehler 113: Geräteinfo nicht zu bekommen\n" #: ../src/udevil.c:4729 msgid "udevil: error 132: unable to initialize udev\n" -msgstr "" +msgstr "udevil: Fehler 132 : Initialisieren von udev nicht möglich\n" #: ../src/udevil.c:4740 msgid "udevil: error 133: cannot create udev monitor\n" -msgstr "" +msgstr "udevil: Fehler 133: Erzeugen des udev Monitors nicht möglich\n" #: ../src/udevil.c:4745 msgid "udevil: error 134: cannot enable udev monitor receiving\n" -msgstr "" +msgstr "udevil: Fehler 134: Erzeugen der Empfangsfunktion des udev Monitors nicht möglich\n" #: ../src/udevil.c:4750 msgid "udevil: error 135: cannot set udev filter\n" -msgstr "" +msgstr "udevil: Fehler 135: Festlegen des udev Filters nicht möglich\n" #: ../src/udevil.c:4757 msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" -msgstr "" +msgstr "udevil: Fehler 136: Socketdateideskriptor des udev Monitors nicht zu bekommen\n" #: ../src/udevil.c:4778 #, c-format msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" -msgstr "" +msgstr "udevil: Fehler 137: Monitoring /proc/self/mountinfo: %s\n" #: ../src/udevil.c:4829 #, c-format msgid "" "Mounts and unmounts devices without password, shows device info, monitors\n" -msgstr "" +msgstr "Hängt Geräte ohne Passwort aus und ein, zeigt Geräteinfos und überwacht\n" #: ../src/udevil.c:4830 #, c-format msgid "" "device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" -msgstr "" +msgstr "Geräteänderungen. Emuliert die Verwendung von udisks1/2 Befehlszeilen und udisks1 Ausgaben.\n" #: ../src/udevil.c:4831 #, c-format msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" -msgstr "" +msgstr "Aufruf: udevil [OPTIONEN] BEFEHL [BEFEHLSOPTIONEN] [BEFEHLSARGUMENTE]\n" #: ../src/udevil.c:4832 #, c-format msgid "OPTIONS:\n" -msgstr "" +msgstr "OPTIONEN:\n" #: ../src/udevil.c:4833 msgid "print details" -msgstr "" +msgstr "Druck Details" #: ../src/udevil.c:4834 msgid "minimal output" -msgstr "" +msgstr "minimale Ausgabe" #: ../src/udevil.c:4835 #, c-format msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" -msgstr "" +msgstr "MOUNT - Hängt das GERÄT mit den EINHÄNGEOPTIONEN auf den Einhängepunkt VERZEICHNIS ein:\n" #: ../src/udevil.c:4836 #, c-format msgid "" " udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " "[DIR]\n" -msgstr "" +msgstr " udevil mount|--mount [EINHÄNGEOPTIONEN] [[-b|--block-device] GERÄT] [VERZEICHNIS]\n" #: ../src/udevil.c:4837 #, c-format msgid " MOUNT-OPTIONS:\n" -msgstr "" +msgstr " EINHÄNGE-OPTIONEN:\n" #: ../src/udevil.c:4838 ../src/udevil.c:4839 msgid "see man mount" -msgstr "" +msgstr "siehe man mount" #. printf( " -L LABEL mount device by #. label LABEL\n" ); @@ -849,88 +850,88 @@ #. UUID\n" ); #: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 msgid "ignored (for compatibility)" -msgstr "" +msgstr "ignoriert (aus Kompatibilitätsgründen)" #: ../src/udevil.c:4843 ../src/udevil.c:4878 msgid "EXAMPLES" -msgstr "" +msgstr "BEISPIELE" #. printf( " udevil mount -L 'Disk Label'\n" ); #: ../src/udevil.c:4848 msgid "ISO file" -msgstr "" +msgstr "ISO Datei" #: ../src/udevil.c:4849 msgid "ftp site - requires" -msgstr "" +msgstr "FTP Netzpräsenz - erfordert" #: ../src/udevil.c:4850 msgid "or" -msgstr "" +msgstr "oder" #: ../src/udevil.c:4851 ../src/udevil.c:4853 msgid "ftp share with" -msgstr "" +msgstr "ftp Freigabeordner mit" #: ../src/udevil.c:4852 msgid "user and password" -msgstr "" +msgstr "Nutzer und Passwort" #: ../src/udevil.c:4854 msgid "port, user and password" -msgstr "" +msgstr "Port, Nutzer und Passwort" #: ../src/udevil.c:4855 msgid "ftp site with ftpfs" -msgstr "" +msgstr "FTP Netzpräsenz mit ftpfs" #: ../src/udevil.c:4856 msgid "ftp site with curl" -msgstr "" +msgstr "FTP Netzpräsenz mit curl" #: ../src/udevil.c:4857 msgid "ftp site with curl u/p" -msgstr "" +msgstr "FTP Netzpräsenz mit curl u/p" #: ../src/udevil.c:4858 ../src/udevil.c:4859 msgid "nfs share" -msgstr "" +msgstr "nfs Freigabeordner" #: ../src/udevil.c:4860 ../src/udevil.c:4863 msgid "samba share w/ cifs" -msgstr "" +msgstr "Samba Freigabeordner w/ cifs" #: ../src/udevil.c:4861 msgid "samba share w/ u/p/port" -msgstr "" +msgstr "Samba Freigabeordner w/ u/p/port" #: ../src/udevil.c:4862 msgid "samba share w/ workgroup" -msgstr "" +msgstr "Samba Freigabeordner w/ Arbeitsgruppe" #: ../src/udevil.c:4864 msgid "samba share w/ smbfs" -msgstr "" +msgstr "Samba Freigabeordner w/ smbfs" #: ../src/udevil.c:4865 msgid "sshfs with user - " -msgstr "" +msgstr "sshfs mit Nutzer -" #: ../src/udevil.c:4866 msgid "requires sshfs" -msgstr "" +msgstr "erfordert sshfs" #: ../src/udevil.c:4867 msgid "sshfs with user" -msgstr "" +msgstr "sshfs mit Nutzer" #: ../src/udevil.c:4868 msgid "WebDAV - requires davfs2" -msgstr "" +msgstr "WebDAV - erfordert davfs2" #: ../src/udevil.c:4869 msgid "make a ram drive" -msgstr "" +msgstr "erzeuge RAM Laufwerk" #: ../src/udevil.c:4870 #, c-format @@ -938,121 +939,121 @@ "\n" " WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" "\n" -msgstr "" +msgstr "\n WARNUNG !!! Ein Passwort in der Befehlzeile ist ein SICHERHEITSRISIKO - siehe Dukumentation zum Dateisystem\n\n" #: ../src/udevil.c:4871 #, c-format msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" -msgstr "" +msgstr "UNMOUNT - Hängt das GERÄT oder VERZEICHNIS mit den AUSHÄNGEOPTIONEN aus:\n" #: ../src/udevil.c:4872 #, c-format msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" -msgstr "" +msgstr " udevil umount|unmount|--unmount|--umount [AUSHÄNGEOPTIONEN] \n" #: ../src/udevil.c:4873 #, c-format msgid "" " {[-b|--block-device] " "DEVICE}|DIR\n" -msgstr "" +msgstr " {[-b|--block-device] GERÄT}|VERZEICHNIS\n" #: ../src/udevil.c:4874 #, c-format msgid " UNMOUNT-OPTIONS:\n" -msgstr "" +msgstr " AUSHÄNGEOPTIONEN:\n" #: ../src/udevil.c:4875 ../src/udevil.c:4887 msgid "lazy unmount (see man umount)" -msgstr "" +msgstr "lazy unmount (siehe man umount)" #: ../src/udevil.c:4876 ../src/udevil.c:4888 msgid "force unmount (see man umount)" -msgstr "" +msgstr "force unmount (siehe man umount)" #: ../src/udevil.c:4883 #, c-format msgid "" "REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" -msgstr "" +msgstr "REMOVE - Aushängen aller Partitonen beim Host des GERÄTS und Vorbereitung eines sicheren\n" #: ../src/udevil.c:4884 #, c-format msgid " removal (sync, stop, unbind driver, and power off):\n" -msgstr "" +msgstr " Entfernens (sync, stoppen, Treiber abkoppeln , und ausschalten):\n" #: ../src/udevil.c:4885 #, c-format msgid "" " udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" -msgstr "" +msgstr " udevil remove|--remove|--detach [OPTIONEN] [-b|--block-device] GERÄT\n" #: ../src/udevil.c:4886 #, c-format msgid " OPTIONS:\n" -msgstr "" +msgstr " OPTIONEN:\n" #: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 msgid "EXAMPLE" -msgstr "" +msgstr "BEISPIEL" #: ../src/udevil.c:4892 #, c-format msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" -msgstr "" +msgstr "INFO - Information anzeigen über GERÄT mit Emulation einer udisks v1 Ausgabe:\n" #: ../src/udevil.c:4893 #, c-format msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" -msgstr "" +msgstr " udevil info|--show-info|--info [-b|--block-device] GERÄT\n" #: ../src/udevil.c:4895 #, c-format msgid "MONITOR - Display device events emulating udisks v1 output:\n" -msgstr "" +msgstr "MONITOR - Anzeige von Geräteereignissen mit Emulation einer udisks v1 Ausgabe:\n" #: ../src/udevil.c:4898 #, c-format msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" -msgstr "" +msgstr "CLEAN - Entfernen nicht eingehängter mit udevil erzeugter Einhängeverzeichnisse in Medienverzeichnissen\n" #: ../src/udevil.c:4900 #, c-format msgid "HELP - Show this help\n" -msgstr "" +msgstr "HILFE - diese Hilfe anzeigen\n" #: ../src/udevil.c:4903 msgid "See /etc/udevil/udevil.conf for config." -msgstr "" +msgstr "Siehe /etc/udevil/udevil.conf zum Konfigurieren." #: ../src/udevil.c:4904 #, c-format msgid "For automounting with udevil run 'devmon --help'\n" -msgstr "" +msgstr "Zum automatischen Einhängen mit udevil 'devmon --help' ausführen\n" #: ../src/udevil.c:5001 msgid "udevil: read config /etc/udevil/udevil.conf\n" -msgstr "" +msgstr "udevil: bitte config /etc/udevil/udevil.conf lesen\n" #: ../src/udevil.c:5050 msgid "udevil: error 138: argument is not valid UTF-8\n" -msgstr "" +msgstr "udevil: Fehler 138: Argument entspricht nicht UTF-8 Format\n" #: ../src/udevil.c:5352 msgid "udevil: error 139: too many arguments\n" -msgstr "" +msgstr "udevil: Fehler 139: zu viele Argumente\n" #: ../src/udevil.c:5355 #, c-format msgid "udevil: error 140: option '%s' requires an argument\n" -msgstr "" +msgstr "udevil: Fehler 140: Option '%s' erfordert ein Argument\n" #: ../src/udevil.c:5359 #, c-format msgid "udevil: error 141: invalid option '%s'\n" -msgstr "" +msgstr "udevil: Fehler 141: ungültige Option '%s'\n" #: ../src/udevil.c:5361 #, c-format msgid "udevil: error 142: invalid or unexpected argument '%s'\n" -msgstr "" +msgstr "udevil: Fehler 142: ungültiges oder unerwartetes Argument '%s'\n" diff -Nru udevil-0.4.1/po/es.po udevil-0.4.3/po/es.po --- udevil-0.4.1/po/es.po 1970-01-01 00:00:00.000000000 +0000 +++ udevil-0.4.3/po/es.po 2013-12-09 13:59:27.000000000 +0000 @@ -0,0 +1,1059 @@ +# udevil PO Template http://ignorantguru.github.com/udevil/ +# This file is distributed under the same copyright and license as the udevil +# package. +# +# Translators: +# Adolfo Jayme Barrientos , 2013 +# Dorian_Hawkmoon , 2013 +msgid "" +msgstr "" +"Project-Id-Version: udevil\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: ignorantguru \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/udevil/language/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../src/udevil.c:612 +#, c-format +msgid "" +"udevil: error 1: unable to drop priviledges - please report this problem\n" +msgstr "udevil: error 1: no se pueden revocar los privilegios; informe de este problema\n" + +#: ../src/udevil.c:804 +#, c-format +msgid "udevil: error 2: %s line %d is not valid UTF-8\n" +msgstr "udevil: error 2: la línea %d en %s no es UTF-8 válido\n" + +#: ../src/udevil.c:810 +#, c-format +msgid "udevil: error 3: %s line %d is too long\n" +msgstr "udevil: error 3: la línea %d en %s es muy larga\n" + +#: ../src/udevil.c:820 +#, c-format +msgid "udevil: error 4: %s line %d syntax error:\n" +msgstr "" + +#: ../src/udevil.c:833 +#, c-format +msgid "udevil: error 5: %s line %d syntax error:\n" +msgstr "" + +#: ../src/udevil.c:840 +#, c-format +msgid "udevil: error 6: %s line %d duplicate assignment:\n" +msgstr "" + +#: ../src/udevil.c:903 +#, c-format +msgid "udevil: warning 7: /etc/udevil/udevil.conf could not be read\n" +msgstr "" + +#: ../src/udevil.c:913 +#, c-format +msgid "udevil: read config %s\n" +msgstr "udevil: leer configuración %s\n" + +#: ../src/udevil.c:1152 +#, c-format +msgid "udevil: error 8: failed writing to log file '%s'\n" +msgstr "" + +#: ../src/udevil.c:1488 ../src/udevil.c:1530 ../src/udevil.c:1592 +#: ../src/udevil.c:1635 +#, c-format +msgid "udevil: warning 9: unable to run losetup (%s)\n" +msgstr "udevil: aviso 9: no se puede ejecutar losetup (%s)\n" + +#: ../src/udevil.c:1543 +msgid "udevil: error 147: unable to get free loop device\n" +msgstr "" + +#: ../src/udevil.c:1552 +msgid "udevil: error 150: path changed\n" +msgstr "udevil: error 150: la ruta ha cambiado\n" + +#: ../src/udevil.c:1692 +#, c-format +msgid "udevil: warning 10: unable to run losetup (%s)\n" +msgstr "udevil: aviso 10: no se puede ejecutar losetup (%s)\n" + +#: ../src/udevil.c:1926 +#, c-format +msgid "udevil: error 11: could not open %s\n" +msgstr "udevil: error 11: no se puede abrir %s\n" + +#: ../src/udevil.c:1934 +#, c-format +msgid "udevil: error 12: error writing to %s\n" +msgstr "udevil: error 12: error al escribir en %s\n" + +#: ../src/udevil.c:1984 +#, c-format +msgid "udevil: error 13: unable to run %s\n" +msgstr "udevil: error 13: no se puede ejecutar %s\n" + +#: ../src/udevil.c:1996 +#, c-format +msgid " %s exit status = %d\n" +msgstr " estado de salida de %s = %d\n" + +#: ../src/udevil.c:2001 +#, c-format +msgid "udevil: denied 14: %s returned exit status %d\n" +msgstr "udevil: denegación 14: %s devolvió el estado de salida %d\n" + +#. log +#: ../src/udevil.c:2039 +msgid "udevil: trying umount as current user\n" +msgstr "" + +#: ../src/udevil.c:2052 +#, c-format +msgid "udevil: warning 15: unable to run umount (%s)\n" +msgstr "udevil: aviso 15: no se puede ejecutar umount (%s)\n" + +#: ../src/udevil.c:2057 ../src/udevil.c:2130 +#, c-format +msgid " umount exit status = %d\n" +msgstr " estado de salida de umount = %d\n" + +#. success - show output +#: ../src/udevil.c:2066 +msgid "udevil: success running umount as current user\n" +msgstr "" + +#: ../src/udevil.c:2109 ../src/udevil.c:2181 +msgid "udevil: error 144: invalid path\n" +msgstr "udevil: error 144: la ruta no es válida\n" + +#: ../src/udevil.c:2120 +#, c-format +msgid "udevil: error 16: unable to run umount (%s)\n" +msgstr "udevil: error 16: no se puede ejecutar umount (%s)\n" + +#: ../src/udevil.c:2193 +#, c-format +msgid "udevil: error 17: unable to run mount (%s)\n" +msgstr "udevil: error 17: no se puede ejecutar mount (%s)\n" + +#: ../src/udevil.c:2206 +#, c-format +msgid " mount exit status = %d\n" +msgstr " estado de salida de mount = %d\n" + +#: ../src/udevil.c:2220 +msgid "udevil: error 148: unable to attach file to loop device\n" +msgstr "udevil: error 148: no se puede adjuntar el archivo al dispositivo «loop»\n" + +#: ../src/udevil.c:2264 +#, c-format +msgid "udevil: warning 18: unable to run mount (%s)\n" +msgstr "udevil: aviso 18: no se puede ejecutar mount (%s)\n" + +#: ../src/udevil.c:2281 +#, c-format +msgid "udevil: denied 19: Invalid path\n" +msgstr "udevil: denegación 19: la ruta no es válida\n" + +#: ../src/udevil.c:2287 +#, c-format +msgid "udevil: denied 20: mount path '%s' is not a directory\n" +msgstr "udevil: denegación 20: la ruta de montaje «%s» no es una carpeta\n" + +#: ../src/udevil.c:2289 +#, c-format +msgid "udevil: denied 21: mount path '%s' is already mounted\n" +msgstr "udevil: denegación 21: la ruta de montaje «%s» ya está montada\n" + +#: ../src/udevil.c:2293 +#, c-format +msgid "udevil: denied 22: cannot stat '%s': %s\n" +msgstr "udevil: denegación 22: no se puede ejecutar stat en «%s»: %s\n" + +#: ../src/udevil.c:2295 +#, c-format +msgid "udevil: denied 23: neither you nor root owns '%s'\n" +msgstr "udevil: denegación 23: ni usted ni root son propietarios de «%s»\n" + +#: ../src/udevil.c:2332 +#, c-format +msgid "udevil: warning 24: unable to run setfacl (%s)\n" +msgstr "udevil: aviso 24: no se puede ejecutar setfacl (%s)\n" + +#. setfacl apparently failed so fallback to normal permissions +#: ../src/udevil.c:2340 +#, c-format +msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" +msgstr "udevil: aviso 25: falló setfacl en %s, alternando a «rwxr-xr-x»\n" + +#: ../src/udevil.c:2446 +#, c-format +msgid "" +"udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" +msgstr "" + +#: ../src/udevil.c:2461 +#, c-format +msgid "" +"udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "" + +#: ../src/udevil.c:2474 +#, c-format +msgid "" +"udevil: error 28: invalid type '%s' for curlftpfs share - must be " +"curlftpfs\n" +msgstr "" + +#: ../src/udevil.c:2486 +#, c-format +msgid "" +"udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " +"ftpfs\n" +msgstr "" + +#: ../src/udevil.c:2511 +#, c-format +msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "" + +#: ../src/udevil.c:2524 +#, c-format +msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "" + +#: ../src/udevil.c:2536 +#, c-format +msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" +msgstr "" + +#: ../src/udevil.c:2551 +#, c-format +msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "" + +#: ../src/udevil.c:2562 +#, c-format +msgid "" +"udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "" + +#: ../src/udevil.c:2679 +#, c-format +msgid "udevil: error 34: '%s' is not a recognized network url\n" +msgstr "udevil: error 34: «%s» no es un url de red reconocido\n" + +#: ../src/udevil.c:2688 +msgid "udevil: error 35: invalid network url\n" +msgstr "udevil: error 35: el url de red no es válido\n" + +#: ../src/udevil.c:2695 +#, c-format +msgid "udevil: error 36: lookup host '%s' failed\n" +msgstr "" + +#: ../src/udevil.c:2743 +#, c-format +msgid "udevil: error 37: %s\n" +msgstr "udevil: error 37: %s\n" + +#: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 +msgid "udevil was not run suid root" +msgstr "" + +#: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 +msgid "To correct this problem" +msgstr "Para corregir este problema" + +#: ../src/udevil.c:2763 +msgid "udevil: error 38: mount requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:2765 +msgid "udevil: error 39: unmount requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:2810 +#, c-format +msgid "udevil: error 40: cannot stat %s: %s\n" +msgstr "udevil: error 40: no se puede ejecutar stat en %s: %s\n" + +#: ../src/udevil.c:2822 +msgid "udevil: error 41: cannot canonicalize device path\n" +msgstr "" + +#: ../src/udevil.c:2829 +#, c-format +msgid "udevil: error 42: cannot stat %s: %s\n" +msgstr "udevil: error 42: no se puede ejecutar stat en %s: %s\n" + +#: ../src/udevil.c:2840 +#, c-format +msgid "udevil: error 43: '%s' is not a regular file or directory\n" +msgstr "udevil: error 43: «%s» no es un archivo o directorio normal\n" + +#. mount knows (in fstab) so mount as normal user with only specified opts +#: ../src/udevil.c:2879 ../src/udevil.c:3809 +#, c-format +msgid "udevil: %s is known to mount - running mount as current user\n" +msgstr "" + +#: ../src/udevil.c:2882 +msgid "" +"udevil: warning 44: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:2885 +msgid "" +"udevil: warning 45: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:2956 +#, c-format +msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" +msgstr "" + +#: ../src/udevil.c:2970 +msgid "udevil: error 47: cannot canonicalize attached loop device\n" +msgstr "" + +#: ../src/udevil.c:2976 +msgid "udevil: denied 48: 'file' is not an allowed type\n" +msgstr "" + +#: ../src/udevil.c:2984 +#, c-format +msgid "udevil: denied 49: '%s' is not an allowed file\n" +msgstr "" + +#: ../src/udevil.c:2991 +#, c-format +msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" +msgstr "" + +#: ../src/udevil.c:3010 +#, c-format +msgid "udevil: warning 51: attached device %s is not a loop device\n" +msgstr "" + +#: ../src/udevil.c:3035 +#, c-format +msgid "udevil: error 52: cannot stat %s: %s\n" +msgstr "udevil: error 52: no se puede ejecutar stat en %s: %s\n" + +#: ../src/udevil.c:3054 +msgid "udevil: error 53: cannot canonicalize path\n" +msgstr "" + +#: ../src/udevil.c:3070 +#, c-format +msgid "udevil: error 54: invalid path '%s'\n" +msgstr "udevil: error 54: la ruta «%s» no es válida\n" + +#: ../src/udevil.c:3079 +#, c-format +msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" +msgstr "udevil: error 55: no se encontró «%s» montado en mtab\n" + +#: ../src/udevil.c:3086 +#, c-format +msgid "udevil: error 56: cannot find device %s fstype in mtab\n" +msgstr "" + +#: ../src/udevil.c:3097 +#, c-format +msgid "udevil: error 57: cannot stat %s: %s\n" +msgstr "" + +#: ../src/udevil.c:3106 +#, c-format +msgid "udevil: error 58: %s is not a block device\n" +msgstr "" + +#: ../src/udevil.c:3115 +msgid "udevil: error 59: error initializing libudev\n" +msgstr "" + +#: ../src/udevil.c:3123 +#, c-format +msgid "udevil: error 60: no udev device for device %s\n" +msgstr "" + +#: ../src/udevil.c:3134 +#, c-format +msgid "udevil: error 61: unable to get device info for device %s\n" +msgstr "" + +#: ../src/udevil.c:3157 +#, c-format +msgid "udevil: error 62: type %s is invalid for block device\n" +msgstr "" + +#: ../src/udevil.c:3177 +msgid "udevil: error 143: unable to determine device fstype\n" +msgstr "" + +#: ../src/udevil.c:3180 +#, c-format +msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" +msgstr "" + +#: ../src/udevil.c:3183 +msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" +msgstr "" + +#: ../src/udevil.c:3243 +#, c-format +msgid "udevil: denied 65: device %s is not mounted\n" +msgstr "" + +#: ../src/udevil.c:3246 +#, c-format +msgid "udevil: denied 66: could not find mount point for '%s'\n" +msgstr "" + +#: ../src/udevil.c:3266 +msgid "udevil: error 67: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3277 +#, c-format +msgid "udevil: error 68: cannot stat '%s'\n" +msgstr "udevil: error 68: no se puede ejecutar stat en «%s»\n" + +#: ../src/udevil.c:3295 +msgid "udevil: error 69: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3306 +msgid "udevil: error 70: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3316 +#, c-format +msgid "udevil: denied 71: '%s' is not an allowed media directory\n" +msgstr "" + +#: ../src/udevil.c:3328 +msgid "udevil: error 72: multiple fstypes not allowed\n" +msgstr "" + +#: ../src/udevil.c:3334 +#, c-format +msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" +msgstr "" + +#: ../src/udevil.c:3343 +msgid "udevil: error 74: could not get username\n" +msgstr "udevil: error 74: no se pudo obtener el nombre de usuario\n" + +#: ../src/udevil.c:3351 +#, c-format +msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" +msgstr "udevil: denegación 75: el usuario «%s» (%s) no figura en los usuarios permitidos\n" + +#: ../src/udevil.c:3373 +#, c-format +msgid "udevil: denied 77: user %s is not in allowed groups\n" +msgstr "" + +#: ../src/udevil.c:3385 +#, c-format +msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" +msgstr "udevil: denegación 78: el anfitrión «%s» (%s) no es una red permitida\n" + +#: ../src/udevil.c:3391 +#, c-format +msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" +msgstr "udevil: denegación 79: el anfitrión «%s» (%s) es una red prohibida\n" + +#: ../src/udevil.c:3406 +#, c-format +msgid "udevil: denied 80: device %s is not an allowed device\n" +msgstr "" + +#: ../src/udevil.c:3413 +#, c-format +msgid "udevil: denied 81: device %s is a forbidden device\n" +msgstr "" + +#: ../src/udevil.c:3429 +#, c-format +msgid "udevil: denied 82: '%s' is not an allowed file\n" +msgstr "udevil: denegación 82: «%s» no es un archivo permitido\n" + +#: ../src/udevil.c:3436 +#, c-format +msgid "udevil: denied 83: you don't have read permission for file '%s'\n" +msgstr "udevil: denegación 83: no tiene permiso de lectura para el archivo «%s»\n" + +#: ../src/udevil.c:3447 +#, c-format +msgid "udevil: denied 145: cannot open '%s'\n" +msgstr "udevil: denegación 145: no se puede abrir «%s»\n" + +#: ../src/udevil.c:3460 +msgid "udevil: error 146: path changed\n" +msgstr "" + +#: ../src/udevil.c:3468 +msgid "udevil: error 84: cannot specify mount point for directory\n" +msgstr "" + +#: ../src/udevil.c:3488 +#, c-format +msgid "udevil: denied 85: %s is attached to an invalid file\n" +msgstr "udevil: denegación 85: %s está adjunto a un archivo no válido\n" + +#: ../src/udevil.c:3496 +#, c-format +msgid "udevil: denied 86: '%s' is not a permitted file\n" +msgstr "" + +#: ../src/udevil.c:3506 +#, c-format +msgid "udevil: denied 87: '%s' is not an allowed file\n" +msgstr "" + +#: ../src/udevil.c:3527 +#, c-format +msgid "udevil: denied 88: device %s is an internal device and you're not root\n" +msgstr "" + +#: ../src/udevil.c:3729 +#, c-format +msgid "udevil: error 89: options contain an invalid character ('%c')\n" +msgstr "udevil: error 89: las opciones contienen un carácter no válido («%c»)\n" + +#: ../src/udevil.c:3738 +#, c-format +msgid "udevil: denied 90: option '%s' is not an allowed option\n" +msgstr "udevil: denegación 90: la opción «%s» no está permitida\n" + +#: ../src/udevil.c:3749 +msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" +msgstr "" + +#: ../src/udevil.c:3758 +msgid "udevil: denied 149: cannot use remount option with file\n" +msgstr "udevil: denegación 149: no se puede usar la opción de remontaje con el archivo\n" + +#: ../src/udevil.c:3777 +#, c-format +msgid "" +"udevil: denied 92: device %s is already mounted (or specify mount point)\n" +msgstr "" + +#: ../src/udevil.c:3788 +#, c-format +msgid "" +"udevil: denied 93: file %s is already mounted at %s (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:3792 +#, c-format +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "" + +#: ../src/udevil.c:3800 +#, c-format +msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" +msgstr "" + +#: ../src/udevil.c:3812 +msgid "" +"udevil: warning 96: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:3815 +msgid "" +"udevil: warning 97: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:3857 +#, c-format +msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" +msgstr "" + +#: ../src/udevil.c:3860 +#, c-format +msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" +msgstr "" + +#: ../src/udevil.c:3874 +msgid "udevil: denied 100: must specify device or network for remount\n" +msgstr "" + +#: ../src/udevil.c:3880 +msgid "udevil: warning 101: specified mount point with remount ignored\n" +msgstr "" + +#: ../src/udevil.c:3925 +#, c-format +msgid "udevil: warning 102: device %s is already mounted on %s\n" +msgstr "udevil: aviso 102: el dispositivo %s ya se montó en %s\n" + +#: ../src/udevil.c:3937 +msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" +msgstr "" + +#: ../src/udevil.c:4051 +#, c-format +msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" +msgstr "udevil: error 104: el punto de montaje «%s» no es una cadena UTF-8 válida\n" + +#: ../src/udevil.c:4073 +#, c-format +msgid "udevil: error 105: mkdir '%s' failed\n" +msgstr "udevil: error 105: falló mkdir «%s»\n" + +#. try cifs as guest first +#: ../src/udevil.c:4106 +#, c-format +msgid "udevil: trying %s as guest\n" +msgstr "udevil: intentando %s como invitado\n" + +#: ../src/udevil.c:4117 +#, c-format +msgid "udevil: trying with %s\n" +msgstr "udevil: intentando con %s\n" + +#: ../src/udevil.c:4164 +msgid "" +"udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" +msgstr "" + +#: ../src/udevil.c:4229 +#, c-format +msgid "udevil: error 107: %s\n" +msgstr "udevil: error 107: %s\n" + +#: ../src/udevil.c:4244 +msgid "udevil: error 108: remove requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4250 +#, c-format +msgid "udevil: error 109: cannot stat %s: %s\n" +msgstr "udevil: error 109: no se puede ejecutar stat en %s: %s\n" + +#: ../src/udevil.c:4258 +#, c-format +msgid "udevil: error 110: %s is not a block device\n" +msgstr "" + +#: ../src/udevil.c:4265 +msgid "udevil: error 111: error initializing libudev\n" +msgstr "udevil: error 111: error al iniciar libudev\n" + +#: ../src/udevil.c:4272 +#, c-format +msgid "udevil: error 112: no udev device for device %s\n" +msgstr "" + +#: ../src/udevil.c:4281 +msgid "udevil: error 113: unable to get device info\n" +msgstr "udevil: error 113: no se puede obtener información del dispositivo\n" + +#: ../src/udevil.c:4293 +#, c-format +msgid "" +"udevil: warning 114: device %s is an internal device - not unbinding " +"driver\n" +msgstr "" + +#: ../src/udevil.c:4304 +msgid "" +"udevil: warning 115: interface is not usb, firewire, sdio, esata - not " +"unbinding driver\n" +msgstr "" + +#: ../src/udevil.c:4312 +#, c-format +msgid "udevil: denied 116: device %s is not an allowed device\n" +msgstr "udevil: denegación 116: el dispositivo %s no está permitido\n" + +#: ../src/udevil.c:4318 +#, c-format +msgid "udevil: denied 117: device %s is a forbidden device\n" +msgstr "udevil: denegación 117: el dispositivo %s está prohibido\n" + +#: ../src/udevil.c:4356 +#, c-format +msgid "udevil: unmount %s\n" +msgstr "udevil: desmontar %s\n" + +#: ../src/udevil.c:4390 +#, c-format +msgid "udevil: error 118: unable to access dir %s\n" +msgstr "udevil: error 118: no se puede acceder a la carpeta %s\n" + +#: ../src/udevil.c:4415 +#, c-format +msgid "udevil: examining partition %s\n" +msgstr "udevil: examinando la partición %s\n" + +#. unmount partition +#: ../src/udevil.c:4420 +#, c-format +msgid "udevil: unmount partition %s\n" +msgstr "udevil: desmontar partición %s\n" + +#: ../src/udevil.c:4472 +#, c-format +msgid "udevil: error 119: unable to find host for %s\n" +msgstr "" + +#: ../src/udevil.c:4478 +#, c-format +msgid "udevil: error 120: unable to find host for %s\n" +msgstr "" + +#: ../src/udevil.c:4487 +#, c-format +msgid "udevil: error 121: unable to find last component for %s\n" +msgstr "" + +#: ../src/udevil.c:4511 +#, c-format +msgid "udevil: warning 122: missing power autosuspend %s\n" +msgstr "" + +#: ../src/udevil.c:4523 +#, c-format +msgid "udevil: warning 123: missing power control %s\n" +msgstr "udevil: aviso 123: falta el control de energía %s\n" + +#: ../src/udevil.c:4552 +#, c-format +msgid "udevil: error 124: %s\n" +msgstr "udevil: error 124: %s\n" + +#: ../src/udevil.c:4633 +msgid "udevil: error 126: info requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4639 +#, c-format +msgid "udevil: error 127: cannot stat %s: %s\n" +msgstr "udevil: error 127: no se puede ejecutar stat en %s: %s\n" + +#: ../src/udevil.c:4647 +#, c-format +msgid "udevil: error 128: %s is not a block device\n" +msgstr "" + +#: ../src/udevil.c:4654 +msgid "udevil: error 129: error initializing libudev\n" +msgstr "udevil: error 129: ocurrió un error al iniciar libudev\n" + +#: ../src/udevil.c:4661 +#, c-format +msgid "udevil: error 130: no udev device for device %s\n" +msgstr "" + +#: ../src/udevil.c:4677 +msgid "udevil: error 131: unable to get device info\n" +msgstr "udevil: error 131: no se puede obtener información del dispositivo\n" + +#: ../src/udevil.c:4729 +msgid "udevil: error 132: unable to initialize udev\n" +msgstr "udevil: error 132: no se puede iniciar udev\n" + +#: ../src/udevil.c:4740 +msgid "udevil: error 133: cannot create udev monitor\n" +msgstr "udevil: error 133: no se puede crear el monitor de umount\n" + +#: ../src/udevil.c:4745 +msgid "udevil: error 134: cannot enable udev monitor receiving\n" +msgstr "" + +#: ../src/udevil.c:4750 +msgid "udevil: error 135: cannot set udev filter\n" +msgstr "" + +#: ../src/udevil.c:4757 +msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" +msgstr "" + +#: ../src/udevil.c:4778 +#, c-format +msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" +msgstr "" + +#: ../src/udevil.c:4829 +#, c-format +msgid "" +"Mounts and unmounts devices without password, shows device info, monitors\n" +msgstr "" + +#: ../src/udevil.c:4830 +#, c-format +msgid "" +"device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" +msgstr "" + +#: ../src/udevil.c:4831 +#, c-format +msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" +msgstr "Usage: udevil [OPCIONES] ORDEN [OPCIONES-DE-ORDEN] [ARGUMENTOS-DE-ORDEN]\n" + +#: ../src/udevil.c:4832 +#, c-format +msgid "OPTIONS:\n" +msgstr "OPCIONES:\n" + +#: ../src/udevil.c:4833 +msgid "print details" +msgstr "mostrar detalles" + +#: ../src/udevil.c:4834 +msgid "minimal output" +msgstr "salida mínima" + +#: ../src/udevil.c:4835 +#, c-format +msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4836 +#, c-format +msgid "" +" udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " +"[DIR]\n" +msgstr "" + +#: ../src/udevil.c:4837 +#, c-format +msgid " MOUNT-OPTIONS:\n" +msgstr " OPCIONES-DE-MONTAJE:\n" + +#: ../src/udevil.c:4838 ../src/udevil.c:4839 +msgid "see man mount" +msgstr "vea man mount" + +#. printf( " -L LABEL mount device by +#. label LABEL\n" ); +#. printf( " -U UUID mount device by +#. UUID\n" ); +#: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 +msgid "ignored (for compatibility)" +msgstr "ignorado (para compatibilidad)" + +#: ../src/udevil.c:4843 ../src/udevil.c:4878 +msgid "EXAMPLES" +msgstr "EJEMPLOS" + +#. printf( " udevil mount -L 'Disk Label'\n" ); +#: ../src/udevil.c:4848 +msgid "ISO file" +msgstr "Archivo ISO" + +#: ../src/udevil.c:4849 +msgid "ftp site - requires" +msgstr "sitio ftp - requiere" + +#: ../src/udevil.c:4850 +msgid "or" +msgstr "o" + +#: ../src/udevil.c:4851 ../src/udevil.c:4853 +msgid "ftp share with" +msgstr "" + +#: ../src/udevil.c:4852 +msgid "user and password" +msgstr "usuario y contraseña" + +#: ../src/udevil.c:4854 +msgid "port, user and password" +msgstr "puerto, usuario y contraseña" + +#: ../src/udevil.c:4855 +msgid "ftp site with ftpfs" +msgstr "sitio ftp con ftpfs" + +#: ../src/udevil.c:4856 +msgid "ftp site with curl" +msgstr "sitio ftp con curl" + +#: ../src/udevil.c:4857 +msgid "ftp site with curl u/p" +msgstr "sitio ftp con curl u/p" + +#: ../src/udevil.c:4858 ../src/udevil.c:4859 +msgid "nfs share" +msgstr "" + +#: ../src/udevil.c:4860 ../src/udevil.c:4863 +msgid "samba share w/ cifs" +msgstr "" + +#: ../src/udevil.c:4861 +msgid "samba share w/ u/p/port" +msgstr "" + +#: ../src/udevil.c:4862 +msgid "samba share w/ workgroup" +msgstr "" + +#: ../src/udevil.c:4864 +msgid "samba share w/ smbfs" +msgstr "" + +#: ../src/udevil.c:4865 +msgid "sshfs with user - " +msgstr "" + +#: ../src/udevil.c:4866 +msgid "requires sshfs" +msgstr "requiere sshfs" + +#: ../src/udevil.c:4867 +msgid "sshfs with user" +msgstr "" + +#: ../src/udevil.c:4868 +msgid "WebDAV - requires davfs2" +msgstr "WebDAV - requiere davfs2" + +#: ../src/udevil.c:4869 +msgid "make a ram drive" +msgstr "crear una unidad ram" + +#: ../src/udevil.c:4870 +#, c-format +msgid "" +"\n" +" WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" +"\n" +msgstr "" + +#: ../src/udevil.c:4871 +#, c-format +msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4872 +#, c-format +msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" +msgstr " udevil umount|unmount|--unmount|--umount [OPCIONES-DESMONTAJE] \n" + +#: ../src/udevil.c:4873 +#, c-format +msgid "" +" {[-b|--block-device] " +"DEVICE}|DIR\n" +msgstr "" + +#: ../src/udevil.c:4874 +#, c-format +msgid " UNMOUNT-OPTIONS:\n" +msgstr " OPCIONES-DE-DESMONTAJE:\n" + +#: ../src/udevil.c:4875 ../src/udevil.c:4887 +msgid "lazy unmount (see man umount)" +msgstr "" + +#: ../src/udevil.c:4876 ../src/udevil.c:4888 +msgid "force unmount (see man umount)" +msgstr "forzar desmontaje (vea man umount)" + +#: ../src/udevil.c:4883 +#, c-format +msgid "" +"REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" +msgstr "" + +#: ../src/udevil.c:4884 +#, c-format +msgid " removal (sync, stop, unbind driver, and power off):\n" +msgstr "" + +#: ../src/udevil.c:4885 +#, c-format +msgid "" +" udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4886 +#, c-format +msgid " OPTIONS:\n" +msgstr " OPCIONES:\n" + +#: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 +msgid "EXAMPLE" +msgstr "EJEMPLO" + +#: ../src/udevil.c:4892 +#, c-format +msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" +msgstr "" + +#: ../src/udevil.c:4893 +#, c-format +msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4895 +#, c-format +msgid "MONITOR - Display device events emulating udisks v1 output:\n" +msgstr "" + +#: ../src/udevil.c:4898 +#, c-format +msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" +msgstr "" + +#: ../src/udevil.c:4900 +#, c-format +msgid "HELP - Show this help\n" +msgstr "HELP - Mostrar esta ayuda\n" + +#: ../src/udevil.c:4903 +msgid "See /etc/udevil/udevil.conf for config." +msgstr "Vea /etc/udevil/udevil.conf para la configuración." + +#: ../src/udevil.c:4904 +#, c-format +msgid "For automounting with udevil run 'devmon --help'\n" +msgstr "Para montar automáticamente con udevil ejecute «devmon --help»\n" + +#: ../src/udevil.c:5001 +msgid "udevil: read config /etc/udevil/udevil.conf\n" +msgstr "udevil: leyendo configuración en /etc/udevil/udevil.conf\n" + +#: ../src/udevil.c:5050 +msgid "udevil: error 138: argument is not valid UTF-8\n" +msgstr "udevil: error 138: el argumento no es UTF-8 válido\n" + +#: ../src/udevil.c:5352 +msgid "udevil: error 139: too many arguments\n" +msgstr "udevil: error 139: demasiados argumentos\n" + +#: ../src/udevil.c:5355 +#, c-format +msgid "udevil: error 140: option '%s' requires an argument\n" +msgstr "udevil: error 140: la opción «%s» requiere un argumento\n" + +#: ../src/udevil.c:5359 +#, c-format +msgid "udevil: error 141: invalid option '%s'\n" +msgstr "udevil: error 141: la opción «%s» no es válida\n" + +#: ../src/udevil.c:5361 +#, c-format +msgid "udevil: error 142: invalid or unexpected argument '%s'\n" +msgstr "udevil: error 142: el argumento «%s» no es válido o es inesperado\n" diff -Nru udevil-0.4.1/po/fr.po udevil-0.4.3/po/fr.po --- udevil-0.4.1/po/fr.po 1970-01-01 00:00:00.000000000 +0000 +++ udevil-0.4.3/po/fr.po 2013-12-09 13:59:27.000000000 +0000 @@ -0,0 +1,1058 @@ +# udevil PO Template http://ignorantguru.github.com/udevil/ +# This file is distributed under the same copyright and license as the udevil +# package. +# +# Translators: +# appzer0, 2013 +msgid "" +msgstr "" +"Project-Id-Version: udevil\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: appzer0\n" +"Language-Team: French (http://www.transifex.com/projects/p/udevil/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../src/udevil.c:612 +#, c-format +msgid "" +"udevil: error 1: unable to drop priviledges - please report this problem\n" +msgstr "udevil : erreur 1 : impossible de modifier les privilèges ; veuillez rapporter ce problème\n" + +#: ../src/udevil.c:804 +#, c-format +msgid "udevil: error 2: %s line %d is not valid UTF-8\n" +msgstr "udevil : erreur 2 : %s à la ligne la ligne %d a un codage UTF-8 incorrect\n\n" + +#: ../src/udevil.c:810 +#, c-format +msgid "udevil: error 3: %s line %d is too long\n" +msgstr "udevil : erreur 3 : %s à la ligne %d est trop long\n" + +#: ../src/udevil.c:820 +#, c-format +msgid "udevil: error 4: %s line %d syntax error:\n" +msgstr "udevil : erreur 4 : %s présente une erreur de syntaxe à la ligne %d :\n" + +#: ../src/udevil.c:833 +#, c-format +msgid "udevil: error 5: %s line %d syntax error:\n" +msgstr "udevil : erreur 5 : %s présente une erreur de syntaxe à la ligne %d :\n" + +#: ../src/udevil.c:840 +#, c-format +msgid "udevil: error 6: %s line %d duplicate assignment:\n" +msgstr "udevil : erreur 6 : %s est assigné plusieurs fois à la ligne %d :\n" + +#: ../src/udevil.c:903 +#, c-format +msgid "udevil: warning 7: /etc/udevil/udevil.conf could not be read\n" +msgstr "udevil : avertissement 7 : /etc/udevil/udevil.conf est inaccessible\n" + +#: ../src/udevil.c:913 +#, c-format +msgid "udevil: read config %s\n" +msgstr "udevil : lecture de la configuration %s\n" + +#: ../src/udevil.c:1152 +#, c-format +msgid "udevil: error 8: failed writing to log file '%s'\n" +msgstr "udevil : erreur 8 : impossible d'écrire dans le fichier journal '%s'\n" + +#: ../src/udevil.c:1488 ../src/udevil.c:1530 ../src/udevil.c:1592 +#: ../src/udevil.c:1635 +#, c-format +msgid "udevil: warning 9: unable to run losetup (%s)\n" +msgstr "udevil : avertissement 9 : impossible d'exécuter losetup (%s)\n" + +#: ../src/udevil.c:1543 +msgid "udevil: error 147: unable to get free loop device\n" +msgstr "udevil : erreur 147 : aucun périphérique-boucle « loop » libre n'a été trouvé\n" + +#: ../src/udevil.c:1552 +msgid "udevil: error 150: path changed\n" +msgstr "udevil : erreur 150 : chemin incorrect\n" + +#: ../src/udevil.c:1692 +#, c-format +msgid "udevil: warning 10: unable to run losetup (%s)\n" +msgstr "udevil : avertissement 10 : impossible d'exécuter losetup (%s)\n" + +#: ../src/udevil.c:1926 +#, c-format +msgid "udevil: error 11: could not open %s\n" +msgstr "udevil : error 11 : impossible d'ouvrir %s\n" + +#: ../src/udevil.c:1934 +#, c-format +msgid "udevil: error 12: error writing to %s\n" +msgstr "udevil : erreur 12 : impossible d'écrire dans %s\n" + +#: ../src/udevil.c:1984 +#, c-format +msgid "udevil: error 13: unable to run %s\n" +msgstr "udevil : erreur 13 : impossible d'exécuter %s\n" + +#: ../src/udevil.c:1996 +#, c-format +msgid " %s exit status = %d\n" +msgstr "%s a quitté avec le code d'état = %d\n\n" + +#: ../src/udevil.c:2001 +#, c-format +msgid "udevil: denied 14: %s returned exit status %d\n" +msgstr "udevil : accès refusé 14 : %s a retourné le code d'état %d\n" + +#. log +#: ../src/udevil.c:2039 +msgid "udevil: trying umount as current user\n" +msgstr "udevil : tentative de démontage avec l'utilisateur actif\n" + +#: ../src/udevil.c:2052 +#, c-format +msgid "udevil: warning 15: unable to run umount (%s)\n" +msgstr "udevil : avertissement 15 : impossible de démonter (%s)\n" + +#: ../src/udevil.c:2057 ../src/udevil.c:2130 +#, c-format +msgid " umount exit status = %d\n" +msgstr "Code d'état de umount = %d\n" + +#. success - show output +#: ../src/udevil.c:2066 +msgid "udevil: success running umount as current user\n" +msgstr "udevil : démontage réussi avec l'utilisateur actif\n" + +#: ../src/udevil.c:2109 ../src/udevil.c:2181 +msgid "udevil: error 144: invalid path\n" +msgstr "udevil : erreur 144 : chemin incorrect\n" + +#: ../src/udevil.c:2120 +#, c-format +msgid "udevil: error 16: unable to run umount (%s)\n" +msgstr "udevil : erreur 16 : impossible de démonter (%s)\n" + +#: ../src/udevil.c:2193 +#, c-format +msgid "udevil: error 17: unable to run mount (%s)\n" +msgstr "udevil : erreur 17 : impossible de monter (%s)\n" + +#: ../src/udevil.c:2206 +#, c-format +msgid " mount exit status = %d\n" +msgstr "Code d'état de mount = %d\n" + +#: ../src/udevil.c:2220 +msgid "udevil: error 148: unable to attach file to loop device\n" +msgstr "udevil : erreur 148 : impossible d'attacher le fichier au périphérique-boucle\n" + +#: ../src/udevil.c:2264 +#, c-format +msgid "udevil: warning 18: unable to run mount (%s)\n" +msgstr "udevil : avertissement 18 : impossible de monter (%s)\n" + +#: ../src/udevil.c:2281 +#, c-format +msgid "udevil: denied 19: Invalid path\n" +msgstr "udevil : erreur 19 : chemin incorrect\n" + +#: ../src/udevil.c:2287 +#, c-format +msgid "udevil: denied 20: mount path '%s' is not a directory\n" +msgstr "udevil : accès refusé 20 : le point de montage '%s' n'est pas un répertoire\n" + +#: ../src/udevil.c:2289 +#, c-format +msgid "udevil: denied 21: mount path '%s' is already mounted\n" +msgstr "udevil : accès refusé 21 : le point de montage '%s' est déjà monté\n" + +#: ../src/udevil.c:2293 +#, c-format +msgid "udevil: denied 22: cannot stat '%s': %s\n" +msgstr "udevil : accès refusé 22 : '%s' introuvable : %s\n" + +#: ../src/udevil.c:2295 +#, c-format +msgid "udevil: denied 23: neither you nor root owns '%s'\n" +msgstr "udevil : accès refusé 23 : '%s' n'aapprtient ni à vous ni à root\n" + +#: ../src/udevil.c:2332 +#, c-format +msgid "udevil: warning 24: unable to run setfacl (%s)\n" +msgstr "udevil : avertissement 24 : impossible d'exécuter setfacl (%s)\n" + +#. setfacl apparently failed so fallback to normal permissions +#: ../src/udevil.c:2340 +#, c-format +msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" +msgstr "udevil : avertissement 25 : échec de setfacl sur %s, retour sur les droits 'rwxr-xr-x'\n" + +#: ../src/udevil.c:2446 +#, c-format +msgid "" +"udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" +msgstr "udevil : avertissement 26 : type incorrect '%s' pour le partage SMB - ce doit être cifs ou smbfs\n" + +#: ../src/udevil.c:2461 +#, c-format +msgid "" +"udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil : avertissement 27 : type incorrect '%s' pour le partage NFS - ce doit être nfs ou nfs4\n" + +#: ../src/udevil.c:2474 +#, c-format +msgid "" +"udevil: error 28: invalid type '%s' for curlftpfs share - must be " +"curlftpfs\n" +msgstr "udevil : avertissement 28 : type incorrect '%s' pour le partage curlftpfs - ce doit être curlftpfs\n" + +#: ../src/udevil.c:2486 +#, c-format +msgid "" +"udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " +"ftpfs\n" +msgstr "udevil : avertissement 29 : type incorrect '%s' pour le partage FTP - ce doit être curlftpfs ou ftpfs\n" + +#: ../src/udevil.c:2511 +#, c-format +msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil : avertissement 30 : type incorrect '%s' pour le partage sshfs - ce doit être sshfs\n" + +#: ../src/udevil.c:2524 +#, c-format +msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil : avertissement 31 : type incorrect '%s' pour le partage sshfs - ce doit être sshfs\n" + +#: ../src/udevil.c:2536 +#, c-format +msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" +msgstr "udevil : erreur 151 : type incorrect '%s' pour le partage WebDAV - ce doit être davfs\n" + +#: ../src/udevil.c:2551 +#, c-format +msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil : erreur 32 : type incorrect '%s' pour le partage sshfs - ce doit être sshfs\n" + +#: ../src/udevil.c:2562 +#, c-format +msgid "" +"udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil : erreur 33 : type incorrect '%s' pour le partage NFS - ce doit être nfs ou nfs4\n" + +#: ../src/udevil.c:2679 +#, c-format +msgid "udevil: error 34: '%s' is not a recognized network url\n" +msgstr "udevil : erreur 34 : '%s' n'est pas une URL distante reconnue\n" + +#: ../src/udevil.c:2688 +msgid "udevil: error 35: invalid network url\n" +msgstr "udevil : erreur 35 : URL distante incorrecte\n" + +#: ../src/udevil.c:2695 +#, c-format +msgid "udevil: error 36: lookup host '%s' failed\n" +msgstr "udevil : erreur 36 : la résolution de l'hôte '%s' a échoué\n\n" + +#: ../src/udevil.c:2743 +#, c-format +msgid "udevil: error 37: %s\n" +msgstr "udevil : erreur 37 : %s\n" + +#: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 +msgid "udevil was not run suid root" +msgstr "udevil na pas été exécuté avec le bit setuid root" + +#: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 +msgid "To correct this problem" +msgstr "Pour corriger le problème" + +#: ../src/udevil.c:2763 +msgid "udevil: error 38: mount requires DEVICE argument\n" +msgstr "udevil : erreur 38 : mount nécessite un argument PÉRIPHÉRIQUE\n" + +#: ../src/udevil.c:2765 +msgid "udevil: error 39: unmount requires DEVICE argument\n" +msgstr "udevil : erreur 39 : umount nécessite un argument PÉRIPHÉRIQUE\n" + +#: ../src/udevil.c:2810 +#, c-format +msgid "udevil: error 40: cannot stat %s: %s\n" +msgstr "udevil : erreur 40 : %s est introuvable : %s\n" + +#: ../src/udevil.c:2822 +msgid "udevil: error 41: cannot canonicalize device path\n" +msgstr "udevil : erreur 41 : impossible de lire le nom canonique du chemin de périphérique\n" + +#: ../src/udevil.c:2829 +#, c-format +msgid "udevil: error 42: cannot stat %s: %s\n" +msgstr "udevil : erreur 42 : %s est introuvable : %s\n" + +#: ../src/udevil.c:2840 +#, c-format +msgid "udevil: error 43: '%s' is not a regular file or directory\n" +msgstr "udevil : erreur 43 : '%s n'est pas un fichier régulier ou un répertoire\n" + +#. mount knows (in fstab) so mount as normal user with only specified opts +#: ../src/udevil.c:2879 ../src/udevil.c:3809 +#, c-format +msgid "udevil: %s is known to mount - running mount as current user\n" +msgstr "udevil : %s est connu de mount - exécution de mount avec l'utilisateur actif\n" + +#: ../src/udevil.c:2882 +msgid "" +"udevil: warning 44: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil : avertissement 44 : système de fichiers ignoré pour le périphérique figurant dans fstab (ou bien spécifiez un point de montage)\n" + +#: ../src/udevil.c:2885 +msgid "" +"udevil: warning 45: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil : avertissement 454 : options ignorées pour le périphérique figurant dans fstab (ou bien spécifiez un point de montage)\n" + +#: ../src/udevil.c:2956 +#, c-format +msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" +msgstr "udevil : erreur 46 : le montage '%s' est introuvable dans le fichier 'mtab'\n" + +#: ../src/udevil.c:2970 +msgid "udevil: error 47: cannot canonicalize attached loop device\n" +msgstr "udevil : erreur 47 : impossible d'obtenir le nom canonique du périphérique-boucle attaché\n" + +#: ../src/udevil.c:2976 +msgid "udevil: denied 48: 'file' is not an allowed type\n" +msgstr "udevil : accès refusé 48 : 'file' n'est pas un système de fichiers autorisé\n" + +#: ../src/udevil.c:2984 +#, c-format +msgid "udevil: denied 49: '%s' is not an allowed file\n" +msgstr "udevil : accès refusé 49 : '%s' n'est pas un fichier autorisé\n" + +#: ../src/udevil.c:2991 +#, c-format +msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" +msgstr "udevil : erreur 50 : '%s' est introuvable dansle fichier 'mtab'\n" + +#: ../src/udevil.c:3010 +#, c-format +msgid "udevil: warning 51: attached device %s is not a loop device\n" +msgstr "udevil : avertissement 51 : '%s' n'est pas un périphérique-boucle « loop »\n" + +#: ../src/udevil.c:3035 +#, c-format +msgid "udevil: error 52: cannot stat %s: %s\n" +msgstr "udevil : erreur52 : %s est introuvable : %s\n" + +#: ../src/udevil.c:3054 +msgid "udevil: error 53: cannot canonicalize path\n" +msgstr "udevil : erreur 53 : impossible de trouver le nom canonique du chemin\n" + +#: ../src/udevil.c:3070 +#, c-format +msgid "udevil: error 54: invalid path '%s'\n" +msgstr "udevil : erreur 54 : '%s' est introuvable\n" + +#: ../src/udevil.c:3079 +#, c-format +msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" +msgstr "udevil : erreur 55 : '%s' est introuvable dans le fichier 'mtab'\n" + +#: ../src/udevil.c:3086 +#, c-format +msgid "udevil: error 56: cannot find device %s fstype in mtab\n" +msgstr "udevil : erreur 56 : impossible de trouver le système de fichiers du périphérique '%s' dans le fichier 'mtab'\n" + +#: ../src/udevil.c:3097 +#, c-format +msgid "udevil: error 57: cannot stat %s: %s\n" +msgstr "udevil : erreur 57 : '%s' est introuvable : %s\n" + +#: ../src/udevil.c:3106 +#, c-format +msgid "udevil: error 58: %s is not a block device\n" +msgstr "udevil : erreur 58 : '%s' n'est pas un périphérique de type bloc\n" + +#: ../src/udevil.c:3115 +msgid "udevil: error 59: error initializing libudev\n" +msgstr "udevil : erreur 59 : erreur lors d'initialisation de la libudev\n" + +#: ../src/udevil.c:3123 +#, c-format +msgid "udevil: error 60: no udev device for device %s\n" +msgstr "udevil : erreur 60 : le périphérique '%s' n'existe pas pour udev\n" + +#: ../src/udevil.c:3134 +#, c-format +msgid "udevil: error 61: unable to get device info for device %s\n" +msgstr "devil : erreur 61 : impossible d'obtenir les caractéristiques du périphérique '%s'\n" + +#: ../src/udevil.c:3157 +#, c-format +msgid "udevil: error 62: type %s is invalid for block device\n" +msgstr "udevil : erreur 62 : le type '%s' est incorrect pour le périphérique bloc demandé\n" + +#: ../src/udevil.c:3177 +msgid "udevil: error 143: unable to determine device fstype\n" +msgstr "udevil : erreur 143 : impossible de déterminer le système de fichiers du périphérique\n" + +#: ../src/udevil.c:3180 +#, c-format +msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" +msgstr "udevil : erreur 63 : aucun média présent dans le périphérique '%s' (ou bien spécifiez une option -t)\n" + +#: ../src/udevil.c:3183 +msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" +msgstr "udevil : erreur 64 : impossible de déterminer le système de fichiers - ou bien spécifiez l'option -t\n" + +#: ../src/udevil.c:3243 +#, c-format +msgid "udevil: denied 65: device %s is not mounted\n" +msgstr "udevil : accès refusé 65 : le périphérique '%s' n'est pas monté\n" + +#: ../src/udevil.c:3246 +#, c-format +msgid "udevil: denied 66: could not find mount point for '%s'\n" +msgstr "udevil : accès refusé 66 : point de montage '%s' introuvable\n" + +#: ../src/udevil.c:3266 +msgid "udevil: error 67: cannot canonicalize mount point path\n" +msgstr "udevil : erreur 67 : impossible de trouver le nom canonique du point de montage\n" + +#: ../src/udevil.c:3277 +#, c-format +msgid "udevil: error 68: cannot stat '%s'\n" +msgstr "udevil : erreur 68 : '%s' est introuvable\n" + +#: ../src/udevil.c:3295 +msgid "udevil: error 69: cannot canonicalize mount point path\n" +msgstr "udevil : erreur 69 : impossible de trouver le nom canonique du point de montage\n" + +#: ../src/udevil.c:3306 +msgid "udevil: error 70: cannot canonicalize mount point path\n" +msgstr "udevil : erreur 70 : impossible de trouver le nom canonique du point de montage\n" + +#: ../src/udevil.c:3316 +#, c-format +msgid "udevil: denied 71: '%s' is not an allowed media directory\n" +msgstr "udevil : accès refusé 71 : '%s' n'est pas un répertoire media autorisé\n" + +#: ../src/udevil.c:3328 +msgid "udevil: error 72: multiple fstypes not allowed\n" +msgstr "udevil : erreur 72 : les systèmes de fichiers multiples ne sont pas autorisés\n" + +#: ../src/udevil.c:3334 +#, c-format +msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" +msgstr "devil : erreur 73 : le système de fichiers '%s' n'est pas autorisé\n" + +#: ../src/udevil.c:3343 +msgid "udevil: error 74: could not get username\n" +msgstr "udevil : erreur 74 : nom d'utilisateur introuvable\n" + +#: ../src/udevil.c:3351 +#, c-format +msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" +msgstr "evil : accès refusé 75 : l'utilisateur '%s' n'est pas un utilisateur autorisé\n" + +#: ../src/udevil.c:3373 +#, c-format +msgid "udevil: denied 77: user %s is not in allowed groups\n" +msgstr "udevil : accès refusé 77 : l'utilisateur '%s' ne fait pas partie d'un groupe autorisé\n" + +#: ../src/udevil.c:3385 +#, c-format +msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" +msgstr "udevil : accès refusé 78 : l'hôte '%s' (%s) n'est pas autorisé\n\n" + +#: ../src/udevil.c:3391 +#, c-format +msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" +msgstr "udevil 79 : l'hôte '%s' (%s) est explicitement interdit\n" + +#: ../src/udevil.c:3406 +#, c-format +msgid "udevil: denied 80: device %s is not an allowed device\n" +msgstr "udevil : accès refusé 80 : le périphérique '%s' n'est pas autorisé\n" + +#: ../src/udevil.c:3413 +#, c-format +msgid "udevil: denied 81: device %s is a forbidden device\n" +msgstr "udevil : accès refusé 81 : le périphérique '%s' est interdit\n" + +#: ../src/udevil.c:3429 +#, c-format +msgid "udevil: denied 82: '%s' is not an allowed file\n" +msgstr "udevil : accès refusé 82 : le fichier '%s' n'est pas autorisé\n" + +#: ../src/udevil.c:3436 +#, c-format +msgid "udevil: denied 83: you don't have read permission for file '%s'\n" +msgstr "udevil : accès refusé 83 : vous n'avez pas la permission de lire '%s'\n" + +#: ../src/udevil.c:3447 +#, c-format +msgid "udevil: denied 145: cannot open '%s'\n" +msgstr "udevil : accès refusé 145 : impossible d'ouvrir '%s'\n" + +#: ../src/udevil.c:3460 +msgid "udevil: error 146: path changed\n" +msgstr "udevil : erreur 146 : le chemin a changé\n" + +#: ../src/udevil.c:3468 +msgid "udevil: error 84: cannot specify mount point for directory\n" +msgstr "udevil : erreur 84 : impossible de spécifier un point de montage pour le répertoire\n" + +#: ../src/udevil.c:3488 +#, c-format +msgid "udevil: denied 85: %s is attached to an invalid file\n" +msgstr "udevil : acc-s refusé 85 : '%s' est attaché à un fichier invalide\n" + +#: ../src/udevil.c:3496 +#, c-format +msgid "udevil: denied 86: '%s' is not a permitted file\n" +msgstr "udevil : accès refusé 86 : '%s' n'est pas fichier autorisé\n" + +#: ../src/udevil.c:3506 +#, c-format +msgid "udevil: denied 87: '%s' is not an allowed file\n" +msgstr "devil : accès refusé 87 : '%s' n'est pas un fichier autorisé\n" + +#: ../src/udevil.c:3527 +#, c-format +msgid "udevil: denied 88: device %s is an internal device and you're not root\n" +msgstr "udevil : accès refusé 88 : '%s' est un périphérique interne et vous n'êtes pas root\n" + +#: ../src/udevil.c:3729 +#, c-format +msgid "udevil: error 89: options contain an invalid character ('%c')\n" +msgstr "devil : erreur 89 : les options contiennent un caractère incorrect ('%c')\n" + +#: ../src/udevil.c:3738 +#, c-format +msgid "udevil: denied 90: option '%s' is not an allowed option\n" +msgstr "udevil : accès refusé 90 : l'option '%s' n'est pas autorisée\n" + +#: ../src/udevil.c:3749 +msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" +msgstr "udevil : accès refusé 91 : l'option « remount » est impossible avec les partages FTP ou sshfs\n" + +#: ../src/udevil.c:3758 +msgid "udevil: denied 149: cannot use remount option with file\n" +msgstr "udevil : accès refusé 149 : l'option « remount » est impossible dans un fichier\n" + +#: ../src/udevil.c:3777 +#, c-format +msgid "" +"udevil: denied 92: device %s is already mounted (or specify mount point)\n" +msgstr "udevil : accès refusé 92 : le périphérique '%s' est déjà monté (spécifiez un autre point de montage)\n" + +#: ../src/udevil.c:3788 +#, c-format +msgid "" +"udevil: denied 93: file %s is already mounted at %s (or specify mount " +"point)\n" +msgstr "udevil : accès refusé 93 : le fichier '%s' est déjà monté dans '%s' (spécifiez un autre point de montage)\n" + +#: ../src/udevil.c:3792 +#, c-format +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "" + +#: ../src/udevil.c:3800 +#, c-format +msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" +msgstr "" + +#: ../src/udevil.c:3812 +msgid "" +"udevil: warning 96: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:3815 +msgid "" +"udevil: warning 97: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "" + +#: ../src/udevil.c:3857 +#, c-format +msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" +msgstr "" + +#: ../src/udevil.c:3860 +#, c-format +msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" +msgstr "" + +#: ../src/udevil.c:3874 +msgid "udevil: denied 100: must specify device or network for remount\n" +msgstr "" + +#: ../src/udevil.c:3880 +msgid "udevil: warning 101: specified mount point with remount ignored\n" +msgstr "" + +#: ../src/udevil.c:3925 +#, c-format +msgid "udevil: warning 102: device %s is already mounted on %s\n" +msgstr "" + +#: ../src/udevil.c:3937 +msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" +msgstr "" + +#: ../src/udevil.c:4051 +#, c-format +msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" +msgstr "" + +#: ../src/udevil.c:4073 +#, c-format +msgid "udevil: error 105: mkdir '%s' failed\n" +msgstr "" + +#. try cifs as guest first +#: ../src/udevil.c:4106 +#, c-format +msgid "udevil: trying %s as guest\n" +msgstr "" + +#: ../src/udevil.c:4117 +#, c-format +msgid "udevil: trying with %s\n" +msgstr "" + +#: ../src/udevil.c:4164 +msgid "" +"udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" +msgstr "" + +#: ../src/udevil.c:4229 +#, c-format +msgid "udevil: error 107: %s\n" +msgstr "" + +#: ../src/udevil.c:4244 +msgid "udevil: error 108: remove requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4250 +#, c-format +msgid "udevil: error 109: cannot stat %s: %s\n" +msgstr "" + +#: ../src/udevil.c:4258 +#, c-format +msgid "udevil: error 110: %s is not a block device\n" +msgstr "" + +#: ../src/udevil.c:4265 +msgid "udevil: error 111: error initializing libudev\n" +msgstr "" + +#: ../src/udevil.c:4272 +#, c-format +msgid "udevil: error 112: no udev device for device %s\n" +msgstr "" + +#: ../src/udevil.c:4281 +msgid "udevil: error 113: unable to get device info\n" +msgstr "" + +#: ../src/udevil.c:4293 +#, c-format +msgid "" +"udevil: warning 114: device %s is an internal device - not unbinding " +"driver\n" +msgstr "" + +#: ../src/udevil.c:4304 +msgid "" +"udevil: warning 115: interface is not usb, firewire, sdio, esata - not " +"unbinding driver\n" +msgstr "" + +#: ../src/udevil.c:4312 +#, c-format +msgid "udevil: denied 116: device %s is not an allowed device\n" +msgstr "" + +#: ../src/udevil.c:4318 +#, c-format +msgid "udevil: denied 117: device %s is a forbidden device\n" +msgstr "" + +#: ../src/udevil.c:4356 +#, c-format +msgid "udevil: unmount %s\n" +msgstr "" + +#: ../src/udevil.c:4390 +#, c-format +msgid "udevil: error 118: unable to access dir %s\n" +msgstr "" + +#: ../src/udevil.c:4415 +#, c-format +msgid "udevil: examining partition %s\n" +msgstr "" + +#. unmount partition +#: ../src/udevil.c:4420 +#, c-format +msgid "udevil: unmount partition %s\n" +msgstr "" + +#: ../src/udevil.c:4472 +#, c-format +msgid "udevil: error 119: unable to find host for %s\n" +msgstr "" + +#: ../src/udevil.c:4478 +#, c-format +msgid "udevil: error 120: unable to find host for %s\n" +msgstr "" + +#: ../src/udevil.c:4487 +#, c-format +msgid "udevil: error 121: unable to find last component for %s\n" +msgstr "" + +#: ../src/udevil.c:4511 +#, c-format +msgid "udevil: warning 122: missing power autosuspend %s\n" +msgstr "" + +#: ../src/udevil.c:4523 +#, c-format +msgid "udevil: warning 123: missing power control %s\n" +msgstr "" + +#: ../src/udevil.c:4552 +#, c-format +msgid "udevil: error 124: %s\n" +msgstr "" + +#: ../src/udevil.c:4633 +msgid "udevil: error 126: info requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4639 +#, c-format +msgid "udevil: error 127: cannot stat %s: %s\n" +msgstr "" + +#: ../src/udevil.c:4647 +#, c-format +msgid "udevil: error 128: %s is not a block device\n" +msgstr "" + +#: ../src/udevil.c:4654 +msgid "udevil: error 129: error initializing libudev\n" +msgstr "" + +#: ../src/udevil.c:4661 +#, c-format +msgid "udevil: error 130: no udev device for device %s\n" +msgstr "" + +#: ../src/udevil.c:4677 +msgid "udevil: error 131: unable to get device info\n" +msgstr "" + +#: ../src/udevil.c:4729 +msgid "udevil: error 132: unable to initialize udev\n" +msgstr "" + +#: ../src/udevil.c:4740 +msgid "udevil: error 133: cannot create udev monitor\n" +msgstr "" + +#: ../src/udevil.c:4745 +msgid "udevil: error 134: cannot enable udev monitor receiving\n" +msgstr "" + +#: ../src/udevil.c:4750 +msgid "udevil: error 135: cannot set udev filter\n" +msgstr "" + +#: ../src/udevil.c:4757 +msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" +msgstr "" + +#: ../src/udevil.c:4778 +#, c-format +msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" +msgstr "" + +#: ../src/udevil.c:4829 +#, c-format +msgid "" +"Mounts and unmounts devices without password, shows device info, monitors\n" +msgstr "" + +#: ../src/udevil.c:4830 +#, c-format +msgid "" +"device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" +msgstr "" + +#: ../src/udevil.c:4831 +#, c-format +msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" +msgstr "" + +#: ../src/udevil.c:4832 +#, c-format +msgid "OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4833 +msgid "print details" +msgstr "" + +#: ../src/udevil.c:4834 +msgid "minimal output" +msgstr "" + +#: ../src/udevil.c:4835 +#, c-format +msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4836 +#, c-format +msgid "" +" udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " +"[DIR]\n" +msgstr "" + +#: ../src/udevil.c:4837 +#, c-format +msgid " MOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4838 ../src/udevil.c:4839 +msgid "see man mount" +msgstr "" + +#. printf( " -L LABEL mount device by +#. label LABEL\n" ); +#. printf( " -U UUID mount device by +#. UUID\n" ); +#: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 +msgid "ignored (for compatibility)" +msgstr "" + +#: ../src/udevil.c:4843 ../src/udevil.c:4878 +msgid "EXAMPLES" +msgstr "" + +#. printf( " udevil mount -L 'Disk Label'\n" ); +#: ../src/udevil.c:4848 +msgid "ISO file" +msgstr "" + +#: ../src/udevil.c:4849 +msgid "ftp site - requires" +msgstr "" + +#: ../src/udevil.c:4850 +msgid "or" +msgstr "" + +#: ../src/udevil.c:4851 ../src/udevil.c:4853 +msgid "ftp share with" +msgstr "" + +#: ../src/udevil.c:4852 +msgid "user and password" +msgstr "" + +#: ../src/udevil.c:4854 +msgid "port, user and password" +msgstr "" + +#: ../src/udevil.c:4855 +msgid "ftp site with ftpfs" +msgstr "" + +#: ../src/udevil.c:4856 +msgid "ftp site with curl" +msgstr "" + +#: ../src/udevil.c:4857 +msgid "ftp site with curl u/p" +msgstr "" + +#: ../src/udevil.c:4858 ../src/udevil.c:4859 +msgid "nfs share" +msgstr "" + +#: ../src/udevil.c:4860 ../src/udevil.c:4863 +msgid "samba share w/ cifs" +msgstr "" + +#: ../src/udevil.c:4861 +msgid "samba share w/ u/p/port" +msgstr "" + +#: ../src/udevil.c:4862 +msgid "samba share w/ workgroup" +msgstr "" + +#: ../src/udevil.c:4864 +msgid "samba share w/ smbfs" +msgstr "" + +#: ../src/udevil.c:4865 +msgid "sshfs with user - " +msgstr "" + +#: ../src/udevil.c:4866 +msgid "requires sshfs" +msgstr "" + +#: ../src/udevil.c:4867 +msgid "sshfs with user" +msgstr "" + +#: ../src/udevil.c:4868 +msgid "WebDAV - requires davfs2" +msgstr "" + +#: ../src/udevil.c:4869 +msgid "make a ram drive" +msgstr "" + +#: ../src/udevil.c:4870 +#, c-format +msgid "" +"\n" +" WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" +"\n" +msgstr "" + +#: ../src/udevil.c:4871 +#, c-format +msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4872 +#, c-format +msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" +msgstr "" + +#: ../src/udevil.c:4873 +#, c-format +msgid "" +" {[-b|--block-device] " +"DEVICE}|DIR\n" +msgstr "" + +#: ../src/udevil.c:4874 +#, c-format +msgid " UNMOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4875 ../src/udevil.c:4887 +msgid "lazy unmount (see man umount)" +msgstr "" + +#: ../src/udevil.c:4876 ../src/udevil.c:4888 +msgid "force unmount (see man umount)" +msgstr "" + +#: ../src/udevil.c:4883 +#, c-format +msgid "" +"REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" +msgstr "" + +#: ../src/udevil.c:4884 +#, c-format +msgid " removal (sync, stop, unbind driver, and power off):\n" +msgstr "" + +#: ../src/udevil.c:4885 +#, c-format +msgid "" +" udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4886 +#, c-format +msgid " OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 +msgid "EXAMPLE" +msgstr "" + +#: ../src/udevil.c:4892 +#, c-format +msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" +msgstr "" + +#: ../src/udevil.c:4893 +#, c-format +msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4895 +#, c-format +msgid "MONITOR - Display device events emulating udisks v1 output:\n" +msgstr "" + +#: ../src/udevil.c:4898 +#, c-format +msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" +msgstr "" + +#: ../src/udevil.c:4900 +#, c-format +msgid "HELP - Show this help\n" +msgstr "" + +#: ../src/udevil.c:4903 +msgid "See /etc/udevil/udevil.conf for config." +msgstr "" + +#: ../src/udevil.c:4904 +#, c-format +msgid "For automounting with udevil run 'devmon --help'\n" +msgstr "" + +#: ../src/udevil.c:5001 +msgid "udevil: read config /etc/udevil/udevil.conf\n" +msgstr "" + +#: ../src/udevil.c:5050 +msgid "udevil: error 138: argument is not valid UTF-8\n" +msgstr "" + +#: ../src/udevil.c:5352 +msgid "udevil: error 139: too many arguments\n" +msgstr "" + +#: ../src/udevil.c:5355 +#, c-format +msgid "udevil: error 140: option '%s' requires an argument\n" +msgstr "" + +#: ../src/udevil.c:5359 +#, c-format +msgid "udevil: error 141: invalid option '%s'\n" +msgstr "" + +#: ../src/udevil.c:5361 +#, c-format +msgid "udevil: error 142: invalid or unexpected argument '%s'\n" +msgstr "" diff -Nru udevil-0.4.1/po/it.po udevil-0.4.3/po/it.po --- udevil-0.4.1/po/it.po 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/it.po 2013-12-09 13:59:27.000000000 +0000 @@ -1,18 +1,20 @@ # udevil PO Template http://ignorantguru.github.com/udevil/ -# This file is distributed under the same copyright and license as the SpaceFM +# This file is distributed under the same copyright and license as the udevil # package. # # Translators: -# IgnorantGuru , 2013. -# Matteo Bernardini , 2013. +# ignorantguru , 2013 +# Matteo Bernardini , 2013 +# wandows , 2013 +# wandows , 2013 msgid "" msgstr "" "Project-Id-Version: udevil\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-13 22:35+0000\n" -"PO-Revision-Date: 2013-02-14 13:51+0000\n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-26 10:24+0000\n" "Last-Translator: ignorantguru \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/udevil/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -562,8 +564,8 @@ #: ../src/udevil.c:3792 #, c-format -msgid "udevil: denied 94: file %s is already mounted (or specify mount point)\n" -msgstr "udevil: negato 94: il file %s e' gia' montato (o specificare il punto di mount)\n" +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "" #: ../src/udevil.c:3800 #, c-format diff -Nru udevil-0.4.1/po/LINGUAS udevil-0.4.3/po/LINGUAS --- udevil-0.4.1/po/LINGUAS 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/LINGUAS 2013-12-09 13:59:27.000000000 +0000 @@ -1,5 +1,9 @@ # keep this file sorted alphabetically, one language code per line de +es +fr it +pl pt_BR ru +sv diff -Nru udevil-0.4.1/po/Makefile.in.in udevil-0.4.3/po/Makefile.in.in --- udevil-0.4.1/po/Makefile.in.in 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/Makefile.in.in 2013-12-09 13:59:27.000000000 +0000 @@ -154,7 +154,7 @@ fi mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f *.pox *.old.po cat-id-tbl.tmp rm -f .intltool-merge-cache clean: mostlyclean diff -Nru udevil-0.4.1/po/pl.po udevil-0.4.3/po/pl.po --- udevil-0.4.1/po/pl.po 1970-01-01 00:00:00.000000000 +0000 +++ udevil-0.4.3/po/pl.po 2013-12-09 13:59:27.000000000 +0000 @@ -0,0 +1,1059 @@ +# udevil PO Template http://ignorantguru.github.com/udevil/ +# This file is distributed under the same copyright and license as the udevil +# package. +# +# Translators: +# mati75 , 2013 +# morfik , 2013 +msgid "" +msgstr "" +"Project-Id-Version: udevil\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: morfik \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/udevil/language/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../src/udevil.c:612 +#, c-format +msgid "" +"udevil: error 1: unable to drop priviledges - please report this problem\n" +msgstr "udevil: błąd 1: nie można porzucić uprawnień - prosimy zgłosić ten problem\n" + +#: ../src/udevil.c:804 +#, c-format +msgid "udevil: error 2: %s line %d is not valid UTF-8\n" +msgstr "udevil: błąd 2: %s linia %d nie jest zgodna z UTF-8\n" + +#: ../src/udevil.c:810 +#, c-format +msgid "udevil: error 3: %s line %d is too long\n" +msgstr "udevil: błąd 3: %s linia %d jest za długa\n" + +#: ../src/udevil.c:820 +#, c-format +msgid "udevil: error 4: %s line %d syntax error:\n" +msgstr "udevil: błąd 4: %s linia %d błąd składni:\n" + +#: ../src/udevil.c:833 +#, c-format +msgid "udevil: error 5: %s line %d syntax error:\n" +msgstr "udevil: błąd 5: %s linia %d błąd składni:\n" + +#: ../src/udevil.c:840 +#, c-format +msgid "udevil: error 6: %s line %d duplicate assignment:\n" +msgstr "" + +#: ../src/udevil.c:903 +#, c-format +msgid "udevil: warning 7: /etc/udevil/udevil.conf could not be read\n" +msgstr "udevil: ostrzeżenie 7: /etc/udevil/udevil.conf nie mógł być odczytany\n" + +#: ../src/udevil.c:913 +#, c-format +msgid "udevil: read config %s\n" +msgstr "udevil: czytaj konfiguracje %s\n" + +#: ../src/udevil.c:1152 +#, c-format +msgid "udevil: error 8: failed writing to log file '%s'\n" +msgstr "udevil: błąd 8: błąd to zapisuje do pliku logowania '%s'\n" + +#: ../src/udevil.c:1488 ../src/udevil.c:1530 ../src/udevil.c:1592 +#: ../src/udevil.c:1635 +#, c-format +msgid "udevil: warning 9: unable to run losetup (%s)\n" +msgstr "udevil: ostrzeżenie 9: nie można wykonać losetup (%s)\n" + +#: ../src/udevil.c:1543 +msgid "udevil: error 147: unable to get free loop device\n" +msgstr "udevil: błąd 147: nie można uzyskać dostępu do wolnego urządzenia loop\n" + +#: ../src/udevil.c:1552 +msgid "udevil: error 150: path changed\n" +msgstr "udevil: błąd 150: ścieżka zmieniona\n" + +#: ../src/udevil.c:1692 +#, c-format +msgid "udevil: warning 10: unable to run losetup (%s)\n" +msgstr "udevil: ostrzeżenie 10: nie można wykonać losetup (%s)\n" + +#: ../src/udevil.c:1926 +#, c-format +msgid "udevil: error 11: could not open %s\n" +msgstr "udevil: błąd 11: nie można otworzyć %s\n" + +#: ../src/udevil.c:1934 +#, c-format +msgid "udevil: error 12: error writing to %s\n" +msgstr "udevil: błąd 12: nie można zapisać do %s\n" + +#: ../src/udevil.c:1984 +#, c-format +msgid "udevil: error 13: unable to run %s\n" +msgstr "udevil: błąd 13: nie można uruchomić %s\n" + +#: ../src/udevil.c:1996 +#, c-format +msgid " %s exit status = %d\n" +msgstr " %s status wyjścia = %d\n" + +#: ../src/udevil.c:2001 +#, c-format +msgid "udevil: denied 14: %s returned exit status %d\n" +msgstr "udevil: odrzucono 14: %s zwrócił status wyjścia %d\n" + +#. log +#: ../src/udevil.c:2039 +msgid "udevil: trying umount as current user\n" +msgstr "udevil: próbuję odmontować jako bieżący użytkownik\n" + +#: ../src/udevil.c:2052 +#, c-format +msgid "udevil: warning 15: unable to run umount (%s)\n" +msgstr "udevil: ostrzeżenie 15: nie można uruchomić umount (%s)\n" + +#: ../src/udevil.c:2057 ../src/udevil.c:2130 +#, c-format +msgid " umount exit status = %d\n" +msgstr "status wyjścia umount = %d\n" + +#. success - show output +#: ../src/udevil.c:2066 +msgid "udevil: success running umount as current user\n" +msgstr "udevil: uruchomiono z powodzeniem umount jako bieżący użytkownik\n" + +#: ../src/udevil.c:2109 ../src/udevil.c:2181 +msgid "udevil: error 144: invalid path\n" +msgstr "udevil: błąd 144: nieprawidłowa ścieżka\n" + +#: ../src/udevil.c:2120 +#, c-format +msgid "udevil: error 16: unable to run umount (%s)\n" +msgstr "udevil: błąd 16: nie można wykonać umount (%s)\n" + +#: ../src/udevil.c:2193 +#, c-format +msgid "udevil: error 17: unable to run mount (%s)\n" +msgstr "" + +#: ../src/udevil.c:2206 +#, c-format +msgid " mount exit status = %d\n" +msgstr "status wyjścia mount = %d\n" + +#: ../src/udevil.c:2220 +msgid "udevil: error 148: unable to attach file to loop device\n" +msgstr "" + +#: ../src/udevil.c:2264 +#, c-format +msgid "udevil: warning 18: unable to run mount (%s)\n" +msgstr "" + +#: ../src/udevil.c:2281 +#, c-format +msgid "udevil: denied 19: Invalid path\n" +msgstr "udevil: odrzucono 19: nieprawidłowa ścieżka\n" + +#: ../src/udevil.c:2287 +#, c-format +msgid "udevil: denied 20: mount path '%s' is not a directory\n" +msgstr "udevil: odrzucono 20: ścieżka montowania '%s' nie jest katalogiem\n" + +#: ../src/udevil.c:2289 +#, c-format +msgid "udevil: denied 21: mount path '%s' is already mounted\n" +msgstr "udevil: odrzucono 21: ścieżka montowania '%s' jest już zamontowana\n" + +#: ../src/udevil.c:2293 +#, c-format +msgid "udevil: denied 22: cannot stat '%s': %s\n" +msgstr "udevil: błąd 22: nie można stat %s: %s\n" + +#: ../src/udevil.c:2295 +#, c-format +msgid "udevil: denied 23: neither you nor root owns '%s'\n" +msgstr "udevil: odrzucono 23: ani ty ani root nie posiadacie '%s'\n" + +#: ../src/udevil.c:2332 +#, c-format +msgid "udevil: warning 24: unable to run setfacl (%s)\n" +msgstr "udevil: ostrzeżenie 24: nie można uruchomić setfacl (%s)\n" + +#. setfacl apparently failed so fallback to normal permissions +#: ../src/udevil.c:2340 +#, c-format +msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" +msgstr "udevil: ostrzeżenie 25: setfacl na %s nieudany, powrót do 'rwxr-xr-x'\n" + +#: ../src/udevil.c:2446 +#, c-format +msgid "" +"udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" +msgstr "udevil: błąd 26: nieprawidłowy typ '%s' dla zasobu SMB - musi być cifs albo smbfs\n" + +#: ../src/udevil.c:2461 +#, c-format +msgid "" +"udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil: błąd 27: nieprawidłowy typ '%s' dla zasobu NFS - musi być nfs or nfs4\n" + +#: ../src/udevil.c:2474 +#, c-format +msgid "" +"udevil: error 28: invalid type '%s' for curlftpfs share - must be " +"curlftpfs\n" +msgstr "udevil: błąd 28: nieprawidłowy typ'%s' dla zasobu curlftpfs - musi być curlftpfs\n" + +#: ../src/udevil.c:2486 +#, c-format +msgid "" +"udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " +"ftpfs\n" +msgstr "udevil: błąd 29: nieprawidłowy typ '%s' dla zasobu FTP - musi być curlftpfs albo ftpfs\n" + +#: ../src/udevil.c:2511 +#, c-format +msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil: błąd 30: nieprawidłowy typ '%s' dla zasobu sshfs - musi być sshfs\n" + +#: ../src/udevil.c:2524 +#, c-format +msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil: błąd 31: nieprawidłowy typ '%s' dla zasobu sshfs - musi być sshfs\n" + +#: ../src/udevil.c:2536 +#, c-format +msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" +msgstr "udevil: błąd 151: nieprawidłowy typ '%s' dla zasobu WebDAV - musi być davfs\n" + +#: ../src/udevil.c:2551 +#, c-format +msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil: błąd 32: nieprawidłowy typ '%s' dla zasobu sshfs - musi być sshfs\n" + +#: ../src/udevil.c:2562 +#, c-format +msgid "" +"udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil: błąd 33: nieprawidłowy typ '%s' dla zasobu NFS - musi być nfs albo nfs4\n" + +#: ../src/udevil.c:2679 +#, c-format +msgid "udevil: error 34: '%s' is not a recognized network url\n" +msgstr "udevil: błąd 34: '%s' nie jest rozpoznanym url sieci\n" + +#: ../src/udevil.c:2688 +msgid "udevil: error 35: invalid network url\n" +msgstr "udevil: błąd 35: nieprawidłowy url sieci\n" + +#: ../src/udevil.c:2695 +#, c-format +msgid "udevil: error 36: lookup host '%s' failed\n" +msgstr "udevil: błąd 36: sprawdzanie adresu hosta '%s' nieudane\n" + +#: ../src/udevil.c:2743 +#, c-format +msgid "udevil: error 37: %s\n" +msgstr "udevil: błąd 37: %s\n" + +#: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 +msgid "udevil was not run suid root" +msgstr "udevil nie został uruchomiony z uprawnieniami administratora" + +#: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 +msgid "To correct this problem" +msgstr "Aby rozwiązać ten problem" + +#: ../src/udevil.c:2763 +msgid "udevil: error 38: mount requires DEVICE argument\n" +msgstr "udevil: błąd 38: zamontowanie wymaga argumentu URZĄDZENIE\n\n" + +#: ../src/udevil.c:2765 +msgid "udevil: error 39: unmount requires DEVICE argument\n" +msgstr "udevil: błąd 39: odmontowanie wymaga argumentu URZĄDZENIE\n" + +#: ../src/udevil.c:2810 +#, c-format +msgid "udevil: error 40: cannot stat %s: %s\n" +msgstr "udevil: błąd 40: nie można stat %s: %s\n" + +#: ../src/udevil.c:2822 +msgid "udevil: error 41: cannot canonicalize device path\n" +msgstr "" + +#: ../src/udevil.c:2829 +#, c-format +msgid "udevil: error 42: cannot stat %s: %s\n" +msgstr "udevil: błąd 42: nie można stat %s: %s\n" + +#: ../src/udevil.c:2840 +#, c-format +msgid "udevil: error 43: '%s' is not a regular file or directory\n" +msgstr "udevil: błąd 43: '%s' nie jest regularnym plikiem lub katalogiem\n" + +#. mount knows (in fstab) so mount as normal user with only specified opts +#: ../src/udevil.c:2879 ../src/udevil.c:3809 +#, c-format +msgid "udevil: %s is known to mount - running mount as current user\n" +msgstr "udevil: %s jest znany mount - uruchamianie mount jako bieżący użytkownik\n" + +#: ../src/udevil.c:2882 +msgid "" +"udevil: warning 44: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: ostrzeżenie 44: typ systemu plików zignorowany dla urządzenia w fstab (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:2885 +msgid "" +"udevil: warning 45: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: ostrzeżenie 45: opcje zignorowane dla urządzenia w fstab (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:2956 +#, c-format +msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" +msgstr "udevil: błąd 46: nie można znaleźć '%s' zamontowanego w mtab\n" + +#: ../src/udevil.c:2970 +msgid "udevil: error 47: cannot canonicalize attached loop device\n" +msgstr "" + +#: ../src/udevil.c:2976 +msgid "udevil: denied 48: 'file' is not an allowed type\n" +msgstr "udevil: odrzucono 48: 'file' nie jest dozwolonym typem\n" + +#: ../src/udevil.c:2984 +#, c-format +msgid "udevil: denied 49: '%s' is not an allowed file\n" +msgstr "udevil: odrzucono 49: '%s' nie jest dozwolonym plikiem\n" + +#: ../src/udevil.c:2991 +#, c-format +msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" +msgstr "udevil: błąd 50: nie można znaleźć '%s' zamontowanego w mtab\n" + +#: ../src/udevil.c:3010 +#, c-format +msgid "udevil: warning 51: attached device %s is not a loop device\n" +msgstr "" + +#: ../src/udevil.c:3035 +#, c-format +msgid "udevil: error 52: cannot stat %s: %s\n" +msgstr "udevil: błąd 52: nie można stat %s: %s\n" + +#: ../src/udevil.c:3054 +msgid "udevil: error 53: cannot canonicalize path\n" +msgstr "" + +#: ../src/udevil.c:3070 +#, c-format +msgid "udevil: error 54: invalid path '%s'\n" +msgstr "udevil: błąd 54: nieprawidłowa ścieżka '%s'\n\n" + +#: ../src/udevil.c:3079 +#, c-format +msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" +msgstr "udevil: błąd 55: nie można znaleźć '%s' zamontowanego w mtab\n" + +#: ../src/udevil.c:3086 +#, c-format +msgid "udevil: error 56: cannot find device %s fstype in mtab\n" +msgstr "udevil: błąd 56: nie można odnaleźć systemu plików urządzenia %s w mtab\n" + +#: ../src/udevil.c:3097 +#, c-format +msgid "udevil: error 57: cannot stat %s: %s\n" +msgstr "udevil: błąd 57: nie można stat %s: %s\n" + +#: ../src/udevil.c:3106 +#, c-format +msgid "udevil: error 58: %s is not a block device\n" +msgstr "udevil: błąd 58: %s nie jest blokowym urządzeniem\n" + +#: ../src/udevil.c:3115 +msgid "udevil: error 59: error initializing libudev\n" +msgstr "udevil: błąd 59: błąd przy inicjowaniu libudev\n" + +#: ../src/udevil.c:3123 +#, c-format +msgid "udevil: error 60: no udev device for device %s\n" +msgstr "udevil: błąd 60: brak urządzenia udev dla urządzenia %s\n" + +#: ../src/udevil.c:3134 +#, c-format +msgid "udevil: error 61: unable to get device info for device %s\n" +msgstr "udevil: błąd 161: nie można uzyskać informacji o urządzeniu %s\n" + +#: ../src/udevil.c:3157 +#, c-format +msgid "udevil: error 62: type %s is invalid for block device\n" +msgstr "udevil: błąd 62: typ %s jest nieprawidłowy dla urządzenia blokowego\n\n" + +#: ../src/udevil.c:3177 +msgid "udevil: error 143: unable to determine device fstype\n" +msgstr "udevil: błąd 143: nie można ustalić typu systemu plików urządzenia\n" + +#: ../src/udevil.c:3180 +#, c-format +msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" +msgstr "udevil: błąd 63: brak nośnika w urządzeniu %s (albo sprecyzuj typ za pomocą -t)\n" + +#: ../src/udevil.c:3183 +msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" +msgstr "udevil: błąd 64: nie można ustalić typu systemu plików urządzenia - sprecyzuj za pomocą -t\n" + +#: ../src/udevil.c:3243 +#, c-format +msgid "udevil: denied 65: device %s is not mounted\n" +msgstr "udevil: odrzucono 65: urządzenie %s nie jest zamontowane\n" + +#: ../src/udevil.c:3246 +#, c-format +msgid "udevil: denied 66: could not find mount point for '%s'\n" +msgstr "udevil: odrzucono 66: nie można było znaleźć punktu montownia dla '%s'\n" + +#: ../src/udevil.c:3266 +msgid "udevil: error 67: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3277 +#, c-format +msgid "udevil: error 68: cannot stat '%s'\n" +msgstr "udevil: błąd 68: nie można stat '%s'\n" + +#: ../src/udevil.c:3295 +msgid "udevil: error 69: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3306 +msgid "udevil: error 70: cannot canonicalize mount point path\n" +msgstr "" + +#: ../src/udevil.c:3316 +#, c-format +msgid "udevil: denied 71: '%s' is not an allowed media directory\n" +msgstr "udevil: odrzucono 71: '%s' nie jest dozwolonym katalogiem mediów\n" + +#: ../src/udevil.c:3328 +msgid "udevil: error 72: multiple fstypes not allowed\n" +msgstr "udevil: błąd 72: wiele typów systemów plików nie jest dozwolonych\n" + +#: ../src/udevil.c:3334 +#, c-format +msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" +msgstr "udevil: odrzucono 73: system plików '%s' nie jest dozwolonym typem\n" + +#: ../src/udevil.c:3343 +msgid "udevil: error 74: could not get username\n" +msgstr "udevil: błąd 74: nie można uzyskać username\n" + +#: ../src/udevil.c:3351 +#, c-format +msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" +msgstr "udevil: odrzucono 75: użytkownik '%s' (%s) nie figuruje w dozwolonych użytkownikach\n" + +#: ../src/udevil.c:3373 +#, c-format +msgid "udevil: denied 77: user %s is not in allowed groups\n" +msgstr "udevil: odrzucono 77: użytkownik %s nie figuruje w dozwolonych grupach\n" + +#: ../src/udevil.c:3385 +#, c-format +msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" +msgstr "udevil: odrzucono 78: host '%s' (%s) nie jest w dozwolonej sieci\n" + +#: ../src/udevil.c:3391 +#, c-format +msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" +msgstr "udevil: odrzucono 79: host '%s' (%s) jest z zakazanej sieci\n" + +#: ../src/udevil.c:3406 +#, c-format +msgid "udevil: denied 80: device %s is not an allowed device\n" +msgstr "udevil: odrzucono 80: urządzenie %s nie jest dozwolonym urządzeniem\n" + +#: ../src/udevil.c:3413 +#, c-format +msgid "udevil: denied 81: device %s is a forbidden device\n" +msgstr "udevil: odrzucono 81: urządzenie %s jest zabronionym urządzeniem\n" + +#: ../src/udevil.c:3429 +#, c-format +msgid "udevil: denied 82: '%s' is not an allowed file\n" +msgstr "udevil: odrzucono 82: '%s' nie jest dozwolonym plikiem\n" + +#: ../src/udevil.c:3436 +#, c-format +msgid "udevil: denied 83: you don't have read permission for file '%s'\n" +msgstr "udevil: odrzucono 83: nie masz uprawnień by czytać plik '%s'\n" + +#: ../src/udevil.c:3447 +#, c-format +msgid "udevil: denied 145: cannot open '%s'\n" +msgstr "udevil: odrzucono 145: nie można otworzyć '%s'\n" + +#: ../src/udevil.c:3460 +msgid "udevil: error 146: path changed\n" +msgstr "udevil: błąd 146: zmieniona ścieżka\n" + +#: ../src/udevil.c:3468 +msgid "udevil: error 84: cannot specify mount point for directory\n" +msgstr "udevil: błąd 84: nie można sprecyzować punktu montowania dla katalogu\n" + +#: ../src/udevil.c:3488 +#, c-format +msgid "udevil: denied 85: %s is attached to an invalid file\n" +msgstr "" + +#: ../src/udevil.c:3496 +#, c-format +msgid "udevil: denied 86: '%s' is not a permitted file\n" +msgstr "udevil: odrzucono 86: '%s' nie jest dozwolonym plikiem\n" + +#: ../src/udevil.c:3506 +#, c-format +msgid "udevil: denied 87: '%s' is not an allowed file\n" +msgstr "udevil: odrzucono 87: '%s' nie jest dozwolonym plikiem\n" + +#: ../src/udevil.c:3527 +#, c-format +msgid "udevil: denied 88: device %s is an internal device and you're not root\n" +msgstr "udevil: odrzucono 88: urządzenie %s jest urządzeniem wewnętrznym, a ty nie jesteś użytkownikiem root\n" + +#: ../src/udevil.c:3729 +#, c-format +msgid "udevil: error 89: options contain an invalid character ('%c')\n" +msgstr "udevil: błąd 89: opcje zawierają niepoprawny znak ('%c')\n" + +#: ../src/udevil.c:3738 +#, c-format +msgid "udevil: denied 90: option '%s' is not an allowed option\n" +msgstr "udevil: odrzucono 90: opcja '%s' nie jest dozwoloną opcją\n" + +#: ../src/udevil.c:3749 +msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" +msgstr "udevil: odrzucono 91: nie można użyć opcji remount z zasobami FTP lub sshfs\n" + +#: ../src/udevil.c:3758 +msgid "udevil: denied 149: cannot use remount option with file\n" +msgstr "udevil: odrzucono 149: nie można użyć opcji remount z plikiem\n" + +#: ../src/udevil.c:3777 +#, c-format +msgid "" +"udevil: denied 92: device %s is already mounted (or specify mount point)\n" +msgstr "udevil: odrzucono 92: urządzenie %s jest już zamontowane (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3788 +#, c-format +msgid "" +"udevil: denied 93: file %s is already mounted at %s (or specify mount " +"point)\n" +msgstr "udevil: odrzucono 93: plik %s jest już zamontowany w %s (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3792 +#, c-format +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "" + +#: ../src/udevil.c:3800 +#, c-format +msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" +msgstr "udevil: odrzucono 95: %s jest już zamontowany (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3812 +msgid "" +"udevil: warning 96: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: ostrzeżenie 96: typ systemu plików zignorowany dla urządzenia w fstab (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3815 +msgid "" +"udevil: warning 97: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: ostrzeżenie 97: opcje zignorowane dla urządzenia w fstab (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3857 +#, c-format +msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" +msgstr "udevil: odrzucono 98: '%s' jest już zamontowany (albo sprecyzuj punkt montowania)\n" + +#: ../src/udevil.c:3860 +#, c-format +msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" +msgstr "udevil: odrzucono 99: nie można zamontować '%s' (brak w fstab?)\n" + +#: ../src/udevil.c:3874 +msgid "udevil: denied 100: must specify device or network for remount\n" +msgstr "udevil: odrzucono 100: musisz sprecyzować urządzenie albo sieć dla remount\n" + +#: ../src/udevil.c:3880 +msgid "udevil: warning 101: specified mount point with remount ignored\n" +msgstr "udevil: ostrzeżenie 101: punkt montowania sprecyzowany za pomocą remount został zignorowany\n" + +#: ../src/udevil.c:3925 +#, c-format +msgid "udevil: warning 102: device %s is already mounted on %s\n" +msgstr "udevil: ostrzeżenie 102: urządzenie %s jest już zamontowane w %s\n" + +#: ../src/udevil.c:3937 +msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" +msgstr "udevil: błąd 103: brak poprawnego istniejącego katalogu w allowed_media_dirs\n" + +#: ../src/udevil.c:4051 +#, c-format +msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" +msgstr "udevil: błąd 104: punkt montowania '%s' nie jest poprawnym ciągiem UTF8\n" + +#: ../src/udevil.c:4073 +#, c-format +msgid "udevil: error 105: mkdir '%s' failed\n" +msgstr "udevil: błąd 105: mkdir '%s' nieudane\n" + +#. try cifs as guest first +#: ../src/udevil.c:4106 +#, c-format +msgid "udevil: trying %s as guest\n" +msgstr "udevil: spróbuj %s jako gość\n" + +#: ../src/udevil.c:4117 +#, c-format +msgid "udevil: trying with %s\n" +msgstr "udevil: spróbuj z %s\n" + +#: ../src/udevil.c:4164 +msgid "" +"udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" +msgstr "udevil: ostrzeżenie 106: nieprawidłowy mount_point_mode w udevil.conf - użycie 0755\n" + +#: ../src/udevil.c:4229 +#, c-format +msgid "udevil: error 107: %s\n" +msgstr "udevil: błąd 107: %s\n" + +#: ../src/udevil.c:4244 +msgid "udevil: error 108: remove requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4250 +#, c-format +msgid "udevil: error 109: cannot stat %s: %s\n" +msgstr "udevil: błąd 109: nie można stat %s: %s\n" + +#: ../src/udevil.c:4258 +#, c-format +msgid "udevil: error 110: %s is not a block device\n" +msgstr "udevil: błąd 110: %s nie jest blokowym urządzeniem\n" + +#: ../src/udevil.c:4265 +msgid "udevil: error 111: error initializing libudev\n" +msgstr "udevil: błąd 111: błąd przy inicjowaniu libudev\n" + +#: ../src/udevil.c:4272 +#, c-format +msgid "udevil: error 112: no udev device for device %s\n" +msgstr "udevil: błąd 112: brak urządzenia udev dla urządzenia %s\n" + +#: ../src/udevil.c:4281 +msgid "udevil: error 113: unable to get device info\n" +msgstr "udevil: błąd 113: nie można uzyskać informacji o urządzeniu\n" + +#: ../src/udevil.c:4293 +#, c-format +msgid "" +"udevil: warning 114: device %s is an internal device - not unbinding " +"driver\n" +msgstr "" + +#: ../src/udevil.c:4304 +msgid "" +"udevil: warning 115: interface is not usb, firewire, sdio, esata - not " +"unbinding driver\n" +msgstr "" + +#: ../src/udevil.c:4312 +#, c-format +msgid "udevil: denied 116: device %s is not an allowed device\n" +msgstr "udevil: odrzucono 116: urządzenie %s nie jest dozwolonym urządzeniem\n" + +#: ../src/udevil.c:4318 +#, c-format +msgid "udevil: denied 117: device %s is a forbidden device\n" +msgstr "udevil: odrzucono 117: urządzenie %s jest zabronionym urządzeniem\n" + +#: ../src/udevil.c:4356 +#, c-format +msgid "udevil: unmount %s\n" +msgstr "udevil: odmontuj %s\n" + +#: ../src/udevil.c:4390 +#, c-format +msgid "udevil: error 118: unable to access dir %s\n" +msgstr "udevil: błąd 118: nie można uzyskać dostępu do katalogu %s\n" + +#: ../src/udevil.c:4415 +#, c-format +msgid "udevil: examining partition %s\n" +msgstr "udevil: badanie partycji %s\n" + +#. unmount partition +#: ../src/udevil.c:4420 +#, c-format +msgid "udevil: unmount partition %s\n" +msgstr "udevil: odmontuj partycje %s\n" + +#: ../src/udevil.c:4472 +#, c-format +msgid "udevil: error 119: unable to find host for %s\n" +msgstr "udevil: błąd 119: nie można znaleźć hosta dla %s\n" + +#: ../src/udevil.c:4478 +#, c-format +msgid "udevil: error 120: unable to find host for %s\n" +msgstr "udevil: błąd 120: nie można znaleźć hosta dla %s\n" + +#: ../src/udevil.c:4487 +#, c-format +msgid "udevil: error 121: unable to find last component for %s\n" +msgstr "udevil: błąd 121: nie można znaleźć ostatniego komponentu dla %s\n" + +#: ../src/udevil.c:4511 +#, c-format +msgid "udevil: warning 122: missing power autosuspend %s\n" +msgstr "" + +#: ../src/udevil.c:4523 +#, c-format +msgid "udevil: warning 123: missing power control %s\n" +msgstr "udevil: ostrzeżenie 123: brakująca kontrola zasilania %s\n" + +#: ../src/udevil.c:4552 +#, c-format +msgid "udevil: error 124: %s\n" +msgstr "udevil: błąd 124: %s\n" + +#: ../src/udevil.c:4633 +msgid "udevil: error 126: info requires DEVICE argument\n" +msgstr "" + +#: ../src/udevil.c:4639 +#, c-format +msgid "udevil: error 127: cannot stat %s: %s\n" +msgstr "udevil: błąd 127: nie można stat %s: %s\n" + +#: ../src/udevil.c:4647 +#, c-format +msgid "udevil: error 128: %s is not a block device\n" +msgstr "udevil: błąd 128: %s nie jest blokowym urządzeniem\n" + +#: ../src/udevil.c:4654 +msgid "udevil: error 129: error initializing libudev\n" +msgstr "udevil: błąd 129: błąd przy inicjowaniu libudev\n" + +#: ../src/udevil.c:4661 +#, c-format +msgid "udevil: error 130: no udev device for device %s\n" +msgstr "udevil: błąd 130: brak urządzenia udev dla urządzenia %s\n" + +#: ../src/udevil.c:4677 +msgid "udevil: error 131: unable to get device info\n" +msgstr "udevil: błąd 131: nie można uzyskać informacji o urządzeniu\n" + +#: ../src/udevil.c:4729 +msgid "udevil: error 132: unable to initialize udev\n" +msgstr "udevil: błąd 132: błąd przy inicjowaniu udev\n" + +#: ../src/udevil.c:4740 +msgid "udevil: error 133: cannot create udev monitor\n" +msgstr "" + +#: ../src/udevil.c:4745 +msgid "udevil: error 134: cannot enable udev monitor receiving\n" +msgstr "" + +#: ../src/udevil.c:4750 +msgid "udevil: error 135: cannot set udev filter\n" +msgstr "" + +#: ../src/udevil.c:4757 +msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" +msgstr "" + +#: ../src/udevil.c:4778 +#, c-format +msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" +msgstr "udevil: błąd 137: monitorowanie /proc/self/mountinfo: %s\n" + +#: ../src/udevil.c:4829 +#, c-format +msgid "" +"Mounts and unmounts devices without password, shows device info, monitors\n" +msgstr "" + +#: ../src/udevil.c:4830 +#, c-format +msgid "" +"device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" +msgstr "" + +#: ../src/udevil.c:4831 +#, c-format +msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" +msgstr "" + +#: ../src/udevil.c:4832 +#, c-format +msgid "OPTIONS:\n" +msgstr "OPCJE:\n" + +#: ../src/udevil.c:4833 +msgid "print details" +msgstr "wyświetl szczegóły" + +#: ../src/udevil.c:4834 +msgid "minimal output" +msgstr "minimalne wyjście" + +#: ../src/udevil.c:4835 +#, c-format +msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4836 +#, c-format +msgid "" +" udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " +"[DIR]\n" +msgstr "" + +#: ../src/udevil.c:4837 +#, c-format +msgid " MOUNT-OPTIONS:\n" +msgstr "OPCJE MONTOWANIA:\n" + +#: ../src/udevil.c:4838 ../src/udevil.c:4839 +msgid "see man mount" +msgstr "zobacz man mount" + +#. printf( " -L LABEL mount device by +#. label LABEL\n" ); +#. printf( " -U UUID mount device by +#. UUID\n" ); +#: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 +msgid "ignored (for compatibility)" +msgstr "zignorowane (dla kompatybilności)" + +#: ../src/udevil.c:4843 ../src/udevil.c:4878 +msgid "EXAMPLES" +msgstr "PRZYKŁADY" + +#. printf( " udevil mount -L 'Disk Label'\n" ); +#: ../src/udevil.c:4848 +msgid "ISO file" +msgstr "plik ISO" + +#: ../src/udevil.c:4849 +msgid "ftp site - requires" +msgstr "" + +#: ../src/udevil.c:4850 +msgid "or" +msgstr "lub" + +#: ../src/udevil.c:4851 ../src/udevil.c:4853 +msgid "ftp share with" +msgstr "" + +#: ../src/udevil.c:4852 +msgid "user and password" +msgstr "użytkownik i hasło" + +#: ../src/udevil.c:4854 +msgid "port, user and password" +msgstr "port, użytkownik i hasło" + +#: ../src/udevil.c:4855 +msgid "ftp site with ftpfs" +msgstr "" + +#: ../src/udevil.c:4856 +msgid "ftp site with curl" +msgstr "" + +#: ../src/udevil.c:4857 +msgid "ftp site with curl u/p" +msgstr "" + +#: ../src/udevil.c:4858 ../src/udevil.c:4859 +msgid "nfs share" +msgstr "" + +#: ../src/udevil.c:4860 ../src/udevil.c:4863 +msgid "samba share w/ cifs" +msgstr "" + +#: ../src/udevil.c:4861 +msgid "samba share w/ u/p/port" +msgstr "" + +#: ../src/udevil.c:4862 +msgid "samba share w/ workgroup" +msgstr "" + +#: ../src/udevil.c:4864 +msgid "samba share w/ smbfs" +msgstr "" + +#: ../src/udevil.c:4865 +msgid "sshfs with user - " +msgstr "" + +#: ../src/udevil.c:4866 +msgid "requires sshfs" +msgstr "" + +#: ../src/udevil.c:4867 +msgid "sshfs with user" +msgstr "" + +#: ../src/udevil.c:4868 +msgid "WebDAV - requires davfs2" +msgstr "WebDAV - wymaga davfs2" + +#: ../src/udevil.c:4869 +msgid "make a ram drive" +msgstr "stwórz ram dysk" + +#: ../src/udevil.c:4870 +#, c-format +msgid "" +"\n" +" WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" +"\n" +msgstr "\nOSTRZEŻENIE !!! hasło w poleceniu jest NIEBEZPIECZNE - zobacz dokumentację systemu plików\n\n" + +#: ../src/udevil.c:4871 +#, c-format +msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" +msgstr "" + +#: ../src/udevil.c:4872 +#, c-format +msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" +msgstr "" + +#: ../src/udevil.c:4873 +#, c-format +msgid "" +" {[-b|--block-device] " +"DEVICE}|DIR\n" +msgstr "" + +#: ../src/udevil.c:4874 +#, c-format +msgid " UNMOUNT-OPTIONS:\n" +msgstr "OPCJE ODMONTOWANIA:\n" + +#: ../src/udevil.c:4875 ../src/udevil.c:4887 +msgid "lazy unmount (see man umount)" +msgstr "" + +#: ../src/udevil.c:4876 ../src/udevil.c:4888 +msgid "force unmount (see man umount)" +msgstr "siłowe odmontowanie (zobacz man umount)" + +#: ../src/udevil.c:4883 +#, c-format +msgid "" +"REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" +msgstr "" + +#: ../src/udevil.c:4884 +#, c-format +msgid " removal (sync, stop, unbind driver, and power off):\n" +msgstr "" + +#: ../src/udevil.c:4885 +#, c-format +msgid "" +" udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4886 +#, c-format +msgid " OPTIONS:\n" +msgstr "OPCJE:\n" + +#: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 +msgid "EXAMPLE" +msgstr "PRZYKŁAD" + +#: ../src/udevil.c:4892 +#, c-format +msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" +msgstr "INFO - Pokaż informacje o URZĄDZENIU na wzór wyjścia udisks v1\n" + +#: ../src/udevil.c:4893 +#, c-format +msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" +msgstr "" + +#: ../src/udevil.c:4895 +#, c-format +msgid "MONITOR - Display device events emulating udisks v1 output:\n" +msgstr "MONITOR - Pokaż zdarzenia urządzenia na wzór wyjścia udisks v1\n" + +#: ../src/udevil.c:4898 +#, c-format +msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" +msgstr "" + +#: ../src/udevil.c:4900 +#, c-format +msgid "HELP - Show this help\n" +msgstr "HELP - Pokaż tą pomoc\n" + +#: ../src/udevil.c:4903 +msgid "See /etc/udevil/udevil.conf for config." +msgstr "Zobacz /etc/udevil/udevil.conf po konfigurację." + +#: ../src/udevil.c:4904 +#, c-format +msgid "For automounting with udevil run 'devmon --help'\n" +msgstr "Dla automatycznego montowania przy pomocy udevil zobacz 'devmon --help'\n" + +#: ../src/udevil.c:5001 +msgid "udevil: read config /etc/udevil/udevil.conf\n" +msgstr "" + +#: ../src/udevil.c:5050 +msgid "udevil: error 138: argument is not valid UTF-8\n" +msgstr "udevil: błąd 138: argument nie jest zgodny z UTF-8\n" + +#: ../src/udevil.c:5352 +msgid "udevil: error 139: too many arguments\n" +msgstr "udevil: błąd 139: zbyt wiele argumentów\n" + +#: ../src/udevil.c:5355 +#, c-format +msgid "udevil: error 140: option '%s' requires an argument\n" +msgstr "udevil: błąd 140: opcja '%s' wymaga argumentu\n" + +#: ../src/udevil.c:5359 +#, c-format +msgid "udevil: error 141: invalid option '%s'\n" +msgstr "udevil: błąd 141: nieprawidłowa opcja '%s'\n" + +#: ../src/udevil.c:5361 +#, c-format +msgid "udevil: error 142: invalid or unexpected argument '%s'\n" +msgstr "udevil: błąd 142: nieprawidłowy lub nieoczekiwany argument '%s'\n" diff -Nru udevil-0.4.1/po/pt_BR.po udevil-0.4.3/po/pt_BR.po --- udevil-0.4.1/po/pt_BR.po 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/pt_BR.po 2013-12-09 13:59:27.000000000 +0000 @@ -3,14 +3,18 @@ # package. # # Translators: +# wandows , 2013 +# wandows , 2013 +# wandows , 2013 +# wandows , 2013 msgid "" msgstr "" "Project-Id-Version: udevil\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-22 13:49+0000\n" -"PO-Revision-Date: 2013-02-13 22:43+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: ignorantguru \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/udevil/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,826 +25,826 @@ #, c-format msgid "" "udevil: error 1: unable to drop priviledges - please report this problem\n" -msgstr "" +msgstr "udevil: error 1: Impossível obter privilégios de administrador - por favor, relate este problema\n" #: ../src/udevil.c:804 #, c-format msgid "udevil: error 2: %s line %d is not valid UTF-8\n" -msgstr "" +msgstr "udevil: erro 2: %s linha %d UTF-8 não é um valor válido\n" #: ../src/udevil.c:810 #, c-format msgid "udevil: error 3: %s line %d is too long\n" -msgstr "" +msgstr "udevil: erro 3: %s linha %d é muito longa\n" #: ../src/udevil.c:820 #, c-format msgid "udevil: error 4: %s line %d syntax error:\n" -msgstr "" +msgstr "udevil: erro 4: %s erro de sintaxe na linha %d:\n" #: ../src/udevil.c:833 #, c-format msgid "udevil: error 5: %s line %d syntax error:\n" -msgstr "" +msgstr "udevil: erro 5: %s erro de sintaxe na linha %d:\n" #: ../src/udevil.c:840 #, c-format msgid "udevil: error 6: %s line %d duplicate assignment:\n" -msgstr "" +msgstr "udevil: erro 6: %s atribuição duplicaca na linha %d:\n" #: ../src/udevil.c:903 #, c-format msgid "udevil: warning 7: /etc/udevil/udevil.conf could not be read\n" -msgstr "" +msgstr "udevil: Alerta! 7: /etc/udevil/udevil.conf não pode ser lido\n" #: ../src/udevil.c:913 #, c-format msgid "udevil: read config %s\n" -msgstr "" +msgstr "udevil: ler configuração %s\n" #: ../src/udevil.c:1152 #, c-format msgid "udevil: error 8: failed writing to log file '%s'\n" -msgstr "" +msgstr "udevil: erro 8: falha ao graavr arquivo de log '%s'\n" #: ../src/udevil.c:1488 ../src/udevil.c:1530 ../src/udevil.c:1592 #: ../src/udevil.c:1635 #, c-format msgid "udevil: warning 9: unable to run losetup (%s)\n" -msgstr "" +msgstr "udevil: alerta! 9: impossível executar losetup (%s)\n" #: ../src/udevil.c:1543 msgid "udevil: error 147: unable to get free loop device\n" -msgstr "" +msgstr "udevil: erro 147: impossível obter o ciclo de um dispositivo livre\n" #: ../src/udevil.c:1552 msgid "udevil: error 150: path changed\n" -msgstr "" +msgstr "udevil: erro 150: caminho alterado\n" #: ../src/udevil.c:1692 #, c-format msgid "udevil: warning 10: unable to run losetup (%s)\n" -msgstr "" +msgstr "udevil: alerta! 10: impossível executar losetup (%s)\n" #: ../src/udevil.c:1926 #, c-format msgid "udevil: error 11: could not open %s\n" -msgstr "" +msgstr "udevil: erro 11: não pode abrir %s\n" #: ../src/udevil.c:1934 #, c-format msgid "udevil: error 12: error writing to %s\n" -msgstr "" +msgstr "udevil: erro 12: erro ao escrever em %s\n" #: ../src/udevil.c:1984 #, c-format msgid "udevil: error 13: unable to run %s\n" -msgstr "" +msgstr "udevil: erro 13: incapaz de executar %s\n" #: ../src/udevil.c:1996 #, c-format msgid " %s exit status = %d\n" -msgstr "" +msgstr " %s status de saída = %d\n" #: ../src/udevil.c:2001 #, c-format msgid "udevil: denied 14: %s returned exit status %d\n" -msgstr "" +msgstr "udevil: recusado 14: %s retornou estado de saída %d\n" #. log #: ../src/udevil.c:2039 msgid "udevil: trying umount as current user\n" -msgstr "" +msgstr "udevil: tentando desmontar como usuário atual\n" #: ../src/udevil.c:2052 #, c-format msgid "udevil: warning 15: unable to run umount (%s)\n" -msgstr "" +msgstr "udevil: alerta! 15: incapaz de executar umount (%s)\n" #: ../src/udevil.c:2057 ../src/udevil.c:2130 #, c-format msgid " umount exit status = %d\n" -msgstr "" +msgstr " status de saída ao desmontar = %d\n" #. success - show output #: ../src/udevil.c:2066 msgid "udevil: success running umount as current user\n" -msgstr "" +msgstr "udevil: successo ao desmontar como usuário atual\n" #: ../src/udevil.c:2109 ../src/udevil.c:2181 msgid "udevil: error 144: invalid path\n" -msgstr "" +msgstr "udevil: erro 144: caminho inválido\n" #: ../src/udevil.c:2120 #, c-format msgid "udevil: error 16: unable to run umount (%s)\n" -msgstr "" +msgstr "udevil: erro 16: impossível executar desmontagem (%s)\n" #: ../src/udevil.c:2193 #, c-format msgid "udevil: error 17: unable to run mount (%s)\n" -msgstr "" +msgstr "udevil: erro 17: impossível executar montagem (%s)\n" #: ../src/udevil.c:2206 #, c-format msgid " mount exit status = %d\n" -msgstr "" +msgstr " status de saída da montagem = %d\n" #: ../src/udevil.c:2220 msgid "udevil: error 148: unable to attach file to loop device\n" -msgstr "" +msgstr "udevil: erro 148: impossível anexar arquivos a um dispositivo de ciclo\n" #: ../src/udevil.c:2264 #, c-format msgid "udevil: warning 18: unable to run mount (%s)\n" -msgstr "" +msgstr "udevil: aviso 18: impossível executar montagem (%s)\n" #: ../src/udevil.c:2281 #, c-format msgid "udevil: denied 19: Invalid path\n" -msgstr "" +msgstr "udevil: recusado 19: Caminho inválido\n" #: ../src/udevil.c:2287 #, c-format msgid "udevil: denied 20: mount path '%s' is not a directory\n" -msgstr "" +msgstr "udevil: recusado 20: caminho de montagem '%s' não é um diretório\n" #: ../src/udevil.c:2289 #, c-format msgid "udevil: denied 21: mount path '%s' is already mounted\n" -msgstr "" +msgstr "udevil: recusado 21: caminho de montagem '%s' já está montado\n" #: ../src/udevil.c:2293 #, c-format msgid "udevil: denied 22: cannot stat '%s': %s\n" -msgstr "" +msgstr "udevil: recusado 22: impossível obter estatísticas '%s': %s\n" #: ../src/udevil.c:2295 #, c-format msgid "udevil: denied 23: neither you nor root owns '%s'\n" -msgstr "" +msgstr "udevil: recusado 23: nem você nem o administrador possui '%s'\n" #: ../src/udevil.c:2332 #, c-format msgid "udevil: warning 24: unable to run setfacl (%s)\n" -msgstr "" +msgstr "udevil: aviso 24: impossível executar setfacl (%s)\n" #. setfacl apparently failed so fallback to normal permissions #: ../src/udevil.c:2340 #, c-format msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" -msgstr "" +msgstr "udevil: aviso 25: setfacl em %s falhou, voltando para 'rwxr-xr-x'\n" #: ../src/udevil.c:2446 #, c-format msgid "" "udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" -msgstr "" +msgstr "udevil: erro 26: '%s' tipo inválido para SMB partes - deve ser cifs ou smbfs\n" #: ../src/udevil.c:2461 #, c-format msgid "" "udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" -msgstr "" +msgstr "udevil: error 27: '%s' tipo inválido para NFS partes - deve ser nfs ou nfs4\n" #: ../src/udevil.c:2474 #, c-format msgid "" "udevil: error 28: invalid type '%s' for curlftpfs share - must be " "curlftpfs\n" -msgstr "" +msgstr "udevil: error 28: tipo inválido '%s' para curlftpfs partes - deve ser curlftpfs\n" #: ../src/udevil.c:2486 #, c-format msgid "" "udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " "ftpfs\n" -msgstr "" +msgstr "udevil: error 29: '%s' tipo inválido para FTP partes - deve ser curlftpfs ou ftpfs\n" #: ../src/udevil.c:2511 #, c-format msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: erro 30: '%s' tipo inválido para sshfs partes - deve ser sshfs\n" #: ../src/udevil.c:2524 #, c-format msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: erro 31: '%s' tipo inválido para sshfs partes - deve ser sshfs\n" #: ../src/udevil.c:2536 #, c-format msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" -msgstr "" +msgstr "udevil: erro 151: '%s' tipo inválido para WebDAV partes - deve ser davfs\n" #: ../src/udevil.c:2551 #, c-format msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" -msgstr "" +msgstr "udevil: erro 32: '%s' tipo inválido para sshfs partes - deve ser sshfs\n" #: ../src/udevil.c:2562 #, c-format msgid "" "udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" -msgstr "" +msgstr "udevil: erro 33: '%s' tipo inválido para NFS partes - deve ser nfs ou nfs4\n" #: ../src/udevil.c:2679 #, c-format msgid "udevil: error 34: '%s' is not a recognized network url\n" -msgstr "" +msgstr "udevil: erro 34: '%s' não é uma url rede reconhecida\n" #: ../src/udevil.c:2688 msgid "udevil: error 35: invalid network url\n" -msgstr "" +msgstr "udevil: erro 35: url rede inválida\n" #: ../src/udevil.c:2695 #, c-format msgid "udevil: error 36: lookup host '%s' failed\n" -msgstr "" +msgstr "udevil: erro 36: pesquisar host '%s' falhou\n" #: ../src/udevil.c:2743 #, c-format msgid "udevil: error 37: %s\n" -msgstr "" +msgstr "udevil: erro 37: %s\n" #: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 msgid "udevil was not run suid root" -msgstr "" +msgstr "udevil não foi executado como administrador suid" #: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 msgid "To correct this problem" -msgstr "" +msgstr "Para corrigir esse problema" #: ../src/udevil.c:2763 msgid "udevil: error 38: mount requires DEVICE argument\n" -msgstr "" +msgstr "udevil: erro 38: montagem requer argumento DISPOSITIVO\n" #: ../src/udevil.c:2765 msgid "udevil: error 39: unmount requires DEVICE argument\n" -msgstr "" +msgstr "udevil: erro 39: desmontagem requer argumento do DISPOSITIVO\n" #: ../src/udevil.c:2810 #, c-format msgid "udevil: error 40: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 40: impossível obter estado %s: %s\n" #: ../src/udevil.c:2822 msgid "udevil: error 41: cannot canonicalize device path\n" -msgstr "" +msgstr "udevil: erro 41: impossível aceitar caminho do dispositivo\n" #: ../src/udevil.c:2829 #, c-format msgid "udevil: error 42: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 42: impossível obter estado %s: %s\n" #: ../src/udevil.c:2840 #, c-format msgid "udevil: error 43: '%s' is not a regular file or directory\n" -msgstr "" +msgstr "udevil: erro 43: '%s' não é um arquivo regular ou diretório\n" #. mount knows (in fstab) so mount as normal user with only specified opts #: ../src/udevil.c:2879 ../src/udevil.c:3809 #, c-format msgid "udevil: %s is known to mount - running mount as current user\n" -msgstr "" +msgstr "udevil: %s é conhecido por montar - executando montagem como usuário atual\n" #: ../src/udevil.c:2882 msgid "" "udevil: warning 44: fstype ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: aviso 44: tipo de sistema de arquivos ignorado para o dispositivo fstab (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:2885 msgid "" "udevil: warning 45: options ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: aviso 45: opções ignoradas para o dispositivo em fstab (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:2956 #, c-format msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: erro 46: não pode encontrar '%s' montado em mtab\n" #: ../src/udevil.c:2970 msgid "udevil: error 47: cannot canonicalize attached loop device\n" -msgstr "" +msgstr "udevil: erro 47: não pode aceitar ciclo do dispositivo em anexo\n" #: ../src/udevil.c:2976 msgid "udevil: denied 48: 'file' is not an allowed type\n" -msgstr "" +msgstr "udevil: recusado 48: 'arquivo' não é um tipo permitido\n" #: ../src/udevil.c:2984 #, c-format msgid "udevil: denied 49: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: recusado 49: '%s' não é um arquivo permitido\n" #: ../src/udevil.c:2991 #, c-format msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: error 50: não pode encontrar '%s' montado em mtab\n" #: ../src/udevil.c:3010 #, c-format msgid "udevil: warning 51: attached device %s is not a loop device\n" -msgstr "" +msgstr "udevil: alerta 51: o dispositivo conectado %s não é um dispositivo de ciclo\n" #: ../src/udevil.c:3035 #, c-format msgid "udevil: error 52: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 52: impossível obter estado %s: %s\n" #: ../src/udevil.c:3054 msgid "udevil: error 53: cannot canonicalize path\n" -msgstr "" +msgstr "udevil: erro 53: impossível aceitar caminho\n" #: ../src/udevil.c:3070 #, c-format msgid "udevil: error 54: invalid path '%s'\n" -msgstr "" +msgstr "udevil: erro 54: inválido caminho '%s'\n" #: ../src/udevil.c:3079 #, c-format msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" -msgstr "" +msgstr "udevil: erro 55: não pode encontrar '%s' montado em mtab\n" #: ../src/udevil.c:3086 #, c-format msgid "udevil: error 56: cannot find device %s fstype in mtab\n" -msgstr "" +msgstr "udevil: erro 56: impossível localizar o dispositivo %s tipo de sistema de arquivo em mtab\n" #: ../src/udevil.c:3097 #, c-format msgid "udevil: error 57: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 57: impossível encontrar o dispositivo %s: %s\n" #: ../src/udevil.c:3106 #, c-format msgid "udevil: error 58: %s is not a block device\n" -msgstr "" +msgstr "udevil: erro 58: %s não é um dispositivo de bloco\n" #: ../src/udevil.c:3115 msgid "udevil: error 59: error initializing libudev\n" -msgstr "" +msgstr "udevil: erro 59: erro ao inicializar libudev\n" #: ../src/udevil.c:3123 #, c-format msgid "udevil: error 60: no udev device for device %s\n" -msgstr "" +msgstr "udevil: erro 60: nenhum dispositivo udev para o dispositivo %s\n" #: ../src/udevil.c:3134 #, c-format msgid "udevil: error 61: unable to get device info for device %s\n" -msgstr "" +msgstr "udevil: erro 61: impossível obter informação do dispositivo para o dispositivo %s\n" #: ../src/udevil.c:3157 #, c-format msgid "udevil: error 62: type %s is invalid for block device\n" -msgstr "" +msgstr "udevil: erro 62: tipo de %s é inválido para dispositivo de bloco\n" #: ../src/udevil.c:3177 msgid "udevil: error 143: unable to determine device fstype\n" -msgstr "" +msgstr "udevil: erro 143: impossível determinar o sistema de arquivos do dispositivo tipo\n" #: ../src/udevil.c:3180 #, c-format msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" -msgstr "" +msgstr "udevil: erro 63: nenhuma mídia no dispositivo %s (ou especificar tipo com -t)\n" #: ../src/udevil.c:3183 msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" -msgstr "" +msgstr "udevil: erro 64: impossível determinar dispositivo - especificar com -t\n" #: ../src/udevil.c:3243 #, c-format msgid "udevil: denied 65: device %s is not mounted\n" -msgstr "" +msgstr "udevil: recusado 65: o dispositivo %s não está montado\n" #: ../src/udevil.c:3246 #, c-format msgid "udevil: denied 66: could not find mount point for '%s'\n" -msgstr "" +msgstr "udevil: recusado 66: impossível encontrar o ponto de montagem para '%s'\n" #: ../src/udevil.c:3266 msgid "udevil: error 67: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: erro 67: não pode aceitar o ponto de montagem para o caminho\n" #: ../src/udevil.c:3277 #, c-format msgid "udevil: error 68: cannot stat '%s'\n" -msgstr "" +msgstr "udevil: erro 68: impossível obter estado '%s'\n" #: ../src/udevil.c:3295 msgid "udevil: error 69: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: erro 69: não pode aceitar o ponto de montagem para o caminho\n" #: ../src/udevil.c:3306 msgid "udevil: error 70: cannot canonicalize mount point path\n" -msgstr "" +msgstr "udevil: erro 70: não pode aceitar o ponto de montagem para o caminho\n" #: ../src/udevil.c:3316 #, c-format msgid "udevil: denied 71: '%s' is not an allowed media directory\n" -msgstr "" +msgstr "udevil: recusado 71: '%s' não é um diretório de mídia permitido\n" #: ../src/udevil.c:3328 msgid "udevil: error 72: multiple fstypes not allowed\n" -msgstr "" +msgstr "udevil: erro 72: vários tipos de sistema de arquivo não permitidos\n" #: ../src/udevil.c:3334 #, c-format msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" -msgstr "" +msgstr "udevil: recusado 73: sistema de arquivo '%s' não é um tipo permitido\n" #: ../src/udevil.c:3343 msgid "udevil: error 74: could not get username\n" -msgstr "" +msgstr "udevil: erro 74: não foi possível obter nome do usuário\n" #: ../src/udevil.c:3351 #, c-format msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" -msgstr "" +msgstr "udevil: recusado 75: usuário '%s' (%s) não é em usuário autorizado\n" #: ../src/udevil.c:3373 #, c-format msgid "udevil: denied 77: user %s is not in allowed groups\n" -msgstr "" +msgstr "udevil: recusado 77: usuário %s não é permitido em grupos\n" #: ../src/udevil.c:3385 #, c-format msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" -msgstr "" +msgstr "udevil: recusao 78: host '%s' (%s) não é uma rede permitida\n" #: ../src/udevil.c:3391 #, c-format msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" -msgstr "" +msgstr "udevil: recusado 79: host '%s' (%s) é uma rede proibida\n" #: ../src/udevil.c:3406 #, c-format msgid "udevil: denied 80: device %s is not an allowed device\n" -msgstr "" +msgstr "udevil: recusado 80: dispositivo %s não é um dispositivo permitido\n" #: ../src/udevil.c:3413 #, c-format msgid "udevil: denied 81: device %s is a forbidden device\n" -msgstr "" +msgstr "udevil: recusado 81: dispositivo %s é um dispositivo proibido\n" #: ../src/udevil.c:3429 #, c-format msgid "udevil: denied 82: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: recusado 82: '%s' não é um arquivo permitido\n" #: ../src/udevil.c:3436 #, c-format msgid "udevil: denied 83: you don't have read permission for file '%s'\n" -msgstr "" +msgstr "udevil: recusado 83: você não tem permissão de leitura para o arquivo '%s'\n" #: ../src/udevil.c:3447 #, c-format msgid "udevil: denied 145: cannot open '%s'\n" -msgstr "" +msgstr "udevil: recusado 145: não pode abrir '%s'\n" #: ../src/udevil.c:3460 msgid "udevil: error 146: path changed\n" -msgstr "" +msgstr "udevil: erro 146: caminho alterado\n" #: ../src/udevil.c:3468 msgid "udevil: error 84: cannot specify mount point for directory\n" -msgstr "" +msgstr "udevil: erro 84: impossível especificar o ponto de montagem para o diretório\n" #: ../src/udevil.c:3488 #, c-format msgid "udevil: denied 85: %s is attached to an invalid file\n" -msgstr "" +msgstr "udevil: recusado 85: %s está ligado a um arquivo inválido\n" #: ../src/udevil.c:3496 #, c-format msgid "udevil: denied 86: '%s' is not a permitted file\n" -msgstr "" +msgstr "udevil: recusado 86: '%s' não é um arquivo permitido\n" #: ../src/udevil.c:3506 #, c-format msgid "udevil: denied 87: '%s' is not an allowed file\n" -msgstr "" +msgstr "udevil: recusado 87: '%s' não é um arquivo permitido\n" #: ../src/udevil.c:3527 #, c-format msgid "udevil: denied 88: device %s is an internal device and you're not root\n" -msgstr "" +msgstr "udevil: recusado 88: dispositivo %s é um dispositivo interno e você não está como administrador\n" #: ../src/udevil.c:3729 #, c-format msgid "udevil: error 89: options contain an invalid character ('%c')\n" -msgstr "" +msgstr "udevil: erro 89: opções contêm um caracter inválido ('%c')\n" #: ../src/udevil.c:3738 #, c-format msgid "udevil: denied 90: option '%s' is not an allowed option\n" -msgstr "" +msgstr "udevil: recusado 90: opção '%s' não é uma opção permitida\n" #: ../src/udevil.c:3749 msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" -msgstr "" +msgstr "udevil: recusado 91: impossível usar a opção com ação para remontar FTP ou sshfs\n" #: ../src/udevil.c:3758 msgid "udevil: denied 149: cannot use remount option with file\n" -msgstr "" +msgstr "udevil: recusado 149: não pode usar a opção remontar com o arquivo\n" #: ../src/udevil.c:3777 #, c-format msgid "" "udevil: denied 92: device %s is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: recusado 92: dispositivo %s já está montado (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3788 #, c-format msgid "" "udevil: denied 93: file %s is already mounted at %s (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: recusado 93: o arquivo %s já está montado em %s (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3792 #, c-format -msgid "udevil: denied 94: file %s is already mounted (or specify mount point)\n" +msgid "udevil: denied 94: file %s is already attached to loop device\n" msgstr "" #: ../src/udevil.c:3800 #, c-format msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: recusado 95: %s já está montado (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3812 msgid "" "udevil: warning 96: fstype ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: alerta 96: tipo de sistema de arquivo ignorado para o dispositivo em fstab (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3815 msgid "" "udevil: warning 97: options ignored for device in fstab (or specify mount " "point)\n" -msgstr "" +msgstr "udevil: alerta 97: ignorada as opções para o dispositivo em fstab (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3857 #, c-format msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" -msgstr "" +msgstr "udevil: recusado 98: '%s' já está montado (ou especificar o ponto de montagem)\n" #: ../src/udevil.c:3860 #, c-format msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" -msgstr "" +msgstr "udevil: recusado 99: impossível montar '%s' (não está no fstab?)\n" #: ../src/udevil.c:3874 msgid "udevil: denied 100: must specify device or network for remount\n" -msgstr "" +msgstr "udevil: recusado 100: deve especificar o dispositivo ou rede para remontar\n" #: ../src/udevil.c:3880 msgid "udevil: warning 101: specified mount point with remount ignored\n" -msgstr "" +msgstr "udevil: recusado 101: ponto de montagem especificado com remontagem ignorado\n" #: ../src/udevil.c:3925 #, c-format msgid "udevil: warning 102: device %s is already mounted on %s\n" -msgstr "" +msgstr "udevil: alerta 102: dispositivo %s já está montado em %s\n" #: ../src/udevil.c:3937 msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" -msgstr "" +msgstr "udevil: erro 103: nenhum diretório válido existente no allowed_media_dirs\n" #: ../src/udevil.c:4051 #, c-format msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" -msgstr "" +msgstr "udevil: erro 104: ponto de montagem '%s' não contém uma sequência de caracteres UTF8 válido\n" #: ../src/udevil.c:4073 #, c-format msgid "udevil: error 105: mkdir '%s' failed\n" -msgstr "" +msgstr "udevil: error 105: mkdir '%s' falhou\n" #. try cifs as guest first #: ../src/udevil.c:4106 #, c-format msgid "udevil: trying %s as guest\n" -msgstr "" +msgstr "udevil: tentativa %s como convidado\n" #: ../src/udevil.c:4117 #, c-format msgid "udevil: trying with %s\n" -msgstr "" +msgstr "udevil: tentando com %s\n" #: ../src/udevil.c:4164 msgid "" "udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" -msgstr "" +msgstr "udevil: alerta 106: inválido modo_ponto_montagem em udevil.conf - usando 0755\n" #: ../src/udevil.c:4229 #, c-format msgid "udevil: error 107: %s\n" -msgstr "" +msgstr "udevil: erro 107: %s\n" #: ../src/udevil.c:4244 msgid "udevil: error 108: remove requires DEVICE argument\n" -msgstr "" +msgstr "udevil: erro 108: remover requer argumento do DISPOSITIVO\n" #: ../src/udevil.c:4250 #, c-format msgid "udevil: error 109: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 109: impossível obter estado %s: %s\n" #: ../src/udevil.c:4258 #, c-format msgid "udevil: error 110: %s is not a block device\n" -msgstr "" +msgstr "udevil: erro 110: %s não é um dispositivo de bloco\n" #: ../src/udevil.c:4265 msgid "udevil: error 111: error initializing libudev\n" -msgstr "" +msgstr "udevil: erro 111: erro ao inicializar libudev\n" #: ../src/udevil.c:4272 #, c-format msgid "udevil: error 112: no udev device for device %s\n" -msgstr "" +msgstr "udevil: erro 112: nenhum dispositivo udev para o dispositivo %s\n" #: ../src/udevil.c:4281 msgid "udevil: error 113: unable to get device info\n" -msgstr "" +msgstr "udevil: erro 113: impossível obter informação do dispositivo\n" #: ../src/udevil.c:4293 #, c-format msgid "" "udevil: warning 114: device %s is an internal device - not unbinding " "driver\n" -msgstr "" +msgstr "udevil: alerta 114: o dispositivo %s é um dispositivo interno - driver não desvinculado\n" #: ../src/udevil.c:4304 msgid "" "udevil: warning 115: interface is not usb, firewire, sdio, esata - not " "unbinding driver\n" -msgstr "" +msgstr "udevil: alerta 115: interface não é usb, firewire, sdio, esata - driver não desvinculado\n" #: ../src/udevil.c:4312 #, c-format msgid "udevil: denied 116: device %s is not an allowed device\n" -msgstr "" +msgstr "udevil: recusado 116: dispositivo %s não é um dispositivo permitido\n" #: ../src/udevil.c:4318 #, c-format msgid "udevil: denied 117: device %s is a forbidden device\n" -msgstr "" +msgstr "udevil: recusado 117: dispositivo %s é um dispositivo ilegal\n" #: ../src/udevil.c:4356 #, c-format msgid "udevil: unmount %s\n" -msgstr "" +msgstr "udevil: desmontar %s\n" #: ../src/udevil.c:4390 #, c-format msgid "udevil: error 118: unable to access dir %s\n" -msgstr "" +msgstr "udevil: erro 118: impossível acessar o diretório %s\n" #: ../src/udevil.c:4415 #, c-format msgid "udevil: examining partition %s\n" -msgstr "" +msgstr "udevil: verificando partição %s\n" #. unmount partition #: ../src/udevil.c:4420 #, c-format msgid "udevil: unmount partition %s\n" -msgstr "" +msgstr "udevil: desmontar partição %s\n" #: ../src/udevil.c:4472 #, c-format msgid "udevil: error 119: unable to find host for %s\n" -msgstr "" +msgstr "udevil: erro 119: incapaz de encontrar host para %s\n" #: ../src/udevil.c:4478 #, c-format msgid "udevil: error 120: unable to find host for %s\n" -msgstr "" +msgstr "udevil: erro 120: incapaz de encontrar o host para %s\n" #: ../src/udevil.c:4487 #, c-format msgid "udevil: error 121: unable to find last component for %s\n" -msgstr "" +msgstr "udevil: erro 121: impossível encontrar o último componente do %s\n" #: ../src/udevil.c:4511 #, c-format msgid "udevil: warning 122: missing power autosuspend %s\n" -msgstr "" +msgstr "udevil: alerta 122: falta de energia suspensão automática %s\n" #: ../src/udevil.c:4523 #, c-format msgid "udevil: warning 123: missing power control %s\n" -msgstr "" +msgstr "udevil: alerta 123: falta do controle de energia %s\n" #: ../src/udevil.c:4552 #, c-format msgid "udevil: error 124: %s\n" -msgstr "" +msgstr "udevil: erro 124: %s\n" #: ../src/udevil.c:4633 msgid "udevil: error 126: info requires DEVICE argument\n" -msgstr "" +msgstr "udevil: erro 126: informação requer argumento do DISPOSITIVO\n" #: ../src/udevil.c:4639 #, c-format msgid "udevil: error 127: cannot stat %s: %s\n" -msgstr "" +msgstr "udevil: erro 127: impossível obter estado %s: %s\n" #: ../src/udevil.c:4647 #, c-format msgid "udevil: error 128: %s is not a block device\n" -msgstr "" +msgstr "udevil: erro 128: %s não é um dispositivo de bloco\n" #: ../src/udevil.c:4654 msgid "udevil: error 129: error initializing libudev\n" -msgstr "" +msgstr "udevil: erro 129: erro ao inicializar libudev\n" #: ../src/udevil.c:4661 #, c-format msgid "udevil: error 130: no udev device for device %s\n" -msgstr "" +msgstr "udevil: erro 130: nenhum dispositivo udev para o dispositivo %s\n" #: ../src/udevil.c:4677 msgid "udevil: error 131: unable to get device info\n" -msgstr "" +msgstr "udevil: erro 131: impossível recuperar informações do dispositivo\n" #: ../src/udevil.c:4729 msgid "udevil: error 132: unable to initialize udev\n" -msgstr "" +msgstr "udevil: erro 132: impossível inicializar udev\n" #: ../src/udevil.c:4740 msgid "udevil: error 133: cannot create udev monitor\n" -msgstr "" +msgstr "udevil: erro 133: impossível criar monitor udev\n" #: ../src/udevil.c:4745 msgid "udevil: error 134: cannot enable udev monitor receiving\n" -msgstr "" +msgstr "udevil: erro 134: impossível permitir monitor receber udev\n" #: ../src/udevil.c:4750 msgid "udevil: error 135: cannot set udev filter\n" -msgstr "" +msgstr "udevil: erro 135: impossível definir filtro udev\n" #: ../src/udevil.c:4757 msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" -msgstr "" +msgstr "udevil: erro 136: não é possível obter udev monitor descritor de arquivo de soquete\n" #: ../src/udevil.c:4778 #, c-format msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" -msgstr "" +msgstr "udevil: erro 137: monitorando /proc/self/mountinfo: %s\n" #: ../src/udevil.c:4829 #, c-format msgid "" "Mounts and unmounts devices without password, shows device info, monitors\n" -msgstr "" +msgstr "Monta e desmonta dispositivos sem a necessiade de senha. Mostra informações e monitora\n" #: ../src/udevil.c:4830 #, c-format msgid "" "device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" -msgstr "" +msgstr "alterações dos dispositivos. Emula o uso de linha de comando udisks1/2 e saída de udisks1.\n" #: ../src/udevil.c:4831 #, c-format msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" -msgstr "" +msgstr "Uso: udevil [OPÇÕES] COMANDO [OPÇÕES-DE-COMANDO] [ARGUMENTOS-DE-COMANDO]\n" #: ../src/udevil.c:4832 #, c-format msgid "OPTIONS:\n" -msgstr "" +msgstr "OPÇÕES:\n" #: ../src/udevil.c:4833 msgid "print details" -msgstr "" +msgstr "mostrar detalhes" #: ../src/udevil.c:4834 msgid "minimal output" -msgstr "" +msgstr "saída mínima" #: ../src/udevil.c:4835 #, c-format msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" -msgstr "" +msgstr "MOUNT - Monta o DISPOSITIVO no ponto de montagem DIR com OPÇÕES-DE-MONTAGEM:\n" #: ../src/udevil.c:4836 #, c-format msgid "" " udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " "[DIR]\n" -msgstr "" +msgstr " udevil mount|--mount [OPÇÕES-DE-MONTAGEM] [[-b|--block-device] DISPOSITIVO] [DIRETÓRIO]\n" #: ../src/udevil.c:4837 #, c-format msgid " MOUNT-OPTIONS:\n" -msgstr "" +msgstr " OPÇÕES DE MONTAGEM:\n" #: ../src/udevil.c:4838 ../src/udevil.c:4839 msgid "see man mount" -msgstr "" +msgstr "ver man mount" #. printf( " -L LABEL mount device by #. label LABEL\n" ); @@ -848,88 +852,88 @@ #. UUID\n" ); #: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 msgid "ignored (for compatibility)" -msgstr "" +msgstr "ignorado (para compatibilidade)" #: ../src/udevil.c:4843 ../src/udevil.c:4878 msgid "EXAMPLES" -msgstr "" +msgstr "EXEMPLOS" #. printf( " udevil mount -L 'Disk Label'\n" ); #: ../src/udevil.c:4848 msgid "ISO file" -msgstr "" +msgstr "Arquivo ISO" #: ../src/udevil.c:4849 msgid "ftp site - requires" -msgstr "" +msgstr "site FTP - necessário" #: ../src/udevil.c:4850 msgid "or" -msgstr "" +msgstr "ou" #: ../src/udevil.c:4851 ../src/udevil.c:4853 msgid "ftp share with" -msgstr "" +msgstr "ftp partes com" #: ../src/udevil.c:4852 msgid "user and password" -msgstr "" +msgstr "usuário e senha" #: ../src/udevil.c:4854 msgid "port, user and password" -msgstr "" +msgstr "porta, usuário e senha" #: ../src/udevil.c:4855 msgid "ftp site with ftpfs" -msgstr "" +msgstr "site ftp com ftpfs" #: ../src/udevil.c:4856 msgid "ftp site with curl" -msgstr "" +msgstr "site ftp com ondulação" #: ../src/udevil.c:4857 msgid "ftp site with curl u/p" -msgstr "" +msgstr "site ftp com ondulação u/p" #: ../src/udevil.c:4858 ../src/udevil.c:4859 msgid "nfs share" -msgstr "" +msgstr "compartilha nfs " #: ../src/udevil.c:4860 ../src/udevil.c:4863 msgid "samba share w/ cifs" -msgstr "" +msgstr "compartilha samba w/ cifs" #: ../src/udevil.c:4861 msgid "samba share w/ u/p/port" -msgstr "" +msgstr "compartilha samba w/ u/p/port" #: ../src/udevil.c:4862 msgid "samba share w/ workgroup" -msgstr "" +msgstr "compartilha samba w/ grupo de trabalho" #: ../src/udevil.c:4864 msgid "samba share w/ smbfs" -msgstr "" +msgstr "compartilha samba w/ smbfs" #: ../src/udevil.c:4865 msgid "sshfs with user - " -msgstr "" +msgstr "sshfs com o usuário - " #: ../src/udevil.c:4866 msgid "requires sshfs" -msgstr "" +msgstr "necessário sshfs" #: ../src/udevil.c:4867 msgid "sshfs with user" -msgstr "" +msgstr "sshfs com o usuário" #: ../src/udevil.c:4868 msgid "WebDAV - requires davfs2" -msgstr "" +msgstr "WebDAV - necessário davfs2" #: ../src/udevil.c:4869 msgid "make a ram drive" -msgstr "" +msgstr "criar uma unidade de RAM" #: ../src/udevil.c:4870 #, c-format @@ -937,121 +941,121 @@ "\n" " WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" "\n" -msgstr "" +msgstr "\n ATENÇÃO !!! uso de senha em linha de comando NÃO É SEGURO - ver documentação do sistema de arquivos\n" #: ../src/udevil.c:4871 #, c-format msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" -msgstr "" +msgstr "UNMOUNT - Desmontar DISPOSITIVO ou DIRETÓRIO usando OPÇÕES-DESMONTAGEM:\n" #: ../src/udevil.c:4872 #, c-format msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" -msgstr "" +msgstr " udevil umount|unmount|--unmount|--umount [OPÇÕES-DE-DESMONTAGEM] \n" #: ../src/udevil.c:4873 #, c-format msgid "" " {[-b|--block-device] " "DEVICE}|DIR\n" -msgstr "" +msgstr " {[-b|--block-device] DISPOSITIVO}|DIRETÓRIO\n" #: ../src/udevil.c:4874 #, c-format msgid " UNMOUNT-OPTIONS:\n" -msgstr "" +msgstr " OPÇÕES DE DESMONTAGENS:\n" #: ../src/udevil.c:4875 ../src/udevil.c:4887 msgid "lazy unmount (see man umount)" -msgstr "" +msgstr "desmontagem lenta (ver man umount)" #: ../src/udevil.c:4876 ../src/udevil.c:4888 msgid "force unmount (see man umount)" -msgstr "" +msgstr "forçar desmontagem (ver man umount)" #: ../src/udevil.c:4883 #, c-format msgid "" "REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" -msgstr "" +msgstr "REMOVE - Desmontar todas as partições no host do dispositivo e prepare-se para uma remoção\n" #: ../src/udevil.c:4884 #, c-format msgid " removal (sync, stop, unbind driver, and power off):\n" -msgstr "" +msgstr " segura (sincronizar, parar, desvincular o driver e desligar):\n" #: ../src/udevil.c:4885 #, c-format msgid "" " udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" -msgstr "" +msgstr " udevil remove|--remove|--detach [OPÇÕES] [-b|--block-device] DISPOSITIVO\n" #: ../src/udevil.c:4886 #, c-format msgid " OPTIONS:\n" -msgstr "" +msgstr " OPÇÕES:\n" #: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 msgid "EXAMPLE" -msgstr "" +msgstr "EXEMPLO" #: ../src/udevil.c:4892 #, c-format msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" -msgstr "" +msgstr "INFO - Mostra informações do DISPOSITIVO emulando udisks v1 saída:\n" #: ../src/udevil.c:4893 #, c-format msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" -msgstr "" +msgstr " udevil info|--show-info|--info [-b|--block-device] DISPOSITIVO\n" #: ../src/udevil.c:4895 #, c-format msgid "MONITOR - Display device events emulating udisks v1 output:\n" -msgstr "" +msgstr "MONITORAR - Mostra eventos dos dispositivos emulando udisks v1 saída\n" #: ../src/udevil.c:4898 #, c-format msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" -msgstr "" +msgstr "CLEAN - Remove pastas criadas por udevil desmontado as pastas de mídia\n" #: ../src/udevil.c:4900 #, c-format msgid "HELP - Show this help\n" -msgstr "" +msgstr "HELP - Mostrar esta ajuda\n" #: ../src/udevil.c:4903 msgid "See /etc/udevil/udevil.conf for config." -msgstr "" +msgstr "Ver /etc/udevil/udevil.conf para configuração." #: ../src/udevil.c:4904 #, c-format msgid "For automounting with udevil run 'devmon --help'\n" -msgstr "" +msgstr "Para executar montagem automática com udevil 'devmon --help'\n" #: ../src/udevil.c:5001 msgid "udevil: read config /etc/udevil/udevil.conf\n" -msgstr "" +msgstr "udevil: lendo configuração /etc/udevil/udevil.conf\n" #: ../src/udevil.c:5050 msgid "udevil: error 138: argument is not valid UTF-8\n" -msgstr "" +msgstr "udevil: erro 138: argumento UTF-8 não é válido\n" #: ../src/udevil.c:5352 msgid "udevil: error 139: too many arguments\n" -msgstr "" +msgstr "udevil: erro 139: muitos argumentos\n" #: ../src/udevil.c:5355 #, c-format msgid "udevil: error 140: option '%s' requires an argument\n" -msgstr "" +msgstr "udevil: erro 140: a opção '%s' requer um argumento\n" #: ../src/udevil.c:5359 #, c-format msgid "udevil: error 141: invalid option '%s'\n" -msgstr "" +msgstr "udevil: erro 141: a opção '%s' é inválida\n" #: ../src/udevil.c:5361 #, c-format msgid "udevil: error 142: invalid or unexpected argument '%s'\n" -msgstr "" +msgstr "udevil: erro 142: o argumento '%s' é inválido ou inesperado\n" diff -Nru udevil-0.4.1/po/ru.po udevil-0.4.3/po/ru.po --- udevil-0.4.1/po/ru.po 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/ru.po 2013-12-09 13:59:27.000000000 +0000 @@ -1,18 +1,22 @@ # udevil PO Template http://ignorantguru.github.com/udevil/ -# This file is distributed under the same copyright and license as the SpaceFM +# This file is distributed under the same copyright and license as the udevil # package. # # Translators: -# Vladimir Kudrya , 2012. -# Vladimir Lomov , 2012. +# wandows , 2013 +# wandows , 2013 +# Vladimir.csp , 2012 +# Vladimir.csp , 2012 +# Vladimir Lomov , 2012 +# vp1981 , 2012-2013 msgid "" msgstr "" "Project-Id-Version: udevil\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-13 22:35+0000\n" -"PO-Revision-Date: 2013-02-13 22:46+0000\n" -"Last-Translator: ignorantguru \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-12-06 14:57+0000\n" +"Last-Translator: ignorantguru \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/udevil/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -112,7 +116,7 @@ #. log #: ../src/udevil.c:2039 msgid "udevil: trying umount as current user\n" -msgstr "udevil: попытка монтирования от текущего пользователя\n" +msgstr "udevil: попытка выполнения umount от имени текущего пользователя\n" #: ../src/udevil.c:2052 #, c-format @@ -274,11 +278,11 @@ #: ../src/udevil.c:2763 msgid "udevil: error 38: mount requires DEVICE argument\n" -msgstr "udevil: ошибка 38: mount требует аргумента DEVICE\n" +msgstr "udevil: ошибка 38: для mount необходим аргумент УСТРОЙСТВО\n" #: ../src/udevil.c:2765 msgid "udevil: error 39: unmount requires DEVICE argument\n" -msgstr "udevil: ошибка 39: unmount требует аргумента DEVICE\n" +msgstr "udevil: ошибка 39: для unmount необходим аргумент УСТРОЙСТВО\n" #: ../src/udevil.c:2810 #, c-format @@ -309,13 +313,13 @@ msgid "" "udevil: warning 44: fstype ignored for device in fstab (or specify mount " "point)\n" -msgstr "udevil: предупреждение 44: тип ФС игнорируется для устройства в fstab (или можно указать точку монтирования)\n" +msgstr "udevil: предупреждение 44: тип ФС игнорируется для устройства в fstab (или укажите точку монтирования)\n" #: ../src/udevil.c:2885 msgid "" "udevil: warning 45: options ignored for device in fstab (or specify mount " "point)\n" -msgstr "udevil: предупреждение 45: параметры монтирования игнорируются для устройства в fstab (или можно указать точку монтирования)\n" +msgstr "udevil: предупреждение 45: параметры монтирования игнорируются для устройства в fstab (или укажите точку монтирования)\n" #: ../src/udevil.c:2956 #, c-format @@ -400,7 +404,7 @@ #: ../src/udevil.c:3177 msgid "udevil: error 143: unable to determine device fstype\n" -msgstr "udevil: ошибка 143: невозможно определить тип ФС\n" +msgstr "udevil: ошибка 143: невозможно определить тип ФС устройства\n" #: ../src/udevil.c:3180 #, c-format @@ -409,7 +413,7 @@ #: ../src/udevil.c:3183 msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" -msgstr "udevil: ошибка 64: невозможно определить тип ФС — укажите с помощью -t\n" +msgstr "udevil: ошибка 64: невозможно определить тип ФС устройства — укажите с помощью -t\n" #: ../src/udevil.c:3243 #, c-format @@ -419,7 +423,7 @@ #: ../src/udevil.c:3246 #, c-format msgid "udevil: denied 66: could not find mount point for '%s'\n" -msgstr "udevil: отказано 66: невозможно найти точку монтирования для «%s»\n" +msgstr "udevil: отказано 66: не удалось найти точку монтирования для «%s»\n" #: ../src/udevil.c:3266 msgid "udevil: error 67: cannot canonicalize mount point path\n" @@ -441,7 +445,7 @@ #: ../src/udevil.c:3316 #, c-format msgid "udevil: denied 71: '%s' is not an allowed media directory\n" -msgstr "udevil: ошибка 71: «%s» не является разрешённым каталогом монтирования\n" +msgstr "udevil: отказано 71: «%s» не является разрешённым каталогом монтирования\n" #: ../src/udevil.c:3328 msgid "udevil: error 72: multiple fstypes not allowed\n" @@ -454,7 +458,7 @@ #: ../src/udevil.c:3343 msgid "udevil: error 74: could not get username\n" -msgstr "udevil: ошибка 74: невозможно получить имя пользователя\n" +msgstr "udevil: ошибка 74: не удалось получить имя пользователя\n" #: ../src/udevil.c:3351 #, c-format @@ -541,7 +545,7 @@ #: ../src/udevil.c:3749 msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" -msgstr "udevil: отказано 91: ресурсы FTP или sshfs невозможно перемонтировать\n" +msgstr "udevil: отказано 91: нельзя использовать опцию remount для ресурсов FTP или sshfs\n" #: ../src/udevil.c:3758 msgid "udevil: denied 149: cannot use remount option with file\n" @@ -562,8 +566,8 @@ #: ../src/udevil.c:3792 #, c-format -msgid "udevil: denied 94: file %s is already mounted (or specify mount point)\n" -msgstr "udevil: отказано 94: файл %s уже примонтирован (или укажите точку монтирования)\n" +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "udevil: отказано 94: файл %s уже присоединён к loop-устройству\n" #: ../src/udevil.c:3800 #, c-format @@ -598,7 +602,7 @@ #: ../src/udevil.c:3880 msgid "udevil: warning 101: specified mount point with remount ignored\n" -msgstr "udevil: предупреждение 101: точка монтирования игнорируется при перемонтировании\n" +msgstr "udevil: предупреждение 101: указанная точка монтирования с опцией remount игнорируется\n" #: ../src/udevil.c:3925 #, c-format @@ -607,7 +611,7 @@ #: ../src/udevil.c:3937 msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" -msgstr "udevil: ошибка 103: в allowed_media_dirs нет корректного существующего каталога\n" +msgstr "udevil: ошибка 103: в allowed_media_dirs не указано ни одного корректного существующего каталога\n" #: ../src/udevil.c:4051 #, c-format @@ -642,7 +646,7 @@ #: ../src/udevil.c:4244 msgid "udevil: error 108: remove requires DEVICE argument\n" -msgstr "udevil: ошибка 108: remove требует аргумента DEVICE\n" +msgstr "udevil: ошибка 108: для remove необходим аргумент УСТРОЙСТВО\n" #: ../src/udevil.c:4250 #, c-format @@ -743,7 +747,7 @@ #: ../src/udevil.c:4633 msgid "udevil: error 126: info requires DEVICE argument\n" -msgstr "udevil: ошибка 126: info требует аргумента DEVICE\n" +msgstr "udevil: ошибка 126: для info необходим аргумент УСТРОЙСТВО\n" #: ../src/udevil.c:4639 #, c-format @@ -808,7 +812,7 @@ #: ../src/udevil.c:4831 #, c-format msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" -msgstr "Использование: udevil [ПАРАМЕТРЫ] КОМАНДА [ПАРАМЕТРЫ_КОМАНДЫ] [АРГУМЕНТЫ_КОМАНДЫ]\n" +msgstr "Использование: udevil [ПАРАМЕТРЫ] КОМАНДА [ПАРАМЕТРЫ-КОМАНДЫ] [АРГУМЕНТЫ-КОМАНДЫ]\n" #: ../src/udevil.c:4832 #, c-format @@ -842,7 +846,7 @@ #: ../src/udevil.c:4838 ../src/udevil.c:4839 msgid "see man mount" -msgstr "смотрите man mount" +msgstr "см. man mount" #. printf( " -L LABEL mount device by #. label LABEL\n" ); @@ -899,11 +903,11 @@ #: ../src/udevil.c:4860 ../src/udevil.c:4863 msgid "samba share w/ cifs" -msgstr "ресурс samba с: cifs" +msgstr "ресурс samba с cifs" #: ../src/udevil.c:4861 msgid "samba share w/ u/p/port" -msgstr "ресурс samba с: пользователь/пароль/порт" +msgstr "ресурс samba с пользователь/пароль/порт" #: ../src/udevil.c:4862 msgid "samba share w/ workgroup" @@ -911,7 +915,7 @@ #: ../src/udevil.c:4864 msgid "samba share w/ smbfs" -msgstr "ресурс samba с: smbfs" +msgstr "ресурс samba с smbfs" #: ../src/udevil.c:4865 msgid "sshfs with user - " @@ -927,7 +931,7 @@ #: ../src/udevil.c:4868 msgid "WebDAV - requires davfs2" -msgstr "WebDAV - требует davfs2" +msgstr "WebDAV — требует davfs2" #: ../src/udevil.c:4869 msgid "make a ram drive" @@ -939,7 +943,7 @@ "\n" " WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" "\n" -msgstr "\n ВНИМАНИЕ !!! прописывание пароля в командной строке НЕБЕЗОПАСНО - см. документацию по ФС\n\n" +msgstr "\n ВНИМАНИЕ !!! указание пароля в командной строке НЕБЕЗОПАСНО — см. документацию по ФС\n\n" #: ../src/udevil.c:4871 #, c-format @@ -965,11 +969,11 @@ #: ../src/udevil.c:4875 ../src/udevil.c:4887 msgid "lazy unmount (see man umount)" -msgstr "lazy unmount (смотри man umount)" +msgstr "lazy unmount (см. man umount)" #: ../src/udevil.c:4876 ../src/udevil.c:4888 msgid "force unmount (see man umount)" -msgstr "force unmount (смотри man umount)" +msgstr "force unmount (см. man umount)" #: ../src/udevil.c:4883 #, c-format @@ -1024,7 +1028,7 @@ #: ../src/udevil.c:4903 msgid "See /etc/udevil/udevil.conf for config." -msgstr "Смотри /etc/udevil/udevil.conf для конфигурации." +msgstr "См. /etc/udevil/udevil.conf для конфигурации." #: ../src/udevil.c:4904 #, c-format diff -Nru udevil-0.4.1/po/sv.po udevil-0.4.3/po/sv.po --- udevil-0.4.1/po/sv.po 1970-01-01 00:00:00.000000000 +0000 +++ udevil-0.4.3/po/sv.po 2013-12-09 13:59:27.000000000 +0000 @@ -0,0 +1,1060 @@ +# udevil PO Template http://ignorantguru.github.com/udevil/ +# This file is distributed under the same copyright and license as the udevil +# package. +# +# Translators: +# ignorantguru , 2013 +# ignorantguru , 2013 +# Ingemar Karlsson , 2013 +msgid "" +msgstr "" +"Project-Id-Version: udevil\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" +"PO-Revision-Date: 2013-11-20 09:33+0000\n" +"Last-Translator: Ingemar Karlsson \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/udevil/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../src/udevil.c:612 +#, c-format +msgid "" +"udevil: error 1: unable to drop priviledges - please report this problem\n" +msgstr "udevil: error 1: oförmögen att sänka behörigheter - vänligen rapportera problemet\n" + +#: ../src/udevil.c:804 +#, c-format +msgid "udevil: error 2: %s line %d is not valid UTF-8\n" +msgstr "udevil: fel 2: %s rad %d är inte giltig UTF-8\n" + +#: ../src/udevil.c:810 +#, c-format +msgid "udevil: error 3: %s line %d is too long\n" +msgstr "udevil: fel 3: %s rad %d är för lång\n" + +#: ../src/udevil.c:820 +#, c-format +msgid "udevil: error 4: %s line %d syntax error:\n" +msgstr "udevil: fel 4: %s rad %d syntax fel:\n" + +#: ../src/udevil.c:833 +#, c-format +msgid "udevil: error 5: %s line %d syntax error:\n" +msgstr "udevil: fel 5: %s rad %d syntax fel:\n" + +#: ../src/udevil.c:840 +#, c-format +msgid "udevil: error 6: %s line %d duplicate assignment:\n" +msgstr "udevil: fel 6: %s rad %d dubblerad tilldelning:\n" + +#: ../src/udevil.c:903 +#, c-format +msgid "udevil: warning 7: /etc/udevil/udevil.conf could not be read\n" +msgstr "udevil: varning 7: /etc/udevil/udevil.conf kunde inte läsas\n" + +#: ../src/udevil.c:913 +#, c-format +msgid "udevil: read config %s\n" +msgstr "udevil: läs konfigurationen %s\n" + +#: ../src/udevil.c:1152 +#, c-format +msgid "udevil: error 8: failed writing to log file '%s'\n" +msgstr "udevil: fel 8: kunde inte skriva till log fil '%s'\n" + +#: ../src/udevil.c:1488 ../src/udevil.c:1530 ../src/udevil.c:1592 +#: ../src/udevil.c:1635 +#, c-format +msgid "udevil: warning 9: unable to run losetup (%s)\n" +msgstr "udevil: varning 9: kunde inte köra losetup (%s)\n" + +#: ../src/udevil.c:1543 +msgid "udevil: error 147: unable to get free loop device\n" +msgstr "udevil: fel 147: oförmögen att få ledig loopenhet\n" + +#: ../src/udevil.c:1552 +msgid "udevil: error 150: path changed\n" +msgstr "udevil: fel 150: sökväg ändrad\n" + +#: ../src/udevil.c:1692 +#, c-format +msgid "udevil: warning 10: unable to run losetup (%s)\n" +msgstr "udevil: varning 10: kunde inte köra losetup (%s)\n" + +#: ../src/udevil.c:1926 +#, c-format +msgid "udevil: error 11: could not open %s\n" +msgstr "udevil: fel 11: kunde inte öppna %s\n" + +#: ../src/udevil.c:1934 +#, c-format +msgid "udevil: error 12: error writing to %s\n" +msgstr "udevil: fel 12: kunde inte skriva till %s\n" + +#: ../src/udevil.c:1984 +#, c-format +msgid "udevil: error 13: unable to run %s\n" +msgstr "udevil: fel 13: kunde inte köra %s\n" + +#: ../src/udevil.c:1996 +#, c-format +msgid " %s exit status = %d\n" +msgstr " %s exit status = %d\n" + +#: ../src/udevil.c:2001 +#, c-format +msgid "udevil: denied 14: %s returned exit status %d\n" +msgstr "udevil: nekas 14: %s returnerade status %d\n" + +#. log +#: ../src/udevil.c:2039 +msgid "udevil: trying umount as current user\n" +msgstr "udevil: försöker avmontera med aktuell användare\n" + +#: ../src/udevil.c:2052 +#, c-format +msgid "udevil: warning 15: unable to run umount (%s)\n" +msgstr "udevil: varning 15: kunde inte köra umount (%s)\n" + +#: ../src/udevil.c:2057 ../src/udevil.c:2130 +#, c-format +msgid " umount exit status = %d\n" +msgstr " umount avsluts status = %d\n" + +#. success - show output +#: ../src/udevil.c:2066 +msgid "udevil: success running umount as current user\n" +msgstr "udevil: lyckad avmontering som aktuell användare\n" + +#: ../src/udevil.c:2109 ../src/udevil.c:2181 +msgid "udevil: error 144: invalid path\n" +msgstr "udevil: fel 144: ogiltig sökväg\n" + +#: ../src/udevil.c:2120 +#, c-format +msgid "udevil: error 16: unable to run umount (%s)\n" +msgstr "udevil: fel 16: kunde inte köra umount (%s)\n" + +#: ../src/udevil.c:2193 +#, c-format +msgid "udevil: error 17: unable to run mount (%s)\n" +msgstr "udevil: fel 17: kunde inte köra mount (%s)\n" + +#: ../src/udevil.c:2206 +#, c-format +msgid " mount exit status = %d\n" +msgstr " mount avsluts status = %d\n" + +#: ../src/udevil.c:2220 +msgid "udevil: error 148: unable to attach file to loop device\n" +msgstr "udevil: fel 148: oförmögen att ansluta filen till loopenhet\n" + +#: ../src/udevil.c:2264 +#, c-format +msgid "udevil: warning 18: unable to run mount (%s)\n" +msgstr "udevil: varning 18: kunde inte köra mount (%s)\n" + +#: ../src/udevil.c:2281 +#, c-format +msgid "udevil: denied 19: Invalid path\n" +msgstr "udevil: nekad 19: Ogiltig sökväg\n" + +#: ../src/udevil.c:2287 +#, c-format +msgid "udevil: denied 20: mount path '%s' is not a directory\n" +msgstr "udevil: nekad 20: monteringssökväg '%s' är inte en katalog\n" + +#: ../src/udevil.c:2289 +#, c-format +msgid "udevil: denied 21: mount path '%s' is already mounted\n" +msgstr "udevil: nekad 21: monteringssökväg '%s' är redan monterad\n" + +#: ../src/udevil.c:2293 +#, c-format +msgid "udevil: denied 22: cannot stat '%s': %s\n" +msgstr "udevil: nekad 22: kan inte ta status '%s': %s\n" + +#: ../src/udevil.c:2295 +#, c-format +msgid "udevil: denied 23: neither you nor root owns '%s'\n" +msgstr "udevil: nekad 23: varken du eller root äger '%s'\n" + +#: ../src/udevil.c:2332 +#, c-format +msgid "udevil: warning 24: unable to run setfacl (%s)\n" +msgstr "udevil: varning 24: kunde inte köra setfacl (%s)\n" + +#. setfacl apparently failed so fallback to normal permissions +#: ../src/udevil.c:2340 +#, c-format +msgid "udevil: warning 25: setfacl on %s failed, falling back to 'rwxr-xr-x'\n" +msgstr "udevil: varning 25: setfacl på %s misslyckades, faller tillbaka till \"rwxr-xr-x '\n" + +#: ../src/udevil.c:2446 +#, c-format +msgid "" +"udevil: error 26: invalid type '%s' for SMB share - must be cifs or smbfs\n" +msgstr "udevil: fel 26: ogiltig typ '%s' för SMB delning - måste vara cifs eller smbfs\n" + +#: ../src/udevil.c:2461 +#, c-format +msgid "" +"udevil: error 27: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil: fel 27: ogiltig typ '%s' för NFS delning - måste vara nfs eller nfs4\n" + +#: ../src/udevil.c:2474 +#, c-format +msgid "" +"udevil: error 28: invalid type '%s' for curlftpfs share - must be " +"curlftpfs\n" +msgstr "udevil: fel 28: ogiltig typ '%s' för curlftpfs delning - måste vara curlftpfs\n" + +#: ../src/udevil.c:2486 +#, c-format +msgid "" +"udevil: error 29: invalid type '%s' for FTP share - must be curlftpfs or " +"ftpfs\n" +msgstr "udevil: fel 29: ogiltig typ '%s' för FTP delning - måste vara curlftpfs eller ftpfs\n" + +#: ../src/udevil.c:2511 +#, c-format +msgid "udevil: error 30: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil: fel 30: ogiltig typ '%s' för sshfs delning - måste vara sshfs\n" + +#: ../src/udevil.c:2524 +#, c-format +msgid "udevil: error 31: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udevil: fel 31: ogiltig typ '%s' för sshfs delning - måste vara sshfs\n" + +#: ../src/udevil.c:2536 +#, c-format +msgid "udevil: error 151: invalid type '%s' for WebDAV share - must be davfs\n" +msgstr "udevil: fel 151: ogiltig typ '%s' för WebDAV delning - måste vara davfs\n" + +#: ../src/udevil.c:2551 +#, c-format +msgid "udevil: error 32: invalid type '%s' for sshfs share - must be sshfs\n" +msgstr "udvil: fel 32: ogiltig typ '%s' för sshfs delning - måste vara sshfs\n" + +#: ../src/udevil.c:2562 +#, c-format +msgid "" +"udevil: error 33: invalid type '%s' for NFS share - must be nfs or nfs4\n" +msgstr "udevil: fel 33: ogiltig typ '%s' för NFS delning - måste vara nfs eller nfs4\n" + +#: ../src/udevil.c:2679 +#, c-format +msgid "udevil: error 34: '%s' is not a recognized network url\n" +msgstr "udevil: fel 34: '%s' är inte ett igenkänt nätverks url\n" + +#: ../src/udevil.c:2688 +msgid "udevil: error 35: invalid network url\n" +msgstr "udevil: fel 35: ogiltigt nätverks url\n" + +#: ../src/udevil.c:2695 +#, c-format +msgid "udevil: error 36: lookup host '%s' failed\n" +msgstr "udevil: fel 36: lookup värd '%s' misslyckades\n" + +#: ../src/udevil.c:2743 +#, c-format +msgid "udevil: error 37: %s\n" +msgstr "udevil: fel 37: %s\n" + +#: ../src/udevil.c:2744 ../src/udevil.c:4230 ../src/udevil.c:4553 +msgid "udevil was not run suid root" +msgstr "udevil kördes inte suid root" + +#: ../src/udevil.c:2749 ../src/udevil.c:4235 ../src/udevil.c:4558 +msgid "To correct this problem" +msgstr "För att åtgärda detta problem" + +#: ../src/udevil.c:2763 +msgid "udevil: error 38: mount requires DEVICE argument\n" +msgstr "udevil: fel 38: mount behöver ENHET argument\n" + +#: ../src/udevil.c:2765 +msgid "udevil: error 39: unmount requires DEVICE argument\n" +msgstr "udevil: fel 39: umount kräver ENHET argument\n" + +#: ../src/udevil.c:2810 +#, c-format +msgid "udevil: error 40: cannot stat %s: %s\n" +msgstr "udevil: fel 40: kan inte ta status på %s: %s\n" + +#: ../src/udevil.c:2822 +msgid "udevil: error 41: cannot canonicalize device path\n" +msgstr "udevil: error 41: kan inte canonicalize sökväg\n" + +#: ../src/udevil.c:2829 +#, c-format +msgid "udevil: error 42: cannot stat %s: %s\n" +msgstr "udevil: fel 42: kan inte ta status på %s: %s\n" + +#: ../src/udevil.c:2840 +#, c-format +msgid "udevil: error 43: '%s' is not a regular file or directory\n" +msgstr "udevil: fel 43: '%s' är inte en vanlig fil eller katalog\n" + +#. mount knows (in fstab) so mount as normal user with only specified opts +#: ../src/udevil.c:2879 ../src/udevil.c:3809 +#, c-format +msgid "udevil: %s is known to mount - running mount as current user\n" +msgstr "udevil: %s är känd av mount - kör mount som aktuell användare\n" + +#: ../src/udevil.c:2882 +msgid "" +"udevil: warning 44: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: varning 44: filsystemstyp ignoreras för enheten i fstab (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:2885 +msgid "" +"udevil: warning 45: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: varning 45: alternativ ignoreras för enheten i fstab (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:2956 +#, c-format +msgid "udevil: error 46: cannot find '%s' mounted in mtab\n" +msgstr "udevil: fel 46: kan inte hitta '%s' monterad i mtab\n" + +#: ../src/udevil.c:2970 +msgid "udevil: error 47: cannot canonicalize attached loop device\n" +msgstr "udevil: error 47: kan inte canonicalize bifogade loopenhet\n" + +#: ../src/udevil.c:2976 +msgid "udevil: denied 48: 'file' is not an allowed type\n" +msgstr "udevil: nekad 48: 'fil' är inte en tillåten typ\n" + +#: ../src/udevil.c:2984 +#, c-format +msgid "udevil: denied 49: '%s' is not an allowed file\n" +msgstr "udevil: nekad 49: '%s' är inte en tillåten fil\n" + +#: ../src/udevil.c:2991 +#, c-format +msgid "udevil: error 50: cannot find '%s' mounted in mtab\n" +msgstr "udevil: fel 50: kan inte hitta '%s' monterad i mtab\n" + +#: ../src/udevil.c:3010 +#, c-format +msgid "udevil: warning 51: attached device %s is not a loop device\n" +msgstr "udevil: varning 51: ansluten enhet %s är inte en loop-enhet\n" + +#: ../src/udevil.c:3035 +#, c-format +msgid "udevil: error 52: cannot stat %s: %s\n" +msgstr "udevil: fel 52: kan inte ta status på %s: %s\n" + +#: ../src/udevil.c:3054 +msgid "udevil: error 53: cannot canonicalize path\n" +msgstr "udevil: error 53: kan inte canonicalize sökvägen\n" + +#: ../src/udevil.c:3070 +#, c-format +msgid "udevil: error 54: invalid path '%s'\n" +msgstr "udevil: fel 54: ogiltig sökväg '%s'\n" + +#: ../src/udevil.c:3079 +#, c-format +msgid "udevil: error 55: cannot find '%s' mounted in mtab\n" +msgstr "udevil: fel 55: kan inte hitta '%s' monterad i mtab\n" + +#: ../src/udevil.c:3086 +#, c-format +msgid "udevil: error 56: cannot find device %s fstype in mtab\n" +msgstr "udevil: fel 56: kan inte hitta enheten %s filtyp i mtab\n" + +#: ../src/udevil.c:3097 +#, c-format +msgid "udevil: error 57: cannot stat %s: %s\n" +msgstr "udevil: fel 57: kan inte ta status på %s: %s\n" + +#: ../src/udevil.c:3106 +#, c-format +msgid "udevil: error 58: %s is not a block device\n" +msgstr "udevil: fel 58: %s är inte en blockenhet\n" + +#: ../src/udevil.c:3115 +msgid "udevil: error 59: error initializing libudev\n" +msgstr "udevil: fel 59: fel vid initiering av libudev\n" + +#: ../src/udevil.c:3123 +#, c-format +msgid "udevil: error 60: no udev device for device %s\n" +msgstr "udevil: fel 60: ingen udev enhet för enhet %s\n" + +#: ../src/udevil.c:3134 +#, c-format +msgid "udevil: error 61: unable to get device info for device %s\n" +msgstr "udevil: fel 61: oförmögen att hämta enhetsinfo om enheten %s\n" + +#: ../src/udevil.c:3157 +#, c-format +msgid "udevil: error 62: type %s is invalid for block device\n" +msgstr "udevil: fel 62: typ %s är ogiltigt för blockenhet\n" + +#: ../src/udevil.c:3177 +msgid "udevil: error 143: unable to determine device fstype\n" +msgstr "udevil: fel 143: kan inte avgöra enhetens filsystemstyp\n" + +#: ../src/udevil.c:3180 +#, c-format +msgid "udevil: error 63: no media in device %s (or specify type with -t)\n" +msgstr "udevil: fel 63: inget media i enhet %s (eller ange typ med -t)\n" + +#: ../src/udevil.c:3183 +msgid "udevil: error 64: unable to determine device fstype - specify with -t\n" +msgstr "udevil: fel 64: kunde inte avgöra enhets filtyp - ange med -t\n" + +#: ../src/udevil.c:3243 +#, c-format +msgid "udevil: denied 65: device %s is not mounted\n" +msgstr "udievil: nekad 65: enhet %s är inte monterad\n" + +#: ../src/udevil.c:3246 +#, c-format +msgid "udevil: denied 66: could not find mount point for '%s'\n" +msgstr "udevil: nekad 66: kunde inte hitta monteringspunkten för '%s'\n" + +#: ../src/udevil.c:3266 +msgid "udevil: error 67: cannot canonicalize mount point path\n" +msgstr "udevil: error 67: kan inte canonicalize monterings sökvägen\n" + +#: ../src/udevil.c:3277 +#, c-format +msgid "udevil: error 68: cannot stat '%s'\n" +msgstr "udevil: fel 68: kan inte ta status på '%s'\n" + +#: ../src/udevil.c:3295 +msgid "udevil: error 69: cannot canonicalize mount point path\n" +msgstr "udevil: error 69: kan inte canonicalize monterings sökvägen\n" + +#: ../src/udevil.c:3306 +msgid "udevil: error 70: cannot canonicalize mount point path\n" +msgstr "udevil: error 70: kan inte canonicalize monterings sökväg\n" + +#: ../src/udevil.c:3316 +#, c-format +msgid "udevil: denied 71: '%s' is not an allowed media directory\n" +msgstr "udevil: nekad 71: '%s' är inte en tillåten mediakatalog\n" + +#: ../src/udevil.c:3328 +msgid "udevil: error 72: multiple fstypes not allowed\n" +msgstr "udevil: fel 72: flera filtyper tillåts inte\n" + +#: ../src/udevil.c:3334 +#, c-format +msgid "udevil: denied 73: fstype '%s' is not an allowed type\n" +msgstr "udevil: nekad 73: filtyp '%s' är inte en tillåten typ\n" + +#: ../src/udevil.c:3343 +msgid "udevil: error 74: could not get username\n" +msgstr "udevil: fel 74: kunde inte hämta användarnamn\n" + +#: ../src/udevil.c:3351 +#, c-format +msgid "udevil: denied 75: user '%s' (%s) is not in allowed users\n" +msgstr "udevil: nekad 75: användare '%s' (%s) är inte i tillåtna användare\n" + +#: ../src/udevil.c:3373 +#, c-format +msgid "udevil: denied 77: user %s is not in allowed groups\n" +msgstr "udevil: nekad 77: användare '%s' är inte i tillåten grupp\n" + +#: ../src/udevil.c:3385 +#, c-format +msgid "udevil: denied 78: host '%s' (%s) is not an allowed network\n" +msgstr "udevil: nekad 78: värd '%s' (%s) är inte ett tillåtet nätverk\n" + +#: ../src/udevil.c:3391 +#, c-format +msgid "udevil: denied 79: host '%s' (%s) is a forbidden network\n" +msgstr "udevil: nekad 79: värd '%s' (%s) är ett förbjudet nätverk\n" + +#: ../src/udevil.c:3406 +#, c-format +msgid "udevil: denied 80: device %s is not an allowed device\n" +msgstr "udevil: nekad 80: Enheten %s är inte en tillåten enhet\n" + +#: ../src/udevil.c:3413 +#, c-format +msgid "udevil: denied 81: device %s is a forbidden device\n" +msgstr "udevil: nekad 81: enhet %s är en förbjuden enhet\n" + +#: ../src/udevil.c:3429 +#, c-format +msgid "udevil: denied 82: '%s' is not an allowed file\n" +msgstr "udevil: nekad 82: '%s' är inte en tillåten fil\n" + +#: ../src/udevil.c:3436 +#, c-format +msgid "udevil: denied 83: you don't have read permission for file '%s'\n" +msgstr "udevil: nekad 83: du har inte läsbehörighet för filen '%s'\n" + +#: ../src/udevil.c:3447 +#, c-format +msgid "udevil: denied 145: cannot open '%s'\n" +msgstr "udevil: nekad 145: kan inte öppna '%s'\n" + +#: ../src/udevil.c:3460 +msgid "udevil: error 146: path changed\n" +msgstr "udevil: fel 146: sökväg har förändrats\n" + +#: ../src/udevil.c:3468 +msgid "udevil: error 84: cannot specify mount point for directory\n" +msgstr "udevil: fel 84: kan inte ange monteringspunkten för katalogen\n" + +#: ../src/udevil.c:3488 +#, c-format +msgid "udevil: denied 85: %s is attached to an invalid file\n" +msgstr "udevil: nekad 85: %s är ansluten till en ogiltig fil\n" + +#: ../src/udevil.c:3496 +#, c-format +msgid "udevil: denied 86: '%s' is not a permitted file\n" +msgstr "udevil: nekad 86: '%s' är inte en tillåten fil\n" + +#: ../src/udevil.c:3506 +#, c-format +msgid "udevil: denied 87: '%s' is not an allowed file\n" +msgstr "udevil: nekad 87: '%s' är inte en tillåten fil\n" + +#: ../src/udevil.c:3527 +#, c-format +msgid "udevil: denied 88: device %s is an internal device and you're not root\n" +msgstr "udevil: nekad 88: enhet %s är en intern enhet och du är inte root\n" + +#: ../src/udevil.c:3729 +#, c-format +msgid "udevil: error 89: options contain an invalid character ('%c')\n" +msgstr "udevil: fel 89: alternativ innehåller ett ogiltigt tecken ('%c')\n" + +#: ../src/udevil.c:3738 +#, c-format +msgid "udevil: denied 90: option '%s' is not an allowed option\n" +msgstr "udevil: nekad 90: alternativ '%s' är är inte ett tillåtet alternativ\n" + +#: ../src/udevil.c:3749 +msgid "udevil: denied 91: cannot use remount option with FTP or sshfs share\n" +msgstr "udevil: nekad 91: kan inte använda återmonterings alternativ med FTP eller sshfs delning\n" + +#: ../src/udevil.c:3758 +msgid "udevil: denied 149: cannot use remount option with file\n" +msgstr "udevil: nekad 149: kan inte använda återmonterings alternativ med fil\n" + +#: ../src/udevil.c:3777 +#, c-format +msgid "" +"udevil: denied 92: device %s is already mounted (or specify mount point)\n" +msgstr "udevil: nekad 92: enhet %s är ​​redan monterad (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3788 +#, c-format +msgid "" +"udevil: denied 93: file %s is already mounted at %s (or specify mount " +"point)\n" +msgstr "udevil: nekad 93: filen %s är ​​redan monterad på %s (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3792 +#, c-format +msgid "udevil: denied 94: file %s is already attached to loop device\n" +msgstr "udevil: nekad 94: filen %s är redan monterad på loopenhet\n" + +#: ../src/udevil.c:3800 +#, c-format +msgid "udevil: denied 95: %s is already mounted (or specify mount point)\n" +msgstr "udevil: nekad 95: %s är ​​redan monterad (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3812 +msgid "" +"udevil: warning 96: fstype ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: varning 96: filsystemstyp ignoreras för enhet i fstab (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3815 +msgid "" +"udevil: warning 97: options ignored for device in fstab (or specify mount " +"point)\n" +msgstr "udevil: varning 97: alternativ ignoreras för enhet i fstab (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3857 +#, c-format +msgid "udevil: denied 98: '%s' is already mounted (or specify mount point)\n" +msgstr "udevil: nekad 98: '%s' är redan monterad (eller ange monteringspunkt)\n" + +#: ../src/udevil.c:3860 +#, c-format +msgid "udevil: denied 99: can't mount '%s' (not in fstab?)\n" +msgstr "udevil: nekad 99: kan inte montera '%s' (inte i fstab?)\n" + +#: ../src/udevil.c:3874 +msgid "udevil: denied 100: must specify device or network for remount\n" +msgstr "udevil: nekad 100: måste ange enhet eller nätverk för återmontering\n" + +#: ../src/udevil.c:3880 +msgid "udevil: warning 101: specified mount point with remount ignored\n" +msgstr "udevil: varning 101: angiven monteringspunkt med återmontering ignoreras \n" + +#: ../src/udevil.c:3925 +#, c-format +msgid "udevil: warning 102: device %s is already mounted on %s\n" +msgstr "udevil: varning 102: enhet %s är ​​redan monterad på %s\n" + +#: ../src/udevil.c:3937 +msgid "udevil: error 103: no valid existing directory in allowed_media_dirs\n" +msgstr "udevil: fel 103: ingen giltigt befintlig katalog i allowed_media_dirs\n" + +#: ../src/udevil.c:4051 +#, c-format +msgid "udevil: error 104: mount point '%s' is not a valid UTF8 string\n" +msgstr "udevil: error 104: mount point '%s' är inte en giltig UTF8 sträng\n" + +#: ../src/udevil.c:4073 +#, c-format +msgid "udevil: error 105: mkdir '%s' failed\n" +msgstr "udevil: fel 105: mkdir '%s' misslyckades\n" + +#. try cifs as guest first +#: ../src/udevil.c:4106 +#, c-format +msgid "udevil: trying %s as guest\n" +msgstr "udevil: försöker %s som gäst\n" + +#: ../src/udevil.c:4117 +#, c-format +msgid "udevil: trying with %s\n" +msgstr "udevil: försöker med %s\n" + +#: ../src/udevil.c:4164 +msgid "" +"udevil: warning 106: invalid mount_point_mode in udevil.conf - using 0755\n" +msgstr "udevil: varning 106: ogiltig mount_point_mode i udevil.conf - använder 0755\n" + +#: ../src/udevil.c:4229 +#, c-format +msgid "udevil: error 107: %s\n" +msgstr "udevil: fel 107: %s\n" + +#: ../src/udevil.c:4244 +msgid "udevil: error 108: remove requires DEVICE argument\n" +msgstr "udevil: fel 108: borttagning kräver ENHET argument\n" + +#: ../src/udevil.c:4250 +#, c-format +msgid "udevil: error 109: cannot stat %s: %s\n" +msgstr "udevil: fel 109: kan inte ta status på %s: %s\n" + +#: ../src/udevil.c:4258 +#, c-format +msgid "udevil: error 110: %s is not a block device\n" +msgstr "udevil: fel 110: %s är inte en blockenhet\n" + +#: ../src/udevil.c:4265 +msgid "udevil: error 111: error initializing libudev\n" +msgstr "udevil: fel 111: Fel vid initiering av libudev\n" + +#: ../src/udevil.c:4272 +#, c-format +msgid "udevil: error 112: no udev device for device %s\n" +msgstr "udevil: fel 112: ingen udev enhet för enhet %s\n" + +#: ../src/udevil.c:4281 +msgid "udevil: error 113: unable to get device info\n" +msgstr "udevil: fel 113: oförmögen att få enhetsinfo\n" + +#: ../src/udevil.c:4293 +#, c-format +msgid "" +"udevil: warning 114: device %s is an internal device - not unbinding " +"driver\n" +msgstr "udevil: varning 114: Enheten %s är en intern enhet - inte obunden drivrutin\n" + +#: ../src/udevil.c:4304 +msgid "" +"udevil: warning 115: interface is not usb, firewire, sdio, esata - not " +"unbinding driver\n" +msgstr "udevil: varning 115: Gränssnittet är inte usb, firewire, SDIO, eSATA - inte obunden drivrutin\n" + +#: ../src/udevil.c:4312 +#, c-format +msgid "udevil: denied 116: device %s is not an allowed device\n" +msgstr "udevil: nekad 116: enheten %s är inte en tillåten enhet\n" + +#: ../src/udevil.c:4318 +#, c-format +msgid "udevil: denied 117: device %s is a forbidden device\n" +msgstr "udevil: nekad 117: enheten %s är en förbjuden enhet\n" + +#: ../src/udevil.c:4356 +#, c-format +msgid "udevil: unmount %s\n" +msgstr "udevil: avmonterar %s\n" + +#: ../src/udevil.c:4390 +#, c-format +msgid "udevil: error 118: unable to access dir %s\n" +msgstr "udevil: fel 118: oförmögen att komma katalog %s\n" + +#: ../src/udevil.c:4415 +#, c-format +msgid "udevil: examining partition %s\n" +msgstr "udevil: undersöker partition %s\n" + +#. unmount partition +#: ../src/udevil.c:4420 +#, c-format +msgid "udevil: unmount partition %s\n" +msgstr "udevil: avmonterar partitionen %s\n" + +#: ../src/udevil.c:4472 +#, c-format +msgid "udevil: error 119: unable to find host for %s\n" +msgstr "udevil: fel 119: oförmögen att hitta värden för %s\n" + +#: ../src/udevil.c:4478 +#, c-format +msgid "udevil: error 120: unable to find host for %s\n" +msgstr "udevil: fel 120: oförmögen att hitta värden för %s\n" + +#: ../src/udevil.c:4487 +#, c-format +msgid "udevil: error 121: unable to find last component for %s\n" +msgstr "udevil: fel 121: kunde inte hitta sista komponenten för %s\n" + +#: ../src/udevil.c:4511 +#, c-format +msgid "udevil: warning 122: missing power autosuspend %s\n" +msgstr "udevil: varning 122: saknar power autosuspend %s\n" + +#: ../src/udevil.c:4523 +#, c-format +msgid "udevil: warning 123: missing power control %s\n" +msgstr "udevil: varning 123: saknar effektkontroll %s\n" + +#: ../src/udevil.c:4552 +#, c-format +msgid "udevil: error 124: %s\n" +msgstr "udevil: fel 124: %s\n" + +#: ../src/udevil.c:4633 +msgid "udevil: error 126: info requires DEVICE argument\n" +msgstr "udevil: fel 126: info kräver ENHET argument\n" + +#: ../src/udevil.c:4639 +#, c-format +msgid "udevil: error 127: cannot stat %s: %s\n" +msgstr "udevil: fel 127: kan inte ta status på %s : %s\n" + +#: ../src/udevil.c:4647 +#, c-format +msgid "udevil: error 128: %s is not a block device\n" +msgstr "udevil: fel 128: %s är inte en blockenhet\n" + +#: ../src/udevil.c:4654 +msgid "udevil: error 129: error initializing libudev\n" +msgstr "udevil: fel 129: fel vid initiering av libudev\n" + +#: ../src/udevil.c:4661 +#, c-format +msgid "udevil: error 130: no udev device for device %s\n" +msgstr "udevil: fel 130: ingen udev enhet för enhet %s\n" + +#: ../src/udevil.c:4677 +msgid "udevil: error 131: unable to get device info\n" +msgstr "udevil: fel 131: oförmögen att få enhetsinfo\n" + +#: ../src/udevil.c:4729 +msgid "udevil: error 132: unable to initialize udev\n" +msgstr "udevil: fel 132: oförmögen att initiera udev\n" + +#: ../src/udevil.c:4740 +msgid "udevil: error 133: cannot create udev monitor\n" +msgstr "udevil: fel 133: kan inte skapa udev monitor\n" + +#: ../src/udevil.c:4745 +msgid "udevil: error 134: cannot enable udev monitor receiving\n" +msgstr "udevil: fel 134: kan inte aktivera udev monitor mottagning\n" + +#: ../src/udevil.c:4750 +msgid "udevil: error 135: cannot set udev filter\n" +msgstr "udevil: fel 135: kan inte ställa in udev filter\n" + +#: ../src/udevil.c:4757 +msgid "udevil: error 136: cannot get udev monitor socket file descriptor\n" +msgstr "udevil: fel 136: kan inte få udev monitor deskriptor socket fil\n" + +#: ../src/udevil.c:4778 +#, c-format +msgid "udevil: error 137: monitoring /proc/self/mountinfo: %s\n" +msgstr "udevil: fel 137: övervakning av /proc/self/mountinfo: %s\n" + +#: ../src/udevil.c:4829 +#, c-format +msgid "" +"Mounts and unmounts devices without password, shows device info, monitors\n" +msgstr "Monterar och avmonterar enheter utan lösenord, visar enhets info, övervakar\n" + +#: ../src/udevil.c:4830 +#, c-format +msgid "" +"device changes. Emulates udisks1/2 command line usage and udisks1 output.\n" +msgstr "enhets förändringar. Emulerar udisks1/2 kommandorads användning och udisks1 utmatning.\n" + +#: ../src/udevil.c:4831 +#, c-format +msgid "Usage: udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS]\n" +msgstr "Användning: udevil [ALTERNATIV] KOMMANDO [KOMMANDO-ALTERNATIV] [KOMMANDO-ARGUMENT]\n" + +#: ../src/udevil.c:4832 +#, c-format +msgid "OPTIONS:\n" +msgstr "ALTERNATIV:\n" + +#: ../src/udevil.c:4833 +msgid "print details" +msgstr "skriv ut detaljer" + +#: ../src/udevil.c:4834 +msgid "minimal output" +msgstr "minimal utmatning" + +#: ../src/udevil.c:4835 +#, c-format +msgid "MOUNT - Mounts DEVICE to mount point DIR with MOUNT-OPTIONS:\n" +msgstr "MOUNT - Monterar ENHET till monteringspunkt KAT med MOUNT-ALTERNATIV:\n" + +#: ../src/udevil.c:4836 +#, c-format +msgid "" +" udevil mount|--mount [MOUNT-OPTIONS] [[-b|--block-device] DEVICE] " +"[DIR]\n" +msgstr " udevil mount|--mount [MONTERINGS-ALTERNATIV] [[-b|--block-device] ENHET] [KAT]\n" + +#: ../src/udevil.c:4837 +#, c-format +msgid " MOUNT-OPTIONS:\n" +msgstr " MOUNT-ALTERNATIV:\n" + +#: ../src/udevil.c:4838 ../src/udevil.c:4839 +msgid "see man mount" +msgstr "se man mount" + +#. printf( " -L LABEL mount device by +#. label LABEL\n" ); +#. printf( " -U UUID mount device by +#. UUID\n" ); +#: ../src/udevil.c:4842 ../src/udevil.c:4877 ../src/udevil.c:4889 +msgid "ignored (for compatibility)" +msgstr "ignoreras (för kompatibilitet)" + +#: ../src/udevil.c:4843 ../src/udevil.c:4878 +msgid "EXAMPLES" +msgstr "EXEMPEL" + +#. printf( " udevil mount -L 'Disk Label'\n" ); +#: ../src/udevil.c:4848 +msgid "ISO file" +msgstr "ISO fil" + +#: ../src/udevil.c:4849 +msgid "ftp site - requires" +msgstr "ftp adress - krävs" + +#: ../src/udevil.c:4850 +msgid "or" +msgstr "eller" + +#: ../src/udevil.c:4851 ../src/udevil.c:4853 +msgid "ftp share with" +msgstr "ftp delning med" + +#: ../src/udevil.c:4852 +msgid "user and password" +msgstr "användare och lösenord" + +#: ../src/udevil.c:4854 +msgid "port, user and password" +msgstr "port, användare och lösenord" + +#: ../src/udevil.c:4855 +msgid "ftp site with ftpfs" +msgstr "ftp adress med ftpfs" + +#: ../src/udevil.c:4856 +msgid "ftp site with curl" +msgstr "ftp adress med curl" + +#: ../src/udevil.c:4857 +msgid "ftp site with curl u/p" +msgstr "ftp adress med curl a/l" + +#: ../src/udevil.c:4858 ../src/udevil.c:4859 +msgid "nfs share" +msgstr "nfs delning" + +#: ../src/udevil.c:4860 ../src/udevil.c:4863 +msgid "samba share w/ cifs" +msgstr "samba delning med cifs" + +#: ../src/udevil.c:4861 +msgid "samba share w/ u/p/port" +msgstr "samba delning med a/l/port" + +#: ../src/udevil.c:4862 +msgid "samba share w/ workgroup" +msgstr "samba delning med workgroup" + +#: ../src/udevil.c:4864 +msgid "samba share w/ smbfs" +msgstr "samba delning med smbfs" + +#: ../src/udevil.c:4865 +msgid "sshfs with user - " +msgstr "sshfs med användare -" + +#: ../src/udevil.c:4866 +msgid "requires sshfs" +msgstr "kräver sshfs" + +#: ../src/udevil.c:4867 +msgid "sshfs with user" +msgstr "sshfs med användare" + +#: ../src/udevil.c:4868 +msgid "WebDAV - requires davfs2" +msgstr "WebDAV - kräver davfs2" + +#: ../src/udevil.c:4869 +msgid "make a ram drive" +msgstr "skapa en RAM-enhet" + +#: ../src/udevil.c:4870 +#, c-format +msgid "" +"\n" +" WARNING !!! a password on the command line is UNSAFE - see filesystem docs\n" +"\n" +msgstr "\n VARNING !!! ett lösenord på kommandoraden är OSÄKERT - se filsystem dokument\n\n" + +#: ../src/udevil.c:4871 +#, c-format +msgid "UNMOUNT - Unmount DEVICE or DIR with UNMOUNT-OPTIONS:\n" +msgstr "UNMOUNT - Avmontera ENHET eller KAT med UNMOUNT-ALTERNATIV:\n" + +#: ../src/udevil.c:4872 +#, c-format +msgid " udevil umount|unmount|--unmount|--umount [UNMOUNT-OPTIONS] \n" +msgstr " udevil umount|unmount|--unmount|--umount [UNMOUNT-ALTERNATIV]\n" + +#: ../src/udevil.c:4873 +#, c-format +msgid "" +" {[-b|--block-device] " +"DEVICE}|DIR\n" +msgstr " {[-b|--block-device] ENHET}|KAT\n" + +#: ../src/udevil.c:4874 +#, c-format +msgid " UNMOUNT-OPTIONS:\n" +msgstr " UNMOUNT-ALTERNATIV:\n" + +#: ../src/udevil.c:4875 ../src/udevil.c:4887 +msgid "lazy unmount (see man umount)" +msgstr "lazy avmontering (se man umount)" + +#: ../src/udevil.c:4876 ../src/udevil.c:4888 +msgid "force unmount (see man umount)" +msgstr "tvinga avmontering (se man umount)" + +#: ../src/udevil.c:4883 +#, c-format +msgid "" +"REMOVE - Unmount all partitions on host of DEVICE and prepare for safe\n" +msgstr "REMOVE - Avmontera alla partitioner på värd-enhet och förbered för säker\n" + +#: ../src/udevil.c:4884 +#, c-format +msgid " removal (sync, stop, unbind driver, and power off):\n" +msgstr "borttagning (synk, stopp, obunden drivrutin och avstängning):\n" + +#: ../src/udevil.c:4885 +#, c-format +msgid "" +" udevil remove|--remove|--detach [OPTIONS] [-b|--block-device] DEVICE\n" +msgstr " udevil remove|--remove|--detach [ALTERNATIV] [-b|--block-device] ENHET\n" + +#: ../src/udevil.c:4886 +#, c-format +msgid " OPTIONS:\n" +msgstr " ALTERNATIV:\n" + +#: ../src/udevil.c:4890 ../src/udevil.c:4894 ../src/udevil.c:4897 +msgid "EXAMPLE" +msgstr "EXEMPEL" + +#: ../src/udevil.c:4892 +#, c-format +msgid "INFO - Show information about DEVICE emulating udisks v1 output:\n" +msgstr "INFO - Visa information om ENHET emulera udisk v1 utmatning:\n" + +#: ../src/udevil.c:4893 +#, c-format +msgid " udevil info|--show-info|--info [-b|--block-device] DEVICE\n" +msgstr " udevil info|--show-info|--info [-b|--block-device] ENHET\n" + +#: ../src/udevil.c:4895 +#, c-format +msgid "MONITOR - Display device events emulating udisks v1 output:\n" +msgstr "MONITOR - Visa enhetshändelser emulera udisks v1 utmatning:\n" + +#: ../src/udevil.c:4898 +#, c-format +msgid "CLEAN - Remove unmounted udevil-created mount dirs in media dirs\n" +msgstr "CLEAN - Ta bort omonterade udevil-skapade monterade kataloger i media katalogen\n" + +#: ../src/udevil.c:4900 +#, c-format +msgid "HELP - Show this help\n" +msgstr "HELP - Visa denna hjälp\n" + +#: ../src/udevil.c:4903 +msgid "See /etc/udevil/udevil.conf for config." +msgstr "Se /etc/udevil/udevil.conf för konfiguration." + +#: ../src/udevil.c:4904 +#, c-format +msgid "For automounting with udevil run 'devmon --help'\n" +msgstr "För automontering med udevil kör 'devmon --help'\n" + +#: ../src/udevil.c:5001 +msgid "udevil: read config /etc/udevil/udevil.conf\n" +msgstr "udevil: läs konfig /etc/udevil/udevil.conf\n" + +#: ../src/udevil.c:5050 +msgid "udevil: error 138: argument is not valid UTF-8\n" +msgstr "udevil: fel 138: argumentet är inte giltig UTF-8\n" + +#: ../src/udevil.c:5352 +msgid "udevil: error 139: too many arguments\n" +msgstr "udevil: fel 139: för många argument\n" + +#: ../src/udevil.c:5355 +#, c-format +msgid "udevil: error 140: option '%s' requires an argument\n" +msgstr "udevil: fel 140: alternativet '%s' kräver ett argument\n" + +#: ../src/udevil.c:5359 +#, c-format +msgid "udevil: error 141: invalid option '%s'\n" +msgstr "udevil: fel 141: ogiltigt alternativ '%s'\n" + +#: ../src/udevil.c:5361 +#, c-format +msgid "udevil: error 142: invalid or unexpected argument '%s'\n" +msgstr "udevil: fel 142: ogiltig eller oväntat argument '%s'\n" diff -Nru udevil-0.4.1/po/udevil.pot udevil-0.4.3/po/udevil.pot --- udevil-0.4.1/po/udevil.pot 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/po/udevil.pot 2013-12-09 13:59:27.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: udevil 0.4.1\n" +"Project-Id-Version: udevil 0.4.1+\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 17:57+0000\n" +"POT-Creation-Date: 2013-10-31 11:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -560,8 +560,7 @@ #: ../src/udevil.c:3792 #, c-format -msgid "" -"udevil: denied 94: file %s is already mounted (or specify mount point)\n" +msgid "udevil: denied 94: file %s is already attached to loop device\n" msgstr "" #: ../src/udevil.c:3800 diff -Nru udevil-0.4.1/README udevil-0.4.3/README --- udevil-0.4.1/README 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/README 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,14 @@ -README for udevil v0.4.1 +README for udevil v0.4.3 -For updates and instructions visit: - http://ignorantguru.github.com/udevil/ - http://ignorantguru.github.com/udevil/news.html +Homepage: + http://ignorantguru.github.io/udevil/ + +Downloads: + https://github.com/IgnorantGuru/udevil/tree/pkg + +Official Forum (for udevil & SpaceFM): + https://sourceforge.net/p/spacefm/discussion/general/ CONTENTS @@ -52,7 +57,7 @@ INSTALLER A self-extracting installer is available (udevil-x.x.x-installer.sh): - https://github.com/IgnorantGuru/udevil/tree/master/packages + https://github.com/IgnorantGuru/udevil/tree/pkg (To save a file, click on its filename and click 'View Raw') The installer requires the build dependencies listed below in BUILD. If diff -Nru udevil-0.4.1/src/device-info.c udevil-0.4.3/src/device-info.c --- udevil-0.4.1/src/device-info.c 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/src/device-info.c 2013-12-09 13:59:27.000000000 +0000 @@ -1174,7 +1174,9 @@ { const char *cdrom_disc_state; - if ( udev_device_get_property_value( device->udevice, "ID_CDROM_MEDIA") ) + const char* optical_state = udev_device_get_property_value( device->udevice, + "ID_CDROM"); + if ( optical_state && atoi( optical_state ) != 0 ) { device->device_is_optical_disc = TRUE; diff -Nru udevil-0.4.1/src/devmon udevil-0.4.3/src/devmon --- udevil-0.4.1/src/devmon 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/src/devmon 2013-12-09 13:59:27.000000000 +0000 @@ -15,7 +15,7 @@ help() { cat << EOF -devmon version 1.1.6 (distributed with udevil) +devmon version 1.1.7 (distributed with udevil) Automounts and unmounts optical and removable drives Requires: udevil bash>=4 Also Recommended: eject spacefm|zenity Optional: udisks v1 may be substituted for udevil @@ -55,6 +55,7 @@ --mount DEVICE Mount DEVICE --mount-options|--mount-fstype|--eject-options "OPTIONS" These options will be passed to mount or eject +--enumerate-device-files List known devices UNIVERSAL OPTIONS: (these can be used in both daemon and client modes) --ignore-device DEVICE Ignore DEVICE (eg /dev/sdd1) @@ -248,6 +249,39 @@ (( iglabx++ )) shift ;; + --enumerate-device-files ) + all=`grep " [ms]d[a-z0-9]*$" /proc/partitions | \ + sed 's/.* \([ms]d[a-z0-9]*\)/\/dev\/\1/'` + n=$'\n' + if [ "$all" != "" ]; then + all="$all$n" + fi + for f in /dev/mapper/*; do + if [ -h "$f" ]; then + name="$(basename "$f")" + target="$(readlink "$f")" + target="$(basename "$target")" + if [ "$target" != "" ]; then + all="$all/dev/$target$n" + if [ "${name:0:4}" = "loop" ]; then + all="$all/dev/$name$n" + fi + fi + fi + done + # add mounted loop devices (attached requires losetup as root) + loop=`cat /proc/self/mountinfo 2>/dev/null | grep ' /dev/loop[0-9]* ' | cut -f9 -d ' ' 2>/dev/null` + if [ "$loop" != "" ]; then + loop="$loop$n" + fi + other=`/bin/ls -1 /dev/md[0-9]* /dev/dm-* /dev/sr* 2>/dev/null` + if [ "$other" != "" ]; then + other="$other$n" + fi + all="$all$loop$other" + echo -n "$all" | sort | uniq + exit + ;; --* ) unknown "$1";; -* ) @@ -714,7 +748,7 @@ # Mount removable drives, no exec IFSOLD="$IFS" IFS=$'\n' - partlist=`grep " sd[a-z0-9]*$" /proc/partitions | sed 's/.* \(sd[a-z0-9]*\)/\1/'` + partlist=`grep " [ms]d[a-z0-9]*$" /proc/partitions | sed 's/.* \([ms]d[a-z0-9]*\)/\1/'` for p in $partlist; do if ( ignoredevice "/dev/$p" ); then continue @@ -748,8 +782,8 @@ IFSOLD="$IFS" IFS=$'\n' uerr=0 - partlist=`grep " sd[a-z0-9]*$" /proc/partitions | \ - sed 's/.* \(sd[a-z0-9]*\)/\1/'` + partlist=`grep " [ms]d[a-z0-9]*$" /proc/partitions | \ + sed 's/.* \([ms]d[a-z0-9]*\)/\1/'` for p in $partlist; do if ( ignoredevice "/dev/$p" ); then continue @@ -793,7 +827,7 @@ IFS=$'\n' if (( unmountrem == 1 )); then # Unmount All Removable Drives - partlist=`grep " sd[a-z0-9]*$" /proc/partitions | sed 's/.* \(sd[a-z0-9]*\)/\1/'` + partlist=`grep " [ms]d[a-z0-9]*$" /proc/partitions | sed 's/.* \([ms]d[a-z0-9]*\)/\1/'` msgtitle="devmon unmount" else # Unmount Recent diff -Nru udevil-0.4.1/src/Makefile.in udevil-0.4.3/src/Makefile.in --- udevil-0.4.1/src/Makefile.in 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/src/Makefile.in 2013-12-09 13:59:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,7 +81,8 @@ host_triplet = @host@ noinst_PROGRAMS = udevil$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -69,9 +97,13 @@ udevil_OBJECTS = $(am_udevil_OBJECTS) am__DEPENDENCIES_1 = udevil_DEPENDENCIES = $(am__DEPENDENCIES_1) -udevil_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(udevil_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +udevil_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(udevil_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -101,19 +133,40 @@ } am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(udevil_SOURCES) DIST_SOURCES = $(udevil_SOURCES) am__can_run_installinfo = \ @@ -121,6 +174,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -334,9 +404,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + udevil$(EXEEXT): $(udevil_OBJECTS) $(udevil_DEPENDENCIES) $(EXTRA_udevil_DEPENDENCIES) @rm -f udevil$(EXEEXT) - $(udevil_LINK) $(udevil_OBJECTS) $(udevil_LDADD) $(LIBS) + $(AM_V_CCLD)$(udevil_LINK) $(udevil_OBJECTS) $(udevil_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -384,67 +455,67 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udevil-udevil.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< udevil-udevil.o: udevil.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-udevil.o -MD -MP -MF $(DEPDIR)/udevil-udevil.Tpo -c -o udevil-udevil.o `test -f 'udevil.c' || echo '$(srcdir)/'`udevil.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-udevil.Tpo $(DEPDIR)/udevil-udevil.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='udevil.c' object='udevil-udevil.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-udevil.o -MD -MP -MF $(DEPDIR)/udevil-udevil.Tpo -c -o udevil-udevil.o `test -f 'udevil.c' || echo '$(srcdir)/'`udevil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-udevil.Tpo $(DEPDIR)/udevil-udevil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udevil.c' object='udevil-udevil.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-udevil.o `test -f 'udevil.c' || echo '$(srcdir)/'`udevil.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-udevil.o `test -f 'udevil.c' || echo '$(srcdir)/'`udevil.c udevil-udevil.obj: udevil.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-udevil.obj -MD -MP -MF $(DEPDIR)/udevil-udevil.Tpo -c -o udevil-udevil.obj `if test -f 'udevil.c'; then $(CYGPATH_W) 'udevil.c'; else $(CYGPATH_W) '$(srcdir)/udevil.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-udevil.Tpo $(DEPDIR)/udevil-udevil.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='udevil.c' object='udevil-udevil.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-udevil.obj -MD -MP -MF $(DEPDIR)/udevil-udevil.Tpo -c -o udevil-udevil.obj `if test -f 'udevil.c'; then $(CYGPATH_W) 'udevil.c'; else $(CYGPATH_W) '$(srcdir)/udevil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-udevil.Tpo $(DEPDIR)/udevil-udevil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='udevil.c' object='udevil-udevil.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-udevil.obj `if test -f 'udevil.c'; then $(CYGPATH_W) 'udevil.c'; else $(CYGPATH_W) '$(srcdir)/udevil.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-udevil.obj `if test -f 'udevil.c'; then $(CYGPATH_W) 'udevil.c'; else $(CYGPATH_W) '$(srcdir)/udevil.c'; fi` udevil-device-info.o: device-info.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-device-info.o -MD -MP -MF $(DEPDIR)/udevil-device-info.Tpo -c -o udevil-device-info.o `test -f 'device-info.c' || echo '$(srcdir)/'`device-info.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-device-info.Tpo $(DEPDIR)/udevil-device-info.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='device-info.c' object='udevil-device-info.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-device-info.o -MD -MP -MF $(DEPDIR)/udevil-device-info.Tpo -c -o udevil-device-info.o `test -f 'device-info.c' || echo '$(srcdir)/'`device-info.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-device-info.Tpo $(DEPDIR)/udevil-device-info.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='device-info.c' object='udevil-device-info.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-device-info.o `test -f 'device-info.c' || echo '$(srcdir)/'`device-info.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-device-info.o `test -f 'device-info.c' || echo '$(srcdir)/'`device-info.c udevil-device-info.obj: device-info.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-device-info.obj -MD -MP -MF $(DEPDIR)/udevil-device-info.Tpo -c -o udevil-device-info.obj `if test -f 'device-info.c'; then $(CYGPATH_W) 'device-info.c'; else $(CYGPATH_W) '$(srcdir)/device-info.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-device-info.Tpo $(DEPDIR)/udevil-device-info.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='device-info.c' object='udevil-device-info.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-device-info.obj -MD -MP -MF $(DEPDIR)/udevil-device-info.Tpo -c -o udevil-device-info.obj `if test -f 'device-info.c'; then $(CYGPATH_W) 'device-info.c'; else $(CYGPATH_W) '$(srcdir)/device-info.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-device-info.Tpo $(DEPDIR)/udevil-device-info.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='device-info.c' object='udevil-device-info.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-device-info.obj `if test -f 'device-info.c'; then $(CYGPATH_W) 'device-info.c'; else $(CYGPATH_W) '$(srcdir)/device-info.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-device-info.obj `if test -f 'device-info.c'; then $(CYGPATH_W) 'device-info.c'; else $(CYGPATH_W) '$(srcdir)/device-info.c'; fi` udevil-canonicalize.o: canonicalize.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-canonicalize.o -MD -MP -MF $(DEPDIR)/udevil-canonicalize.Tpo -c -o udevil-canonicalize.o `test -f 'canonicalize.c' || echo '$(srcdir)/'`canonicalize.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-canonicalize.Tpo $(DEPDIR)/udevil-canonicalize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='canonicalize.c' object='udevil-canonicalize.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-canonicalize.o -MD -MP -MF $(DEPDIR)/udevil-canonicalize.Tpo -c -o udevil-canonicalize.o `test -f 'canonicalize.c' || echo '$(srcdir)/'`canonicalize.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-canonicalize.Tpo $(DEPDIR)/udevil-canonicalize.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='canonicalize.c' object='udevil-canonicalize.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-canonicalize.o `test -f 'canonicalize.c' || echo '$(srcdir)/'`canonicalize.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-canonicalize.o `test -f 'canonicalize.c' || echo '$(srcdir)/'`canonicalize.c udevil-canonicalize.obj: canonicalize.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-canonicalize.obj -MD -MP -MF $(DEPDIR)/udevil-canonicalize.Tpo -c -o udevil-canonicalize.obj `if test -f 'canonicalize.c'; then $(CYGPATH_W) 'canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udevil-canonicalize.Tpo $(DEPDIR)/udevil-canonicalize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='canonicalize.c' object='udevil-canonicalize.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -MT udevil-canonicalize.obj -MD -MP -MF $(DEPDIR)/udevil-canonicalize.Tpo -c -o udevil-canonicalize.obj `if test -f 'canonicalize.c'; then $(CYGPATH_W) 'canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/udevil-canonicalize.Tpo $(DEPDIR)/udevil-canonicalize.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='canonicalize.c' object='udevil-canonicalize.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) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-canonicalize.obj `if test -f 'canonicalize.c'; then $(CYGPATH_W) 'canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udevil_CFLAGS) $(CFLAGS) -c -o udevil-canonicalize.obj `if test -f 'canonicalize.c'; then $(CYGPATH_W) 'canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -452,26 +523,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -483,15 +543,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -500,6 +556,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + 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 @@ -646,20 +717,20 @@ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binSCRIPTS install-data \ - install-data-am install-data-hook 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 mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-hook +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binSCRIPTS \ + install-data install-data-am install-data-hook 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 mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-hook install-data-hook: diff -Nru udevil-0.4.1/src/udevil.c udevil-0.4.3/src/udevil.c --- udevil-0.4.1/src/udevil.c 2013-03-17 18:01:35.000000000 +0000 +++ udevil-0.4.3/src/udevil.c 2013-12-09 13:59:27.000000000 +0000 @@ -3789,7 +3789,7 @@ wlog( str, NULL, 2 ); } else - wlog( _("udevil: denied 94: file %s is already mounted (or specify mount point)\n"), + wlog( _("udevil: denied 94: file %s is already attached to loop device\n"), data->device_file, 2 ); g_free( str ); ret = 2;