diff -Nru clipit-1.4.2~quantal1/.tx/config clipit-1.4.2~quantal2/.tx/config --- clipit-1.4.2~quantal1/.tx/config 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/.tx/config 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -[main] -host = https://www.transifex.net -lang_map = bg_BG:bg, de_DE:de, et_EE:et - -[clipit.clipitpot] -file_filter = po/.po -source_file = po/clipit.pot -source_lang = en diff -Nru clipit-1.4.2~quantal1/AUTHORS clipit-1.4.2~quantal2/AUTHORS --- clipit-1.4.2~quantal1/AUTHORS 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/AUTHORS 2012-04-04 07:41:50.000000000 +0000 @@ -1,2 +1,3 @@ Cristian Henzel Gilberto "Xyhthyx" Miralla +Eugene Nikolsky diff -Nru clipit-1.4.2~quantal1/ChangeLog clipit-1.4.2~quantal2/ChangeLog --- clipit-1.4.2~quantal1/ChangeLog 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/ChangeLog 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,78 @@ -ClipIt-1.4.2-20111018001 ~ 2011-10-18 15:47:56 +0300 +ClipIt-1.4.2-20120404003 ~ 2012-04-04 10:39:47 +0300 + ++ Added: Added new translations. + + +ClipIt-1.4.2-20120404002 - 2012-04-04 10:35:04 +0300 + ++ Fixed: Bug in previous POTFILES.in generation code. + + +ClipIt-1.4.2-20120404001 - 2012-04-04 10:21:55 +0300 + ++ Fixed: Updated translations and fixed POTFILES generation script. + + +ClipIt-1.4.2-20120302002 - 2012-03-02 22:21:05 +0200 + ++ Fixed: Updated copyright information. + + +ClipIt-1.4.2-20120302001 - 2012-03-02 21:56:42 +0200 + ++ Fixed: Fixed a GTK include error with gtypes.h. + + +ClipIt-1.4.2-20111222001 - 2011-12-04 22:42:57 +0200 + ++ Added: Merged "Offline mode" feature, by Eugene Nikolsky ++ Added: Allow to switch focus by Tab key in "Manage History" + dialog, by Eugene Nikolsky + + +ClipIt-1.4.2-20111115006 - 2011-11-15 12:34:18 +0200 + ++ Fixed: Use the shipped icon instead of gtk-paste. + + +ClipIt-1.4.2-20111115005 - 2011-11-15 11:46:35 +0200 + ++ Fixed: Fix max height of Manage history window. + + +ClipIt-1.4.2-20111115004 - 2011-11-15 11:05:58 +0200 + ++ Fixed: Updated translations. + + +ClipIt-1.4.2-20111115003 - 2011-11-15 10:48:36 +0200 + ++ Fixed: Present the user with the existing dialog, if he tries to + open one while another one is active. + + +ClipIt-1.4.2-20111115002 - 2011-11-15 08:59:45 +0200 + ++ Fixed: Also save history after it is modified by selection of items. + + +ClipIt-1.4.2-20111115001 - 2011-11-15 08:40:38 +0200 + ++ Fixed: Added Unity to autostart. + + +Silence glib warnings regarding GOptionFlags. - 2011-11-09 20:51:51 +0200 + +These warnings: +GLib-WARNING **: goption.c:2168: ignoring no-arg, optional-arg or filename flags (8) on option of type 0 + + +ClipIt-1.4.2-20111115001 - 2011-11-15 08:27:37 +0200 + ++ Fixed: Added dirty workaround for Debian multiarch build. + + +ClipIt-1.4.2-20111018001 - 2011-10-18 15:48:40 +0300 + Fixed: Fixed a typo in preferences dialog. + Fixed: Updated translations. diff -Nru clipit-1.4.2~quantal1/Makefile.am clipit-1.4.2~quantal2/Makefile.am --- clipit-1.4.2~quantal1/Makefile.am 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/Makefile.am 2012-04-04 07:41:50.000000000 +0000 @@ -31,7 +31,8 @@ "'checking whether to use NLS... yes'!" ; exit 1 ; fi update-po: check-gettext - @find $(srcdir)/src/ -name "*.c" -print | grep -v "eggaccelerators" | sort > $(srcdir)/po/POTFILES.in.2 ; \ + @find $(srcdir)/ -name '*.c' -o -name '*.desktop.in' | sed "s/^.\///" | grep -v "eggaccelerators" | grep -v "^clipit-" | sort > $(srcdir)/po/POTFILES.in.2 ; \ + cat $(srcdir)/po/POTFILES.in.2 ; \ if diff $(srcdir)/po/POTFILES.in $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \ rm -f $(srcdir)/po/POTFILES.in.2 ; \ else \ diff -Nru clipit-1.4.2~quantal1/Makefile.in clipit-1.4.2~quantal2/Makefile.in --- clipit-1.4.2~quantal1/Makefile.in 2011-10-30 10:13:38.000000000 +0000 +++ clipit-1.4.2~quantal2/Makefile.in 2012-04-04 07:53:01.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -75,9 +75,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -106,10 +108,13 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AUTOCONF = @AUTOCONF@ @@ -156,6 +161,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ @@ -230,6 +239,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -270,7 +281,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -306,10 +317,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -534,7 +543,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -542,7 +555,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -573,6 +586,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -592,6 +607,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -620,8 +636,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -652,10 +676,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -746,8 +775,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-hook install-dvi \ @@ -771,7 +800,8 @@ "'checking whether to use NLS... yes'!" ; exit 1 ; fi update-po: check-gettext - @find $(srcdir)/src/ -name "*.c" -print | grep -v "eggaccelerators" | sort > $(srcdir)/po/POTFILES.in.2 ; \ + @find $(srcdir)/ -name '*.c' -o -name '*.desktop.in' | sed "s/^.\///" | grep -v "eggaccelerators" | grep -v "^clipit-" | sort > $(srcdir)/po/POTFILES.in.2 ; \ + cat $(srcdir)/po/POTFILES.in.2 ; \ if diff $(srcdir)/po/POTFILES.in $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \ rm -f $(srcdir)/po/POTFILES.in.2 ; \ else \ diff -Nru clipit-1.4.2~quantal1/README clipit-1.4.2~quantal2/README --- clipit-1.4.2~quantal1/README 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/README 2012-04-04 07:41:50.000000000 +0000 @@ -1,7 +1,8 @@ ClipIt - Lightweight GTK+ Clipboard Manager ------------------------------------------------------------------------------- -Copyright (C) 2010 by Cristian Henzel +Copyright (C) 2010-2012 by Cristian Henzel +Copyright (C) 2011 by Eugene Nikolsky forked from parcellite, which is Copyright (C) 2007-2008 Gilberto "Xyhthyx" Miralla diff -Nru clipit-1.4.2~quantal1/aclocal.m4 clipit-1.4.2~quantal2/aclocal.m4 --- clipit-1.4.2~quantal1/aclocal.m4 2011-10-30 10:13:36.000000000 +0000 +++ clipit-1.4.2~quantal2/aclocal.m4 2012-04-04 07:53:00.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -[m4_warning([this file was generated for autoconf 2.67. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. 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'.])]) @@ -472,6 +473,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -889,7 +894,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -935,7 +941,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -983,9 +990,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -1019,12 +1026,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -1034,7 +1044,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1050,19 +1060,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -1144,14 +1156,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1191,6 +1203,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -1255,7 +1268,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -1320,10 +1333,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -1557,12 +1573,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1602,8 +1621,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1623,7 +1642,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +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 @@ -1734,12 +1753,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1762,13 +1784,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1776,13 +1799,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1858,12 +1881,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1886,13 +1911,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1901,13 +1926,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1929,10 +1954,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru clipit-1.4.2~quantal1/commit clipit-1.4.2~quantal2/commit --- clipit-1.4.2~quantal1/commit 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/commit 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -#!/bin/bash - -## Copyright (C) 2010-2011 by Cristian Henzel -## -## This file is part of ClipIt. -## -## ClipIt is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or -## (at your option) any later version. -## -## ClipIt is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -git clean -xdf -./update-po -git clean -xdf - -COMMIT_FILE="COMMIT_MSG" - -CLIPIT_LAST_VSTR=$(git log -1 --pretty="format:%s" | cut -d'-' -f3 | sed s/^........//) -CLIPIT_LAST_DSTR=$(git log -1 --pretty="format:%s" | cut -d'-' -f3 | sed s/...$//) -CLIPIT_NEXT_DSTR=$(date +"%Y%m%d") -CLIPIT_NEXT_DCOM=$(date +"%Y-%m-%d %X %z") -CLIPIT_NEXT_VSTR=$(cat configure.in | grep AC_INIT | awk '{print $2}' | sed s/[][,]//g) -if [ "$CLIPIT_LAST_DSTR" = "$CLIPIT_NEXT_DSTR" ]; then - CLIPIT_NEXT_ASTR="00"$(expr $CLIPIT_LAST_VSTR + 1) -else - CLIPIT_NEXT_ASTR="001" -fi -CLIPIT_NEXT_CSTR="ClipIt-${CLIPIT_NEXT_VSTR}-${CLIPIT_NEXT_DSTR}${CLIPIT_NEXT_ASTR}" - -echo "$CLIPIT_NEXT_CSTR ~ ${CLIPIT_NEXT_DCOM}" > "$COMMIT_FILE" -echo "" >> "$COMMIT_FILE" -echo "+ " >> "$COMMIT_FILE" -echo "" >> "$COMMIT_FILE" - -gedit "$COMMIT_FILE" - -cat "$COMMIT_FILE" | sed /^#/d > ChangeLog -echo "" >> ChangeLog -git log --no-merges --pretty="format:%s - %ai%n%n%b%n" >> ChangeLog -sed -i "s/ ~ .*//" "$COMMIT_FILE" -echo "Will now commit with:" -cat "$COMMIT_FILE" - -git commit -a -F "$COMMIT_FILE" - -read -p "Pushing changes. Continue (yes/no)? " -if [ "$REPLY" != "yes" -a ! -z "$REPLY" ]; then - exit 1; -fi -git push --all -git push --all github - -echo "Uploading ChangeLog for clipit.rspwn.com." -scp -q ChangeLog rspwn:~/clipit-changelog/clipit.log - -rm "$COMMIT_FILE" diff -Nru clipit-1.4.2~quantal1/config.guess clipit-1.4.2~quantal2/config.guess --- clipit-1.4.2~quantal1/config.guess 2011-10-30 09:45:41.000000000 +0000 +++ clipit-1.4.2~quantal2/config.guess 2012-04-04 07:53:01.000000000 +0000 @@ -1,10 +1,10 @@ #! /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 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + 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} @@ -879,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1322,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru clipit-1.4.2~quantal1/config.sub clipit-1.4.2~quantal2/config.sub --- clipit-1.4.2~quantal1/config.sub 2011-10-30 09:45:41.000000000 +0000 +++ clipit-1.4.2~quantal2/config.sub 2012-04-04 07:53:01.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -246,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +290,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +332,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +361,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,26 +405,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +452,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +522,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +567,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -734,7 +782,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -841,6 +897,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +985,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1082,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,6 +1212,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1312,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1300,8 +1352,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1401,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1450,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1495,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1519,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1534,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1502,14 +1564,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1595,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru clipit-1.4.2~quantal1/configure clipit-1.4.2~quantal2/configure --- clipit-1.4.2~quantal1/configure 2011-10-30 10:13:38.000000000 +0000 +++ clipit-1.4.2~quantal2/configure 2012-04-04 07:53:02.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for clipit 1.4.2. +# Generated by GNU Autoconf 2.68 for clipit 1.4.2. # # Report bugs to . # @@ -91,6 +91,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -216,11 +217,18 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -658,6 +666,13 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE +AM_DEFAULT_VERBOSITY INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -683,6 +698,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1190,7 +1206,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1512,7 +1528,7 @@ if $ac_init_version; then cat <<\_ACEOF clipit configure 1.4.2 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1558,7 +1574,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1595,7 +1611,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1637,7 +1653,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1650,10 +1666,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1720,7 +1736,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1729,7 +1745,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1742,7 +1758,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1760,7 +1776,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1805,7 +1821,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1818,7 +1834,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1873,7 +1889,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -1881,7 +1897,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by clipit $as_me 1.4.2, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2139,7 +2155,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2277,7 +2293,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2364,11 +2380,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; 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 @@ -2454,7 +2470,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2494,7 +2510,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2547,7 +2563,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2598,7 +2614,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2638,7 +2654,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2726,11 +2742,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2808,6 +2824,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -2828,7 +2845,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2868,7 +2885,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2921,7 +2938,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2961,7 +2978,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3020,7 +3037,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3064,7 +3081,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3119,7 +3136,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3234,7 +3251,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3277,7 +3294,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3336,7 +3353,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3347,7 +3364,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3388,7 +3405,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3398,7 +3415,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3435,7 +3452,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3513,7 +3530,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3612,7 +3629,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3621,6 +3638,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3680,7 +3698,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3748,7 +3766,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3864,7 +3882,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3876,7 +3894,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3939,7 +3957,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4006,7 +4024,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4137,7 +4155,7 @@ for ac_header in locale.h do : ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = x""yes; then : +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -4149,7 +4167,7 @@ if test $ac_cv_header_locale_h = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then : +if ${am_cv_val_LC_MESSAGES+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4189,7 +4207,7 @@ INTLLIBS= ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = x""yes; then : +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -4198,7 +4216,7 @@ # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then : +if ${gt_cv_func_ngettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4229,7 +4247,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then : +if ${gt_cv_func_dgettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4262,7 +4280,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -4281,7 +4299,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4315,10 +4333,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4352,10 +4370,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then : +if ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4389,7 +4407,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : +if test "x$ac_cv_lib_intl_dgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes fi @@ -4405,7 +4423,7 @@ $as_echo "" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : +if ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4439,10 +4457,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : +if ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4476,7 +4494,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : +if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -4501,7 +4519,7 @@ for ac_func in bind_textdomain_codeset do : ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -4539,7 +4557,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -4576,7 +4594,7 @@ for ac_func in dcgettext do : ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = x""yes; then : +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -4617,7 +4635,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -4658,7 +4676,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -4709,7 +4727,7 @@ case $host in *-*-solaris*) ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -4718,6 +4736,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -4861,14 +4883,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.23"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.23" >&5 $as_echo_n "checking for intltool >= 0.23... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -4879,7 +4899,7 @@ set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -4919,7 +4939,7 @@ set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -4959,7 +4979,7 @@ set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -4999,25 +5019,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -5120,7 +5163,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -5160,7 +5203,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -5200,7 +5243,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -5240,7 +5283,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5291,7 +5334,7 @@ set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -5336,7 +5379,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -5375,7 +5418,7 @@ case $host in *-*-solaris*) ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -5438,7 +5481,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -5479,7 +5522,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5561,7 +5604,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -5639,7 +5682,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -5707,7 +5750,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -5723,7 +5766,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5741,7 +5784,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -5756,7 +5799,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5832,7 +5875,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5869,7 +5912,7 @@ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then : +if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -5889,7 +5932,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then : +if ${acl_cv_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5927,7 +5970,7 @@ solaris*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 $as_echo_n "checking for 64-bit host... " >&6; } -if test "${gl_cv_solaris_64bit+set}" = set; then : +if ${gl_cv_solaris_64bit+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6474,7 +6517,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then : +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_LIBS="$LIBS" @@ -6508,7 +6551,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then : +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_LIBS="$LIBS" @@ -6584,7 +6627,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6647,7 +6690,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6704,7 +6747,7 @@ if test "$am_cv_func_iconv" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 $as_echo_n "checking for working iconv... " >&6; } -if test "${am_cv_func_iconv_works+set}" = set; then : +if ${am_cv_func_iconv_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7300,7 +7343,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -7499,13 +7542,14 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -7548,7 +7592,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -7640,6 +7684,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7656,6 +7701,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -7675,9 +7721,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>&1` + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>&1` else - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>&1` + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator-0.1 >= $APPINDICATOR_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$APPINDICATOR_PKG_ERRORS" >&5 @@ -7706,7 +7752,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS @@ -7778,7 +7824,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -7818,7 +7864,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -7871,7 +7917,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -7911,7 +7957,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -7970,7 +8016,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -8014,7 +8060,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -8069,7 +8115,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -8098,7 +8144,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8135,7 +8181,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -8213,7 +8259,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -8312,7 +8358,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -8321,6 +8367,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -8380,7 +8427,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -8440,7 +8487,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -8495,7 +8542,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -8766,13 +8813,14 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -8815,7 +8863,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -9105,7 +9153,7 @@ # ------------------------------------------------------------------------------- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9189,7 +9237,7 @@ # ------------------------------------------------------------------------------- { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 $as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : +if ${ac_cv_type_signal+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9290,10 +9338,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -9357,7 +9416,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -9458,6 +9517,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9765,7 +9825,7 @@ # values after options handling. ac_log=" This file was extended by clipit $as_me 1.4.2, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9831,7 +9891,7 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ clipit config.status 1.4.2 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -9979,7 +10039,7 @@ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10002,9 +10062,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -10012,12 +10073,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10039,7 +10101,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -10067,7 +10129,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -10115,7 +10177,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -10147,7 +10209,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -10181,7 +10243,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -10193,8 +10255,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -10295,7 +10357,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10314,7 +10376,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -10323,7 +10385,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10349,8 +10411,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -10486,21 +10548,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -10511,20 +10574,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. diff -Nru clipit-1.4.2~quantal1/data/Makefile.in clipit-1.4.2~quantal2/data/Makefile.in --- clipit-1.4.2~quantal1/data/Makefile.in 2011-10-30 10:13:38.000000000 +0000 +++ clipit-1.4.2~quantal2/data/Makefile.in 2012-04-04 07:53:01.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,6 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(autostartdir)" \ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pixmapsdir)" DATA = $(autostart_DATA) $(desktop_DATA) $(pixmaps_DATA) @@ -79,6 +85,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AUTOCONF = @AUTOCONF@ @@ -125,6 +132,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ @@ -199,6 +210,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -289,9 +302,7 @@ @$(NORMAL_UNINSTALL) @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(autostartdir)" && rm -f $$files + dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @@ -309,9 +320,7 @@ @$(NORMAL_UNINSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktopdir)" && rm -f $$files + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-pixmapsDATA: $(pixmaps_DATA) @$(NORMAL_INSTALL) test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" @@ -329,9 +338,7 @@ @$(NORMAL_UNINSTALL) @list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pixmapsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pixmapsdir)" && rm -f $$files + dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -386,10 +393,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru clipit-1.4.2~quantal1/data/clipit-startup.desktop.in clipit-1.4.2~quantal2/data/clipit-startup.desktop.in --- clipit-1.4.2~quantal1/data/clipit-startup.desktop.in 2011-11-02 10:13:06.000000000 +0000 +++ clipit-1.4.2~quantal2/data/clipit-startup.desktop.in 2012-04-04 07:41:50.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] _Name=ClipIt _Comment=Clipboard Manager -Icon=gtk-paste +Icon=clipit-trayicon Exec=clipit Terminal=false Type=Application diff -Nru clipit-1.4.2~quantal1/data/clipit.desktop.in clipit-1.4.2~quantal2/data/clipit.desktop.in --- clipit-1.4.2~quantal1/data/clipit.desktop.in 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/data/clipit.desktop.in 2012-04-04 07:41:50.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] _Name=ClipIt _Comment=Clipboard Manager -Icon=gtk-paste +Icon=clipit-trayicon Exec=clipit Terminal=false Type=Application diff -Nru clipit-1.4.2~quantal1/debian/changelog clipit-1.4.2~quantal2/debian/changelog --- clipit-1.4.2~quantal1/debian/changelog 2012-10-10 23:20:20.000000000 +0000 +++ clipit-1.4.2~quantal2/debian/changelog 2012-10-10 23:46:30.000000000 +0000 @@ -1,8 +1,8 @@ -clipit (1.4.2~quantal1) quantal; urgency=medium +clipit (1.4.2~quantal2) quantal; urgency=medium * Built from 1.4.2 tarball - -- Guido Tabbernuk Thu, 11 Oct 2012 02:19:05 +0300 + -- Guido Tabbernuk Thu, 11 Oct 2012 02:46:20 +0300 clipit (1.4.1-1ppa1natty1) natty; urgency=low diff -Nru clipit-1.4.2~quantal1/depcomp clipit-1.4.2~quantal2/depcomp --- clipit-1.4.2~quantal1/depcomp 2011-10-30 09:45:41.000000000 +0000 +++ clipit-1.4.2~quantal2/depcomp 2012-04-04 07:53:01.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 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 @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # 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 ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru clipit-1.4.2~quantal1/doc/Makefile.in clipit-1.4.2~quantal2/doc/Makefile.in --- clipit-1.4.2~quantal1/doc/Makefile.in 2011-10-30 10:13:38.000000000 +0000 +++ clipit-1.4.2~quantal2/doc/Makefile.in 2012-04-04 07:53:01.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -71,6 +71,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -79,6 +85,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AUTOCONF = @AUTOCONF@ @@ -125,6 +132,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ @@ -199,6 +210,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -288,9 +301,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -358,10 +369,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru clipit-1.4.2~quantal1/install-sh clipit-1.4.2~quantal2/install-sh --- clipit-1.4.2~quantal1/install-sh 2011-10-30 09:45:41.000000000 +0000 +++ clipit-1.4.2~quantal2/install-sh 2012-04-04 07:53:01.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru clipit-1.4.2~quantal1/m4/intltool.m4 clipit-1.4.2~quantal2/m4/intltool.m4 --- clipit-1.4.2~quantal1/m4/intltool.m4 2011-10-30 10:13:33.000000000 +0000 +++ clipit-1.4.2~quantal2/m4/intltool.m4 2012-04-04 07:52:58.000000000 +0000 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -55,25 +53,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -119,7 +140,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then diff -Nru clipit-1.4.2~quantal1/missing clipit-1.4.2~quantal2/missing --- clipit-1.4.2~quantal1/missing 2011-10-30 09:45:41.000000000 +0000 +++ clipit-1.4.2~quantal2/missing 2012-04-04 07:53:01.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru clipit-1.4.2~quantal1/po/Makefile.in.in clipit-1.4.2~quantal2/po/Makefile.in.in --- clipit-1.4.2~quantal1/po/Makefile.in.in 2011-10-30 10:13:33.000000000 +0000 +++ clipit-1.4.2~quantal2/po/Makefile.in.in 2012-04-04 07:52:58.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru clipit-1.4.2~quantal1/po/Makevars.template clipit-1.4.2~quantal2/po/Makevars.template --- clipit-1.4.2~quantal1/po/Makevars.template 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/Makevars.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = Free Software Foundation, Inc. - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff -Nru clipit-1.4.2~quantal1/po/POTFILES.in clipit-1.4.2~quantal2/po/POTFILES.in --- clipit-1.4.2~quantal1/po/POTFILES.in 2011-10-30 10:17:31.000000000 +0000 +++ clipit-1.4.2~quantal2/po/POTFILES.in 2012-04-04 07:41:50.000000000 +0000 @@ -1,10 +1,9 @@ -./src/daemon.c -./src/history.c -./src/keybinder.c -./src/main.c -./src/manage.c -./src/preferences.c -./src/utils.c -./data/clipit-startup.desktop.in -./data/clipit.desktop.in - +data/clipit-startup.desktop.in +data/clipit.desktop.in +src/daemon.c +src/history.c +src/keybinder.c +src/main.c +src/manage.c +src/preferences.c +src/utils.c diff -Nru clipit-1.4.2~quantal1/po/Rules-quot clipit-1.4.2~quantal2/po/Rules-quot --- clipit-1.4.2~quantal1/po/Rules-quot 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/Rules-quot 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# Special Makefile rules for English message catalogs with quotation marks. - -DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot - -.SUFFIXES: .insert-header .po-update-en - -en@quot.po-create: - $(MAKE) en@quot.po-update -en@boldquot.po-create: - $(MAKE) en@boldquot.po-update - -en@quot.po-update: en@quot.po-update-en -en@boldquot.po-update: en@boldquot.po-update-en - -.insert-header.po-update-en: - @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - ll=`echo $$lang | sed -e 's/@.*//'`; \ - LC_ALL=C; export LC_ALL; \ - cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "creation of $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -en@quot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header - -en@boldquot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header - -mostlyclean: mostlyclean-quot -mostlyclean-quot: - rm -f *.insert-header diff -Nru clipit-1.4.2~quantal1/po/bg.po clipit-1.4.2~quantal2/po/bg.po --- clipit-1.4.2~quantal1/po/bg.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/bg.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,330 +0,0 @@ -# ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel -# This file is distributed under the same license as the ClipIt package. -# -# Translators: -# , 2011. -# Stefan Ilivanov , 2011. -msgid "" -msgstr "" -"Project-Id-Version: ClipIt\n" -"Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/clipit/team/bg_BG/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: bg_BG\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: .././src/main.c:288 -msgid "Lightweight GTK+ clipboard manager." -msgstr "Лек GTK+ мениджър за клипборда." - -#. Actions using: -#: .././src/main.c:353 -msgid "Actions using:" -msgstr "" - -#. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 -msgid "None" -msgstr "" - -#: .././src/main.c:382 -msgid "None" -msgstr "Няма" - -#. File contained no actions so adding empty -#. File did not open so adding empty -#. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 -msgid "Empty" -msgstr "Празно" - -#. Edit actions -#: .././src/main.c:440 -msgid "_Edit actions" -msgstr "_Действия за промяна" - -#. Manage history -#: .././src/main.c:669 -msgid "_Manage history" -msgstr "_История" - -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Мениджър за клипборда" - -#. Create the dialog -#: .././src/manage.c:137 -msgid "Editing Clipboard" -msgstr "Промяна на клипборда" - -#: .././src/manage.c:157 -msgid "_Static item" -msgstr "_Статичен запис" - -#: .././src/manage.c:226 -msgid "Clear the history?" -msgstr "Изчистване на историята?" - -#: .././src/manage.c:227 -msgid "Clear history" -msgstr "Изчисти историята" - -#: .././src/manage.c:342 -msgid "Manage History" -msgstr "" - -#: .././src/manage.c:374 -msgid "Results" -msgstr "" - -#: .././src/manage.c:379 -msgid "Edit" -msgstr "" - -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 -msgid "Remove" -msgstr "Премахни" - -#: .././src/manage.c:383 -msgid "Remove all" -msgstr "" - -#: .././src/manage.c:385 -msgid "Close" -msgstr "" - -#: .././src/preferences.c:161 -msgid "Save history" -msgstr "Запиши историята" - -#: .././src/preferences.c:193 -msgid "Remove history file" -msgstr "Премахване на файлът с история" - -#. Create the dialog -#: .././src/preferences.c:628 -msgid "Preferences" -msgstr "Настройки" - -#: .././src/preferences.c:647 -msgid "Settings" -msgstr "Настройки" - -#: .././src/preferences.c:655 -msgid "Clipboards" -msgstr "Клипбордове" - -#: .././src/preferences.c:662 -msgid "Use _Copy (Ctrl-C)" -msgstr "Ползвай _Копиране (Ctrl+C)" - -#: .././src/preferences.c:665 -msgid "Use _Primary (Selection)" -msgstr "Ползвай _Основен (Избор)" - -#: .././src/preferences.c:668 -msgid "S_ynchronize clipboards" -msgstr "С_инхронизиране на клипбордовете" - -#: .././src/preferences.c:670 -msgid "_Automatically paste selected item" -msgstr "_Автоматично вмъкване на избран запис" - -#: .././src/preferences.c:679 -msgid "Miscellaneous" -msgstr "Допълнителни" - -#: .././src/preferences.c:686 -msgid "Show _indexes in history menu" -msgstr "Показва _списъци в менюто за история" - -#: .././src/preferences.c:688 -msgid "S_ave URIs" -msgstr "З_запис на адрес(и)" - -#: .././src/preferences.c:690 -msgid "Capture _hyperlinks only" -msgstr "Прихваща само _адреси" - -#: .././src/preferences.c:692 -msgid "C_onfirm before clearing history" -msgstr "П_отвърди преди изчистване на историята" - -#: .././src/preferences.c:694 -msgid "_Use right-click menu" -msgstr "_Ползва меню с десен бутон" - -#: .././src/preferences.c:703 -msgid "History" -msgstr "История" - -#: .././src/preferences.c:711 -msgid "History" -msgstr "История" - -#: .././src/preferences.c:718 -msgid "Save _history" -msgstr "Запис на _история" - -#: .././src/preferences.c:719 -msgid "Save and restore history between sessions" -msgstr "Запис и възстановяване на историята между сесиите" - -#: .././src/preferences.c:723 -msgid "Items in history:" -msgstr "Записи в историята:" - -#: .././src/preferences.c:732 -msgid "Items in menu:" -msgstr "Записи в меню:" - -#: .././src/preferences.c:739 -msgid "Show _static items in menu" -msgstr "Показва _статични записи в менюто" - -#: .././src/preferences.c:744 -msgid "Static items in menu:" -msgstr "Статични записи в меню:" - -#: .././src/preferences.c:757 -msgid "Items" -msgstr "Записи" - -#: .././src/preferences.c:764 -msgid "Show in a single _line" -msgstr "Показва единична _линия" - -#: .././src/preferences.c:766 -msgid "Show in _reverse order" -msgstr "Показва в _обратен ред" - -#: .././src/preferences.c:770 -msgid "Character length of items:" -msgstr "Дължина на знаците за записите:" - -#: .././src/preferences.c:779 -msgid "Omit items in the:" -msgstr "Ограничи записите в:" - -#: .././src/preferences.c:783 -msgid "Beginning" -msgstr "Начало" - -#: .././src/preferences.c:784 -msgid "Middle" -msgstr "Среда" - -#: .././src/preferences.c:785 -msgid "End" -msgstr "Край" - -#: .././src/preferences.c:815 -msgid "Actions" -msgstr "Действия" - -#. Build the actions label -#: .././src/preferences.c:820 -msgid "Control-click ClipIt's tray icon to use actions" -msgstr "CTRL+Клик на ClipIt иконата, за да видите възможните действия" - -#: .././src/preferences.c:840 -msgid "Action" -msgstr "Действие" - -#: .././src/preferences.c:847 -msgid "Command" -msgstr "Команда" - -#: .././src/preferences.c:862 .././src/preferences.c:923 -msgid "Add..." -msgstr "Добави..." - -#: .././src/preferences.c:883 -msgid "Exclude" -msgstr "Изключва" - -#. Build the exclude label -#: .././src/preferences.c:888 -msgid "" -"Regex list of items that should not be inserted into the history " -"(passwords/sites that you don't need in history, etc)." -msgstr "" - -#: .././src/preferences.c:908 -msgid "Regex" -msgstr "Изключения" - -#: .././src/preferences.c:936 -msgid "Hotkeys" -msgstr "Бързи клавиши" - -#: .././src/preferences.c:944 -msgid "Hotkeys" -msgstr "Бързи клавиши" - -#: .././src/preferences.c:954 -msgid "History hotkey:" -msgstr "История на бързи клавиши:" - -#: .././src/preferences.c:963 -msgid "Actions hotkey:" -msgstr "Действия за бързи клавиши:" - -#: .././src/preferences.c:972 -msgid "Menu hotkey:" -msgstr "Бърз клавиш за меню:" - -#: .././src/preferences.c:981 -msgid "Manage hotkey:" -msgstr "Управление на бързите клавиши:" - -#: .././src/utils.c:40 .././src/utils.c:47 -#, c-format -msgid "Couldn't create directory: %s\n" -msgstr "Невъзможно създаване на директория: %s\n" - -#: .././src/utils.c:121 -msgid "Run as daemon" -msgstr "Стартиране като демон" - -#: .././src/utils.c:128 -msgid "Do not use status icon (Ctrl-Alt-P for menu)" -msgstr "Да не ползва иконата за статус (Ctrl-Alt-P за меню)" - -#: .././src/utils.c:135 -msgid "Print clipboard contents" -msgstr "Отпечатване на съдържанието от клипборда" - -#: .././src/utils.c:142 -msgid "Print primary contents" -msgstr "Отпечатване на първото съдържание" - -#: .././src/utils.c:154 -msgid "" -"Clipboard CLI usage examples:\n" -"\n" -" echo \"copied to clipboard\" | clipit\n" -" clipit \"copied to clipboard\"\n" -" echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Clipboard CLI примери:\n" -"\n" -" echo \"copied to clipboard\" | clipit\n" -" clipit \"copied to clipboard\"\n" -" echo \"copied to clipboard\" | clipit -c" - -#: .././src/utils.c:160 -msgid "" -"Written by Cristian Henzel.\n" -"Report bugs to ." -msgstr "" -"Създадено от Cristian Henzel.\n" -"Съобщете за грешки на ." - - diff -Nru clipit-1.4.2~quantal1/po/boldquot.sed clipit-1.4.2~quantal2/po/boldquot.sed --- clipit-1.4.2~quantal1/po/boldquot.sed 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/boldquot.sed 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g -s/“/“/g -s/”/”/g -s/‘/‘/g -s/’/’/g diff -Nru clipit-1.4.2~quantal1/po/cs.po clipit-1.4.2~quantal2/po/cs.po --- clipit-1.4.2~quantal1/po/cs.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/cs.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,327 +1,339 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: # Miloš Koutný , 2009. +# , 2011. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Cristian Henzel \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Czech (http://www.transifex.net/projects/p/clipit/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Správce schránky" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Odlehčený GTK+ správce schránky." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" -msgstr "" +msgstr "Akce pro:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" -msgstr "" +msgstr "Žádný" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Žádný" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Prázdný" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "Akce _Editace" -#. Manage history -#: .././src/main.c:669 -msgid "_Manage history" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Správce schránky" +#. Manage history +#: ../src/main.c:695 +msgid "_Manage history" +msgstr "_Správa historie" #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" -msgstr "Upravuji schránku" +msgstr "Úprava schránky" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" -msgstr "" +msgstr "_Statická položka" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Vymazat historii?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" -msgstr "" +msgstr "Vymazat historii" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" +msgstr "Správa historie" + +#: ../src/manage.c:351 +msgid " (Offline mode)" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:393 msgid "Results" -msgstr "" +msgstr "Výsledky" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" -msgstr "" +msgstr "Upravit" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Odstranit" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" -msgstr "" +msgstr "Odstranit vše" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" -msgstr "" +msgstr "Zavřít" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" -msgstr "" +msgstr "Uložit historii" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" -msgstr "" +msgstr "Odstranit soubor historie" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" -msgstr "Nastavení" +msgstr "Předvolby" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" -msgstr "" +msgstr "Nastavení" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" -msgstr "Schránka" +msgstr "Schránky" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" -msgstr "Kopírování (Ctrl-C)" +msgstr "Použít _kopírování (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" -msgstr "Užít primární (výběr)" +msgstr "Použít _primární (výběr)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" -msgstr "S_ynchronisieren schránky" +msgstr "S_ynchronizovat schránky" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" -msgstr "" +msgstr "_Automaticky vložit vybranou položku" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" -msgstr "Příslušenství" +msgstr "Různé" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" -msgstr "" +msgstr "_Zobrazit pořadí v nabídce historie" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" -msgstr "" +msgstr "Ukládat _URI" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" -msgstr "Zachycovat pouze hyper-linkové odkazy" +msgstr "Zachycovat pouze _hypertextové odkazy" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "P_otvrzení před smazáním historie" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" -msgstr "" +msgstr "Použít _nabídku vyvolanou pravým tlačítkem" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" -msgstr "" +msgstr "Historie" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historie" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" -msgstr "" +msgstr "Ukládat _historii" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" -msgstr "Uložit a obnovit historii mezi sezeními" +msgstr "Bude ukládat a obnovovat historii mezi sezeními" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" -msgstr "Položky v historii:" +msgstr "Položek v historii:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" -msgstr "" +msgstr "Položek v nabídce:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" -msgstr "" +msgstr "Zobrazit v nabídce _statické položky" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" -msgstr "" +msgstr "Statických položek v nabídce:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Položky" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" -msgstr "" +msgstr "Zobrazit v _jediném řádku" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Zob_razit v opačném pořadí" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" -msgstr "Znaková délka položek" +msgstr "Počet znaků položek:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" -msgstr "Opomenout položku v:" +msgstr "Vynechat položky:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" -msgstr "Začátek" +msgstr "na začátku" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" -msgstr "Střed" +msgstr "ve středu" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" -msgstr "Konec" +msgstr "na konci" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Akce" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Ctrl+klik na ikoně ClipIt v liště k akcím" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Akce" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Příkaz" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Přidat..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" -msgstr "" +msgstr "Výjimky" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Seznam regulárních výrazů, které by neměly být ukládány do historie (hesla/stránky, které nejsou v historii potřeba, atd.)" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" -msgstr "" +msgstr "Regulární výraz" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Klávesové zkratky" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" -msgstr "" +msgstr "Zkratka pro historii:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" -msgstr "" +msgstr "Zkratka pro akce:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" -msgstr "" +msgstr "Zkratka pro nabídku:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" +msgstr "Zkratka pro správu:" + +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Nelze vytvořit adresář: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" -msgstr "Start jako démon" +msgstr "Spouštět jako démon" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" -msgstr "Nepoužívat stavovou ikonu (Ctrl+Alt+P pro menu)" +msgstr "Nepoužívat stavovou ikonu (Ctrl+Alt+P pro nabídku)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Tisknout obsah schránky" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Tisknout primární obsah" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Schránka CLI (příkazová řádka) - příklad užití:\n" -"\n" -" echo \"Kopie od schránky\" | clipit\n" -" clipit \"Kopie do schránky\"\n" -" echo \"Kopie do schránky\" | clipit -o" +msgstr "Příklad užití schránky v příkazovém řádku:\n\n echo \"Kopie do schránky\" | clipit\n clipit \"Kopie do schránky\"\n echo \"Kopie do schránky\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" - - +msgstr "Napsal Cristian Henzel.\nChyby hlaste na ." diff -Nru clipit-1.4.2~quantal1/po/da.po clipit-1.4.2~quantal2/po/da.po --- clipit-1.4.2~quantal1/po/da.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/da.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,310 +18,321 @@ "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Udklipsholder" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Letvægts GTK+ udklipsholder-håndtering" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Ingen" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Tom" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "R_ediger handlinger" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Udklipsholder" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Rediger udklipsholder" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Tøm historikken?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Fjern" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Indstillinger" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Udklipsholder" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Brug _kopier (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Brug _primær (Markering)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_ynkroniser udklipsholder" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Diverse" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Indfang kun _henvisning" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Bekræft før rydning af hist_orik" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historik" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Gem og gendan historik imellem sessioner" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Elementer i historik:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elementer" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Vis i omvendt _rækkefølge" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Tegnlængde på elementer:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Udelad elementer i:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Begyndelsen" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Midten" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Slutningen" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Handlinger" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Hold Ctrl og klik ClipIts ikon for at bruge handlinger" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Handling" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Kommando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Tilføj" -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Tastaturgenveje" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Tastaturgenveje" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Kunne ikke oprette mappen: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Kør som tjeneste" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Vis ikke statusikon (Ctrl-Alt-P for menu)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Udskriv udklipsholderens indhold" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Udskriv udklipsholderens indhold" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Eksempler ved brug af udklipsholder i CLI:\n" -"\n" -" echo \"kopieret til udklipsholderen\" | clipit\n" -" clipit \"kopieret til udklipsholderen\"\n" -" echo \"kopieret til udklipsholderen\" | clipit -o" +msgstr "Eksempler ved brug af udklipsholder i CLI:\n\n echo \"kopieret til udklipsholderen\" | clipit\n clipit \"kopieret til udklipsholderen\"\n echo \"kopieret til udklipsholderen\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/de.po clipit-1.4.2~quantal2/po/de.po --- clipit-1.4.2~quantal1/po/de.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/de.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,330 +1,341 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: # , 2011. # Cristian Henzel , 2011. +# , 2011, 2012. +# , 2011. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: German (Germany) (http://www.transifex.net/projects/p/clipit/team/de_DE/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: German (Germany) (http://www.transifex.net/projects/p/clipit/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Zwischenablage-Verwaltung" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." -msgstr "Leichtgewichtiger GTK+ Zwischenablage-Manager" +msgstr "Schlanke GTK+-Zwischenablagen-Verwaltung" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "Aktionen mit:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "Nichts" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Nichts" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Leer" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" -msgstr "Aktionen _bearbeiten" +msgstr "Aktionen b_earbeiten" + +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "_Offline-Modus" #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "_Verlauf bearbeiten" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Zwischenablage-Manager" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" -msgstr "Zwischenablage bearbeiten" +msgstr "Als Dienst ausführen" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" -msgstr "_statisches Objekt" +msgstr "_Statisches Objekt" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" -msgstr "Verauf löschen?" +msgstr "Verlauf löschen?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "Verlauf löschen" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "Verlauf verwalten" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "(Offline-Modus)" + +#: ../src/manage.c:393 msgid "Results" msgstr "Ergebnisse" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "Ändern" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Entfernen" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "Alle entfernen" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "Schließen" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "Verlauf speichern" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" -msgstr "Verlaufsdatei entfernen" +msgstr "Verlauf entfernen" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Einstellungen" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "Einstellungen" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Zwischenablagen" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" -msgstr "_Kopieren benutzen(Strg-C)" +msgstr "_Kopieren benutzen (Strg-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" -msgstr "_Primäre Zwischenablage benutzen(Auswahl)" +msgstr "_Primäre Zwischenablage benutzen (Auswahl)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "Zwischenablagen s_ynchronisieren" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "Ausgewähltes Objekt _automatisch einfügen" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" -msgstr "Verschiedenes" +msgstr "Sonstiges" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "_Indizes im Verlaufsmenü zeigen" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "URLs s_peichern" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Nur _Hyperlinks aufzeichnen" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Verlauf l_öschen bestätigen" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "Rechts-Klick-Menü ben_utzen" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "Verlauf" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Verlauf" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" -msgstr "_Verlauf speichern" +msgstr "Verlauf speic_hern" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Verlauf zwischen Sitzungen speichern und wiederherstellen" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Objekte im Verlauf:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "Objekte im Menü:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" -msgstr "_Statische Objekte im Menü zeigen" +msgstr "_Statische Objekte im Menü anzeigen" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "Statische Objekte im Menü:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Objekte" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" -msgstr "In einzelner _Zeile zeigen" +msgstr "In einer _Zeile anzeigen" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" -msgstr "In umgekehrter _Reihenfolge zeigen" +msgstr "In umgekehrter _Reihenfolge anzeigen" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Zeichenanzahl des Objekts:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Objekte auslassen in:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Anfang" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Mitte" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Ende" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Aktionen" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "Strg+Klick auf ClipIts's Tray Icon um Aktionen zu benutzen" +msgstr "Strg+Klick auf ClipIts Benachrichtigungsfeld-Symbol, um Aktionen zu benutzen" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Aktion" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" -msgstr "Kommando" +msgstr "Befehl" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." -msgstr "Hinzufügen..." +msgstr "Hinzufügen …" -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "Ausschließen" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Regex-Liste von Objekten, die nicht in den Verlauf aufgenommen werden sollen (Passwörter/Sites, die nicht im Verlauf benötigt werden usw.)." -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "Regex" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" -msgstr "Hotkeys" +msgstr "Tastenkürzel" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" -msgstr "Hotkeys" +msgstr "Tastenkürzel" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" -msgstr "Verlaufs-Hotkey:" +msgstr "Verlaufs-Tastenkürzel:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" -msgstr "Aktionen-Hotkey:" +msgstr "Aktionen-Tastenkürzel:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" -msgstr "Menü-Hotkey:" +msgstr "Menü-Tastenkürzel:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" -msgstr "Verwalten-Hotkey:" +msgstr "Verwalten-Tastenkürzel:" + +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "Tastenkürzel für Offline-Modus:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" -msgstr "Konnte Ordner nicht anlegen: %s\n" +msgstr "Ordner konnte nicht erstellt werden: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" -msgstr "Als Daemon laufen" +msgstr "Als Dienst ausführen" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" -msgstr "Kein Statusicon benutzen ( Strg-Alt-P für Menü)" +msgstr "Kein Statussymbol benutzen ( Strg-Alt-P für Menü)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Zwischenablageninhalt drucken" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Primären Inhalt drucken" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Zwischenablage CLI Beispiele:\n" -"\n" -" echo \"In Zwischenablage kopiert\" | clipit\n" -" clipit \"In Zwischenablage kopiert\"\n" -" echo \"In Zwischenablage kopiert\" | clipit -c" +msgstr "Beispiele Zwischenablage und CLI:\n\n echo \"In Zwischenablage kopiert\" | clipit\n clipit \"In Zwischenablage kopiert\"\n echo \"In Zwischenablage kopiert\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"Geschrieben von Christian Henzel.\n" -"Fehler berichten an: ." - - +msgstr "Geschrieben von Cristian Henzel.\nFehler melden an: ." diff -Nru clipit-1.4.2~quantal1/po/en@boldquot.header clipit-1.4.2~quantal2/po/en@boldquot.header --- clipit-1.4.2~quantal1/po/en@boldquot.header 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/en@boldquot.header 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# -# This catalog furthermore displays the text between the quotation marks in -# bold face, assuming the VT100/XTerm escape sequences. -# diff -Nru clipit-1.4.2~quantal1/po/en@quot.header clipit-1.4.2~quantal2/po/en@quot.header --- clipit-1.4.2~quantal1/po/en@quot.header 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/en@quot.header 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# diff -Nru clipit-1.4.2~quantal1/po/es.po clipit-1.4.2~quantal2/po/es.po --- clipit-1.4.2~quantal1/po/es.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/es.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,310 +19,321 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Gestor de Portapapeles" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Gestor ligero de portapapeles en GTK+." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Ninguno" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Vacío" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Editar acciones" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Gestor de Portapapeles" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Editando Portapapeles" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "¿Borrar el historial?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Eliminar" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferencias" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Portapapeles" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Usar _Copias (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Usar _Primaria (Selección)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_incronizar portapapeles" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Varios" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Capturar _hipervínculos solamente" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "C_onfirmar antes de borrar historial" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historial" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Mantener y restaurar historial entre sesiones" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Artículos en el historial:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Articulos" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Mostrar artículos del historial en orden _invertido" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Longitud de artículos en caracteres:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Omitir en el:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Principio" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Medio" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Final" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Acciones" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Control-clic en el icono de ClipIt para usar acciones" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Acción" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Comando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Añadir..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Atajos" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Atajos" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "No se puede crear el directorio: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Ejecutar como demonio" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "No usar icono de estado (Ctrl-Alt-P para el menú)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Imprimir contenido del portapapeles" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Imprimir contenido de la selección" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Ejemplos del portapapeles por el terminal:\n" -"\n" -" echo \"copiado a portapapeles\" | clipit\n" -" clipit \"copiado a portapapeles\"\n" -" echo \"copiado a portapapeles\" | clipit -o" +msgstr "Ejemplos del portapapeles por el terminal:\n\n echo \"copiado a portapapeles\" | clipit\n clipit \"copiado a portapapeles\"\n echo \"copiado a portapapeles\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/es_ES.po clipit-1.4.2~quantal2/po/es_ES.po --- clipit-1.4.2~quantal1/po/es_ES.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/es_ES.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,330 +1,339 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: # Adolfo Jayme Barrientos , 2011. +# Cristian Henzel , 2011. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/clipit/team/es_ES/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/clipit/language/es_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Gestor del portapapeles" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Gestor de portapapeles ligero, en GTK+." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "Acciones con:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "Ninguno" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Ninguno" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Vacío" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Editar acciones" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "_Gestionar historial" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Gestor del portapapeles" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Editando el portapapeles" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "Elemento e_stático" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "¿Vaciar el historial?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "Vaciar el historial" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "Gestionar el historial" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "Resultados" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "Editar" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Quitar" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "Quitar todo" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "Cerrar" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "Guardar el historial" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "Eliminar archivo de historial" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferencias" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "Configuración" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Portapapeles" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Usar _copiar (Ctrl+C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Usar _primario (selección)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "Sincroni_zar portapapeles" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "Pegar _automáticamente el elemento seleccionado" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Miscelánea" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "Mostrar índ_ices en el menú de historial" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "_Guardar URIs" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Solo capturar _hiperenlaces" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "C_onfirmar antes de vaciar el historial" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "_Usar menú contextual" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "Historial" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historial" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "Guardar _historial" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Guardar y restaurar historial entre sesiones" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Elementos en el historial:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "Elementos en el menú:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "Mostrar elementos e_státicos en el menú" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "Elementos estáticos en el menú:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elementos" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "Mostrar en una sola _línea" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Mostrar en orden inve_rso" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Cantidad de caracteres de los elementos:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Omitir los elementos al:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Comienzo" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Medio" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Final" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Acciones" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "" -"Usar acciones con Ctrl+pulsar sobre el icono de ClipIt en área de notif." +msgstr "Usar acciones con Ctrl+pulsar sobre el icono de ClipIt en área de notif." -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Acción" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Orden" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Añadir..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "Excluir" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Lista de expresiones regulares que no deberían insertarse en el historial (contraseñas/sitios que no necesita en el historial, etc.)" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "Expresiones regulares" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Atajos de teclado" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Atajos de teclado" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "Atajo al historial:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "Atajo a acciones:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "Atajo al menú:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "Atajo a gestión:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "No se pudo crear directorio: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Ejecutar como demonio" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "No usar icono de estado (Ctrl+Alt+P para el menú)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Imprimir el contenido del portapapeles" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Imprimir el contenido primario" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Ejemplos de uso de la línea de órdenes del portapapeles:\n" -"\n" -" echo \"copiado al portapapeles\" | clipit\n" -" clipit \"copiado al portapapeles\"\n" -" echo \"copiado al portapapeles\" | clipit -c" +msgstr "Ejemplos de uso de la línea de órdenes del portapapeles:\n\n echo \"copiado al portapapeles\" | clipit\n clipit \"copiado al portapapeles\"\n echo \"copiado al portapapeles\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"Escrito por Cristian Henzel.\n" -"Informe de errores a ." - - +msgstr "Escrito por Cristian Henzel.\nInforme de errores a ." diff -Nru clipit-1.4.2~quantal1/po/et.po clipit-1.4.2~quantal2/po/et.po --- clipit-1.4.2~quantal1/po/et.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/et.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -9,322 +9,331 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/clipit/team/et_EE/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Estonian (Estonia) (http://www.transifex.net/projects/p/clipit/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Lõikepuhvrihaldur" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Kergekaaluline GTK+ lõikepuhvrihaldur" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "Kasutades väljalõiget:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "Puudub" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Puudub" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Tühi" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Toimeta käsklusi" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "_Toimeta ajalugu" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Lõikepuhvrihaldur" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Lõikepuhvri toimetamine" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "_Staatiline kirje" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Kas tühjendada ajalugu?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "Ajaloo tühjendamine" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "Ajaloo toimetamine" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "Tulemused" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "Toimeta" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Eemalda" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "Eemalda kõik" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "Sulge" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "Ajaloo salvestamine" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "Ajaloofaili eemaldamine" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Eelistused" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "Seaded" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Lõikepuhvrid" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "_Kopeerimispuhvri (Ctrl-C) kasutamine" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "_Primaarpuhvri (valik) kasutamine" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "_Lõikepuhvrite sünkimine" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "Valitud kirje _automaatne asetamine" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Mitmesugust" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "_Järjekorranumbrite näitamine ajaloomenüüs" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "URI'de _salvestamine" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Ainult _hüperlinkide salvestamine" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Nõusoleku küsimine enne ajaloo _tühjendamist" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "Hiire _paremklõpsu menüü kasutamine" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "Ajalugu" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Ajalugu" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "Ajaloo _salvestamine" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Salvestab ajaloo ja taastab selle uues sessioonis" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Kirjeid ajaloos:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "Kirjeid menüüs:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "_Püsikirjete näitamine menüüs" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "Püsikirjeid menüüs:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Väljalõiked" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "Näitamine ühel _real" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "_Tagurpidijärjestus" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Kirje pikkus tärkides:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Väljalõiked kärbitakse:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Algusest" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Keskelt" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Lõpust" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Käsklused" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Käskluste kasutamiseks Ctrl-klõpsa ClipIt'i seisundiikoonil" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Nimi" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Käsk" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Lisa..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "Välistamine" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Regulaaravaldiste nimekiri, mille alusel välistada kirjeid ajaloost (nt paroolid/saidid, mida ajaloos ei tohiks olla jne)." -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "Avaldis" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Välksõrmised" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Välksõrmised" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "Ajaloo sõrmis:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "Käskluste sõrmis:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "Menüü sõrmis:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "Toimetamise sõrmis:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Kataloogi loomine ebaõnnestus: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Käivita ainult deemon" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Ära kasuta näidikuriba ikooni (Ctrl-Alt-P avab menüü)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Väljasta lõikepuhvri sisu" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Väljasta primaarpuhvri sisu" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Lõikepuhvri CLI kasutusnäited:\n" -"\n" -" echo \"copied to clipboard\" | clipit\n" -" clipit \"copied to clipboard\"\n" -" echo \"copied to clipboard\" | clipit -c" +msgstr "Lõikepuhvri CLI kasutusnäited:\n\n echo \"copied to clipboard\" | clipit\n clipit \"copied to clipboard\"\n echo \"copied to clipboard\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"Koodinud Cristian Henzel.\n" -"Vearaportid aadressile ." - - +msgstr "Koodinud Cristian Henzel.\nVearaportid aadressile ." diff -Nru clipit-1.4.2~quantal1/po/fr.po clipit-1.4.2~quantal2/po/fr.po --- clipit-1.4.2~quantal1/po/fr.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/fr.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,312 +19,321 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Gestionnaire de presse-papier" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Gestionnaire de presse-papier léger (GTK+)." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Aucun" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Vide" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Modifier les actions" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Gestionnaire de presse-papier" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Modification du presse-papier" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Effacer l'historique ?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Supprimer" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Préférences" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Presse-papiers" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Utiliser la _copie (Ctrl+C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Utiliser la _sélection du curseur" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_ynchroniser les presse-papiers" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Divers" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Capturer uniquement les _hyperliens" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Demander _confirmation avant d'effacer l'historique" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historique" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Sauvegarder et restaurer l'historique entre les sessions" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Nombre de lignes dans l'historique :" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Éléments du presse-papier" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Afficher dans l'o_rdre inverse" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Nombre de caractères par élément :" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Partie de l'élément à couper :" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Début" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Milieu" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Fin" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Actions" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "" -"Maintenir la touche Ctrl et cliquer sur l'icône de notification de ClipIt " -"pour utiliser les actions" +msgstr "Maintenir la touche Ctrl et cliquer sur l'icône de notification de ClipIt pour utiliser les actions" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Action" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Commande" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Ajouter..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Raccourcis clavier" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Raccourcis claviers" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Impossible de créer le répertoire : %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Démarrer en tant que service" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Ne pas utiliser l'icône de notification (Ctrl+Alt+P pour le menu)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Imprimer le contenu du presse-papier" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Imprimer le contenu de la sélection" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Exemples d'utilisation de commandes interprétées pour le presse-papier:\n" -"\n" -" echo \"copié dans le presse-papier\" | clipit\n" -" clipit \"copié dans le presse-papier\"\n" -" echo \"copié dans le presse-papier\" | clipit -c" +msgstr "Exemples d'utilisation de commandes interprétées pour le presse-papier:\n\n echo \"copié dans le presse-papier\" | clipit\n clipit \"copié dans le presse-papier\"\n echo \"copié dans le presse-papier\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/hu.po clipit-1.4.2~quantal2/po/hu.po --- clipit-1.4.2~quantal1/po/hu.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/hu.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,327 +1,339 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: +# László Gyaraki , 2011, 2012. # Németh Tamás , 2008, 2009. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Cristian Henzel \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Hungarian (http://www.transifex.net/projects/p/clipit/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Vágólapkezelő" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "GTK+ alapú, könnyen kezelhető vágólapkezelő." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" -msgstr "" +msgstr "Műveletek használata:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" -msgstr "" +msgstr "Nincs" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Nincs" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Üres" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Műveletek szerkesztése" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "_Kapcsolat nélküli munka" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" -msgstr "" - -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Vágólapkezelő" +msgstr "_Előzmények kezelése" #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Vágólap szerkesztése" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" -msgstr "" +msgstr "Állandó elem" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Törli az előzményeket?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" -msgstr "" +msgstr "Előzmények törlése" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" -msgstr "" +msgstr "Előzmények kezelése" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr " (Kapcsolat nélküli munka)" + +#: ../src/manage.c:393 msgid "Results" -msgstr "" +msgstr "Eredmények" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" -msgstr "" +msgstr "Szerkesztés" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Eltávolít" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" -msgstr "" +msgstr "Összes törlése" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" -msgstr "" +msgstr "Bezár" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" -msgstr "" +msgstr "Előzmények mentése" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" -msgstr "" +msgstr "Mentett előzmények törlése" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Beállítások" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" -msgstr "" +msgstr "Beállítások" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Vágólapok" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "_Másol használata (Ctrl+C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" -msgstr "_Elsődleges használata (Kiválasztás)" +msgstr "_Eredeti használata (kijelölés)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "Vágólapok s_zinkronizálása" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" -msgstr "" +msgstr "Kijelölés _automatikus beillesztése" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Egyebek" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" -msgstr "" +msgstr "_Indexek mutatása az előzményekben" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" -msgstr "" +msgstr "URI _mentése" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Csak a _hivatkozások elkapása" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" -msgstr "Előzmény törlésének megerősítése" +msgstr "E_lőzmény törlésének megerősítése" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" -msgstr "" +msgstr "_Helyi menü használata" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" -msgstr "" +msgstr "Előzmények" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" -msgstr "Előzmény" +msgstr "Előzmények" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" -msgstr "" +msgstr "_Előzmények mentése" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Előzmények mentése és visszaállítása a munkamenetek között" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Előzmény elemei:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" -msgstr "" +msgstr "Elemek a menüben:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" -msgstr "" +msgstr "Állandó elemek megjelenítése a menüben" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" -msgstr "" +msgstr "Állandó elemek a menüben:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elemek" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" -msgstr "" +msgstr "Megjelenítés egy _sorban" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "_Fordított sorrend" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Elemek karaktereinek száma:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Elemek kihagyása itt:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Elején" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Középen" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Végén" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Műveletek" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Műveletek használatához Ctrl+kattintás a ClipIt állapotikonjára" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Művelet" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Parancs" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." -msgstr "Új..." +msgstr "Hozzáadás..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" -msgstr "" +msgstr "Kizárás" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "A Regex azon reguláris kifejezések listája, melyeket nem kíván közzétenni az előzményekben (például egy jelszó/weboldal, amit nem szükséges naplózni)." -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" -msgstr "" +msgstr "Regex" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Gyorsbillentyűk" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Gyorsbillentyűk" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" -msgstr "" +msgstr "Előzmények:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" -msgstr "" +msgstr "Műveletek:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" -msgstr "" +msgstr "Menü:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" -msgstr "" +msgstr "Előzmények kezelése:" + +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "Kapcsolat nélküli munka gyorsbillentyűje:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "A könyvtár nem hozható létre: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Futtatás démonként" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" -msgstr "Ne használjon állapot ikont (Ctrl+Alt+P)" +msgstr "Ne használjon állapotikont (Ctrl+Alt+P)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Vágólap tartalmak nyomtatása" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" -msgstr "Elsődleges tartalmak nyomtatása" +msgstr "Eredeti tartalmak nyomtatása" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"A vágólapkezelő CLI (konzolos) használatára példák:\n" -"\n" -" echo \"másolás a vágólapra\" | clipit\n" -" clipit \"másolás a vágólapra\"\n" -" echo \"másolás a vágólapra\" | clipit -c" +msgstr "A vágólapkezelő CLI (konzolos) használatára példák:\n\n echo \"másolás a vágólapra\" | clipit\n clipit \"másolás a vágólapra\"\n echo \"másolás a vágólapra\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" - - +msgstr "Készítette: Cristian Henzel.\nHibajelentés ." diff -Nru clipit-1.4.2~quantal1/po/insert-header.sin clipit-1.4.2~quantal2/po/insert-header.sin --- clipit-1.4.2~quantal1/po/insert-header.sin 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/insert-header.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# Sed script that inserts the file called HEADER before the header entry. -# -# At each occurrence of a line starting with "msgid ", we execute the following -# commands. At the first occurrence, insert the file. At the following -# occurrences, do nothing. The distinction between the first and the following -# occurrences is achieved by looking at the hold space. -/^msgid /{ -x -# Test if the hold space is empty. -s/m/m/ -ta -# Yes it was empty. First occurrence. Read the file. -r HEADER -# Output the file's contents by reading the next line. But don't lose the -# current line while doing this. -g -N -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff -Nru clipit-1.4.2~quantal1/po/it.po clipit-1.4.2~quantal2/po/it.po --- clipit-1.4.2~quantal1/po/it.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/it.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,330 +1,340 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: # Davide Truffa , 2008. # , 2011. +# Luca , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Italian (http://www.transifex.net/projects/p/clipit/team/it/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Italian (http://www.transifex.net/projects/p/clipit/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Gestore degli appunti" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Leggero gestore degli Appunti in GTK+" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "Azioni che utilizzano:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "Nessuno" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Nessuno" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Vuoto" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Modifica azioni" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "_Offline mode" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "_Gestisci cronologia" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Gestore degli appunti" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Modifica Appunti" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "_Elemento statico" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Cancellare la cronologia?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "Cancella cronologia" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "Gestisci cronologia" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr " (Modalità Offline)" + +#: ../src/manage.c:393 msgid "Results" msgstr "Risultati" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "Modifica" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Rimuovi" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "Rimuovi tutto" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "Chiudi" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "Salva cronologia" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "Rimuovi file cronologia" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferenze" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "Impostazioni" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Appunti" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Usa _Copia (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Usa Selezione _Primaria" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_incronizza clipboard" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "_Incolla automaticamente l'elemento selezionato" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Varie" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "Mostra _indici nel menu cronologia" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "S_alva URIs" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Cattura solo _Hyperlink" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "C_onferma prima di cancellare la cronologia" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "_Usa il menu contestuale al click destro" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "Cronologia" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Cronologia" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "Salva _Cronologia" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Salva e ripristina cronologia fra le sessioni" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Elementi nella cronologia:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "Elementi nel menu:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "Mostra gli elementi _statici nel menu" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "Elementi statici nel menu:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elementi" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "Mostra su una singola _riga" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Mostra in ordine _inverso" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Lunghezza degli elementi (caratteri):" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Ometti elementi nella seguente posizione:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Inizio" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Centro" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Fine" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Azioni" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Control-click sull'icona della tray per usare le azioni" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Azione" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Comando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Aggiungi..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "Escludi" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Lista Regex degli elementi che non dovranno essere inseriti nella cronologia (password/siti di cui non necessiti nella cronologia, ecc.)" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "Regex" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Scorciatoie da tastiera" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Scorciatoie da tastiera" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "Cronologia scorciatorie:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "Azioni scorciatoie da tastiera:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "Menu scorciatoie da tastiera:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "Gestisci scorciatoie da tastiera:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "Tasto attivazione modalità offline" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Impossibile creare la directory: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Esegui come demone" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Non usare l'icona di stato (Ctrl-Alt-P per il menù)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Stampa contenuto degli appunti" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Stampa contenuto della selezione primaria" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Esempi d'uso degli Appunti da terminale:\n" -"\n" -" echo \"copiato negli appunti\" | clipit\n" -" clipit \"copiato negli appunti\"\n" -" echo \"copiato negli appunti\" | clipit -o" +msgstr "Esempi d'uso degli Appunti da terminale:\n\n echo \"copiato negli appunti\" | clipit\n clipit \"copiato negli appunti\"\n echo \"copiato negli appunti\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"Scritto da Cristian Henzel.\n" -"Riporta gli errori a ." - - +msgstr "Scritto da Cristian Henzel.\nRiporta gli errori a ." diff -Nru clipit-1.4.2~quantal1/po/ja.po clipit-1.4.2~quantal2/po/ja.po --- clipit-1.4.2~quantal1/po/ja.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/ja.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -9,320 +9,331 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Japanese (http://www.transifex.net/projects/p/clipit/team/ja/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Japanese (http://www.transifex.net/projects/p/clipit/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "クリップボード・マネージャ" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "軽量な GTK+ クリップボード・マネージャ" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "使用アクション:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "なし" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "なし" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "空" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "アクション編集(_E)" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "履歴管理(_M)" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "クリップボード・マネージャ" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "クリップボードの編集" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "定型登録アイテム(_S)" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "履歴を消去しますか？" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "履歴の消去" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "履歴管理" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "検索結果" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "編集" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "削除" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "全て削除" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "閉じる" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "履歴の保存" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "履歴ファイルの削除" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "環境設定" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "設定" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "クリップボード" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "コピー(Ctrl-C)を使用する(_C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "プライマリ(セレクション)を使用する(_P)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "クリップボード同士を同期する(_Y)" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "選択アイテムを自動的に貼り付ける(_A)" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "その他" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "履歴メニューで番号を表示する(_I)" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "URI を保存する(_A)" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "ハイパーリンクのみを取り込む(_H)" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "履歴を消去する前に確認を取る(_O)" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "右クリックメニューを使用する(_U)" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "履歴" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "履歴" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "履歴を保存する(_H)" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "セッションをまたぐ履歴の保存と復元" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "履歴アイテム数:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "メニューでのアイテム表示数:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "定型登録アイテムをメニューに表示する(_S)" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "メニューでの登録アイテム表示数:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "アイテム" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "1行で表示する(_L)" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "逆順に表示(_R)" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "アイテムの表示文字数:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "アイテムの省略表示:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "文頭" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "文中" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "文末" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "アクション" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "アクションの使用には Ctrl + ClipItのトレイアイコンをクリック" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "アクション" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "コマンド" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "追加..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "除外対象" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "履歴に挿入されないようにするアイテムの正規表現リスト（履歴に不要なパスワード/サイト等）" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "正規表現" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "ホットキー" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "ホットキー" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "履歴のホットキー:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "アクションのホットキー:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "メニューのホットキー:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "管理のホットキー:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "ディレクトリの作成ができませんでした。: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "デーモンとして実行する" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "ステータスアイコンを使用しない（Ctrl-Alt-P でメニュー）" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "クリップボード内容を出力する" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "プライマリ内容を出力する" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"クリップボードの CLI の使用例:\n" -"\n" -" echo \"クリップボードにコピー\" | clipit\n" -" clipit \"クリップボードにコピー\"\n" -" echo \"クリップボードにコピー\" | clipit -c" +msgstr "クリップボードの CLI の使用例:\n\n echo \"クリップボードにコピー\" | clipit\n clipit \"クリップボードにコピー\"\n echo \"クリップボードにコピー\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" - - +msgstr "Written by Cristian Henzel.\nReport bugs to ." diff -Nru clipit-1.4.2~quantal1/po/nb.po clipit-1.4.2~quantal2/po/nb.po --- clipit-1.4.2~quantal1/po/nb.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/nb.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,293 +18,311 @@ "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Utklippstavleverkty" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Lettvekts GTK+ utklippstavlebehandler" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Ingen" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Tom " #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Rediger handlinger" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Utklippstavleverkty" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Redigerer Utklippstavlen" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Tm historikken?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Fjern" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Tilpass ClipIt " -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Utklippstavler" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Bruk _Kopier (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Bruk _Primr (Utvalg)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Diverse" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Bare fang _hyperlenker" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Bekreft fr tmming av hist_orikk" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historikk" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Lagre og gjenopprett mellom sesjoner" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Elementer i historikken:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elementer" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Vis i _omvendt rekkeflge" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Tegnlengde p elementer:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Unng elementer i:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Begynnelse" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Midtpunkt" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Slutt" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Handlinger" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Hold Ctrl og klikk ClipIts ikon for bruke handlinger" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Handling" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Kommando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Legg til..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Hurtigtaster" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Kunne ikke opprette mappe: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Kjr i bakgrunnen" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Ikke vis statusikon (Ctrl-Alt-P for menyen)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Skriv ut utklippstavlens innhold" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" @@ -313,10 +331,8 @@ " echo \"copied to clipboard\" | clipit -c" msgstr "" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/pl.po clipit-1.4.2~quantal2/po/pl.po --- clipit-1.4.2~quantal1/po/pl.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/pl.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,310 +18,321 @@ "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/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Schowek" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Lekki menedżer schowka w GTK+." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Żadne" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "pusty" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Edytuj akcje" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Schowek" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Edytuj zawartość schowka" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Wyczyścić historię?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Usuń" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferencje" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Schowki" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Użyj do skopiowanego tekstu (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Użyj do zaznaczonego tekstu" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_ynchronizuj schowki" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Różne" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Kopiuj tylko _hiperlinki" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Potwierdź usunię_cie historii" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historia" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Przywracaj historię po zamknięciu sesji" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Pozycje w historii:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Pozycje w schowku" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Odw_róć kolejność" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Długość w znakach:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Omiń pozycje:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Początek" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Środek" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Koniec" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Akcje" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Kliknij na ikonę ClipIt trzymając Ctrl, aby użyć akcji " -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Akcja" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Komenda" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Dodaj..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Skróty klawiszowe" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Nie można stworzyć katalogu: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Uruchom jako demon" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Nie używaj ikony statusu (Ctrl+Alt+P dla menu)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Drukuj zawartość schowka" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Drukuj zaznaczenie" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Przykład użycia w trybie tekstowym (CLI):\n" -"\n" -" echo \"kopiuj do schowka\" | clipit\n" -" clipit \"kopiuj do schowka\"\n" -" echo \"kopiuj do schowka\" | clipit -c" +msgstr "Przykład użycia w trybie tekstowym (CLI):\n\n echo \"kopiuj do schowka\" | clipit\n clipit \"kopiuj do schowka\"\n echo \"kopiuj do schowka\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/pt_BR.po clipit-1.4.2~quantal2/po/pt_BR.po --- clipit-1.4.2~quantal1/po/pt_BR.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/pt_BR.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,310 +18,321 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Gerenciador de Área de Transferência" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Gerenciador de Área de Transferência em GTK+ leve." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Nenhum" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Vazio" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Editar ações" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Gerenciador de Área de Transferência" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Editando a Área de Transferência" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Limpar o histórico?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Remover" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferências" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Áreas de Transferência" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Usar _Cópia (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Usar Seleção _Primária" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_incronizar áreas de transferência" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Vários" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Capturar somente _hyperlinks" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "C_onfirmar antes de limpar o histórico" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Histórico" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Salvar e restaurar histórico entre as sessões" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Itens no histórico:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Itens" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Exibir em ordem _reversa" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Quantidade de caracteres dos itens:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Omitir itens no:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Início" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Centro" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Fim" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Ações" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Control-clique no ícone da bandeja do ClipIt para usar ações" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Ação" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Comando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Adicionar..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Atalhos" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Atalhos" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Impossível criar diretório: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Executar como daemon" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Não usar ícone de status (Ctrl-Alt-P para o menu)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Imprimir conteúdo da área de transferência" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Imprimir conteúdo primário" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Exemplo de uso da Área de Transferência no terminal:\n" -"\n" -" echo \"copiado para a área de transferência\" | clipit\n" -" clipit \"copiado para a área de transferência\"\n" -" echo \"copiado para a área de transferência\" | clipit -c" +msgstr "Exemplo de uso da Área de Transferência no terminal:\n\n echo \"copiado para a área de transferência\" | clipit\n clipit \"copiado para a área de transferência\"\n echo \"copiado para a área de transferência\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/quot.sed clipit-1.4.2~quantal2/po/quot.sed --- clipit-1.4.2~quantal1/po/quot.sed 2011-10-30 09:45:34.000000000 +0000 +++ clipit-1.4.2~quantal2/po/quot.sed 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g diff -Nru clipit-1.4.2~quantal1/po/remove-potcdate.sin clipit-1.4.2~quantal2/po/remove-potcdate.sin --- clipit-1.4.2~quantal1/po/remove-potcdate.sin 2011-10-30 09:45:35.000000000 +0000 +++ clipit-1.4.2~quantal2/po/remove-potcdate.sin 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff -Nru clipit-1.4.2~quantal1/po/ro.po clipit-1.4.2~quantal2/po/ro.po --- clipit-1.4.2~quantal1/po/ro.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/ro.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -9,324 +9,331 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Romanian (http://www.transifex.net/projects/p/clipit/team/ro/)\n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Romanian (http://www.transifex.net/projects/p/clipit/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Administrator clipboard" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Mic manager de clipboard." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "Acțiuni care folosesc:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "Niciunul" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Niciunul" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Gol" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Editare acțiuni" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "_Administrează istoric" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Administrator clipboard" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Editare clipboard" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "_Element static" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Doriți să goliți istoricul?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "Golește istoric" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "Administrează istoric" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "Rezultate" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "Editează" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Șterge" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "Șterge toate" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "Închide" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "Salvează istoric" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "Elimină fișierul istoricului" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Preferințe" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "Setări" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Clipboard-uri" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Folosește _Copiază (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Folosește selecția _primară (Selecție)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_incronizare clipboard-uri" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "Lipește _automat elementul selectat" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Diverse" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "Afișează _index în meniul istoricului" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "S_alvează URI-uri" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Capturează doar _hiperlegăturile" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "Cere c_onfirmare înainte de golirea istoricului" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "Folosește meni_ul clic-dreapta" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "Istoric" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Istoric" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "Salvează istoric" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Salvează și restaurează istoricul între sesiuni" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Elemente în istoric:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "Elemente în meniu:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "Afișează elemente _statice în meniu" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "Elemente statice în meniu:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Elemente" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "Afișează pe o singură _linie" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Afișează în o_rdine inversă" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Lungimea în caractere a elementelor:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Omitere elemente în:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Început" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Mijloc" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Sfârșit" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Acțiuni" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "" -"Apăsați pe Control și faceți clic pe pictograma ClipIt pentru a utiliza " -"acțiunile" +msgstr "Apăsați pe Control și faceți clic pe pictograma ClipIt pentru a utiliza acțiunile" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Acțiuni" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Comandă" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Adaugă..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "Exclude" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Listă de expresii regulate pentru elemente ce nu trebuie introduse în istoric (parole, saituri de care nu ai nevoie în istoric, etc.)." -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "Regex" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Taste rapide" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Taste rapide" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "Combinație de taste pt. istoric:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "Combinație de taste pt. acțiuni:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "Combinație de taste pt. meniu:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "Combinație de taste pt. administrare:" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Nu s-a putut creea directorul: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Rulare ca serviciu" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Nu afișa pictograma de status (apăsați Ctrl-Alt-P pentru meniu)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Imprimare conținut clipboard" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Imprimare conținut principal" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Exemple de utilizare în linie de comandă:\n" -"\n" -" echo \"copiat în clipboard\" | clipit\n" -" clipit \"copiat în clipboard\"\n" -" echo \"copiat în clipboard\" | clipit -c" +msgstr "Exemple de utilizare în linie de comandă:\n\n echo \"copiat în clipboard\" | clipit\n clipit \"copiat în clipboard\"\n echo \"copiat în clipboard\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"Scris de Cristian Henzel.\n" -"Raportează bug-uri la ." - - +msgstr "Scris de Cristian Henzel.\nRaportează bug-uri la ." diff -Nru clipit-1.4.2~quantal1/po/ru.po clipit-1.4.2~quantal2/po/ru.po --- clipit-1.4.2~quantal1/po/ru.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/ru.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,326 +1,338 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: +# Andrei Borisov , 2012. msgid "" msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" -"Language-Team: Cristian Henzel \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" +"Language-Team: Russian (http://www.transifex.net/projects/p/clipit/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Менеджер буфера обмена" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Легковесный менеджер буфера обмена на GTK+." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" -msgstr "" +msgstr "Используемые действия:" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" -msgstr "" +msgstr "Нет" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Нет" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Пусто" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "_Править действия" -#. Manage history -#: .././src/main.c:669 -msgid "_Manage history" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Менеджер буфера обмена" +#. Manage history +#: ../src/main.c:695 +msgid "_Manage history" +msgstr "_Управление историей" #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Редактирование буфера обмена" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" -msgstr "" +msgstr "_Статический элемент" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Очистить историю?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" -msgstr "" +msgstr "Очистить историю" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" +msgstr "Менеджер Истории" + +#: ../src/manage.c:351 +msgid " (Offline mode)" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:393 msgid "Results" -msgstr "" +msgstr "Результаты" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" -msgstr "" +msgstr "Редактировать" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Удалить" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" -msgstr "" +msgstr "Удалить всё" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" -msgstr "" +msgstr "Закрыть" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" -msgstr "" +msgstr "Сохранить историю" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" -msgstr "" +msgstr "Удалить файл истории" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" -msgstr "Настройки" +msgstr "Предпочтения" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" -msgstr "" +msgstr "Настройки" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Буферы обмена" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Использовать буфер _Копировать (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "_Использовать буфер выделения" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "Синхронизировать буферы" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" -msgstr "" +msgstr "_Автоматически вставить выбранный элемент" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Исключения" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" -msgstr "" +msgstr "Показать _индексы в меню истории" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" -msgstr "" +msgstr "Сохранять URL'ы" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Захватывать только _гиперссылки" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "_Подтверждение перед очисткой истории" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" -msgstr "" +msgstr "Использование контекстного меню" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" -msgstr "" +msgstr "История" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "История" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" -msgstr "" +msgstr "Сохранить _историю" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Сохранять и восстанавливать историю между сессиями" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Элементы в истории:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" -msgstr "" +msgstr "Элементы в меню:" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" -msgstr "" +msgstr "Показывать _постоянные элементы в меню" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" -msgstr "" +msgstr "Постоянные элементы в меню:" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Элементы" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" -msgstr "" +msgstr "Показать в одну строку" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Показывать в обратном порядке" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Число символов в элементе " -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Исключить элементы в:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Начале" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Середине" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Конце" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Действия" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "CTRL+клик по иконке ClipIt в трее для выполнения действий" +msgstr "Ctrl+клик по иконке ClipIt в трее для выполнения действий" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Действие" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Команда" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Добавить..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" -msgstr "" +msgstr "Исключить" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." -msgstr "" +msgstr "Список элементов регулярных выражений, которые не должны быть скопированы в историю (пароли/сайты, которые вам не нужны в истории, и т.д.)." -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" -msgstr "" +msgstr "Регулярные выражения" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Горячие клавиши" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Горячие клавиши" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" -msgstr "" +msgstr "Горячая клавиша истории:" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" -msgstr "" +msgstr "Горячая клавиша для действий:" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" -msgstr "" +msgstr "Горячая клавиша меню:" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" +msgstr "Горячая клавиша менеджера:" + +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Невозможно создание директории: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Запускать как демон" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Не использовать иконку статутса (Strg+Alt+P для меню)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Напечатать содержимое буфера обмена" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Напечатать основное содержимое" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Пример использования менеджера из командной строки:\n" -"\n" -" echo \"скопировано в буфер\" | clipit\n" -" clipit \"скопировано в буфер\"\n" -" echo \"скопировано в буфер\" | clipit -o" +msgstr "Пример использования менеджера из командной строки:\n\n echo \"скопировано в буфер\" | clipit\n clipit \"скопировано в буфер\"\n echo \"скопировано в буфер\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" - - +msgstr "Автор: Cristian Henzel.\nСообщить о ошибках на ." diff -Nru clipit-1.4.2~quantal1/po/sv.po clipit-1.4.2~quantal2/po/sv.po --- clipit-1.4.2~quantal1/po/sv.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/sv.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,310 +18,321 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Urklippshanterare" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Resurssnål GTK+-urklippshanterare." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Inget" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Tom" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "R_edigera åtgärder" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Urklippshanterare" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Redigerar urklipp" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Töm historik?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "Ta bort" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Inställningar" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "Urklipp" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "Använd _Kopiera (Ctrl-C)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "Använd _Primär (Markering)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "S_ynkronisera urklipp" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "Diverse" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "Fånga endast _hyperlänkar" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "B_ekräfta innan historiken töms" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Historik" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "Spara och återställ historik mellan sessioner" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "Objekt i historik:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "Objekt" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "Visa i _omvänd ordning" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "Teckenlängd för objekt:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "Utelämna objekt i:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Början" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Mitten" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Slutet" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Åtgärder" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "Control-klicka på ClipIts aktivitetsikon för att använda åtgärder" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Åtgärd" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Kommando" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "Lägg till..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "Snabbtangenter" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Snabbtangenter" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Kunde inte skapa katalog: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Kör som demon" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Använd inte statusikon (Ctrl-Alt-P för meny)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Skriv ut urklippets innehåll" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "Skriv ut primärt innehåll" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"Användningexempel för kommandorad:\n" -"\n" -" echo \"kopierad till urklipp\" | clipit\n" -" clipit \"kopierad till urklipp\"\n" -" echo \"kopierad till urklipp\" | clipit -c" +msgstr "Användningexempel för kommandorad:\n\n echo \"kopierad till urklipp\" | clipit\n clipit \"kopierad till urklipp\"\n echo \"kopierad till urklipp\" | clipit -c" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/tr.po clipit-1.4.2~quantal2/po/tr.po --- clipit-1.4.2~quantal1/po/tr.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/tr.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,294 +18,311 @@ "Language: tr\n" "Plural-Forms: nplurals=1; plural=0\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "Pano Yöneticisi" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "Hafif GTK+ pano yöneticisi." #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "Hiçbiri" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "Boş" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "Eylemleri _düzenle" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "Pano Yöneticisi" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "Pano Düzenleme" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "Geçmiş temizlensin mi?" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "Yeğlenenler" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "Geçmiş" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "Başlangıç" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "Orta" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "Bitiş" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "Eylemler" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" -msgstr "" -"Eylemleri kullanabilmek için ClipIt'nin tepsi simgesine Ctrl ile tıklayın" +msgstr "Eylemleri kullanabilmek için ClipIt'nin tepsi simgesine Ctrl ile tıklayın" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "Eylem" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "Komut" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "" -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "Geçiş Tuşları" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "Dizin yaratılamıyor: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "Artalan işlem olarak çalıştır" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "Durum simgesini kullanma (menü için Ctrl-Alt-P)" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "Pano içeriğini yazdır" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" @@ -314,10 +331,8 @@ " echo \"copied to clipboard\" | clipit -c" msgstr "" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." msgstr "" - - diff -Nru clipit-1.4.2~quantal1/po/zh_CN.po clipit-1.4.2~quantal2/po/zh_CN.po --- clipit-1.4.2~quantal1/po/zh_CN.po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/po/zh_CN.po 2012-04-04 07:52:44.000000000 +0000 @@ -1,5 +1,5 @@ # ClipIt translation file. -# Copyright (C) 2010-2011 Cristian Henzel +# Copyright (C) 2010-2012 Cristian Henzel # This file is distributed under the same license as the ClipIt package. # # Translators: @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ClipIt\n" "Report-Msgid-Bugs-To: http://github.com/shantzu/ClipIt/issues\n" -"POT-Creation-Date: 2011-10-18 15:47+0300\n" -"PO-Revision-Date: 2011-10-18 12:29+0000\n" -"Last-Translator: shantzu \n" +"POT-Creation-Date: 2012-04-04 10:39+0300\n" +"PO-Revision-Date: 2012-04-04 06:30+0000\n" +"Last-Translator: Cristian Henzel \n" "Language-Team: Cristian Henzel \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,312 +18,321 @@ "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" -#: .././src/main.c:288 +#: ../data/clipit-startup.desktop.in.h:1 ../data/clipit.desktop.in.h:1 +msgid "ClipIt" +msgstr "" + +#: ../data/clipit-startup.desktop.in.h:2 ../data/clipit.desktop.in.h:2 +#: ../src/main.c:833 +msgid "Clipboard Manager" +msgstr "剪切板管理器" + +#: ../src/main.c:287 msgid "Lightweight GTK+ clipboard manager." msgstr "小巧的 GTK+ 剪切板管理器。" #. Actions using: -#: .././src/main.c:353 +#: ../src/main.c:356 msgid "Actions using:" msgstr "" #. Create menu item for empty clipboard contents -#: .././src/main.c:362 .././src/main.c:379 +#: ../src/main.c:365 ../src/main.c:382 msgid "None" msgstr "" -#: .././src/main.c:382 +#: ../src/main.c:385 msgid "None" msgstr "无" #. File contained no actions so adding empty #. File did not open so adding empty #. Nothing in history so adding empty -#: .././src/main.c:404 .././src/main.c:433 .././src/main.c:588 +#: ../src/main.c:407 ../src/main.c:436 ../src/main.c:600 msgid "Empty" msgstr "空" #. Edit actions -#: .././src/main.c:440 +#: ../src/main.c:443 msgid "_Edit actions" msgstr "编辑动作(_E)" +#. Offline mode checkbox +#: ../src/main.c:686 +msgid "_Offline mode" +msgstr "" + #. Manage history -#: .././src/main.c:669 +#: ../src/main.c:695 msgid "_Manage history" msgstr "管理历史记录(_M)" -#: .././src/main.c:809 -msgid "Clipboard Manager" -msgstr "剪切板管理器" - #. Create the dialog -#: .././src/manage.c:137 +#: ../src/manage.c:138 msgid "Editing Clipboard" msgstr "编辑剪切板" -#: .././src/manage.c:157 +#: ../src/manage.c:158 msgid "_Static item" msgstr "" -#: .././src/manage.c:226 +#: ../src/manage.c:227 msgid "Clear the history?" msgstr "清除历史记录？" -#: .././src/manage.c:227 +#: ../src/manage.c:228 msgid "Clear history" msgstr "清除历史记录" -#: .././src/manage.c:342 +#: ../src/manage.c:348 msgid "Manage History" msgstr "" -#: .././src/manage.c:374 +#: ../src/manage.c:351 +msgid " (Offline mode)" +msgstr "" + +#: ../src/manage.c:393 msgid "Results" msgstr "" -#: .././src/manage.c:379 +#: ../src/manage.c:398 msgid "Edit" msgstr "" -#: .././src/manage.c:381 .././src/preferences.c:866 .././src/preferences.c:927 +#: ../src/manage.c:400 ../src/preferences.c:886 ../src/preferences.c:947 msgid "Remove" msgstr "删除" -#: .././src/manage.c:383 +#: ../src/manage.c:402 msgid "Remove all" msgstr "" -#: .././src/manage.c:385 +#: ../src/manage.c:404 msgid "Close" msgstr "" -#: .././src/preferences.c:161 +#: ../src/preferences.c:170 msgid "Save history" msgstr "" -#: .././src/preferences.c:193 +#: ../src/preferences.c:203 msgid "Remove history file" msgstr "删除历史记录文件" #. Create the dialog -#: .././src/preferences.c:628 +#: ../src/preferences.c:648 msgid "Preferences" msgstr "首选项" -#: .././src/preferences.c:647 +#: ../src/preferences.c:667 msgid "Settings" msgstr "设定" -#: .././src/preferences.c:655 +#: ../src/preferences.c:675 msgid "Clipboards" msgstr "剪切板" -#: .././src/preferences.c:662 +#: ../src/preferences.c:682 msgid "Use _Copy (Ctrl-C)" msgstr "记录 _Copy (复制部分)" -#: .././src/preferences.c:665 +#: ../src/preferences.c:685 msgid "Use _Primary (Selection)" msgstr "记录 _Primary (选中部分)" -#: .././src/preferences.c:668 +#: ../src/preferences.c:688 msgid "S_ynchronize clipboards" msgstr "同步剪切板(_Y)" -#: .././src/preferences.c:670 +#: ../src/preferences.c:690 msgid "_Automatically paste selected item" msgstr "" -#: .././src/preferences.c:679 +#: ../src/preferences.c:699 msgid "Miscellaneous" msgstr "其他" -#: .././src/preferences.c:686 +#: ../src/preferences.c:706 msgid "Show _indexes in history menu" msgstr "" -#: .././src/preferences.c:688 +#: ../src/preferences.c:708 msgid "S_ave URIs" msgstr "保存URI(_A)" -#: .././src/preferences.c:690 +#: ../src/preferences.c:710 msgid "Capture _hyperlinks only" msgstr "仅捕获超级链接(_H)" -#: .././src/preferences.c:692 +#: ../src/preferences.c:712 msgid "C_onfirm before clearing history" msgstr "清除历史纪录时确认(_C)" -#: .././src/preferences.c:694 +#: ../src/preferences.c:714 msgid "_Use right-click menu" msgstr "" -#: .././src/preferences.c:703 +#: ../src/preferences.c:723 msgid "History" msgstr "历史记录" -#: .././src/preferences.c:711 +#: ../src/preferences.c:731 msgid "History" msgstr "历史记录" -#: .././src/preferences.c:718 +#: ../src/preferences.c:738 msgid "Save _history" msgstr "" -#: .././src/preferences.c:719 +#: ../src/preferences.c:739 msgid "Save and restore history between sessions" msgstr "保存历史记录并在下次启动后恢复" -#: .././src/preferences.c:723 +#: ../src/preferences.c:743 msgid "Items in history:" msgstr "历史记录条数:" -#: .././src/preferences.c:732 +#: ../src/preferences.c:752 msgid "Items in menu:" msgstr "" -#: .././src/preferences.c:739 +#: ../src/preferences.c:759 msgid "Show _static items in menu" msgstr "" -#: .././src/preferences.c:744 +#: ../src/preferences.c:764 msgid "Static items in menu:" msgstr "" -#: .././src/preferences.c:757 +#: ../src/preferences.c:777 msgid "Items" msgstr "条目" -#: .././src/preferences.c:764 +#: ../src/preferences.c:784 msgid "Show in a single _line" msgstr "" -#: .././src/preferences.c:766 +#: ../src/preferences.c:786 msgid "Show in _reverse order" msgstr "逆序显示(_R)" -#: .././src/preferences.c:770 +#: ../src/preferences.c:790 msgid "Character length of items:" msgstr "条目显示的文字长度:" -#: .././src/preferences.c:779 +#: ../src/preferences.c:799 msgid "Omit items in the:" msgstr "省略显示条目的:" -#: .././src/preferences.c:783 +#: ../src/preferences.c:803 msgid "Beginning" msgstr "起始" -#: .././src/preferences.c:784 +#: ../src/preferences.c:804 msgid "Middle" msgstr "中间" -#: .././src/preferences.c:785 +#: ../src/preferences.c:805 msgid "End" msgstr "结尾" -#: .././src/preferences.c:815 +#: ../src/preferences.c:835 msgid "Actions" msgstr "动作" #. Build the actions label -#: .././src/preferences.c:820 +#: ../src/preferences.c:840 msgid "Control-click ClipIt's tray icon to use actions" msgstr "按住 Ctrl 并点击 ClipIt 的任务栏图标使用动作" -#: .././src/preferences.c:840 +#: ../src/preferences.c:860 msgid "Action" msgstr "动作" -#: .././src/preferences.c:847 +#: ../src/preferences.c:867 msgid "Command" msgstr "命令" -#: .././src/preferences.c:862 .././src/preferences.c:923 +#: ../src/preferences.c:882 ../src/preferences.c:943 msgid "Add..." msgstr "添加..." -#: .././src/preferences.c:883 +#: ../src/preferences.c:903 msgid "Exclude" msgstr "排除" #. Build the exclude label -#: .././src/preferences.c:888 +#: ../src/preferences.c:908 msgid "" "Regex list of items that should not be inserted into the history " "(passwords/sites that you don't need in history, etc)." msgstr "" -#: .././src/preferences.c:908 +#: ../src/preferences.c:928 msgid "Regex" msgstr "正则表达式" -#: .././src/preferences.c:936 +#: ../src/preferences.c:956 msgid "Hotkeys" msgstr "快捷键" -#: .././src/preferences.c:944 +#: ../src/preferences.c:964 msgid "Hotkeys" msgstr "快捷键" -#: .././src/preferences.c:954 +#: ../src/preferences.c:974 msgid "History hotkey:" msgstr "" -#: .././src/preferences.c:963 +#: ../src/preferences.c:983 msgid "Actions hotkey:" msgstr "" -#: .././src/preferences.c:972 +#: ../src/preferences.c:992 msgid "Menu hotkey:" msgstr "" -#: .././src/preferences.c:981 +#: ../src/preferences.c:1001 msgid "Manage hotkey:" msgstr "" -#: .././src/utils.c:40 .././src/utils.c:47 +#: ../src/preferences.c:1010 +msgid "Offline mode hotkey:" +msgstr "" + +#: ../src/utils.c:40 ../src/utils.c:47 #, c-format msgid "Couldn't create directory: %s\n" msgstr "无法创建目录: %s\n" -#: .././src/utils.c:121 +#: ../src/utils.c:121 msgid "Run as daemon" msgstr "作为守护进程运行" -#: .././src/utils.c:128 +#: ../src/utils.c:128 msgid "Do not use status icon (Ctrl-Alt-P for menu)" msgstr "不使用状态图标（Ctrl-Alt-P 调出菜单）" -#: .././src/utils.c:135 +#: ../src/utils.c:135 msgid "Print clipboard contents" msgstr "打印剪切板内容" -#: .././src/utils.c:142 +#: ../src/utils.c:142 msgid "Print primary contents" msgstr "打印剪切板内容" -#: .././src/utils.c:154 +#: ../src/utils.c:154 msgid "" "Clipboard CLI usage examples:\n" "\n" " echo \"copied to clipboard\" | clipit\n" " clipit \"copied to clipboard\"\n" " echo \"copied to clipboard\" | clipit -c" -msgstr "" -"剪切板命令行使用范例:\n" -"\n" -" echo \"复制到剪切板\" | clipit\n" -" clipit \"复制到剪切板\"\n" -" echo \"复制到剪切板\" | clipit -o" +msgstr "剪切板命令行使用范例:\n\n echo \"复制到剪切板\" | clipit\n clipit \"复制到剪切板\"\n echo \"复制到剪切板\" | clipit -o" -#: .././src/utils.c:160 +#: ../src/utils.c:160 msgid "" "Written by Cristian Henzel.\n" "Report bugs to ." -msgstr "" -"由Cristian Henzel编写.\n" -"问题反馈 " - - +msgstr "由Cristian Henzel编写.\n问题反馈 " diff -Nru clipit-1.4.2~quantal1/src/Makefile.am clipit-1.4.2~quantal2/src/Makefile.am --- clipit-1.4.2~quantal1/src/Makefile.am 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/Makefile.am 2012-04-04 07:41:50.000000000 +0000 @@ -1,6 +1,7 @@ AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = -Wall -g -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\" -INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) +## FIXME!!! +INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS) AM_LDFLAGS = -Wl,--as-needed diff -Nru clipit-1.4.2~quantal1/src/Makefile.in clipit-1.4.2~quantal2/src/Makefile.in --- clipit-1.4.2~quantal1/src/Makefile.in 2011-10-30 10:13:38.000000000 +0000 +++ clipit-1.4.2~quantal2/src/Makefile.in 2012-04-04 07:53:01.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -76,6 +76,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AUTOCONF = @AUTOCONF@ @@ -122,6 +123,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ @@ -196,6 +201,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -217,7 +224,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = -Wall -g -DCLIPITLOCALEDIR=\""$(clipitlocaledir)"\" -INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) +INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) $(X11_LIBS) AM_LDFLAGS = -Wl,--as-needed DISTCLEANFILES = *.bak *.log *~ .deps/*.P @@ -302,7 +309,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -clipit$(EXEEXT): $(clipit_OBJECTS) $(clipit_DEPENDENCIES) +clipit$(EXEEXT): $(clipit_OBJECTS) $(clipit_DEPENDENCIES) $(EXTRA_clipit_DEPENDENCIES) @rm -f clipit$(EXEEXT) $(LINK) $(clipit_OBJECTS) $(clipit_LDADD) $(LIBS) @@ -434,10 +441,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru clipit-1.4.2~quantal1/src/daemon.c clipit-1.4.2~quantal2/src/daemon.c --- clipit-1.4.2~quantal1/src/daemon.c 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/daemon.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/src/daemon.h clipit-1.4.2~quantal2/src/daemon.h --- clipit-1.4.2~quantal1/src/daemon.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/daemon.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/src/history.c clipit-1.4.2~quantal2/src/history.c --- clipit-1.4.2~quantal1/src/history.c 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/history.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/src/history.h clipit-1.4.2~quantal2/src/history.h --- clipit-1.4.2~quantal1/src/history.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/history.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/src/keybinder.h clipit-1.4.2~quantal2/src/keybinder.h --- clipit-1.4.2~quantal1/src/keybinder.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/keybinder.h 2012-04-04 07:41:50.000000000 +0000 @@ -20,7 +20,7 @@ #ifndef __KEY_BINDER_H__ #define __KEY_BINDER_H__ -#include +#include G_BEGIN_DECLS diff -Nru clipit-1.4.2~quantal1/src/main.c clipit-1.4.2~quantal2/src/main.c --- clipit-1.4.2~quantal1/src/main.c 2011-10-30 09:35:42.000000000 +0000 +++ clipit-1.4.2~quantal2/src/main.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel + * Copyright (C) 2011 by Eugene Nikolsky * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -63,11 +64,15 @@ DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_SINGLE_LINE, DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH, DEF_ELLIPSIZE, INIT_HISTORY_KEY, INIT_ACTIONS_KEY, INIT_MENU_KEY, - INIT_SEARCH_KEY, DEF_NO_ICON}; + INIT_SEARCH_KEY, INIT_OFFLINE_KEY, DEF_NO_ICON, + DEF_OFFLINE_MODE}; /* Called every CHECK_INTERVAL seconds to check for new items */ -static gboolean item_check(gpointer data) -{ +static gboolean item_check(gpointer data) { + /* Immediately return in offline mode */ + if (prefs.offline_mode) + return TRUE; + /* Grab the current primary and clipboard text */ gchar* primary_temp = gtk_clipboard_wait_for_text(primary); gchar* clipboard_temp = gtk_clipboard_wait_for_text(clipboard); @@ -177,15 +182,13 @@ } /* Called when execution action exits */ -static void action_exit(GPid pid, gint status, gpointer data) -{ +static void action_exit(GPid pid, gint status, gpointer data) { g_spawn_close_pid(pid); actions_lock = FALSE; } /* Called when an action is selected from actions menu */ -static void action_selected(GtkButton *button, gpointer user_data) -{ +static void action_selected(GtkButton *button, gpointer user_data) { /* Enable lock */ actions_lock = TRUE; @@ -210,17 +213,13 @@ } /* Called when Edit Actions is selected from actions menu */ -static void edit_actions_selected(GtkButton *button, gpointer user_data) -{ - /* This helps prevent multiple instances */ - if (!gtk_grab_get_current()) - /* Show the preferences dialog on the actions tab */ - show_preferences(ACTIONS_TAB); +static void edit_actions_selected(GtkButton *button, gpointer user_data) { + /* Show the preferences dialog on the actions tab */ + show_preferences(ACTIONS_TAB); } /* Called when an item is selected from history menu */ -static void item_selected(GtkMenuItem *menu_item, gpointer user_data) -{ +static void item_selected(GtkMenuItem *menu_item, gpointer user_data) { /* Get the text from the right element and set as clipboard */ GList* element = g_list_nth(history, GPOINTER_TO_INT(user_data)); history = g_list_remove_link(history, element); @@ -228,6 +227,7 @@ history_item *elem_data = history->data; gtk_clipboard_set_text(clipboard, (gchar*)elem_data->content, -1); gtk_clipboard_set_text(primary, (gchar*)elem_data->content, -1); + save_history(); /* Paste the clipboard contents automatically if enabled */ if (prefs.automatic_paste) { gchar* cmd = g_strconcat("/bin/sh -c 'xdotool key ctrl+v'", NULL); @@ -239,12 +239,6 @@ g_child_watch_add(pid, (GChildWatchFunc)action_exit, NULL); g_strfreev(argv); } - /* Refresh indicator menu. Temporary solution until - * getting the visible status of the menu is supported by the API - */ -#ifdef HAVE_APPINDICATOR - create_app_indicator(0); -#endif } /* Clears all local data (specific to main.c) */ @@ -260,13 +254,12 @@ } /* Called when About is selected from right-click menu */ -static void show_about_dialog(GtkMenuItem *menu_item, gpointer user_data) -{ +static void show_about_dialog(GtkMenuItem *menu_item, gpointer user_data) { /* This helps prevent multiple instances */ - if (!gtk_grab_get_current()) - { + if (!gtk_grab_get_current()) { const gchar* authors[] = {"Cristian Henzel \n" - "Gilberto \"Xyhthyx\" Miralla ", NULL}; + "Gilberto \"Xyhthyx\" Miralla \n" + "Eugene Nikolsky ", NULL}; const gchar* license = "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -296,7 +289,7 @@ gtk_about_dialog_set_website((GtkAboutDialog*)about_dialog, "http://clipit.rspwn.com/"); - gtk_about_dialog_set_copyright((GtkAboutDialog*)about_dialog, "Copyright (C) 2010 Cristian Henzel"); + gtk_about_dialog_set_copyright((GtkAboutDialog*)about_dialog, "Copyright (C) 2010-2012 Cristian Henzel"); gtk_about_dialog_set_authors((GtkAboutDialog*)about_dialog, authors); gtk_about_dialog_set_translator_credits ((GtkAboutDialog*)about_dialog, "Guido Tabbernuk \n" @@ -324,30 +317,34 @@ /* Run the about dialog */ gtk_dialog_run((GtkDialog*)about_dialog); gtk_widget_destroy(about_dialog); + } else { + /* A window is already open, so we present it to the user */ + GtkWidget *toplevel = gtk_widget_get_toplevel(gtk_grab_get_current()); + gtk_window_present((GtkWindow*)toplevel); } } /* Called when Preferences is selected from right-click menu */ -static void preferences_selected(GtkMenuItem *menu_item, gpointer user_data) -{ - /* This helps prevent multiple instances */ - if (!gtk_grab_get_current()) - /* Show the preferences dialog */ - show_preferences(0); +static void preferences_selected(GtkMenuItem *menu_item, gpointer user_data) { + /* Show the preferences dialog */ + show_preferences(0); } /* Called when Quit is selected from right-click menu */ -static void quit_selected(GtkMenuItem *menu_item, gpointer user_data) -{ +static void quit_selected(GtkMenuItem *menu_item, gpointer user_data) { /* Prevent quit with dialogs open */ - if (!gtk_grab_get_current()) + if (!gtk_grab_get_current()) { /* Quit the program */ gtk_main_quit(); + } else { + /* A window is already open, so we present it to the user */ + GtkWidget *toplevel = gtk_widget_get_toplevel(gtk_grab_get_current()); + gtk_window_present((GtkWindow*)toplevel); + } } /* Called when status icon is control-clicked */ -static gboolean show_actions_menu(gpointer data) -{ +static gboolean show_actions_menu(gpointer data) { /* Declare some variables */ GtkWidget *menu, *menu_item, *menu_image, *item_label; @@ -455,8 +452,7 @@ return FALSE; } -static gboolean menu_key_pressed(GtkWidget *history_menu, GdkEventKey *event, gpointer user_data) -{ +static gboolean menu_key_pressed(GtkWidget *history_menu, GdkEventKey *event, gpointer user_data) { switch (event->keyval) { case XK_1: case XK_KP_1: @@ -512,8 +508,18 @@ return FALSE; } -static GtkWidget *create_history_menu(GtkWidget *history_menu) -{ +static void toggle_offline_mode() { + if (prefs.offline_mode) { + /* Restore clipboard contents before turning offline mode off */ + gtk_clipboard_set_text(clipboard, clipboard_text != NULL ? clipboard_text : "", -1); + } + + prefs.offline_mode = !prefs.offline_mode; + /* Save the change */ + save_preferences(); +} + +static GtkWidget *create_history_menu(GtkWidget *history_menu) { GtkWidget *menu_item, *item_label; history_menu = gtk_menu_new(); g_signal_connect((GObject*)history_menu, "key-press-event", (GCallback)menu_key_pressed, NULL); @@ -632,12 +638,22 @@ elem = elem->next; } } + /* Show a notice in offline mode */ + if (prefs.offline_mode) { + gtk_menu_shell_append((GtkMenuShell*)history_menu, gtk_separator_menu_item_new()); + + menu_item = gtk_menu_item_new_with_label(""); + item_label = gtk_bin_get_child((GtkBin*)menu_item); + gtk_label_set_markup((GtkLabel*)item_label, "Offline mode is ON"); + gtk_label_set_single_line_mode((GtkLabel*)item_label, TRUE); + gtk_widget_set_sensitive(item_label, FALSE); + gtk_menu_shell_append((GtkMenuShell*)history_menu, menu_item); + } return history_menu; } /* Generates the history menu */ -static gboolean show_history_menu(gpointer data) -{ +static gboolean show_history_menu(gpointer data) { /* Declare some variables */ GtkWidget *menu = gtk_menu_new(); menu = create_history_menu(menu); @@ -650,8 +666,7 @@ return FALSE; } -static GtkWidget *create_tray_menu(GtkWidget *tray_menu, int menu_type) -{ +static GtkWidget *create_tray_menu(GtkWidget *tray_menu, int menu_type) { GtkWidget *menu_item, *menu_image; if ((menu_type == 1) || (menu_type == 2)) { @@ -667,6 +682,11 @@ * - use_rmb_menu is active and menu_type is right-click, OR * - use_rmb_menu is inactive and menu_type is left-click */ if ((prefs.use_rmb_menu && (menu_type == 3)) || (!prefs.use_rmb_menu) || (menu_type == 2)) { + /* Offline mode checkbox */ + menu_item = gtk_check_menu_item_new_with_mnemonic(_("_Offline mode")); + gtk_check_menu_item_set_active((GtkCheckMenuItem*)menu_item, prefs.offline_mode); + g_signal_connect((GObject*)menu_item, "activate", (GCallback)toggle_offline_mode, NULL); + gtk_menu_shell_append((GtkMenuShell*)tray_menu, menu_item); /* About */ menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); g_signal_connect((GObject*)menu_item, "activate", (GCallback)show_about_dialog, NULL); @@ -693,8 +713,7 @@ #ifdef HAVE_APPINDICATOR -void create_app_indicator(gint create) -{ +void create_app_indicator(gint create) { /* Create the menu */ indicator_menu = create_tray_menu(indicator_menu, 2); /* check if we need to create the indicator or just refresh the menu */ @@ -709,8 +728,7 @@ #else /* Called when status icon is clicked */ -static void show_clipit_menu(int menu_type) -{ +static void show_clipit_menu(int menu_type) { /* If the menu is visible, we don't do anything, so that it gets hidden */ if((statusicon_menu != NULL) && gtk_widget_get_visible((GtkWidget *)statusicon_menu)) return; @@ -730,8 +748,7 @@ /* Called when status icon is clicked */ /* (checks type of click and calls correct function) */ -static void status_icon_clicked(GtkStatusIcon *status_icon, GdkEventButton *event ) -{ +static void status_icon_clicked(GtkStatusIcon *status_icon, GdkEventButton *event ) { /* Check what type of click was recieved */ GdkModifierType state; gtk_get_current_event_state(&state); @@ -758,34 +775,34 @@ #endif /* Called when history global hotkey is pressed */ -void history_hotkey(char *keystring, gpointer user_data) -{ +void history_hotkey(char *keystring, gpointer user_data) { g_timeout_add(POPUP_DELAY, show_history_menu, NULL); } /* Called when actions global hotkey is pressed */ -void actions_hotkey(char *keystring, gpointer user_data) -{ +void actions_hotkey(char *keystring, gpointer user_data) { g_timeout_add(POPUP_DELAY, show_actions_menu, NULL); } /* Called when actions global hotkey is pressed */ -void menu_hotkey(char *keystring, gpointer user_data) -{ +void menu_hotkey(char *keystring, gpointer user_data) { #ifndef HAVE_APPINDICATOR show_clipit_menu(1); #endif } /* Called when search global hotkey is pressed */ -void search_hotkey(char *keystring, gpointer user_data) -{ +void search_hotkey(char *keystring, gpointer user_data) { g_timeout_add(POPUP_DELAY, show_search, NULL); } +/* Called when offline mode global hotkey is pressed */ +void offline_hotkey(char *keystring, gpointer user_data) { + toggle_offline_mode(); +} + /* Startup calls and initializations */ -static void clipit_init() -{ +static void clipit_init() { /* Create clipboard */ primary = gtk_clipboard_get(GDK_SELECTION_PRIMARY); clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); @@ -804,6 +821,7 @@ keybinder_bind(prefs.actions_key, actions_hotkey, NULL); keybinder_bind(prefs.menu_key, menu_hotkey, NULL); keybinder_bind(prefs.search_key, search_hotkey, NULL); + keybinder_bind(prefs.offline_key, offline_hotkey, NULL); /* Create status icon */ if (!prefs.no_icon) @@ -819,8 +837,7 @@ } /* This is Sparta! */ -int main(int argc, char **argv) -{ +int main(int argc, char **argv) { bindtextdomain(GETTEXT_PACKAGE, CLIPITLOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); @@ -880,11 +897,13 @@ keybinder_unbind(prefs.actions_key, actions_hotkey); keybinder_unbind(prefs.menu_key, menu_hotkey); keybinder_unbind(prefs.search_key, search_hotkey); + keybinder_unbind(prefs.offline_key, offline_hotkey); /* Cleanup */ g_free(prefs.history_key); g_free(prefs.actions_key); g_free(prefs.menu_key); g_free(prefs.search_key); + g_free(prefs.offline_key); g_list_foreach(history, (GFunc)g_free, NULL); g_list_free(history); g_free(primary_text); diff -Nru clipit-1.4.2~quantal1/src/main.h clipit-1.4.2~quantal2/src/main.h --- clipit-1.4.2~quantal1/src/main.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/main.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel + * Copyright (C) 2011 by Eugene Nikolsky * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -59,8 +60,11 @@ gchar* actions_key; /* Actions menu hotkey */ gchar* menu_key; /* ClipIt menu hotkey */ gchar* search_key; /* ClipIt search hotkey */ + gchar* offline_key; /* ClipIt offline mode hotkey */ gboolean no_icon; /* No icon */ + + gboolean offline_mode; /* Offline mode */ } prefs_t; extern prefs_t prefs; @@ -73,6 +77,8 @@ void search_hotkey(char *keystring, gpointer user_data); +void offline_hotkey(char *keystring, gpointer user_data); + void clear_main_data(); #ifdef HAVE_APPINDICATOR diff -Nru clipit-1.4.2~quantal1/src/manage.c clipit-1.4.2~quantal2/src/manage.c --- clipit-1.4.2~quantal1/src/manage.c 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/manage.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel + * Copyright (C) 2011 by Eugene Nikolsky * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -303,6 +304,7 @@ case XK_Shift_R: case XK_Control_L: case XK_Control_R: + case XK_Tab: // allow to switch focus by the Tab key return FALSE; case XK_Return: search_doubleclick(); @@ -328,8 +330,12 @@ gboolean show_search() { /* Prevent multiple instances */ - if(gtk_grab_get_current()) + if(gtk_grab_get_current()) { + /* A window is already open, so we present it to the user */ + GtkWidget *toplevel = gtk_widget_get_toplevel(gtk_grab_get_current()); + gtk_window_present((GtkWindow*)toplevel); return FALSE; + } /* Declare some variables */ GtkWidget *hbox; @@ -339,13 +345,26 @@ GtkWidget* search_dialog = gtk_dialog_new(); gtk_window_set_icon((GtkWindow*)search_dialog, gtk_widget_render_icon(search_dialog, GTK_STOCK_FIND, GTK_ICON_SIZE_MENU, NULL)); - gtk_window_set_title((GtkWindow*)search_dialog, _("Manage History")); + gchar *orig_title = _("Manage History"); + gchar *title = 0; + if (prefs.offline_mode) + title = g_strconcat(orig_title, _(" (Offline mode)"), NULL); + else + title = g_strdup(orig_title); + gtk_window_set_title((GtkWindow*)search_dialog, title); + g_free(title); gtk_window_set_resizable((GtkWindow*)search_dialog, TRUE); gtk_window_set_position((GtkWindow*)search_dialog, GTK_WIN_POS_CENTER); + GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(search_dialog)); + gint screen_height = gdk_screen_get_height(screen)-120; + gint win_height = 600; + if (win_height > screen_height) + win_height = screen_height; + GtkWidget* vbox_search = gtk_vbox_new(FALSE, 10); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(search_dialog))), vbox_search, TRUE, TRUE, 2); - gtk_widget_set_size_request((GtkWidget*)vbox_search, 400, 600); + gtk_widget_set_size_request((GtkWidget*)vbox_search, 400, win_height); hbox = gtk_hbox_new(TRUE, 4); gtk_box_pack_start((GtkBox*)vbox_search, hbox, FALSE, FALSE, 0); diff -Nru clipit-1.4.2~quantal1/src/manage.h clipit-1.4.2~quantal2/src/manage.h --- clipit-1.4.2~quantal1/src/manage.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/manage.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/src/preferences.c clipit-1.4.2~quantal2/src/preferences.c --- clipit-1.4.2~quantal1/src/preferences.c 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/preferences.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel + * Copyright (C) 2011 by Eugene Nikolsky * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -46,6 +47,7 @@ *actions_key_entry, *menu_key_entry, *search_key_entry, + *offline_key_entry, *save_check, *confirm_check, *reverse_check, @@ -73,6 +75,9 @@ keybinder_unbind(prefs.search_key, search_hotkey); g_free(prefs.search_key); prefs.search_key = NULL; + keybinder_unbind(prefs.offline_key, offline_hotkey); + g_free(prefs.offline_key); + prefs.offline_key = NULL; /* Get the new preferences */ prefs.use_copy = gtk_toggle_button_get_active((GtkToggleButton*)copy_check); @@ -97,17 +102,19 @@ prefs.actions_key = g_strdup(gtk_entry_get_text((GtkEntry*)actions_key_entry)); prefs.menu_key = g_strdup(gtk_entry_get_text((GtkEntry*)menu_key_entry)); prefs.search_key = g_strdup(gtk_entry_get_text((GtkEntry*)search_key_entry)); + prefs.offline_key = g_strdup(gtk_entry_get_text((GtkEntry*)offline_key_entry)); /* Bind keys and apply the new history limit */ keybinder_bind(prefs.history_key, history_hotkey, NULL); keybinder_bind(prefs.actions_key, actions_hotkey, NULL); keybinder_bind(prefs.menu_key, menu_hotkey, NULL); keybinder_bind(prefs.search_key, search_hotkey, NULL); + keybinder_bind(prefs.offline_key, offline_hotkey, NULL); truncate_history(); } /* Save preferences to CONFIGDIR/clipit/clipitrc */ -static void save_preferences() +void save_preferences() { /* Create key */ GKeyFile* rc_key = g_key_file_new(); @@ -135,6 +142,8 @@ g_key_file_set_string(rc_key, "rc", "actions_key", prefs.actions_key); g_key_file_set_string(rc_key, "rc", "menu_key", prefs.menu_key); g_key_file_set_string(rc_key, "rc", "search_key", prefs.search_key); + g_key_file_set_string(rc_key, "rc", "offline_key", prefs.offline_key); + g_key_file_set_boolean(rc_key, "rc", "offline_mode", prefs.offline_mode); /* Check config and data directories */ check_dirs(); @@ -172,6 +181,7 @@ prefs.actions_key = DEF_ACTIONS_KEY; prefs.menu_key = DEF_MENU_KEY; prefs.search_key = DEF_SEARCH_KEY; + prefs.offline_key = DEF_OFFLINE_KEY; save_preferences(); } g_free(rc_file); @@ -242,6 +252,8 @@ prefs.actions_key = g_key_file_get_string(rc_key, "rc", "actions_key", NULL); prefs.menu_key = g_key_file_get_string(rc_key, "rc", "menu_key", NULL); prefs.search_key = g_key_file_get_string(rc_key, "rc", "search_key", NULL); + prefs.offline_key = g_key_file_get_string(rc_key, "rc", "offline_key", NULL); + prefs.offline_mode = g_key_file_get_boolean(rc_key, "rc", "offline_mode", NULL); /* Check for errors and set default values if any */ if ((!prefs.history_limit) || (prefs.history_limit > 1000) || (prefs.history_limit < 0)) @@ -260,6 +272,8 @@ prefs.menu_key = g_strdup(DEF_MENU_KEY); if (!prefs.search_key) prefs.search_key = g_strdup(DEF_SEARCH_KEY); + if (!prefs.offline_key) + prefs.offline_key = g_strdup(DEF_OFFLINE_KEY); } else { @@ -268,6 +282,7 @@ prefs.actions_key = g_strdup(DEF_ACTIONS_KEY); prefs.menu_key = g_strdup(DEF_MENU_KEY); prefs.search_key = g_strdup(DEF_SEARCH_KEY); + prefs.offline_key = g_strdup(DEF_OFFLINE_KEY); } g_key_file_free(rc_key); g_free(rc_file); @@ -614,8 +629,13 @@ } /* Shows the preferences dialog on the given tab */ -void show_preferences(gint tab) -{ +void show_preferences(gint tab) { + if(gtk_grab_get_current()) { + /* A window is already open, so we present it to the user */ + GtkWidget *toplevel = gtk_widget_get_toplevel(gtk_grab_get_current()); + gtk_window_present((GtkWindow*)toplevel); + return; + } /* Declare some variables */ GtkWidget *frame, *label, *alignment, *hbox, @@ -984,6 +1004,15 @@ search_key_entry = gtk_entry_new(); gtk_entry_set_width_chars((GtkEntry*)search_key_entry, 10); gtk_box_pack_end((GtkBox*)hbox, search_key_entry, TRUE, TRUE, 0); + /* Offline mode key combination */ + hbox = gtk_hbox_new(TRUE, 4); + gtk_box_pack_start((GtkBox*)vbox, hbox, FALSE, FALSE, 0); + label = gtk_label_new(_("Offline mode hotkey:")); + gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); + gtk_box_pack_start((GtkBox*)hbox, label, TRUE, TRUE, 0); + offline_key_entry = gtk_entry_new(); + gtk_entry_set_width_chars((GtkEntry*)offline_key_entry, 10); + gtk_box_pack_end((GtkBox*)hbox, offline_key_entry, TRUE, TRUE, 0); gtk_box_pack_start((GtkBox*)vbox_extras, frame, FALSE, FALSE, 0); /* Make widgets reflect current preferences */ @@ -1009,6 +1038,7 @@ gtk_entry_set_text((GtkEntry*)actions_key_entry, prefs.actions_key); gtk_entry_set_text((GtkEntry*)menu_key_entry, prefs.menu_key); gtk_entry_set_text((GtkEntry*)search_key_entry, prefs.search_key); + gtk_entry_set_text((GtkEntry*)offline_key_entry, prefs.offline_key); /* Read actions */ read_actions(); diff -Nru clipit-1.4.2~quantal1/src/preferences.h clipit-1.4.2~quantal2/src/preferences.h --- clipit-1.4.2~quantal1/src/preferences.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/preferences.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel + * Copyright (C) 2011 by Eugene Nikolsky * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -28,6 +29,7 @@ #define INIT_ACTIONS_KEY NULL #define INIT_MENU_KEY NULL #define INIT_SEARCH_KEY NULL +#define INIT_OFFLINE_KEY NULL #define DEF_USE_COPY TRUE #define DEF_USE_PRIMARY FALSE @@ -51,7 +53,9 @@ #define DEF_ACTIONS_KEY "A" #define DEF_MENU_KEY "P" #define DEF_SEARCH_KEY "F" +#define DEF_OFFLINE_KEY "O" #define DEF_NO_ICON FALSE +#define DEF_OFFLINE_MODE FALSE #define ACTIONS_FILE "clipit/actions" #define EXCLUDES_FILE "clipit/excludes" @@ -67,6 +71,8 @@ void read_preferences(); +void save_preferences(); + void show_preferences(gint tab); G_END_DECLS diff -Nru clipit-1.4.2~quantal1/src/utils.c clipit-1.4.2~quantal2/src/utils.c --- clipit-1.4.2~quantal1/src/utils.c 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/utils.c 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx @@ -116,28 +116,28 @@ { { "daemon", 'd', - G_OPTION_FLAG_NO_ARG, + 0, G_OPTION_ARG_NONE, &daemon, _("Run as daemon"), NULL }, { "no-icon", 'n', - G_OPTION_FLAG_NO_ARG, + 0, G_OPTION_ARG_NONE, &icon, _("Do not use status icon (Ctrl-Alt-P for menu)"), NULL }, { "clipboard", 'c', - G_OPTION_FLAG_NO_ARG, + 0, G_OPTION_ARG_NONE, &clipboard, _("Print clipboard contents"), NULL }, { "primary", 'p', - G_OPTION_FLAG_NO_ARG, + 0, G_OPTION_ARG_NONE, &primary, _("Print primary contents"), NULL diff -Nru clipit-1.4.2~quantal1/src/utils.h clipit-1.4.2~quantal2/src/utils.h --- clipit-1.4.2~quantal1/src/utils.h 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/src/utils.h 2012-04-04 07:41:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 by Cristian Henzel +/* Copyright (C) 2010-2012 by Cristian Henzel * * forked from parcellite, which is * Copyright (C) 2007-2008 by Xyhthyx diff -Nru clipit-1.4.2~quantal1/update-po clipit-1.4.2~quantal2/update-po --- clipit-1.4.2~quantal1/update-po 2011-10-30 09:33:01.000000000 +0000 +++ clipit-1.4.2~quantal2/update-po 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/bin/bash - -## Copyright (C) 2010-2011 by Cristian Henzel -## -## This file is part of ClipIt. -## -## ClipIt is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or -## (at your option) any later version. -## -## ClipIt is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . - -CURRENTYEAR=$(date "+%Y") -CURRENTSTAMP=$(date "+%Y-%m-%d %H:%M%z") - -## Update po files with new strings -./autogen.sh && ./configure -cd po -intltool-update -r -cd .. -make update-po - -## Update po header files information -for filename in po/*.po po/*.pot; do - sed -i "s/SOME DESCRIPTIVE TITLE\./ClipIt translation file./" "$filename" - sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010-${CURRENTYEAR} Cristian Henzel /" "$filename" - sed -i "s/as the PACKAGE package\./as the ClipIt package\./" "$filename" - sed -i "s/FIRST AUTHOR , YEAR/Cristian Henzel , 2010/" "$filename" - sed -i "s/Project-Id-Version:.*$/Project-Id-Version: ClipIt\\\\n\"/" "$filename" - sed -i "s/Report-Msgid-Bugs-To:.*$/Report-Msgid-Bugs-To: Cristian Henzel \\\\n\"/" "$filename" - sed -i "s/YEAR-MO-DA HO:MI+ZONE/${CURRENTSTAMP}/" "$filename" - sed -i "s/FULL NAME /Cristian Henzel /" "$filename" - sed -i "s/LANGUAGE /Cristian Henzel /" "$filename" - sed -i "s/CHARSET/UTF-8/" "$filename" -done - -## Push po/clipit.pot to transifex -tx push -s - -## Pull translations from transifex -tx pull -af