From: Jean-Philippe Orsini Date: Mon, 1 Sep 2014 16:00:20 +0000 (+0200) Subject: Merge branch 'master' into ppa-daily-trunk X-Git-Tag: debian/1.1.3-1ppautopic1~7^2~3 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=commitdiff_plain;h=06abeddc3fa8a3984c2300ab7223a350589d7c46;hp=9830d95c63d6058fcc42a057d159ac9ce1e4fed7 Merge branch 'master' into ppa-daily-trunk Conflicts: debian/changelog --- diff --git a/Makefile.am b/Makefile.am index e199b72..df37f0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,10 @@ desktop_DATA = psensor.desktop EXTRA_DIST = $(desktop_DATA) $(autostart_DATA) +if ASCIIDOC README.html: README www/style.css asciidoc --theme style -a themedir=`pwd`/www -n -a toc README NEWS.html: NEWS www/style.css asciidoc --theme style -a themedir=`pwd`/www NEWS +endif diff --git a/Makefile.in b/Makefile.in index 74ac73c..f45bf33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,14 +79,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS ar-lib compile \ - config.guess config.rpath config.sub depcomp install-sh \ - missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in ABOUT-NLS $(dist_doc_DATA) COPYING \ + ar-lib compile config.guess config.rpath config.sub depcomp \ + install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -68,15 +99,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -113,11 +157,33 @@ am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)" DATA = $(desktop_DATA) $(dist_doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -128,6 +194,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -155,15 +222,18 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -185,15 +255,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -245,7 +311,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -260,7 +325,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -285,6 +349,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -381,8 +446,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -438,22 +503,25 @@ uninstall-dist_docDATA: dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -468,57 +536,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -534,12 +557,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -551,15 +569,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -568,9 +582,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -638,40 +674,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -682,8 +720,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -695,18 +731,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -729,7 +766,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -866,13 +903,12 @@ ps-am: uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ @@ -883,15 +919,15 @@ uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-desktopDATA uninstall-dist_docDATA -README.html: README www/style.css - asciidoc --theme style -a themedir=`pwd`/www -n -a toc README +@ASCIIDOC_TRUE@README.html: README www/style.css +@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www -n -a toc README -NEWS.html: NEWS www/style.css - asciidoc --theme style -a themedir=`pwd`/www NEWS +@ASCIIDOC_TRUE@NEWS.html: NEWS www/style.css +@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www NEWS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/NEWS b/NEWS index ecda156..182b4d5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,38 @@ Psensor NEWS ============ +v1.1.1 +------ + +* Sensor properties stored in +$HOME/.psensor/psensor.cfg+ instead of + GConf. +* psensor settings stored with dconf, removed dependency to gconf2. +* Fixed check of sensors/error.h. +* Made asciidoc optional. +* Hide/show sensors in the main window. +* Added TODO in the source tarball. +* Merged Hungarian translation from LP (Richard Somlói). +* Merged Italian translation from LP (Gabriele). +* Merged Latvian translation from LP (tuxmaniack). +* Merged Swedish translation from LP (Josef Andersson). +* Meged Turkish translation from LP (İbrahim Çelik). + +v1.0.4 +------ + +* Fixed menu separators of the appindicator. + +v1.0.3 +------ + +* Fixed bug: psensor not autostarted when $HOME/.config/autostart does + not exist. +* Fixed few swedish translations (Josef Andersson). +* Fixed psensor does not start: Attempt to unlock mutex that was not + locked during startup with glib 2.41.2. (LP: #1346299). +* Fixed FTBFS with clang instead of gcc. (Closes: #753061). +* Fixed notification script call (wrong allocation of command string). + v1.0.2 ------ diff --git a/NEWS.html b/NEWS.html index ccf68c4..d801d1c 100644 --- a/NEWS.html +++ b/NEWS.html @@ -381,6 +381,115 @@ asciidoc.install();
+

v1.1.1

+
+
    +
  • +

    +Sensor properties stored in $HOME/.psensor/psensor.cfg instead of + GConf. +

    +
    • +
  • +

    +psensor settings stored with dconf, removed dependency to gconf2. +

    +
    • +
  • +

    +Fixed check of sensors/error.h. +

    +
    • +
  • +

    +Made asciidoc optional. +

    +
    • +
  • +

    +Hide/show sensors in the main window. +

    +
    • +
  • +

    +Added TODO in the source tarball. +

    +
    • +
  • +

    +Merged Hungarian translation from LP (Richard Somlói). +

    +
    • +
  • +

    +Merged Italian translation from LP (Gabriele). +

    +
    • +
  • +

    +Merged Latvian translation from LP (tuxmaniack). +

    +
    • +
  • +

    +Merged Swedish translation from LP (Josef Andersson). +

    +
    • +
  • +

    +Meged Turkish translation from LP (İbrahim Çelik). +

    +
    • +
+
+
+
+

v1.0.4

+
+
    +
  • +

    +Fixed menu separators of the appindicator. +

    +
    • +
+
+
+
+

v1.0.3

+
+
    +
  • +

    +Fixed bug: psensor not autostarted when $HOME/.config/autostart does + not exist. +

    +
    • +
  • +

    +Fixed few swedish translations (Josef Andersson). +

    +
    • +
  • +

    +Fixed psensor does not start: Attempt to unlock mutex that was not + locked during startup with glib 2.41.2. (LP: #1346299). +

    +
    • +
  • +

    +Fixed FTBFS with clang instead of gcc. (Closes: #753061). +

    +
    • +
  • +

    +Fixed notification script call (wrong allocation of command string). +

    +
    • +
+
+
+

v1.0.2

    @@ -2620,7 +2729,7 @@ Fixed BR1: crash when no temperature sensor is available
    diff --git a/README b/README index 43123c8..00d93ab 100644 --- a/README +++ b/README @@ -114,7 +114,6 @@ The compilation of +psensor+ requires: * lm-sensors * library sensors4 * library gtk3 >=3.4 - * library gconf2 * help2man * asciidoc (optional, required to produce the html version of the faq) @@ -122,7 +121,7 @@ The compilation of +psensor+ requires: * library libnotify (optional) * library libappindicator (optional) * library libXNVCtrl (optional) - * library json0 and curl (optional, required for remote monitoring) + * library json-c >= 0.11.99 and curl (optional, required for remote monitoring) * library unity (>=v3.4.2, optional) * library gtop2 (optional, required for CPU usage) * library atasmart (optional, for disk monitoring) @@ -132,31 +131,6 @@ The specific requirements for +psensor-server+: * library libmicrohttpd * library json0 -For Debian 7.0: ------------------------------------------------------------------ -sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev -libgconf2-dev libnotify-dev libsensors4-dev help2man -libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev -libatasmart-dev make ------------------------------------------------------------------ - -For Fedora 17: ------------------------------------------------------------------------ -sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck -libatasmart-devel libcurl-devel json-c-devel libmicrohttpd-devel -help2man libnotify-devel libgtop2-devel make ------------------------------------------------------------------------ - -For Ubuntu 12.10: -------------------------------------------------------------------------- -sudo apt-get install asciidoc autoconf automake autopoint -debhelper (>= 9) cppcheck gettext help2man libappindicator3-dev -libatasmart-dev libcurl4-gnutls-dev libgconf2-dev libgtk-3-dev -libgtop2-dev libjson0-dev libmicrohttpd-dev libnotify-dev -libsensors4-dev libunity-dev nvidia-settings perl - -------------------------------------------------------------------------- - Compilation and Installation Steps ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/README.html b/README.html index 7b1b294..a1942e9 100644 --- a/README.html +++ b/README.html @@ -3,7 +3,7 @@ - + Psensor README + + + +
    +
    +
    +

    The last version of this file is available at +http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/TODO.html;hb=HEAD.

    +
      +
    • +

      +Play a sound when a sensor alert is raised. Note that + it can actually be done by using the script support. +

      +
      • +
    • +

      +Use max/crit temperature information provided by + lm-sensor. +

      +
      • +
    • +

      +Include help/faq directly in psensor UI. +

      +
      • +
    +
    +
    +
    +
    + + + diff --git a/doc/TODO.txt b/doc/TODO.txt new file mode 100644 index 0000000..cc7b502 --- /dev/null +++ b/doc/TODO.txt @@ -0,0 +1,13 @@ +Psensor TODO +============ + +The last version of this file is available at +http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/TODO.html;hb=HEAD. + + * Play a sound when a sensor alert is raised. Note that + it can actually be done by using the script support. + + * Use max/crit temperature information provided by + lm-sensor. + + * Include help/faq directly in psensor UI. diff --git a/doc/faq.html b/doc/faq.html index 1ae0908..23cde0a 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -564,8 +564,7 @@ email to:

Check the FAQ or the TODO pages.

If you don’t find the information, you can send an email to the public -mailing-list psensor-users@googlegroups.com (require registration at: -https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users) -or send an email directly to me: jeanfi@gmail.com.

+mailing-list psensor-users@googlegroups.com or directly to me: +jeanfi@gmail.com.

@@ -698,15 +696,23 @@ It should output something like:

root      1433     1  0 May28 ?        00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb
-

Since recent Ubuntu releases, installing the hddtemp package is not -enough, it is required to manually allow the hddtemp daemon. Edit the -file /etc/default/hddtemp and set RUN_DAEMON to "true".

+

Depending on the Linux distribution, the installation of the hddtemp +package does not enable the hddtemp daemon automaticaly.

+

In this case, edit the file /etc/default/hddtemp and set +RUN_DAEMON to "true" like in the following example:

# hddtemp network daemon switch. If set to true, hddtemp will listen
 # for incoming connections.
 RUN_DAEMON="true"
+

For Debian/Ubuntu, you can use

+
+
+
dpkg-reconfigure hddtemp
+
+

and reply yes when asked whether hddtemp daemon must be +run during the startup.

@@ -738,11 +744,21 @@ more general, but can be configured to display sensors
+
+

18. Is it possible to hide sensors in the main window?

+
+

Before v1.1.1, the sensors retrieved from the lm-sensor library can be +ignored directly in the lm-sensor configuration. See the manpage +of sensors.conf(5).

+

Since v1.1.1, it is possible to hide a sensor, uncheck the setting +Display sensor in the list of sensors in the sensor preferences.

+
+
diff --git a/doc/faq.txt b/doc/faq.txt index 1de2f69..56350b6 100644 --- a/doc/faq.txt +++ b/doc/faq.txt @@ -121,8 +121,7 @@ repositories. If you don’t want to use the launchpad, you can send the report by email to: - - psensor-users@googlegroups.com (require registration at: - https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users) + - psensor-users@googlegroups.com - or jeanfi@gmail.com. If the bug is concerning Debian or Ubuntu derivatives distribution, @@ -139,9 +138,8 @@ How to send ideas, questions or comments? Check the FAQ or the TODO pages. If you don’t find the information, you can send an email to the public -mailing-list psensor-users@googlegroups.com (require registration at: -https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users) -or send an email directly to me: jeanfi@gmail.com. +mailing-list psensor-users@googlegroups.com or directly to me: +jeanfi@gmail.com. [[S_Contribute]] @@ -247,9 +245,11 @@ It should output something like: root 1433 1 0 May28 ? 00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb --------------------- -Since recent Ubuntu releases, installing the +hddtemp+ package is not -enough, it is required to manually allow the +hddtemp+ daemon. Edit the -file +/etc/default/hddtemp+ and set +RUN_DAEMON+ to +"true"+. +Depending on the Linux distribution, the installation of the +hddtemp+ +package does not enable the hddtemp daemon automaticaly. + +In this case, edit the file +/etc/default/hddtemp+ and set ++RUN_DAEMON+ to +"true"+ like in the following example: ------------------ # hddtemp network daemon switch. If set to true, hddtemp will listen @@ -257,6 +257,13 @@ file +/etc/default/hddtemp+ and set +RUN_DAEMON+ to +"true"+. RUN_DAEMON="true" ------------------ +For Debian/Ubuntu, you can use +------------------ +dpkg-reconfigure hddtemp +------------------ + +and reply +yes+ when asked whether hddtemp daemon must be +run during the startup. [[S_SimilarSoft]] Is there any other similar softwares? @@ -272,3 +279,14 @@ Here is a list of few well-known sensors monitoring softwares: - more general, but can be configured to display sensors information: http://conky.sourceforge.net/ + +[[S_HideSensor]] +Is it possible to hide sensors in the main window? +-------------------------------------------------- + +Before v1.1.1, the sensors retrieved from the lm-sensor library can be +ignored directly in the lm-sensor configuration. See the manpage +of sensors.conf(5). + +Since v1.1.1, it is possible to hide a sensor, uncheck the setting +'Display sensor in the list of sensors' in the sensor preferences. diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in index e569095..397cd9c 100644 --- a/icons/hicolor/14x14/Makefile.in +++ b/icons/hicolor/14x14/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/14x14 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in index 54cd6ed..897d839 100644 --- a/icons/hicolor/16x16/Makefile.in +++ b/icons/hicolor/16x16/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in index 1dcd3a0..897481a 100644 --- a/icons/hicolor/22x22/Makefile.in +++ b/icons/hicolor/22x22/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in index 9c669b9..c477aec 100644 --- a/icons/hicolor/24x24/Makefile.in +++ b/icons/hicolor/24x24/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/24x24 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in index ab3755f..0962c12 100644 --- a/icons/hicolor/32x32/Makefile.in +++ b/icons/hicolor/32x32/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/32x32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in index 85dc9b5..f21011d 100644 --- a/icons/hicolor/48x48/Makefile.in +++ b/icons/hicolor/48x48/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in index 583f909..bfb3d67 100644 --- a/icons/hicolor/64x64/Makefile.in +++ b/icons/hicolor/64x64/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/64x64 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in index ba51e7c..44e0e57 100644 --- a/icons/hicolor/scalable/Makefile.in +++ b/icons/hicolor/scalable/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/hicolor/scalable -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in index 55f3e39..63b9a6f 100644 --- a/icons/ubuntu-mono-dark/apps/22/Makefile.in +++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/ubuntu-mono-dark/apps/22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in index 799c68a..76d9ea6 100644 --- a/icons/ubuntu-mono-dark/status/22/Makefile.in +++ b/icons/ubuntu-mono-dark/status/22/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/ubuntu-mono-dark/status/22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in index a1ed921..88e49ea 100644 --- a/icons/ubuntu-mono-light/status/22/Makefile.in +++ b/icons/ubuntu-mono-light/status/22/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = icons/ubuntu-mono-light/status/22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(psensordistpixdir)" DATA = $(psensordistpix_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -312,11 +353,11 @@ uninstall-psensordistpixDATA: @list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,17 +495,17 @@ uninstall-am: uninstall-psensordistpixDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-psensordistpixDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-psensordistpixDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-psensordistpixDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-psensordistpixDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/po/POTFILES.in b/po/POTFILES.in index abf0ea6..71ba7c7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +src/cfg.c src/glade/psensor.glade src/glade/psensor-pref.glade src/glade/sensor-edit.glade diff --git a/po/de.gmo b/po/de.gmo index 0298a82..09cbfd5 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index adf7336..74cc44e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2014-04-30 16:48+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n" "X-Generator: Poedit 1.5.4\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Erzeugen des Webservers ist gescheitert." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." + #: src/glade/psensor.glade:6 msgid "About" msgstr "Info" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Einstellungen" @@ -40,15 +59,15 @@ msgstr "Beenden" msgid "Show" msgstr "Anzeigen" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor – Temperaturüberwachung" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Hilfe" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Messungen" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Graph" @@ -212,7 +231,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N/V" @@ -272,6 +291,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden." @@ -374,38 +397,38 @@ msgstr "Verbindung zum X11-Server konnte nicht hergestellt werden." msgid "Failed to retrieve NVIDIA information." msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "U/min" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "HOME-Variable ist nicht festgelegt." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Sensorprotokolldatei ist bereits geöffnet." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Sensorprotokolldatei kann nicht geöffnet werden: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Sensorprotokolldatei ist nicht geöffnet." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen " "werden." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -421,12 +444,12 @@ msgstr "" "weiterverbreiten.\n" "Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION] …\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -434,11 +457,11 @@ msgstr "" "Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, " "inklusive Temperaturen und Lüftergeschwindigkeiten." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Optionen:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -446,7 +469,7 @@ msgstr "" " -h, --help Diese Hilfe anzeigen und beenden\n" " -v, --version Versionsinformationen anzeigen und beenden" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -454,7 +477,7 @@ msgstr "" " -u, --url=URL Die Adresse (URL) von psensor-server,\n" " Beispiel: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -462,44 +485,49 @@ msgstr "" " --use-libatasmart atasmart-Bibliothek zur Festplattenüberwachung\n" " anstelle des hddtemp-Dienstes nutzen" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance Erzeugung einer neuen Psensor-Anwendung erzwingen" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=STUFE Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und " "3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Programmfehler melden an: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Website: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Fehlerdiagnosemodus wird aktiviert." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Es existiert bereits eine Psensor-Instanz." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Erzeugen des Webservers ist gescheitert." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -515,24 +543,24 @@ msgstr "Ungültiger Inhalt: %s" msgid "Invalid JSON: %s" msgstr "Ungültiges JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Anhalten des Servers angefordert

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Seite nicht gefunden – Gehen Sie zurück zur Startseite

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ist ein HTTP-Server zur Fernüberwachung von Hardware-Sensoren." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -540,7 +568,7 @@ msgstr "" " -h, --help\t\tDiese Hilfe anzeigen und beenden\n" " -v, --version\t\tVersionsinformationen anzeigen und beenden" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -548,60 +576,60 @@ msgstr "" " -p,--port=PORT\tWebserver-Port\n" " -w,--wdir=DIR\t\tOrdner, der Webserver-Seiten enthält" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL Fehlerdiagnoseebene festlegen, Ganzzahl zwischen 0 " "und 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH Protokolldatei auf PATH festlegen" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=PATH Sensorenprotokolldatei auf PATH festlegen" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S Sensorenprotokollierungsintervall auf S (Sekunden) " "festlegen" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Abfrage: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Aktiviert den Fehlerdiagnosemodus: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Keine Sensoren erkannt." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Erzeugen des Webservers ist gescheitert." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Web-Server wurde gestartet auf Port: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW-Ordner: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "Adresse: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." @@ -625,31 +653,31 @@ msgstr "Info zu Psensor" msgid "Psensor Homepage" msgstr "Psensor-Website" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Laden des Psensor-Symbols ist gescheitert." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Wählen Sie eine Vordergrundfarbe" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Wert" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min." -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Max." -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Farbe" @@ -665,6 +693,6 @@ msgstr "Temperaturalarm" msgid "Fan alert" msgstr "Lüfteralarm" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Unbekannt" diff --git a/po/es.gmo b/po/es.gmo index f39bc28..360fd65 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 94ab010..96f95aa 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2013-05-12 22:16+0000\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n" "X-Generator: Launchpad (build 16799)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Fallo al crear el servidor Web" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Error al activar el registro de sensores" + #: src/glade/psensor.glade:6 msgid "About" msgstr "Acerca de" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Ajustes" @@ -40,15 +59,15 @@ msgstr "Salir" msgid "Show" msgstr "Mostrar" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Ayuda" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Medidas" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Gráfica" @@ -212,7 +231,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "No disponible" @@ -273,6 +292,11 @@ msgstr "Mostrar sensor en el menú de aplicaciones" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Mostrar sensor en el menú de aplicaciones" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: no se ha encontrado la librería ADL" @@ -375,36 +399,36 @@ msgstr "Imposible establecer conexión con el servidor X11." msgid "Failed to retrieve NVIDIA information." msgstr "Error al obtener la información de NVIDIA" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "La variable HOME no ha sido definida" -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Ya existe un registro de sensores abierto" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "No se puede abrir el archivo de registro: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "No se abrió el archivo de registro." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "¡No existe archivo que cerrar!" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -420,12 +444,12 @@ msgstr "" "apoyada por el autor. \n" "No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPTION]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -433,11 +457,11 @@ msgstr "" "Psensor es un programa GTK+ que muestra datos de temperatura y ventiladores " "a través de los sensores de su hardware." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Opciones" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -445,7 +469,7 @@ msgstr "" " -h, --help Muestra esta ayuda. \n" " -v, --versión Muestra información sobre la versión." -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -453,7 +477,7 @@ msgstr "" " -u, --url=URL La URL del servidor psensor,\n" " ejemplo: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -461,43 +485,48 @@ msgstr "" " --usar-libatasmart usar librería atasmart para leer el sensor del disco\n" " duro en lugar de hddtemp daemon" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance Fuerza el inicio de otro Psensor paralelo" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=NIVEL Establece el nivel de depuración con un valor entre 0 " "y 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Comunicar fallos: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Página Oficial: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor no ha sido compilado con soporte para sensores remotos." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Activa el modo de depuración" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Introducir `%s --ayuda' para obtener más información\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Ya existe un Psensor en ejecución." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Fallo al crear el servidor Web" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -513,25 +542,25 @@ msgstr "Contenido no válido:%s" msgid "Invalid JSON: %s" msgstr "JSON no válido:%s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

El servidor solicitó detenerse

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Página no encontrada- Ir a Página Principal" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server es un servidor HTTP para obtener información de los sensores " "de forma remota." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -539,7 +568,7 @@ msgstr "" " -h, --help\t\tMuestra esta ayuda.\n" " -v, --version\t\tMuestra la versión." -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -547,59 +576,59 @@ msgstr "" " -p,--port=PORT\tPuerto del servidor web. \n" " -w,--wdir=DIR\t\tDirectorio de servidores web." -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=NIVEL Establece el nivel de depuración con un número de 0 " "a 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH establece el archivo de registro en PATH" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=PATH establecer el archivo de registro en PATH" -#: src/server/server.c:113 +#: src/server/server.c:114 #, fuzzy msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr " --sensor-log-interval=S registrar sensores cada S (seconds)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "Petición HTTP:%s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Activa el modo de depuración:%d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "No se han detectado sensores." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Fallo al crear el servidor Web" -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado en el puerto:%d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "directorio WWW:%s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Error al activar el registro de sensores" @@ -625,31 +654,31 @@ msgstr "Sobre Psensor" msgid "Psensor Homepage" msgstr "Web de Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Error al cargar el icono de Psensor" -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Seleccionar el color del primer plano" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Valor" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Mín" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Máx" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Color" @@ -665,6 +694,6 @@ msgstr "Alarma por temperatura." msgid "Fan alert" msgstr "Alarma por parada de ventilador." -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Desconocido" diff --git a/po/fr.gmo b/po/fr.gmo index cabf2dd..513b873 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 84221ad..3f02095 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2013-06-29 15:14+0000\n" "Last-Translator: londumas \n" "Language-Team: French <>\n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n" "X-Generator: Launchpad (build 16799)\n" +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Échec de l'activation de la journalisation des capteurs." + #: src/glade/psensor.glade:6 msgid "About" msgstr "À propos" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Préférences" @@ -40,15 +59,15 @@ msgstr "Quitter" msgid "Show" msgstr "Afficher" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Surveillance des températures" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Aide" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Mesures" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Graphe" @@ -212,7 +231,7 @@ msgstr "Type :" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -272,6 +291,11 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Afficher le capteur dans le menu" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD : impossible de trouver la bibliothèque ADL." @@ -374,36 +398,36 @@ msgstr "Impossible d'ouvrir la connexion au serveur X11." msgid "Failed to retrieve NVIDIA information." msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "Tr/mn" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Variable home non définie." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Le journal des capteurs est déjà ouvert." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Ne peut ouvrir le journal : %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Le journal des capteurs n'est pas ouvert." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -420,12 +444,12 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisées par la loi.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation : %s [OPTION]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -433,11 +457,11 @@ msgstr "" "Psensor est une application GTK+ pour surveiller les capteurs thermiques et " "les vitesses de ventilateurs." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Options :" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -445,14 +469,14 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL l'URL de psensor-server, example: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -460,46 +484,51 @@ msgstr "" " --use-libatasmart utiliser la librairie atasmart pour la surveillance\n" " des disks a la place du serveur hddtemp" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forcer la création d'une nouvelle occurrence de " "l'application Psensor" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL assigner le niveau de débogage, nombre entier entre 0 " "et 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bogues à: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d’accueil: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor n'a pas été compilé avec le support de surveillance à distance." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Active le mode de débogage." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez « %s --help » pour plus d'informations.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Une instance de Psensor existe déjà." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Échec de la création du serveur Web." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -515,25 +544,25 @@ msgstr "Contenu invalide : %s" msgid "Invalid JSON: %s" msgstr "JSON invalide : %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

L’arrêt du serveur a été demandé

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Page introuvable - Allez à Main page

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server est un serveur HTTP pour surveiller à distance les capteurs " "matérielles." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -541,7 +570,7 @@ msgstr "" " -h, --help\t\tafficher cette aide et quitter\n" " -v, --version\t\tafficher les informations de version et quitter" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -549,60 +578,60 @@ msgstr "" " -p,--port=PORT\tport du serveur Web\n" " -w,--wdir=DIR\t\trépertoire contenant les pages du serveur Web" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL assigne le niveau de débogage, nombre entier entre 0 " "et 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH assigner le chemin d’accès au journal" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=PATH assigne le journal du capteur vers PATH" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S assigne l'intervalle de journalisation du capteur " "à S (secondes)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "Requête HTTP : %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Activation du mode de déboguage: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Aucun capteur détecté." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Échec de la création du serveur Web." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Le serveur Web a été démarré sur le port: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW répertoire : %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Échec de l'activation de la journalisation des capteurs." @@ -628,31 +657,31 @@ msgstr "À propos de Psensor" msgid "Psensor Homepage" msgstr "Site internet de Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Échec du chargement de l’icône de Psensor." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Sélectionner la couleur d'avant-plan" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Capteur" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Valeur" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Couleur" @@ -668,6 +697,6 @@ msgstr "Alerte thermique" msgid "Fan alert" msgstr "Alerte ventilateur" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Inconnu" diff --git a/po/hu.gmo b/po/hu.gmo index acda171..d67daf5 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 8b95e70..a4a8e0a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,23 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" -"PO-Revision-Date: 2012-10-29 09:41+0000\n" -"Last-Translator: Bence Lukács \n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"PO-Revision-Date: 2014-08-21 11:43+0000\n" +"Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n" -"X-Generator: Launchpad (build 16430)\n" +"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n" +"X-Generator: Launchpad (build 17174)\n" + +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Nem sikerült a mappa létrehozása: %s - %s" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "A konfigurációs fájl nem létezik." + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "Nem sikerült a konfigurációs fájlt elmenteni: %s" #: src/glade/psensor.glade:6 msgid "About" msgstr "Névjegy" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Beállítások" @@ -41,22 +60,22 @@ msgstr "Kilépés" msgid "Show" msgstr "Megjelenítés" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - hőmérsékletfigyelő" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" -msgstr "" +msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Súgó" #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" -msgstr "" +msgstr "Jobbra" #: src/glade/psensor-pref.glade:27 msgid "Left" @@ -64,11 +83,11 @@ msgstr "Balra" #: src/glade/psensor-pref.glade:30 msgid "Top" -msgstr "Tetejére" +msgstr "Felül" #: src/glade/psensor-pref.glade:33 msgid "Bottom" -msgstr "Aljára" +msgstr "Alul" #: src/glade/psensor-pref.glade:60 msgid "Edit Preferences" @@ -92,11 +111,11 @@ msgstr "Unity indítón lévő számláló engedélyezése" #: src/glade/psensor-pref.glade:209 msgid "Celsius" -msgstr "" +msgstr "Celsius" #: src/glade/psensor-pref.glade:210 msgid "Fahrenheit" -msgstr "" +msgstr "Fahrenheit" #: src/glade/psensor-pref.glade:254 msgid "Temperature unit:" @@ -112,7 +131,7 @@ msgstr "Felület" #: src/glade/psensor-pref.glade:299 msgid "Launch on session startup" -msgstr "" +msgstr "Indítás a munkamenettel" #: src/glade/psensor-pref.glade:320 msgid "Hide window on startup" @@ -124,7 +143,7 @@ msgstr "Ablak pozíciójának és méretének visszaállítása" #: src/glade/psensor-pref.glade:367 msgid "Startup" -msgstr "" +msgstr "Indítás" #: src/glade/psensor-pref.glade:405 msgid "Foreground:" @@ -160,7 +179,7 @@ msgstr "perc" #: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752 msgid "second(s)" -msgstr "s" +msgstr "másodperc" #: src/glade/psensor-pref.glade:637 msgid "Update interval:" @@ -171,7 +190,7 @@ msgid "Measures" msgstr "Mérések" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafikon" @@ -189,11 +208,11 @@ msgstr "Naplózás időköze:" #: src/glade/psensor-pref.glade:827 msgid "seconds(s)" -msgstr "másodperc(ek)" +msgstr "másodperc" #: src/glade/psensor-pref.glade:844 msgid "Script executed when an alarm is raised:" -msgstr "" +msgstr "Parancsfájl futtatás riasztáskor:" #: src/glade/psensor-pref.glade:877 msgid "Sensors" @@ -205,7 +224,7 @@ msgstr "Érzékelő beállításainak szerkesztése" #: src/glade/sensor-edit.glade:96 msgid "Name" -msgstr "" +msgstr "Név" #: src/glade/sensor-edit.glade:140 msgid "Type:" @@ -213,7 +232,7 @@ msgstr "Típus:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "---" @@ -231,7 +250,7 @@ msgstr "Név:" #: src/glade/sensor-edit.glade:232 msgid "Id:" -msgstr "Id:" +msgstr "Azonosító:" #: src/glade/sensor-edit.glade:278 msgid "Draw sensor curve" @@ -259,7 +278,7 @@ msgstr "Alsó küszöbérték:" #: src/glade/sensor-edit.glade:397 msgid "Application Indicator" -msgstr "" +msgstr "Alkalmazás Indikátor" #: src/glade/sensor-edit.glade:411 msgid "Display sensor in the menu" @@ -268,12 +287,17 @@ msgstr "Érzékelők megjelenítése az alkalmazásmenüben" #: src/glade/sensor-edit.glade:429 #, fuzzy msgid "Display sensor in the label (experimental)" -msgstr "Érzékelők megjelenítése az alkalmazásmenüben" +msgstr "Érzékelők megjelenítése a címkén (fejlesztés alatt)" #: src/glade/sensor-edit.glade:500 msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Érzékelő megjelenítése az érzékelők listáján" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat." @@ -293,20 +317,20 @@ msgstr "AMD: adapterek számainak lekérése meghiúsult" #: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" -msgstr "" +msgstr "ADM/ATI adapterek száma: %d" #: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" -msgstr "" +msgstr "Aktív ADM/ATI adapterek száma: %d" #: src/lib/cpu.c:46 msgid "CPU" -msgstr "" +msgstr "Processzor" #: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122 msgid "Disk" -msgstr "" +msgstr "Lemez" #: src/lib/hdd_atasmart.c:152 #, c-format @@ -337,19 +361,19 @@ msgstr "lmsensor: lmsensor_psensor_create hiba: rossz funkciótípus." #: src/lib/lmsensor.c:148 msgid "Intel CPU" -msgstr "" +msgstr "Intel processzor" #: src/lib/lmsensor.c:152 msgid "AMD CPU" -msgstr "" +msgstr "AMD processzor" #: src/lib/lmsensor.c:154 src/lib/nvidia.c:73 msgid "NVIDIA GPU" -msgstr "" +msgstr "NVIDIA videokártya" #: src/lib/lmsensor.c:156 msgid "VIA CPU" -msgstr "" +msgstr "VIA processzor" #: src/lib/lmsensor.c:218 #, c-format @@ -365,6 +389,8 @@ msgstr "A naplófájl megnyitása sikertelen: %s" msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" +"Az NVIDIA zár eszközmeghajtó nincs használatban vagy csak nem sikerült a " +"videokártya hőmérsékletének lekérése." #: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." @@ -374,36 +400,36 @@ msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval." msgid "Failed to retrieve NVIDIA information." msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "HOME változó nincs beállítva." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Az érzékelő naplófájlja már meg van nyitva." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "%s érzékelő naplófájlját nem lehet megnyitni" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Az érzékelő naplófájlja nincs nyitva." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -418,12 +444,12 @@ msgstr "" "Ez egy szabad szoftver: szabadon terjesztheti és/vagy módosíthatja\n" "NINCS GARANCIA, a jogszabályok által megengedett mértékben.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓK]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -431,11 +457,11 @@ msgstr "" "A Psensor egy GTK+ alkalmazás a hardver érzékelőinek figyelésére, beleértve " "a hőmérsékleteket és a ventilátor sebességét." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Kapcsolók:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -443,7 +469,7 @@ msgstr "" " -h, --help ezen súgó megjelenítése, majd kilépés\n" " -v, --version verzióinformációk megjelenítése, majd kilépés" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -451,7 +477,7 @@ msgstr "" " -u, --url=URL a psensor-server URL-címe,\n" " például: http://gepnev:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -460,42 +486,47 @@ msgstr "" "figyelésére a\n" " hddtemp démon helyett" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance új Psensor alkalmazás indításának kényszerítése" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hibakeresési szint beállítása, egész 0 és 3 között" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "A talált hibákat itt jelentse be: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Hibakeresési mód engedélyezése." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "További információkért adja ki a „%s --help” parancsot.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "A Psensors egy példánya már létezik." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Nem sikerült a mappa létrehozása: %s - %s" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -511,25 +542,25 @@ msgstr "Érvénytelen tartalom: %s" msgid "Invalid JSON: %s" msgstr "Érvénytelen JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

A kiszolgáló leállítást kért

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Az oldal nem található - Ugrás a Főoldalra" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "A psensor-server egy HTTP kiszolgáló a hardver érzékelőinek figyelésére " "távolról." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -537,7 +568,7 @@ msgstr "" " -h, --help\t\tezen súgó megjelenítése, majd kilépés\n" " -v, --version\t\tverzióinformáció megjelenítése, majd kilépés" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -545,60 +576,60 @@ msgstr "" " -p,--port=PORT\twebkiszolgáló portja\n" " -w,--wdir=DIR\t\ta webkiszolgáló oldalait tartalmazó mappa" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hibakeresési szint beállítása, egész 0 és 3 között" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=ÚTVONAL a naplófájl ÚTVONALÁNAK beállítása" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" " --sensor-log-file=ÚTVONAL érzékelők naplójának beállítása az ÚTVONALRA" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S érzékelő naplózási gyakoriságának beállítása S " "másodpercre" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-kérés: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Hibakeresési mód engedélyezése: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Nem találhatók érzékelők." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Nem sikerült létrehozni a webkiszolgálót." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "A webkiszolgáló elindult ezen a porton: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW könyvtár: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Érzékelők naplózásának aktiválása meghiúsult." @@ -622,31 +653,31 @@ msgstr "A Psensor névjegye" msgid "Psensor Homepage" msgstr "A Psensor honlapja" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." -msgstr "Nem sikerült betölteni a Psensor ikont." +msgstr "Nem sikerült betölteni a Psensor ikonját." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Előtérszín kiválasztása" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Érzékelő" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Érték" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Minimum" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Maximum" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Szín" @@ -662,6 +693,6 @@ msgstr "Hőmérséklet riasztás" msgid "Fan alert" msgstr "Ventilátor riasztás" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Ismeretlen" diff --git a/po/it.gmo b/po/it.gmo index c1b43c8..3e77dc2 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 441a95f..d421310 100644 --- a/po/it.po +++ b/po/it.po @@ -7,30 +7,49 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" -"PO-Revision-Date: 2013-04-14 16:06+0000\n" -"Last-Translator: Diego Pierotto \n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"PO-Revision-Date: 2014-08-15 21:05+0000\n" +"Last-Translator: Gabriele \n" "Language-Team: Italian\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-04-20 08:36+0000\n" -"X-Generator: Launchpad (build 16567)\n" +"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n" +"X-Generator: Launchpad (build 17174)\n" + +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Impossibile creare il Web server." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Attivazione registro dei sensori fallita." #: src/glade/psensor.glade:6 msgid "About" msgstr "Informazioni su..." #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Preferenze" #: src/glade/psensor.glade:15 src/glade/psensor.glade:16 #: src/glade/psensor.glade:28 msgid "Sensor Preferences" -msgstr "Sensor Preferenze" +msgstr "Preferenze Sensore" #: src/glade/psensor.glade:24 msgid "Quit" @@ -40,34 +59,34 @@ msgstr "Esci" msgid "Show" msgstr "Mostra" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor temperatura" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Aiuto" #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" -msgstr "Diritto" +msgstr "Destra" #: src/glade/psensor-pref.glade:27 msgid "Left" -msgstr "Sinestra" +msgstr "Sinistra" #: src/glade/psensor-pref.glade:30 msgid "Top" -msgstr "" +msgstr "In Alto" #: src/glade/psensor-pref.glade:33 msgid "Bottom" -msgstr "" +msgstr "In Basso" #: src/glade/psensor-pref.glade:60 msgid "Edit Preferences" @@ -91,11 +110,11 @@ msgstr "Abilita contatore nel Launcher Unity" #: src/glade/psensor-pref.glade:209 msgid "Celsius" -msgstr "" +msgstr "Celsius" #: src/glade/psensor-pref.glade:210 msgid "Fahrenheit" -msgstr "" +msgstr "Fahrenheit" #: src/glade/psensor-pref.glade:254 msgid "Temperature unit:" @@ -111,7 +130,7 @@ msgstr "Interfaccia" #: src/glade/psensor-pref.glade:299 msgid "Launch on session startup" -msgstr "" +msgstr "Lancia all'avvio" #: src/glade/psensor-pref.glade:320 msgid "Hide window on startup" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Misure" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafico" @@ -212,7 +231,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -270,7 +289,12 @@ msgstr "" #: src/glade/sensor-edit.glade:500 msgid "-1" -msgstr "" +msgstr "-1" + +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Mostra sensore nel menu" #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." @@ -300,11 +324,11 @@ msgstr "" #: src/lib/cpu.c:46 msgid "CPU" -msgstr "" +msgstr "CPU" #: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122 msgid "Disk" -msgstr "" +msgstr "Disco" #: src/lib/hdd_atasmart.c:152 #, c-format @@ -335,19 +359,19 @@ msgstr "lmsensor: lmsensor_psensor_create fallito: tipo di funzione errata." #: src/lib/lmsensor.c:148 msgid "Intel CPU" -msgstr "" +msgstr "CPU Intel" #: src/lib/lmsensor.c:152 msgid "AMD CPU" -msgstr "" +msgstr "CPU AMD" #: src/lib/lmsensor.c:154 src/lib/nvidia.c:73 msgid "NVIDIA GPU" -msgstr "" +msgstr "CPU NVIDIA" #: src/lib/lmsensor.c:156 msgid "VIA CPU" -msgstr "" +msgstr "CPU VIA" #: src/lib/lmsensor.c:218 #, c-format @@ -374,36 +398,36 @@ msgstr "Impossibile connettersi al server X11." msgid "Failed to retrieve NVIDIA information." msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Variabile HOME non impostata." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "File di registazione sensori già aperto." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Impossibile aprire il file di registrazione sensori: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "File di registazione sensori non aperto." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Registro sensori non aperto, impossibile chiuderlo." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -418,12 +442,12 @@ msgstr "" "Questo è software libero: sei libero di modificarlo e redistribuirlo.\n" "NON esiste GARANZIA, per gli scopi permessi dalla legge.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -431,11 +455,11 @@ msgstr "" "Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, " "incluse temperature e velocità delle ventole." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Opzioni:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -443,7 +467,7 @@ msgstr "" " -h, --help mostra questo help ed esce\n" " -v, --version mostra le informazioni sulla versione ed esce" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -451,7 +475,7 @@ msgstr "" " -u, --url=URL URL del server psensor,\n" " esempio: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -460,43 +484,48 @@ msgstr "" "dell'hard disk invece del \n" " servizio hddtemp" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forza la creazione di una nuova applicazione Psensor" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Segnalare i bug a: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s home page: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor è stato compilato senza il supporto per sensori remoti." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Abilita la modalità debug." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare '%s --help' per maggiori informazioni.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Esiste già un'istanza di Psensor" +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Impossibile creare il Web server." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -512,25 +541,25 @@ msgstr "Conenuto non valido: %s" msgid "Invalid JSON: %s" msgstr "JSON non valido: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Arresto del server richiesto

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Pagina non trovata - Vai a Pagina principale" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server è un server HTTP per il monitoraggio remoto di sensori " "hardware." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -538,7 +567,7 @@ msgstr "" " -h, --help\t\tmostra questo help ed esce\n" " -v, --version\t\tmostra le informazioni sulla versione ed esce" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -546,60 +575,60 @@ msgstr "" " -p,--port=PORT\tporta del server web\n" " -w,--wdir=DIR\t\tdirectory che contiene le pagine web" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH imposta il file di log su PATH" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" " --sensor-log-file=PATH imposta il file di registro dei sensori come PATH" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S imposta l'intervallo del registro di sensori come " "S (secondi)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Request: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Abilita modalità di debug: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Nessun sensore rilevato." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Impossibile creare il Web server." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Web server inizializzato sulla porta: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW directory: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Attivazione registro dei sensori fallita." @@ -623,31 +652,31 @@ msgstr "Informazioni su Psensor" msgid "Psensor Homepage" msgstr "Psensor Homepage" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Impossibile caricare l'icona di Psensor." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Colore di primo piano:" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensore" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Valore" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Minimo" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Massimo" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Colore" @@ -663,6 +692,6 @@ msgstr "Allarme temperatura" msgid "Fan alert" msgstr "Allarme ventola" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Sconosciuto" diff --git a/po/lv.gmo b/po/lv.gmo index 007b43a..4c4888e 100644 Binary files a/po/lv.gmo and b/po/lv.gmo differ diff --git a/po/lv.po b/po/lv.po index 78ba9d8..d33a21b 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,23 +7,42 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" -"PO-Revision-Date: 2013-10-24 12:32+0000\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"PO-Revision-Date: 2014-06-04 22:47+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n" +"X-Generator: Launchpad (build 17174)\n" + +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Neizdevās izveidot tīmekļa serveri." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." #: src/glade/psensor.glade:6 msgid "About" msgstr "Par" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Iestatījumi" @@ -40,34 +59,34 @@ msgstr "Iziet" msgid "Show" msgstr "Rādīt" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - temperatūras pārraugs" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Palīdzība" #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" -msgstr "" +msgstr "Pa labi" #: src/glade/psensor-pref.glade:27 msgid "Left" -msgstr "" +msgstr "Pa kreisi" #: src/glade/psensor-pref.glade:30 msgid "Top" -msgstr "" +msgstr "Augšā" #: src/glade/psensor-pref.glade:33 msgid "Bottom" -msgstr "" +msgstr "Lejā" #: src/glade/psensor-pref.glade:60 msgid "Edit Preferences" @@ -91,11 +110,11 @@ msgstr "Aktivizēt Unity palaidēja skaitītāju" #: src/glade/psensor-pref.glade:209 msgid "Celsius" -msgstr "" +msgstr "Celsijs" #: src/glade/psensor-pref.glade:210 msgid "Fahrenheit" -msgstr "" +msgstr "Fārenheits" #: src/glade/psensor-pref.glade:254 msgid "Temperature unit:" @@ -111,7 +130,7 @@ msgstr "Saskarne" #: src/glade/psensor-pref.glade:299 msgid "Launch on session startup" -msgstr "" +msgstr "Palaist pieteicoties sistēmā" #: src/glade/psensor-pref.glade:320 msgid "Hide window on startup" @@ -123,7 +142,7 @@ msgstr "Atjaunot loga pozīciju un izmēru" #: src/glade/psensor-pref.glade:367 msgid "Startup" -msgstr "" +msgstr "Palaišana" #: src/glade/psensor-pref.glade:405 msgid "Foreground:" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Mērījumi" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafiks" @@ -212,7 +231,7 @@ msgstr "Tips:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N/P" @@ -267,12 +286,17 @@ msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē" #: src/glade/sensor-edit.glade:429 #, fuzzy msgid "Display sensor in the label (experimental)" -msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē" +msgstr "Attēlot sensoru etiķetē (eksperimentāls)" #: src/glade/sensor-edit.glade:500 msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: nevar atrast ADL bibliotēku." @@ -292,20 +316,20 @@ msgstr "AMD: nevar saņemt adapteru skaitu." #: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" -msgstr "" +msgstr "AMD/ATI adapteru skaits: %d" #: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" -msgstr "" +msgstr "Aktīvo AMD/ATI adapteru skaits: %d" #: src/lib/cpu.c:46 msgid "CPU" -msgstr "" +msgstr "CPU" #: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122 msgid "Disk" -msgstr "" +msgstr "Disks" #: src/lib/hdd_atasmart.c:152 #, c-format @@ -336,19 +360,19 @@ msgstr "lmsensor: lmsensor_psensor_create atteice: nepareis īpašības tips." #: src/lib/lmsensor.c:148 msgid "Intel CPU" -msgstr "" +msgstr "Intel CPU" #: src/lib/lmsensor.c:152 msgid "AMD CPU" -msgstr "" +msgstr "AMD CPU" #: src/lib/lmsensor.c:154 src/lib/nvidia.c:73 msgid "NVIDIA GPU" -msgstr "" +msgstr "NVIDIA GPU" #: src/lib/lmsensor.c:156 msgid "VIA CPU" -msgstr "" +msgstr "VIA CPU" #: src/lib/lmsensor.c:218 #, c-format @@ -364,6 +388,8 @@ msgstr "Nevar atvērt žurnāla failu: %s" msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" +"NVIDIA īpašniekdraiveris netiek izmantots vai nevar iegūt NVIDIA GPU " +"temperatūru." #: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." @@ -373,36 +399,36 @@ msgstr "Nevar atvērt savienojumu ar X11 server." msgid "Failed to retrieve NVIDIA information." msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "HOME mainīgais nav iestatīts." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Sensora žurnāla fails jau ir atvērts." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Nevar atvērt sensora žurnāla failu: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Sensora žurnāla fails nav atvērts." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Sensora žurnāls nav atvērts, nevar aizvērt." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -412,12 +438,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" -msgstr "" +msgstr "Lietošana: %s [OPCIJAS]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -425,11 +451,11 @@ msgstr "" "Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot " "temperatūras un ventilatoru ātrumus." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Opcijas:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -437,7 +463,7 @@ msgstr "" " -h, --help rādīt šo palīdzību un iziet\n" " -v, --version rādīt versijas informāciju un iziet" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -445,7 +471,7 @@ msgstr "" " -u, --url=SAITE psensor-server adrese,\n" " piemērs: http://saimniekdatoravārds:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -453,41 +479,46 @@ msgstr "" " --use-libatasmart izmantot atasmart bibliotēku disku pārraudzībai\n" " hddtemp dēmona vietā" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance piespiest izveidot jaunu Psensor lietotni" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LĪMENIS iestatīt atkļūdošanas līmeni, starp 0 un 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Ziņojiet kļūdas uz: %s.\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s mājas lapa: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Aktivizēt atkļūdošanas režīmu." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Mēģiniet `%s --help', lai iegūtu vairāk informācijas.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Psensor instance jau eksistē." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Neizdevās izveidot tīmekļa serveri." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -503,24 +534,24 @@ msgstr "Nederīgs saturs: %s" msgid "Invalid JSON: %s" msgstr "Nederīgs JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Servera apturēšana pieprasīta

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Lapa nav atrasta - dodieties uz galveno lapu" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ir HTTP serveris aparatūras sensoru attālinātai pārraudzībai." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -528,7 +559,7 @@ msgstr "" " -h, --help\t\trādīt šo palīdzību un iziet\n" " -v, --version\t\trādīt versijas informāciju un iziet" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -536,59 +567,59 @@ msgstr "" " -p,--port=PORTS\ttīmekļa servera ports\n" " -w,--wdir=DIR\t\tmape ar tīmekļa servera lapām" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LĪMENIS iestatīt atkļūdošanas līmeni, vesels skaitlis " "starp 0 un 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=CEĻŠ žurnalēšanas faila ceļš" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=CEĻŠ sensora žurnāla faila ceļš" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S iestata sensora žurnāla intervālu uz S (sekundēm)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP pieprasījums: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Aktivizē atkļūdošanas režīmu: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Sensori nav atklāti." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Tīmekļa serveris sākts uz porta: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW mape: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "Saite: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." @@ -612,31 +643,31 @@ msgstr "Par Psensor" msgid "Psensor Homepage" msgstr "Psensor mājas lapa" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Neizdevās ielādēt Psensor ikonu." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Izvēlieties priekšplāna krāsu" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensors" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Vērtība" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min." -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Maks." -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Krāsa" @@ -652,6 +683,6 @@ msgstr "Temperatūras trauksme" msgid "Fan alert" msgstr "Ventilatora trauksme" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Nezināms" diff --git a/po/nl.gmo b/po/nl.gmo index b8382a3..4e3682e 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 684df73..2ad5bc9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2014-04-07 08:50+0000\n" "Last-Translator: Pjotr12345 \n" "Language-Team: Dutch \n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2014-04-09 22:52+0000\n" "X-Generator: Launchpad (build 16976)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Kon geen webserver maken." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." + #: src/glade/psensor.glade:6 msgid "About" msgstr "Over" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Voorkeuren" @@ -40,15 +59,15 @@ msgstr "Afsluiten" msgid "Show" msgstr "Tonen" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Temperatuurbewaker" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Hulp" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Metingen" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafiek" @@ -212,7 +231,7 @@ msgstr "Soort:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N.v.t." @@ -274,6 +293,11 @@ msgstr "Sensor tonen in het menu van de Toepassingsindicator" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Sensor tonen in het menu van de Toepassingsindicator" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: kan ADL-bibliotheekbestand niet vinden" @@ -376,36 +400,36 @@ msgstr "Kan verbinding met X11-server niet openen." msgid "Failed to retrieve NVIDIA information." msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Variabele voor HOME niet ingesteld." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Logboekbestand van sensor is al geopend." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Kan logboekbestand van sensor niet openen: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Logboekbestand van sensor niet geopend." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -420,12 +444,12 @@ msgstr "" "Dit is vrije programmatuur: u mag hem wijzigen en doorgeven.\n" "Er zit geen garantie op, voor zover de wet dat toestaat.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Gebruik: %s [OPTIE]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -433,11 +457,11 @@ msgstr "" "Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, " "inclusief temperaturen en ventilatorsnelheden." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Opties:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -445,7 +469,7 @@ msgstr "" " -h, --help toon deze hulpinformatie en sluit af\n" " -v, --version toon versie-informatie en sluit af" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -453,7 +477,7 @@ msgstr "" " -u, --url=URL het webadres van de psensor-server,\n" " voorbeeld: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -462,44 +486,49 @@ msgstr "" "schijfbewaking\n" " i.p.v. hddtemp-achtergronddienst" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forceer het aanmaken van een nieuwe Psensor-toepassing" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL stel het foutopsporingsniveau in, integer tussen 0 en 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Meld fouten aan: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Schakelt foutopsporingsmodus in." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer '%s --help' voor meer informatie.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Er bestaat reeds een instantie van Psensor." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Kon geen webserver maken." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -515,25 +544,25 @@ msgstr "Ongeldige inhoud: %s" msgid "Invalid JSON: %s" msgstr "Ongeldige JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Stilzetting van server verzocht

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Pagina niet gevonden - ga naar Hoofdpagina" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server is een HTTP-server voor het bewaken van apparatuursensoren op " "afstand." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -541,7 +570,7 @@ msgstr "" " -h, --help\t\ttoon deze hulptekst en sluit af\n" " -v, --version\t\ttoon versie-infomatie en sluit af" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -549,60 +578,60 @@ msgstr "" " -p,--port=PORT\twebserverpoort\n" " -w,--wdir=DIR\t\tmap die webserverpagina's bevat" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL stel het foutopsporingsniveau in, integer tussen 0 " "en 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH stel het logboekbestand in op PATH" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=PATH stel het sensorlogboekbestand in op PATH" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S stel de tussenpoze voor het sensorlogboek in op S " "(seconden)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-verzoek: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Schakelt foutopsporingsmodus in: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Geen sensoren bespeurd." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Kon geen webserver maken." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Webserver gestart op poort: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW-map: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." @@ -626,31 +655,31 @@ msgstr "Over Psensor" msgid "Psensor Homepage" msgstr "Thuispagina van Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Kon pictogram van Psensor niet laden." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Kies voorgrondkleur" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Waarde" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Kleur" @@ -666,6 +695,6 @@ msgstr "Temperatuurwaarschuwing" msgid "Fan alert" msgstr "Ventilatorwaarschuwing" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Onbekend" diff --git a/po/psensor.pot b/po/psensor.pot index f1f02ab..c21f555 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,31 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "" + #: src/glade/psensor.glade:6 msgid "About" msgstr "" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "" @@ -39,15 +58,15 @@ msgstr "" msgid "Show" msgstr "" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "" @@ -169,7 +188,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "" @@ -211,7 +230,7 @@ msgstr "" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -271,6 +290,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" @@ -371,36 +394,36 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "" -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "" -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -410,74 +433,78 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" msgstr "" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "" +#: src/main.c:597 +msgid "Failed to create thread for monitoring sensors" +msgstr "" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -493,82 +520,82 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "" -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "" @@ -590,31 +617,31 @@ msgstr "" msgid "Psensor Homepage" msgstr "" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "" @@ -630,6 +657,6 @@ msgstr "" msgid "Fan alert" msgstr "" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 725ab3a..e194334 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 72a05bc..b4c0801 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2013-09-01 18:54+0000\n" "Last-Translator: Celio Alves \n" "Language-Team: Brazilian Portuguese\n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n" "X-Generator: Launchpad (build 16799)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Falhou ao criar servidor web." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "" + #: src/glade/psensor.glade:6 msgid "About" msgstr "Sobre" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Preferências" @@ -40,15 +59,15 @@ msgstr "Sair" msgid "Show" msgstr "Mostrar" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "Ajuda" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Medidas" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafo" @@ -212,7 +231,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "N/D" @@ -272,6 +291,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: não foi possível encontrar a biblioteca ADL." @@ -372,36 +395,36 @@ msgstr "Não é possível abrir conexão com o servidor X11." msgid "Failed to retrieve NVIDIA information." msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Variável HOME não configurada." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Arquivo de registro do sensor já está aberto." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Não é possível abrir arquivo de log do sensor: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Arquivo de registros do sensor não foi aberto." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -411,12 +434,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -424,11 +447,11 @@ msgstr "" "Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, " "incluindo temperatura e velocidade de ventoinhas." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Opções:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -436,7 +459,7 @@ msgstr "" " -h, --help exibir esta ajuda e sair\n" " -v, --version exibir informação de versão e sair" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -444,47 +467,52 @@ msgstr "" " -u, --url=URL a URL do psensor-server,\n" " exemplo: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" msgstr "" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Relatar falhas para: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Ativar o modo de depuração" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Utilize `%s --help' para mais informações.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Uma instancia de Psensor já existe." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Falhou ao criar servidor web." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -500,86 +528,86 @@ msgstr "Conteúdo inválido: %s" msgid "Invalid JSON: %s" msgstr "JSON inválido: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Página não encontrada - Ir para a página inicial

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server é um servidor HTTP para monitoramento remoto de sensores de " "hardware." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "Requisição HTTP: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Habilita modo de depuração: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Nenhum sensor detectado" -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Falhou ao criar servidor web." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado na porta: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "Diretório WWW: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "" @@ -603,31 +631,31 @@ msgstr "Sobre o Psensor" msgid "Psensor Homepage" msgstr "Site do Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Falha ao carregar o ícone do Psensor." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Selecionar cor do primeiro plano" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Valor" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Cor" @@ -643,6 +671,6 @@ msgstr "Alerta de temperatura" msgid "Fan alert" msgstr "Alenta do ventilador" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Desconhecido" diff --git a/po/ru.gmo b/po/ru.gmo index 3da0d82..2bcb418 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index c5df1e2..0c4e30c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2014-05-20 05:14+0000\n" "Last-Translator: Dmitry Serov \n" "Language-Team: Russian\n" @@ -19,12 +19,31 @@ msgstr "" "X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n" "X-Generator: Launchpad (build 17031)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Не удалось создать веб-сервер." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Не удалось включить журналирование датчиков." + #: src/glade/psensor.glade:6 msgid "About" msgstr "О программе" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Параметры" @@ -41,15 +60,15 @@ msgstr "Выход" msgid "Show" msgstr "Показать" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - монитор температуры" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Справка" @@ -171,7 +190,7 @@ msgid "Measures" msgstr "Замеры" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Диаграмма" @@ -213,7 +232,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -273,6 +292,11 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Показать датчик в индикаторе меню приложений" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: библиотека ADL не найдена." @@ -373,36 +397,36 @@ msgstr "Ошибка открытия соединения к серверу X11 msgid "Failed to retrieve NVIDIA information." msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/мин" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Переменная HOME не установлена." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Файл журнала датчика уже открыт." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Не удалось открыть файл журнала датчика: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Файл журнала датчика не открыт." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Файл журнала датчика не открыт, не удалось закрыть." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -412,12 +436,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -425,11 +449,11 @@ msgstr "" "Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая " "температуру и скорость вентилятора." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Опции:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -437,14 +461,14 @@ msgstr "" " -h, --help показать эту справку и выйти\n" " -v, --version показать версию и выйти" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL URL psensor-сервера, пример: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -452,42 +476,47 @@ msgstr "" " --use-libatasmart использовать библиотеку atasmart для мониторинга " "дисков вместо демона hddtemp" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance принудительно запускает новую копию программы Psensor" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=УРОВЕНЬ установить уровень отладки, целое между 0 и 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Сообщайте об ошибках на: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашняя страница: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не был собран с поддержкой удалённых датчиков." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Включает режим отладки." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Копия Psensor уже запущена." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Не удалось создать веб-сервер." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -503,25 +532,25 @@ msgstr "Неправильное содержимое: %s" msgid "Invalid JSON: %s" msgstr "Неправильный JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Запрошена остановка сервера

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Страница не найдена - Перейти к Главной странице

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ‌— это HTTP-сервер для удалённого мониторинга аппаратных " "датчиков." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -529,7 +558,7 @@ msgstr "" " -h, --help\t\tпоказать эту справку и выйти\n" " -v, --version\t\tпоказать версию и выйти" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -537,58 +566,58 @@ msgstr "" " -p,--port=PORT\tпорт веб-сервера\n" " -w,--wdir=DIR\t\tдиректория для страниц веб-сервера" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LEVEL установить уровень отладки, целое между 0 и 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=ПУТЬ установить ПУТЬ к файлу журнала" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=ПУТЬ установить ПУТЬ к файлу журнала датчика" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=ПЕРИОД установить ПЕРИОД журналирования датчиков (в " "секундах)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запрос: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Включает режим отладки: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Датчики не обнаружены." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Не удалось создать веб-сервер." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Веб-сервер запущен на порту: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW-каталог: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Не удалось включить журналирование датчиков." @@ -610,31 +639,31 @@ msgstr "О Psensor" msgid "Psensor Homepage" msgstr "Домашняя страница Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Не удалось загрузить значок Psensor." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Выберите цвет переднего плана" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Датчик" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Значение" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Мин." -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Макс." -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Цвет" @@ -650,6 +679,6 @@ msgstr "Уведомление температуры" msgid "Fan alert" msgstr "Уведомление вентилятора" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "" diff --git a/po/sl.gmo b/po/sl.gmo index 22830de..ffbc6ad 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 396987d..49a9516 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n" "X-Generator: Launchpad (build 15520)\n" +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "" + #: src/glade/psensor.glade:6 msgid "About" msgstr "" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "" @@ -40,15 +59,15 @@ msgstr "" msgid "Show" msgstr "" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "" @@ -212,7 +231,7 @@ msgstr "" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -272,6 +291,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" @@ -372,36 +395,36 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "" -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "" -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -411,74 +434,78 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" msgstr "" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "" +#: src/main.c:597 +msgid "Failed to create thread for monitoring sensors" +msgstr "" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -494,82 +521,82 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "" -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "" @@ -591,31 +618,31 @@ msgstr "" msgid "Psensor Homepage" msgstr "" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "" @@ -631,6 +658,6 @@ msgstr "" msgid "Fan alert" msgstr "" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "" diff --git a/po/sr.gmo b/po/sr.gmo index 66c9da6..7eedc46 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index 347465f..681936c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n" "X-Generator: Launchpad (build 15520)\n" +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "" + #: src/glade/psensor.glade:6 msgid "About" msgstr "О програму" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Поставке" @@ -40,15 +59,15 @@ msgstr "Изађи" msgid "Show" msgstr "" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "" @@ -212,7 +231,7 @@ msgstr "" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "Недоступно" @@ -272,6 +291,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" @@ -372,36 +395,36 @@ msgstr "" msgid "Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "" -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "" -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -411,74 +434,78 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Употреба: %s [ОПЦИЈА]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Опције:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" msgstr "" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Пријавите грешку на: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s матична страна: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Покушајте„%s --help“ за више информација.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "" +#: src/main.c:597 +msgid "Failed to create thread for monitoring sensors" +msgstr "" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -494,82 +521,82 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "" -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "" @@ -591,31 +618,31 @@ msgstr "О Псензору" msgid "Psensor Homepage" msgstr "Матична страница Псензора" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Одаберите боју текста" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Сензор" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Најмање" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Највише" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "У боји" @@ -631,7 +658,7 @@ msgstr "" msgid "Fan alert" msgstr "" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "" diff --git a/po/sv.gmo b/po/sv.gmo index 3dc465a..b486cd7 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 4cb8332..b19621c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,24 +9,43 @@ msgid "" msgstr "" "Project-Id-Version: psensor 1.0.0.0\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" -"PO-Revision-Date: 2014-06-01 13:09+0000\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"PO-Revision-Date: 2014-08-02 18:45+0000\n" "Last-Translator: Josef Andersson \n" "Language-Team: Swedish\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n" -"X-Generator: Launchpad (build 17031)\n" +"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n" +"X-Generator: Launchpad (build 17174)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/cfg.c:494 +#, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Misslyckades med att skapa katalogen %s: %s" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "Konfigurationsfilen existerar inte" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "Misslyckades med att tolka konfigurationsfilen: %s" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "Misslyckades med att spara konfigurationsfilen %s." + #: src/glade/psensor.glade:6 msgid "About" msgstr "Om" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Inställningar" @@ -43,15 +62,15 @@ msgstr "Avsluta" msgid "Show" msgstr "Visa" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Temperaturövervakare" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Hjälp" @@ -102,7 +121,7 @@ msgstr "Fahrenheit" #: src/glade/psensor-pref.glade:254 msgid "Temperature unit:" -msgstr "Temperaturenheter:" +msgstr "Temperaturenhet:" #: src/glade/psensor-pref.glade:272 msgid "Position of sensors table:" @@ -146,7 +165,7 @@ msgstr "Min" #: src/glade/psensor-pref.glade:504 msgid "Max" -msgstr "Min" +msgstr "Max" #: src/glade/psensor-pref.glade:530 msgid "Colors" @@ -173,7 +192,7 @@ msgid "Measures" msgstr "Mätningar" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Graf" @@ -215,7 +234,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "Ej tillgänglig" @@ -269,12 +288,17 @@ msgstr "Visa sensor i meny" #: src/glade/sensor-edit.glade:429 msgid "Display sensor in the label (experimental)" -msgstr "Visa sensor i etiketten (exprimentiell)" +msgstr "Visa sensor i etiketten (experimentell)" #: src/glade/sensor-edit.glade:500 msgid "-1" msgstr "-1" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Visa sensor i meny" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: kan inte hitta ADL-bibliotek." @@ -312,7 +336,7 @@ msgstr "Disk" #: src/lib/hdd_atasmart.c:152 #, c-format msgid "atasmart: sk_disk_open() failure: %s." -msgstr "atasmart: sk_disk_open() fel: %s." +msgstr "atasmart: sk_disk_open()-fel: %s." #: src/lib/hdd_hddtemp.c:59 msgid "hddtemp: failed to open socket." @@ -366,7 +390,7 @@ msgstr "Kan inte öppna loggfil: %s" msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -"Properitär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-" +"Proprietär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-" "temperatur." #: src/lib/nvidia.c:95 @@ -377,36 +401,36 @@ msgstr "Kan inte öppna anslutning till X11-server." msgid "Failed to retrieve NVIDIA information." msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "HOME-variabel inte inställd." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Sensorloggfil redan öppen." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Kan inte öppna sensorloggfil: %s" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Sensorloggfil ej öppen." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Sensorloggfil ej öppen, kan inte stänga." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -421,12 +445,12 @@ msgstr "" "Det här är fri programvara: Du kan fritt modifiera den och distribuera den\n" "Det finns INGEN GARANTI i den omfattning som medges av gällande lag.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" -msgstr "Användning: %s [OPTION]...\n" +msgstr "Användning: %s [FLAGGA]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -434,11 +458,11 @@ msgstr "" "Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive " "temperaturer och fläkthastigheter." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Alternativ:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -446,7 +470,7 @@ msgstr "" " -h, --help visa denna hjälp och avsluta\n" " -v, --version visa versionsinformation och avsluta" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -454,51 +478,56 @@ msgstr "" " -u, --url=URL URL för psensor-server,\n" " exempelvis: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" msgstr "" -" --use-libatasmart använd atasmart library för diskövervakning istället " -"för\n" +" --use-libatasmart använd atasmart-biblioteket för diskövervakning " +"istället för\n" " hddtemp-demon" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance tvinga fram att skapa ett nytt Psensor-program" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL ställ in felsökningsnivå, heltal mellan nivå 0 och 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Rapportera fel till: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s webbplats <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor har inte kompilerats med fjärrsensorstöd." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Aktivera felsökningsläge." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova`%s --help' för mer information.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Det finns redan en Psensor-instans." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Misslyckades med att skapa katalogen %s: %s" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -514,24 +543,24 @@ msgstr "Ogiltigt innehåll: %s" msgid "Invalid JSON: %s" msgstr "Ogiltig JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Begärde serverstopp

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Hittade inte sida - GÃ¥ till Huvudsida

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server är en HTTP-server för att fjärrövervaka hårdvarusensorer." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -539,7 +568,7 @@ msgstr "" " -h, --help\t\tvisa denna hjälp och avsluta\n" " -v, --version\t\tvisa versionsinformation och avsluta" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -547,57 +576,57 @@ msgstr "" " -p,--port=PORT\twebbserverport\n" " -w,--wdir=DIR\t\tkatalog som innehåller webbserversidor" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LEVEL ställ in felsökningnivån mellan 0 and 3" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH ställ in loggfilen till PATH" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" -msgstr " --sensor-log-file=PATH ställ in loggintervall för sensor till PATH" +msgstr " --sensor-log-file=PATH ställ in loggfil för sensor till PATH" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S ställ in loggintervall för sensor till S (sekunder)" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-begäran: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" -msgstr "Aktivera felsökningsläge: %d" +msgstr "Aktiverar felsökningsläge: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Inga sensorer hittades." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Misslyckades med att skapa webbserver." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Webbserver startade på port: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW-katalog: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Misslyckades med att aktivera sensorloggning." @@ -621,31 +650,31 @@ msgstr "Om Psensor" msgid "Psensor Homepage" msgstr "Psensor-webbplats" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Misslyckades med att läsa in Psensor-ikon." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Välj förgrundsfärg" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Sensor" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Värde" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Min" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Max" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Färg" @@ -661,6 +690,6 @@ msgstr "Temperaturlarm" msgid "Fan alert" msgstr "Fläktlarm" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Okänd" diff --git a/po/tr.gmo b/po/tr.gmo index 6c3dc45..9ae3b9b 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 7a1d690..fd08f1c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,23 +7,42 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" -"PO-Revision-Date: 2013-11-24 08:42+0000\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" +"PO-Revision-Date: 2014-07-19 20:17+0000\n" "Last-Translator: İbrahim Çelik \n" "Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n" +"X-Generator: Launchpad (build 17174)\n" + +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Web sunucusu oluşturulamadı." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "Yapılandırma dosyası mevcut değil." + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." #: src/glade/psensor.glade:6 msgid "About" msgstr "Hakkında" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Tercihler" @@ -40,15 +59,15 @@ msgstr "Çıkış" msgid "Show" msgstr "Göster" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Sıcaklık Gözlemleyici" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Yardım" @@ -91,7 +110,7 @@ msgstr "Unity Başlatıcı sayacını etkinleştir" #: src/glade/psensor-pref.glade:209 msgid "Celsius" -msgstr "" +msgstr "Celsius" #: src/glade/psensor-pref.glade:210 msgid "Fahrenheit" @@ -111,7 +130,7 @@ msgstr "Arayüz" #: src/glade/psensor-pref.glade:299 msgid "Launch on session startup" -msgstr "" +msgstr "Oturum başlangıcında başlat" #: src/glade/psensor-pref.glade:320 msgid "Hide window on startup" @@ -123,7 +142,7 @@ msgstr "Pencere konumunu ve boyutunu yeniden yükle" #: src/glade/psensor-pref.glade:367 msgid "Startup" -msgstr "" +msgstr "Başlangıç" #: src/glade/psensor-pref.glade:405 msgid "Foreground:" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Ölçümler" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Grafik" @@ -212,7 +231,7 @@ msgstr "Tür:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "Bilinmeyen" @@ -267,12 +286,17 @@ msgstr "Algılayıcıları menüde göster" #: src/glade/sensor-edit.glade:429 #, fuzzy msgid "Display sensor in the label (experimental)" -msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster" +msgstr "Etikette algılayıcı göster (deneysel)" #: src/glade/sensor-edit.glade:500 msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "Algılayıcıları menüde göster" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: ADL kütüphanesi bulunamadı." @@ -301,11 +325,11 @@ msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d" #: src/lib/cpu.c:46 msgid "CPU" -msgstr "" +msgstr "İşlemci" #: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122 msgid "Disk" -msgstr "" +msgstr "Disk" #: src/lib/hdd_atasmart.c:152 #, c-format @@ -336,19 +360,19 @@ msgstr "lmsensor: lmsensor_psensor_create hatası: yanlış özellik tipi." #: src/lib/lmsensor.c:148 msgid "Intel CPU" -msgstr "" +msgstr "İntel işlemci" #: src/lib/lmsensor.c:152 msgid "AMD CPU" -msgstr "" +msgstr "AMD işlemci" #: src/lib/lmsensor.c:154 src/lib/nvidia.c:73 msgid "NVIDIA GPU" -msgstr "" +msgstr "NVIDIA Ekran Kartı" #: src/lib/lmsensor.c:156 msgid "VIA CPU" -msgstr "" +msgstr "VIA İşlemci" #: src/lib/lmsensor.c:218 #, c-format @@ -375,36 +399,36 @@ msgstr "X11 sunucusu bağlantısı açılamıyor." msgid "Failed to retrieve NVIDIA information." msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "HOME değişkeni ayarlanmamış." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "Algılayıcı günlük kaydı dosyası zaten açık." -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "Algılayıcı günlük kaydı dosyası açılamıyor: %s." -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "Algılayıcı günlük kaydı dosyası açık değil." -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "Algılayıcı günlük kaydı açık değil, kapatılamıyor." -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -419,12 +443,12 @@ msgstr "" "Bu bir özgür yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz.\n" "Yasaların izin verdiği çerçevede hiçbir garantisi YOKTUR.\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -432,11 +456,11 @@ msgstr "" "Psensor, sıcaklık ve fan hızı da dahil olmak üzere donanım algılayıcılarını " "gözlemleyen bir GTK+ uygulamasıdır." -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Seçenekler:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -444,7 +468,7 @@ msgstr "" " -h, --help yardımı göster ve çık\n" " -v, --version sürüm bilgisini göster ve çık" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -452,7 +476,7 @@ msgstr "" " -u, --url=URL psensor sunucusunun bağlantısı,\n" " example: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -460,43 +484,48 @@ msgstr "" " --use-libatasmart disk gözlemleme için hddtemp yerine bir atasmart\n" " kütüphanesi kullan" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance yeni bir Psensor uygulaması oluşturulmasını zorla" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hata ayıklama seviyesin ayarla, 0 ve 3 arasında tamsayı" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Hata ayıklama modunu etkinleştirir." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "Bir Psensor örneği zaten mevcut." +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Web sunucusu oluşturulamadı." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -512,25 +541,25 @@ msgstr "Geçersiz içerik: %s" msgid "Invalid JSON: %s" msgstr "Geçersiz JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

Sunucu durdurma istendi

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Sayfa bulunamadı - Şuraya gidin Main page" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-sunucusu, donanım algılayıcılarını uzaktan gözlemleme amaçlı bir " "HTTP sunucusudur." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -538,7 +567,7 @@ msgstr "" " -h, --help\t\tyardımı göster ve çık\n" " -v, --version\t\tsürüm bilgisini göster ve çık" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -546,61 +575,61 @@ msgstr "" " -p,--port=PORT\twebsunucu bağlantı noktası\n" " -w,--wdir=DIR\t\tdizin websunucusu sayfaları içerir" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hata ayıklama seviyesini ayarla, 0 ve 3 arasında bir " "tamsayı" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH günlük kaydı dosyasını PATH olarak ayarla" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" " --sensor-log-file=PATH algılayıcı günlük kaydı dosyasını PATH olarak ayarla" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S algılayıcı günlük kaydı aralığını S (saniye) " "olarak ayarla" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP İsteği: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "Hata ayıklama modunu etkinleştirir: %d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Hiçbir algılayıcı bulunamadı." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Web sunucusu oluşturulamadı." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "Web sunucusu şu noktadan başlatıldı: %d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW dizini: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." @@ -625,31 +654,31 @@ msgstr "Psensor Hakkında" msgid "Psensor Homepage" msgstr "Psensor Anasayfası" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Psensor simgesi yüklenemedi." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Önplan rengini seçin" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Algılayıcı" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Değer" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Asgari" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Azami" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Renk" @@ -665,6 +694,6 @@ msgstr "Sıcaklık uyarısı" msgid "Fan alert" msgstr "Fan uyarısı" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "Bilinmeyen" diff --git a/po/uk.gmo b/po/uk.gmo index 0c29caf..1de1261 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 761b599..c2cdd83 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2012-10-13 16:24+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n" "X-Generator: Launchpad (build 16430)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "Не вдалося створити веб-сервер." + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, c-format +msgid "Failed to save configuration file %s." +msgstr "" + #: src/glade/psensor.glade:6 msgid "About" msgstr "Про програму" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "Налаштування" @@ -40,15 +59,15 @@ msgstr "Вихід" msgid "Show" msgstr "Показати" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "_Довдіка" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "Заміри" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "Діаграма" @@ -212,7 +231,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -272,6 +291,10 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +msgid "Display sensor in the list of sensors" +msgstr "" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: не вдалося знайти бібліотеку ADL." @@ -372,36 +395,36 @@ msgstr "Не вдалося встановити з'єднання до серв msgid "Failed to retrieve NVIDIA information." msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/хв" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "Змінна HOME не встановлена." -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "" -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -411,22 +434,22 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "Опції:" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -434,14 +457,14 @@ msgstr "" " -h, --help показати цю довідку і вийти\n" " -v, --version показати версію і вийти" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL URL psensor-сервера, наприклад: http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -449,41 +472,46 @@ msgstr "" " --use-libatasmart використовувати бібліотеку atasmart для моніторингу\n" "дисків замість демона hddtemp" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance примусово створювати нову копію програми Psensor" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=РІВЕНЬ встановити рівень налагодження, ціле між 0 та 3" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "Звітуйте про помилки до: %s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашня сторінка: <%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "Включає режим налагодження." -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "" +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "Не вдалося створити веб-сервер." + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -499,25 +527,25 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "Неправильний JSON: %s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Сторінка не знайдена - Перейти до Головної " "сторінки

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ‌— це HTTP-сервер для віддаленого моніторингу апаратних " "датчиків." -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -525,7 +553,7 @@ msgstr "" " -h, --help\t\tпоказати цю довідку і вийти\n" " -v, --version\t\tпоказати версію і вийти" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -533,56 +561,56 @@ msgstr "" " -p,--port=PORT\tпорт веб-сервера\n" " -w,--wdir=DIR\t\tдиректорія для сторінок веб-сервера" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr "" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запит: %s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "Датчики не знайдені." -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "Не вдалося створити веб-сервер." -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW-директорія: %s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "" @@ -604,31 +632,31 @@ msgstr "Про Psensor" msgid "Psensor Homepage" msgstr "Домашня сторінка Psensor" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "Не вдалося завантажити іконку Psensor." -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "Оберіть колір переднього плану" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "Датчик" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "Значення" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "Мін." -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "Макс." -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "Колір" @@ -644,6 +672,6 @@ msgstr "" msgid "Fan alert" msgstr "" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 70db6d9..fc90737 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 9e3b2b8..4f7cbcc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-06-01 00:22+0200\n" +"POT-Creation-Date: 2014-08-27 10:01+0200\n" "PO-Revision-Date: 2014-05-01 13:23+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -18,12 +18,31 @@ msgstr "" "X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n" "X-Generator: Launchpad (build 17031)\n" +#: src/cfg.c:494 +#, fuzzy, c-format +msgid "Failed to create the directory %s: %s" +msgstr "无法创建网络服务器。" + +#: src/cfg.c:542 +msgid "The configuration file does not exist." +msgstr "" + +#: src/cfg.c:545 +#, c-format +msgid "Failed to parse configuration file: %s" +msgstr "" + +#: src/cfg.c:569 +#, fuzzy, c-format +msgid "Failed to save configuration file %s." +msgstr "无法激活监测器日志。" + #: src/glade/psensor.glade:6 msgid "About" msgstr "关于" #: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209 +#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217 msgid "Preferences" msgstr "首选项" @@ -40,15 +59,15 @@ msgstr "退出" msgid "Show" msgstr "显示" -#: src/glade/psensor.glade:184 +#: src/glade/psensor.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - 温度监视器" -#: src/glade/psensor.glade:199 +#: src/glade/psensor.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:246 +#: src/glade/psensor.glade:248 msgid "_Help" msgstr "帮助(_H)" @@ -170,7 +189,7 @@ msgid "Measures" msgstr "测量" #: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264 -#: src/ui_sensorlist.c:334 +#: src/ui_sensorlist.c:364 msgid "Graph" msgstr "图表" @@ -212,7 +231,7 @@ msgstr "类型:" #: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202 #: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475 -#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81 msgid "N/A" msgstr "不可用" @@ -272,6 +291,11 @@ msgstr "" msgid "-1" msgstr "" +#: src/glade/sensor-edit.glade:541 +#, fuzzy +msgid "Display sensor in the list of sensors" +msgstr "在应用指示器菜单中显示监视器" + #: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD：未找到 ADL 库。" @@ -372,36 +396,36 @@ msgstr "无法打开到 X11 服务器的连接。" msgid "Failed to retrieve NVIDIA information." msgstr "无法获取 NVIDIA 信息。" -#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "转速" -#: src/lib/psensor.c:488 +#: src/lib/psensor.c:479 msgid "%" msgstr "%" -#: src/lib/slog.c:86 +#: src/lib/slog.c:87 msgid "HOME variable not set." msgstr "未设置 HOME 变量。" -#: src/lib/slog.c:96 +#: src/lib/slog.c:97 msgid "Sensor log file already open." msgstr "已经打开监测器日志文件。" -#: src/lib/slog.c:105 +#: src/lib/slog.c:106 #, c-format msgid "Cannot open sensor log file: %s." msgstr "无法打开监测器日志文件：%s。" -#: src/lib/slog.c:136 +#: src/lib/slog.c:137 msgid "Sensor log file not open." msgstr "监测器日志文件未打开。" -#: src/lib/slog.c:192 +#: src/lib/slog.c:193 msgid "Sensor log not open, cannot close." msgstr "监测器日志未打开，故无法关闭。" -#: src/main.c:77 src/server/server.c:84 +#: src/main.c:78 src/server/server.c:85 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -416,22 +440,22 @@ msgstr "" "本软件为自由软件：您可以自由修改并分发。\n" "There is NO WARRANTY, to the extent permitted by law。\n" -#: src/main.c:88 src/server/server.c:94 +#: src/main.c:89 src/server/server.c:95 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" -#: src/main.c:90 +#: src/main.c:91 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。" -#: src/main.c:94 +#: src/main.c:95 msgid "Options:" msgstr "选项：" -#: src/main.c:95 +#: src/main.c:96 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -439,7 +463,7 @@ msgstr "" " -h, --help 显示这个帮助并退出\n" " -v, --version 显示版本信息并退出" -#: src/main.c:101 +#: src/main.c:102 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -447,7 +471,7 @@ msgstr "" " -u, --url=URL psensor 服务器 URL\n" " 例如：http://hostname:3131" -#: src/main.c:104 +#: src/main.c:105 msgid "" " --use-libatasmart use atasmart library for disk monitoring instead of\n" " hddtemp daemon" @@ -455,41 +479,46 @@ msgstr "" " --use-libatasmart 使用 atasmart 库来监测硬盘，而不是\n" " hddtemp 进程" -#: src/main.c:107 +#: src/main.c:108 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程" -#: src/main.c:110 +#: src/main.c:111 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数" -#: src/main.c:115 src/server/server.c:117 +#: src/main.c:116 src/server/server.c:118 #, c-format msgid "Report bugs to: %s\n" msgstr "报告问题至：%s\n" -#: src/main.c:117 src/server/server.c:119 +#: src/main.c:118 src/server/server.c:120 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页：<%s>\n" -#: src/main.c:454 +#: src/main.c:453 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor 不支持远程传感器。" -#: src/main.c:517 +#: src/main.c:515 msgid "Enables debug mode." msgstr "启用调试模式。" -#: src/main.c:529 src/server/server.c:380 +#: src/main.c:527 src/server/server.c:381 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用‘%s --help’来获得更多信息。\n" -#: src/main.c:542 +#: src/main.c:540 msgid "A Psensor instance already exists." msgstr "已存在一个 Psensor 例程。" +#: src/main.c:597 +#, fuzzy +msgid "Failed to create thread for monitoring sensors" +msgstr "无法创建网络服务器。" + #: src/rsensor.c:107 #, c-format msgid "Fail to connect to: %s" @@ -505,21 +534,21 @@ msgstr "无效内容：%s" msgid "Invalid JSON: %s" msgstr "无效 JSON：%s" -#: src/server/server.c:54 +#: src/server/server.c:55 msgid "

Server stop requested

" msgstr "

服务器停止请求

" -#: src/server/server.c:60 +#: src/server/server.c:61 msgid "" "

Page not found - Go to Main page

" msgstr "

未找到页面 - 请访问主页

" -#: src/server/server.c:96 +#: src/server/server.c:97 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" -#: src/server/server.c:101 +#: src/server/server.c:102 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -527,7 +556,7 @@ msgstr "" " -h, --help\t\t 显示本帮助并退出\n" " -v, --version\t\t 显示版本信息并退出" -#: src/server/server.c:105 +#: src/server/server.c:106 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -535,56 +564,56 @@ msgstr "" " -p,--port=PORT\t 网络服务器端口\n" " -w,--wdir=DIR\t\t 包括网络服务器页面的目录" -#: src/server/server.c:109 +#: src/server/server.c:110 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LEVEL 设置调试级别，0～3 之间的整数" -#: src/server/server.c:111 +#: src/server/server.c:112 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH 将日志文件设为 PATH" -#: src/server/server.c:112 +#: src/server/server.c:113 msgid " --sensor-log-file=PATH set the sensor log file to PATH" msgstr " --sensor-log-file=路径 设置监测器日志文件的路径" -#: src/server/server.c:113 +#: src/server/server.c:114 msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:297 +#: src/server/server.c:298 #, c-format msgid "HTTP Request: %s" msgstr "HTTP 请求：%s" -#: src/server/server.c:360 +#: src/server/server.c:361 #, c-format msgid "Enables debug mode: %d" msgstr "启用调试模式：%d" -#: src/server/server.c:402 +#: src/server/server.c:405 msgid "No sensors detected." msgstr "未检测到传感器。" -#: src/server/server.c:409 +#: src/server/server.c:412 msgid "Failed to create Web server." msgstr "无法创建网络服务器。" -#: src/server/server.c:413 +#: src/server/server.c:416 #, c-format msgid "Web server started on port: %d" msgstr "网络服务器启动端口：%d" -#: src/server/server.c:414 +#: src/server/server.c:417 #, c-format msgid "WWW directory: %s" msgstr "WWW 目录：%s" -#: src/server/server.c:415 +#: src/server/server.c:418 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:425 +#: src/server/server.c:428 msgid "Failed to activate logging of sensors." msgstr "无法激活监测器日志。" @@ -608,31 +637,31 @@ msgstr "关于 Psensor" msgid "Psensor Homepage" msgstr "Psensor 主页" -#: src/ui.c:217 +#: src/ui.c:216 msgid "Failed to load Psensor icon." msgstr "无法加载 Psensor 图标。" -#: src/ui_sensorlist.c:245 +#: src/ui_sensorlist.c:253 msgid "Select foreground color" msgstr "选择前景色" -#: src/ui_sensorlist.c:297 +#: src/ui_sensorlist.c:327 msgid "Sensor" msgstr "监视设备" -#: src/ui_sensorlist.c:303 +#: src/ui_sensorlist.c:333 msgid "Value" msgstr "值" -#: src/ui_sensorlist.c:309 +#: src/ui_sensorlist.c:339 msgid "Min" msgstr "最小值" -#: src/ui_sensorlist.c:315 +#: src/ui_sensorlist.c:345 msgid "Max" msgstr "最大值" -#: src/ui_sensorlist.c:322 +#: src/ui_sensorlist.c:352 msgid "Color" msgstr "颜色" @@ -648,6 +677,6 @@ msgstr "温度报警" msgid "Fan alert" msgstr "风扇警报" -#: src/ui_sensorpref.c:234 +#: src/ui_sensorpref.c:248 msgid "Unknown" msgstr "未知" diff --git a/src/Makefile.am b/src/Makefile.am index 0f64275..c3a496a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,14 +9,13 @@ SUBDIRS += server endif endif -# -no-deprecated-declarations to avoid some glib deprecation warnings -AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \ +AM_CPPFLAGS =-Wall -Werror \ -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\ -DDATADIR=\""$(datadir)"\"\ + -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS)\ - $(GCONF_CFLAGS)\ $(SENSORS_CFLAGS) DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ @@ -24,20 +23,17 @@ DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ LIBS = \ lib/libpsensor.a \ $(GTK_LIBS)\ - $(GCONF_LIBS)\ $(PTHREAD_LIBS)\ $(SENSORS_LIBS) if GTK if X11 if XEXT -if GCONF bin_PROGRAMS = psensor dist_man_MANS = psensor.1 endif endif endif -endif psensor_SOURCES = \ cfg.h cfg.c \ @@ -104,15 +100,11 @@ endif EXTRA_DIST = description.txt psensor.schemas -if GCONF -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = psensor.schemas - -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA) -endif - psensor.1: main.c $(top_srcdir)/configure.ac $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT) help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT) +gsettings_SCHEMAS=psensor.gschema.xml +EXTRA_DIST=$(gsettings_SCHEMAS) + +@GSETTINGS_RULES@ diff --git a/src/Makefile.in b/src/Makefile.in index 9d13b6d..98383f9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,25 +14,52 @@ @SET_MAKE@ - VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,8 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server -@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = \ -@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@ psensor$(EXEEXT) +@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = psensor$(EXEEXT) @GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS) @GTOP_TRUE@am__append_3 = $(GTOP_LIBS) @LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c @@ -76,18 +101,21 @@ host_triplet = @host@ @CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_LIBS) $(JSON_LIBS) @CURL_TRUE@@JSON_TRUE@am__append_21 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(schemadir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \ graph.h graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \ @@ -108,23 +136,44 @@ am_psensor_OBJECTS = cfg.$(OBJEXT) notify_cmd.$(OBJEXT) \ $(am__objects_4) psensor_OBJECTS = $(am_psensor_OBJECTS) psensor_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(psensor_SOURCES) DIST_SOURCES = $(am__psensor_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -160,12 +209,31 @@ am__uninstall_files_from_dir = { \ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) -DATA = $(schema_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = lib glade server @@ -197,9 +265,11 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -221,15 +291,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -255,10 +321,10 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(PTHREAD_LIBS) \ - $(SENSORS_LIBS) $(am__append_3) $(am__append_5) \ - $(am__append_8) $(am__append_11) $(am__append_13) \ - $(am__append_15) $(am__append_18) $(am__append_20) +LIBS = lib/libpsensor.a $(GTK_LIBS) $(PTHREAD_LIBS) $(SENSORS_LIBS) \ + $(am__append_3) $(am__append_5) $(am__append_8) \ + $(am__append_11) $(am__append_13) $(am__append_15) \ + $(am__append_18) $(am__append_20) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -284,7 +350,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -299,7 +364,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -324,6 +388,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -356,16 +421,15 @@ SUBDIRS = lib glade $(am__append_1) # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic - -# -no-deprecated-declarations to avoid some glib deprecation warnings -AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \ - -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ - -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(GCONF_CFLAGS) \ - $(SENSORS_CFLAGS) $(am__append_2) $(am__append_6) \ - $(am__append_9) $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_17) $(am__append_21) -@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1 +AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\" \ + -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ + $(GTK_CFLAGS) $(SENSORS_CFLAGS) $(am__append_2) \ + $(am__append_6) $(am__append_9) $(am__append_10) \ + $(am__append_12) $(am__append_14) $(am__append_17) \ + $(am__append_21) +@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1 psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \ graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \ ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \ @@ -373,9 +437,8 @@ psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \ ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \ $(am__append_4) $(am__append_7) $(am__append_16) \ $(am__append_19) -EXTRA_DIST = description.txt psensor.schemas -@GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) -@GCONF_TRUE@schema_DATA = psensor.schemas +EXTRA_DIST = $(gsettings_SCHEMAS) +gsettings_SCHEMAS = psensor.gschema.xml all: all-recursive .SUFFIXES: @@ -419,10 +482,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -443,16 +507,18 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) $(EXTRA_psensor_DEPENDENCIES) @rm -f psensor$(EXEEXT) - $(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -478,18 +544,18 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -533,45 +599,27 @@ uninstall-man1: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(schemadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(schemadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -586,57 +634,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -652,12 +655,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -669,15 +667,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -686,24 +680,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -760,10 +756,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) +all-am: Makefile $(PROGRAMS) $(MANS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -796,7 +792,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_FALSE@install-data-local: clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic mostlyclean-am @@ -819,7 +814,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-man install-schemaDATA +install-data-am: install-man install-dvi: install-dvi-recursive @@ -864,38 +859,34 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-schemaDATA +uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-man uninstall-man1 \ - uninstall-schemaDATA - + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-man uninstall-man1 -@GCONF_TRUE@install-data-local: -@GCONF_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA) psensor.1: main.c $(top_srcdir)/configure.ac $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT) help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT) +@GSETTINGS_RULES@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/cfg.c b/src/cfg.c index a5014ff..8f22975 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -16,110 +16,156 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ + +#include #include #include #include #include +#include +#include -#include "cfg.h" -#include +#include +#include +#define _(str) gettext(str) -static const char *KEY_SENSORS = "/apps/psensor/sensors"; +#include -static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled"; -static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm/high_threshold"; -static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm/low_threshold"; +#include +#include +#include + +/* Properties of each sensor */ +static const char *ATT_SENSOR_ALARM_ENABLED = "alarm_enabled"; +static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm_high_threshold"; +static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm_low_threshold"; static const char *ATT_SENSOR_COLOR = "color"; -static const char *ATT_SENSOR_ENABLED = "enabled"; +static const char *ATT_SENSOR_GRAPH_ENABLED = "graph_enabled"; static const char *ATT_SENSOR_NAME = "name"; -static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled"; +static const char *ATT_SENSOR_APPINDICATOR_MENU_DISABLED += "appindicator_menu_disabled"; static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED -= "appindicator/menu/enabled"; - += "appindicator_label_enabled"; static const char *ATT_SENSOR_POSITION = "position"; +static const char *ATT_SENSOR_HIDE = "hide"; +/* Update interval of the measures of the sensors */ static const char *KEY_SENSOR_UPDATE_INTERVAL -= "/apps/psensor/sensor/update_interval"; += "sensor-update-interval"; -static const char *KEY_GRAPH_UPDATE_INTERVAL -= "/apps/psensor/graph/update_interval"; +/* Graph settings */ +static const char *KEY_GRAPH_UPDATE_INTERVAL = "graph-update-interval"; -static const char *KEY_GRAPH_MONITORING_DURATION -= "/apps/psensor/graph/monitoring_duration"; +static const char *KEY_GRAPH_MONITORING_DURATION = "graph-monitoring-duration"; -static const char *KEY_GRAPH_BACKGROUND_COLOR -= "/apps/psensor/graph/background_color"; +static const char *KEY_GRAPH_BACKGROUND_COLOR = "graph-background-color"; static const char *DEFAULT_GRAPH_BACKGROUND_COLOR = "#e8f4e8f4a8f5"; -static const char *KEY_GRAPH_BACKGROUND_ALPHA -= "/apps/psensor/graph/background_alpha"; +static const char *KEY_GRAPH_BACKGROUND_ALPHA = "graph-background-alpha"; static const char *KEY_GRAPH_FOREGROUND_COLOR -= "/apps/psensor/graph/foreground_color"; += "graph-foreground-color"; + static const char *DEFAULT_GRAPH_FOREGROUND_COLOR = "#000000000000"; -static const char *KEY_ALPHA_CHANNEL_ENABLED -= "/apps/psensor/graph/alpha_channel_enabled"; +static const char *KEY_ALPHA_CHANNEL_ENABLED = "graph-alpha-channel-enabled"; +/* Inteface settings */ static const char *KEY_INTERFACE_SENSORLIST_POSITION -= "/apps/psensor/interface/sensorlist_position"; += "interface-sensorlist-position"; static const char *KEY_INTERFACE_WINDOW_DECORATION_DISABLED -= "/apps/psensor/interface/window_decoration_disabled"; += "interface-window-decoration-disabled"; static const char *KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED -= "/apps/psensor/interface/window_keep_below_enabled"; += "interface-window-keep-below-enabled"; static const char *KEY_INTERFACE_MENU_BAR_DISABLED -= "/apps/psensor/interface/menu_bar_disabled"; += "interface-menu-bar-disabled"; static const char *KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED -= "/apps/psensor/interface/unity_launcher_count_disabled"; += "interface-unity-launcher-count-disabled"; static const char *KEY_INTERFACE_HIDE_ON_STARTUP -= "/apps/psensor/interface/hide_on_startup"; += "interface-hide-on-startup"; static const char *KEY_INTERFACE_WINDOW_RESTORE_ENABLED -= "/apps/psensor/interface/window_restore_enabled"; += "interface-window-restore-enabled"; -static const char *KEY_INTERFACE_WINDOW_X = "/apps/psensor/interface/window_x"; -static const char *KEY_INTERFACE_WINDOW_Y = "/apps/psensor/interface/window_y"; -static const char *KEY_INTERFACE_WINDOW_W = "/apps/psensor/interface/window_w"; -static const char *KEY_INTERFACE_WINDOW_H = "/apps/psensor/interface/window_h"; +static const char *KEY_INTERFACE_WINDOW_X = "interface-window-x"; +static const char *KEY_INTERFACE_WINDOW_Y = "interface-window-y"; +static const char *KEY_INTERFACE_WINDOW_W = "interface-window-w"; +static const char *KEY_INTERFACE_WINDOW_H = "interface-window-h"; static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS -= "/apps/psensor/interface/window_divider_pos"; += "interface-window-divider-pos"; static const char *KEY_INTERFACE_TEMPERATURE_UNIT -= "/apps/psensor/interface/temperature_unit"; += "interface-temperature-unit"; + +/* Sensor logging settings */ +static const char *KEY_SLOG_ENABLED = "slog-enabled"; +static const char *KEY_SLOG_INTERVAL = "slog-interval"; + +/* Path to the script called when a notification is raised */ +static const char *KEY_NOTIFICATION_SCRIPT = "notif-script"; + +static GSettings *settings; + +static char *user_dir; -static const char *KEY_SLOG_ENABLED = "/apps/psensor/slog/enabled"; -static const char *KEY_SLOG_INTERVAL = "/apps/psensor/slog/interval"; +static GKeyFile *key_file; -static const char *KEY_NOTIFICATION_SCRIPT = "/apps/psensor/notif_script"; +static char *sensor_config_path; -static GConfClient *client; +static void (*slog_enabled_cbk)(void *); -static char *get_string(const char *key, const char *default_value) +static char *get_string(const char *key) { - char *value; + return g_settings_get_string(settings, key); +} - value = gconf_client_get_string(client, key, NULL); +static void set_string(const char *key, const char *str) +{ + g_settings_set_string(settings, key, str); +} - if (!value) { - value = strdup(default_value); - gconf_client_set_string(client, key, default_value, NULL); - } +static void set_bool(const char *k, bool b) +{ + g_settings_set_boolean(settings, k, b); +} + +static bool get_bool(const char *k) +{ + return g_settings_get_boolean(settings, k); +} - return value; +static void set_int(const char *k, int i) +{ + g_settings_set_int(settings, k, i); +} + +static double get_double(const char *k) +{ + return g_settings_get_double(settings, k); +} + +static void set_double(const char *k, double d) +{ + g_settings_set_double(settings, k, d); +} + +static int get_int(const char *k) +{ + return g_settings_get_int(settings, k); } char *config_get_notif_script() { char *str; - str = gconf_client_get_string(client, KEY_NOTIFICATION_SCRIPT, NULL); + str = get_string(KEY_NOTIFICATION_SCRIPT); if (str && !strlen(str)) { free(str); str = NULL; @@ -131,11 +177,9 @@ char *config_get_notif_script() void config_set_notif_script(const char *str) { if (str && strlen(str) > 0) - gconf_client_set_string(client, - KEY_NOTIFICATION_SCRIPT, str, NULL); + set_string(KEY_NOTIFICATION_SCRIPT, str); else - gconf_client_set_string(client, - KEY_NOTIFICATION_SCRIPT, "", NULL); + set_string(KEY_NOTIFICATION_SCRIPT, ""); } static struct color *get_background_color() @@ -143,14 +187,13 @@ static struct color *get_background_color() char *scolor; struct color *c; - scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR, - DEFAULT_GRAPH_BACKGROUND_COLOR); + scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR); c = str_to_color(scolor); free(scolor); if (!c) - return color_new(0xffff, 0xffff, 0xffff); + return color_new(1, 1, 1); return c; } @@ -160,49 +203,45 @@ static struct color *get_foreground_color() char *scolor; struct color *c; - scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR, - DEFAULT_GRAPH_FOREGROUND_COLOR); + scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR); c = str_to_color(scolor); free(scolor); if (!c) - return color_new(0x0000, 0x0000, 0x0000); + return color_new(0, 0, 0); return c; } static bool is_alpha_channel_enabled() { - return gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL); + return get_bool(KEY_ALPHA_CHANNEL_ENABLED); +} + +static void set_alpha_channeld_enabled(bool b) +{ + set_bool(KEY_ALPHA_CHANNEL_ENABLED, b); } static enum sensorlist_position get_sensorlist_position() { - return gconf_client_get_int(client, - KEY_INTERFACE_SENSORLIST_POSITION, NULL); + return get_int(KEY_INTERFACE_SENSORLIST_POSITION); } static void set_sensorlist_position(enum sensorlist_position pos) { - gconf_client_set_int(client, - KEY_INTERFACE_SENSORLIST_POSITION, pos, NULL); + set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos); } static double get_graph_background_alpha() { - double a; - - a = gconf_client_get_float(client, KEY_GRAPH_BACKGROUND_ALPHA, NULL); - if (a == 0) - gconf_client_set_float(client, - KEY_GRAPH_BACKGROUND_ALPHA, 1.0, NULL); - return a; + return get_double(KEY_GRAPH_BACKGROUND_ALPHA); } static void set_graph_background_alpha(double alpha) { - gconf_client_set_float(client, KEY_GRAPH_BACKGROUND_ALPHA, alpha, NULL); + set_double(KEY_GRAPH_BACKGROUND_ALPHA, alpha); } static void set_background_color(const struct color *color) @@ -213,8 +252,7 @@ static void set_background_color(const struct color *color) if (!scolor) scolor = strdup(DEFAULT_GRAPH_BACKGROUND_COLOR); - gconf_client_set_string(client, - KEY_GRAPH_BACKGROUND_COLOR, scolor, NULL); + set_string(KEY_GRAPH_BACKGROUND_COLOR, scolor); free(scolor); } @@ -227,468 +265,495 @@ static void set_foreground_color(const struct color *color) if (!str) str = strdup(DEFAULT_GRAPH_FOREGROUND_COLOR); - gconf_client_set_string(client, KEY_GRAPH_FOREGROUND_COLOR, str, NULL); + set_string(KEY_GRAPH_FOREGROUND_COLOR, str); free(str); } -static char *get_sensor_att_key(const char *sid, const char *att) +bool is_slog_enabled() { - char *esc_sid, *key; - - esc_sid = gconf_escape_key(sid, -1); - /* [KEY_SENSORS]/[esc_sid]/[att] */ - key = malloc(strlen(KEY_SENSORS) - + 1 + 2 * strlen(esc_sid) - + 1 + strlen(att) + 1); - - sprintf(key, "%s/%s/%s", KEY_SENSORS, esc_sid, att); - - free(esc_sid); + return get_bool(KEY_SLOG_ENABLED); +} - return key; +static void set_slog_enabled(bool enabled) +{ + set_bool(KEY_SLOG_ENABLED, enabled); } -struct color * -config_get_sensor_color(const char *sid, const struct color *dft) +static void slog_enabled_changed_cbk(GSettings *settings, + gchar *key, + gpointer data) { - char *key, *scolor; - struct color *color; + if (slog_enabled_cbk) + slog_enabled_cbk(data); +} - key = get_sensor_att_key(sid, ATT_SENSOR_COLOR); +void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data) +{ + log_fct_enter(); - scolor = gconf_client_get_string(client, key, NULL); + slog_enabled_cbk = cbk; - color = NULL; + g_signal_connect_after(settings, + "changed::slog-enabled", + G_CALLBACK(slog_enabled_changed_cbk), + data); - if (scolor) - color = str_to_color(scolor); + log_fct_exit(); +} - if (!scolor || !color) { - color = color_new(dft->red, dft->green, dft->blue); - scolor = color_to_str(color); - gconf_client_set_string(client, key, scolor, NULL); - } +int config_get_slog_interval() +{ + return get_int(KEY_SLOG_INTERVAL); +} - free(scolor); - free(key); +static void set_slog_interval(int interval) +{ + if (interval <= 0) + interval = 300; - return color; + set_int(KEY_SLOG_INTERVAL, interval); } -void config_set_sensor_color(const char *sid, const struct color *color) +static bool is_window_decoration_enabled() { - char *key, *scolor; + return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED); +} - key = get_sensor_att_key(sid, ATT_SENSOR_COLOR); - scolor = color_to_str(color); +static bool is_window_keep_below_enabled() +{ + return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED); +} - gconf_client_set_string(client, key, scolor, NULL); +static void set_window_decoration_enabled(bool enabled) +{ + set_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled); +} - free(scolor); - free(key); +static void set_window_keep_below_enabled(bool enabled) +{ + set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled); } -int config_get_sensor_alarm_high_threshold(const char *sid) +static void init() { - int res; - char *key; + log_fct_enter(); - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); - res = gconf_client_get_int(client, key, NULL); - free(key); + if (!settings) + settings = g_settings_new("psensor"); - return res; + log_fct_exit(); } -void -config_set_sensor_alarm_high_threshold(const char *sid, int threshold) +void config_cleanup() { - char *key; + config_sync(); - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); - gconf_client_set_int(client, key, threshold, NULL); - free(key); -} + if (settings) { + g_settings_sync(); + g_object_unref(settings); + settings = NULL; + } -int config_get_sensor_alarm_low_threshold(const char *sid) -{ - int res; - char *key; + if (user_dir) { + free(user_dir); + user_dir = NULL; + } - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); - res = gconf_client_get_int(client, key, NULL); - free(key); + if (key_file) { + g_key_file_free(key_file); + key_file = NULL; + } + + if (sensor_config_path) { + free(sensor_config_path); + sensor_config_path = NULL; + } - return res; + slog_enabled_cbk = NULL; } -void -config_set_sensor_alarm_low_threshold(const char *sid, int threshold) +struct config *config_load() { - char *key; + struct config *c; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); - gconf_client_set_int(client, key, threshold, NULL); - free(key); -} + init(); -bool config_get_sensor_alarm_enabled(const char *sid) -{ - gboolean b; - char *key; + c = malloc(sizeof(struct config)); - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED); - b = gconf_client_get_bool(client, key, NULL); - free(key); + c->graph_bgcolor = get_background_color(); + c->graph_fgcolor = get_foreground_color(); + c->graph_bg_alpha = get_graph_background_alpha(); + c->alpha_channel_enabled = is_alpha_channel_enabled(); + c->sensorlist_position = get_sensorlist_position(); + c->window_decoration_enabled = is_window_decoration_enabled(); + c->window_keep_below_enabled = is_window_keep_below_enabled(); + c->slog_enabled = is_slog_enabled(); + c->slog_interval = config_get_slog_interval(); - return b; -} + c->sensor_update_interval + = get_int(KEY_SENSOR_UPDATE_INTERVAL); + if (c->sensor_update_interval < 1) + c->sensor_update_interval = 1; -void config_set_sensor_alarm_enabled(const char *sid, bool enabled) -{ - char *key; + c->graph_update_interval = get_int(KEY_GRAPH_UPDATE_INTERVAL); + if (c->graph_update_interval < 1) + c->graph_update_interval = 1; + + c->graph_monitoring_duration = get_int(KEY_GRAPH_MONITORING_DURATION); + + if (c->graph_monitoring_duration < 1) + c->graph_monitoring_duration = 10; + + c->sensor_values_max_length + = (c->graph_monitoring_duration * 60) / c->sensor_update_interval; + + if (c->sensor_values_max_length < 3) + c->sensor_values_max_length = 3; + + c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED); + + c->unity_launcher_count_disabled + = get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED); + + c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP); + + c->window_restore_enabled + = get_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED); - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED); - gconf_client_set_bool(client, key, enabled, NULL); - free(key); + c->window_x = get_int(KEY_INTERFACE_WINDOW_X); + c->window_y = get_int(KEY_INTERFACE_WINDOW_Y); + c->window_w = get_int(KEY_INTERFACE_WINDOW_W); + c->window_h = get_int(KEY_INTERFACE_WINDOW_H); + + c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS); + + if (!c->window_restore_enabled || !c->window_w || !c->window_h) { + c->window_w = 800; + c->window_h = 200; + } + + c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT); + + return c; } -bool config_is_sensor_enabled(const char *sid) +void config_save(const struct config *c) { - gboolean b; - char *key; + set_alpha_channeld_enabled(c->alpha_channel_enabled); + set_background_color(c->graph_bgcolor); + set_foreground_color(c->graph_fgcolor); + set_graph_background_alpha(c->graph_bg_alpha); + set_sensorlist_position(c->sensorlist_position); + set_window_decoration_enabled(c->window_decoration_enabled); + set_window_keep_below_enabled(c->window_keep_below_enabled); + set_slog_enabled(c->slog_enabled); + set_slog_interval(c->slog_interval); + + set_int(KEY_GRAPH_UPDATE_INTERVAL, c->graph_update_interval); + + set_int(KEY_GRAPH_MONITORING_DURATION, c->graph_monitoring_duration); + + set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval); + + set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled); + + set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, + c->unity_launcher_count_disabled); + + set_bool(KEY_INTERFACE_HIDE_ON_STARTUP, c->hide_on_startup); + + set_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED, + c->window_restore_enabled); + + set_int(KEY_INTERFACE_WINDOW_X, c->window_x); + set_int(KEY_INTERFACE_WINDOW_Y, c->window_y); + set_int(KEY_INTERFACE_WINDOW_W, c->window_w); + set_int(KEY_INTERFACE_WINDOW_H, c->window_h); - key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED); - b = gconf_client_get_bool(client, key, NULL); - free(key); + set_int(KEY_INTERFACE_WINDOW_DIVIDER_POS, c->window_divider_pos); - return b; + set_int(KEY_INTERFACE_TEMPERATURE_UNIT, c->temperature_unit); } -void config_set_sensor_enabled(const char *sid, bool enabled) +const char *get_psensor_user_dir() { - char *key; + const char *home; + + log_fct_enter(); + + if (!user_dir) { + home = getenv("HOME"); + + if (!home) + return NULL; + + user_dir = path_append(home, ".psensor"); - key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED); - gconf_client_set_bool(client, key, enabled, NULL); - free(key); + if (mkdir(user_dir, 0700) == -1 && errno != EEXIST) { + log_err(_("Failed to create the directory %s: %s"), + user_dir, + strerror(errno)); + + free(user_dir); + user_dir = NULL; + } + } + + log_fct_exit(); + + return user_dir; } -char *config_get_sensor_name(const char *sid) +static const char *get_sensor_config_path() { - char *name, *key; + const char *dir; - key = get_sensor_att_key(sid, ATT_SENSOR_NAME); - name = gconf_client_get_string(client, key, NULL); - free(key); + if (!sensor_config_path) { + dir = get_psensor_user_dir(); - return name; + if (dir) + sensor_config_path = path_append(dir, "psensor.cfg"); + } + + return sensor_config_path; } -void config_set_sensor_name(const char *sid, const char *name) +static GKeyFile *get_sensor_key_file() { - char *key; + int ret; + GError *err; + const char *path; + + if (!key_file) { + path = get_sensor_config_path(); + + key_file = g_key_file_new(); - key = get_sensor_att_key(sid, ATT_SENSOR_NAME); - gconf_client_set_string(client, key, name, NULL); - free(key); + err = NULL; + ret = g_key_file_load_from_file(key_file, + path, + G_KEY_FILE_KEEP_COMMENTS + | G_KEY_FILE_KEEP_TRANSLATIONS, + &err); + + if (!ret) { + if (err->code == G_KEY_FILE_ERROR_NOT_FOUND) + log_fct(_("The configuration file " + "does not exist.")); + else + log_err(_("Failed to parse configuration " + "file: %s"), + path); + } + } + + return key_file; } -int config_get_sensor_position(const char *sid) +static void save_sensor_key_file() { - char *key; - int pos; + GKeyFile *kfile; + const char *path; + char *data; - key = get_sensor_att_key(sid, ATT_SENSOR_POSITION); - pos = gconf_client_get_int(client, key, NULL); - free(key); + log_fct_enter(); - return pos; + kfile = get_sensor_key_file(); + + data = g_key_file_to_data(kfile, NULL, NULL); + + path = get_sensor_config_path(); + + if (!g_file_set_contents(path, data, -1, NULL)) + log_err(_("Failed to save configuration file %s."), path); + + free(data); + + log_fct_exit(); } -void config_set_sensor_position(const char *sid, int pos) +void config_sync() { - char *key; - - key = get_sensor_att_key(sid, ATT_SENSOR_POSITION); - gconf_client_set_int(client, key, pos, NULL); - free(key); + log_fct_enter(); + if (settings) + g_settings_sync(); + save_sensor_key_file(); + log_fct_exit(); } -bool config_is_appindicator_enabled(const char *sid) +static void sensor_set_str(const char *sid, const char *att, const char *str) { - char *key; - gboolean b; + GKeyFile *kfile; + + kfile = get_sensor_key_file(); + g_key_file_set_string(kfile, sid, att, str); +} - key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED); - b = gconf_client_get_bool(client, key, NULL); - free(key); +static char *sensor_get_str(const char *sid, const char *att) +{ + GKeyFile *kfile; - return !b; + kfile = get_sensor_key_file(); + return g_key_file_get_string(kfile, sid, att, NULL); } -void config_set_appindicator_enabled(const char *sid, bool enabled) +static bool sensor_get_bool(const char *sid, const char *att) { - char *key; + GKeyFile *kfile; - key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED); - gconf_client_set_bool(client, key, !enabled, NULL); - free(key); + kfile = get_sensor_key_file(); + return g_key_file_get_boolean(kfile, sid, att, NULL); } -bool config_is_appindicator_label_enabled(const char *sid) +static void sensor_set_bool(const char *sid, const char *att, bool enabled) { - char *key; - gboolean b; + GKeyFile *kfile; - key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED); - b = gconf_client_get_bool(client, key, NULL); - free(key); + kfile = get_sensor_key_file(); - return b; + g_key_file_set_boolean(kfile, sid, att, enabled); } -void config_set_appindicator_label_enabled(const char *sid, bool enabled) +static int sensor_get_int(const char *sid, const char *att) { - char *key; + GKeyFile *kfile; - key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED); - gconf_client_set_bool(client, key, enabled, NULL); - free(key); + kfile = get_sensor_key_file(); + return g_key_file_get_integer(kfile, sid, att, NULL); } -bool is_slog_enabled() +static void sensor_set_int(const char *sid, const char *att, int i) { - return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL); + GKeyFile *kfile; + + kfile = get_sensor_key_file(); + + g_key_file_set_integer(kfile, sid, att, i); } -static void set_slog_enabled(bool enabled) +char *config_get_sensor_name(const char *sid) { - gconf_client_set_bool(client, KEY_SLOG_ENABLED, enabled, NULL); + return sensor_get_str(sid, ATT_SENSOR_NAME); } -void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data) +void config_set_sensor_name(const char *sid, const char *name) { - log_debug("config_slog_enabled_notify_add"); - gconf_client_add_dir(client, - KEY_SLOG_ENABLED, - GCONF_CLIENT_PRELOAD_NONE, - NULL); - gconf_client_notify_add(client, - KEY_SLOG_ENABLED, - cbk, - data, - NULL, - NULL); + sensor_set_str(sid, ATT_SENSOR_NAME, name); } -int config_get_slog_interval() +void config_set_sensor_color(const char *sid, const struct color *color) { - int res; + char *scolor; - res = gconf_client_get_int(client, KEY_SLOG_INTERVAL, NULL); + scolor = color_to_str(color); - if (res <= 0) - return 300; - else - return res; + sensor_set_str(sid, ATT_SENSOR_COLOR, scolor); + + free(scolor); } -static void set_slog_interval(int interval) +struct color * +config_get_sensor_color(const char *sid, const struct color *dft) { - if (interval <= 0) - interval = 300; + char *scolor; + struct color *color; + + scolor = sensor_get_str(sid, ATT_SENSOR_COLOR); - gconf_client_set_int(client, KEY_SLOG_INTERVAL, interval, NULL); + if (scolor) + color = str_to_color(scolor); + else + color = NULL; + + if (!color) { + color = color_new(dft->red, dft->green, dft->blue); + config_set_sensor_color(sid, color); + } + + free(scolor); + + return color; } -static bool is_window_decoration_enabled() +bool config_is_sensor_graph_enabled(const char *sid) { - return !gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, - NULL); + return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED); } -static bool is_window_keep_below_enabled() +void config_set_sensor_graph_enabled(const char *sid, bool enabled) { - return gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - NULL); + sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled); } -static void set_window_decoration_enabled(bool enabled) +int config_get_sensor_alarm_high_threshold(const char *sid) { - gconf_client_set_bool - (client, - KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled, NULL); + return sensor_get_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); } -static void set_window_keep_below_enabled(bool enabled) +void config_set_sensor_alarm_high_threshold(const char *sid, int threshold) { - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, - enabled, NULL); + sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold); } -/* - * Initializes the GConf client. - */ -static void init() +int config_get_sensor_alarm_low_threshold(const char *sid) { - if (!client) - client = gconf_client_get_default(); + return sensor_get_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); } -void config_cleanup() +void config_set_sensor_alarm_low_threshold(const char *sid, int threshold) { - if (client) { - g_object_unref(client); - client = NULL; - } + sensor_set_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, threshold); } -struct config *config_load() +bool config_is_appindicator_enabled(const char *sid) { - struct config *c; - - init(); - - c = malloc(sizeof(struct config)); - - c->graph_bgcolor = get_background_color(); - c->graph_fgcolor = get_foreground_color(); - c->graph_bg_alpha = get_graph_background_alpha(); - c->alpha_channel_enabled = is_alpha_channel_enabled(); - c->sensorlist_position = get_sensorlist_position(); - c->window_decoration_enabled = is_window_decoration_enabled(); - c->window_keep_below_enabled = is_window_keep_below_enabled(); - c->slog_enabled = is_slog_enabled(); - c->slog_interval = config_get_slog_interval(); - - c->sensor_update_interval - = gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL); - if (c->sensor_update_interval < 1) - c->sensor_update_interval = 1; - - c->graph_update_interval - = gconf_client_get_int(client, KEY_GRAPH_UPDATE_INTERVAL, NULL); - if (c->graph_update_interval < 1) - c->graph_update_interval = 1; - - c->graph_monitoring_duration - = gconf_client_get_int(client, KEY_GRAPH_MONITORING_DURATION, NULL); - - if (c->graph_monitoring_duration < 1) - c->graph_monitoring_duration = 10; - - c->sensor_values_max_length - = - (c->graph_monitoring_duration * 60) / c->sensor_update_interval; - if (c->sensor_values_max_length < 3) - c->sensor_values_max_length = 3; + return !sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_MENU_DISABLED); +} - c->menu_bar_disabled - = gconf_client_get_bool(client, - KEY_INTERFACE_MENU_BAR_DISABLED, - NULL); +void config_set_appindicator_enabled(const char *sid, bool enabled) +{ + return sensor_set_bool(sid, + ATT_SENSOR_APPINDICATOR_MENU_DISABLED, + !enabled); +} - c->unity_launcher_count_disabled - = gconf_client_get_bool - (client, - KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, - NULL); +int config_get_sensor_position(const char *sid) +{ + return sensor_get_int(sid, ATT_SENSOR_POSITION); +} - c->hide_on_startup - = gconf_client_get_bool(client, - KEY_INTERFACE_HIDE_ON_STARTUP, - NULL); +void config_set_sensor_position(const char *sid, int pos) +{ + return sensor_set_int(sid, ATT_SENSOR_POSITION, pos); +} - c->window_restore_enabled - = gconf_client_get_bool(client, - KEY_INTERFACE_WINDOW_RESTORE_ENABLED, - NULL); - - c->window_x = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_X, - NULL); - c->window_y = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_Y, - NULL); - c->window_w = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_W, - NULL); - c->window_h = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_H, - NULL); - c->window_divider_pos - = gconf_client_get_int(client, - KEY_INTERFACE_WINDOW_DIVIDER_POS, - NULL); +bool config_get_sensor_alarm_enabled(const char *sid) +{ + return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED); +} - if (!c->window_restore_enabled || !c->window_w || !c->window_h) { - c->window_w = 800; - c->window_h = 200; - } +void config_set_sensor_alarm_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_ALARM_ENABLED, enabled); +} - c->temperature_unit = gconf_client_get_int - (client, KEY_INTERFACE_TEMPERATURE_UNIT, NULL); +bool config_is_sensor_enabled(const char *sid) +{ + return !sensor_get_bool(sid, ATT_SENSOR_HIDE); +} - return c; +void config_set_sensor_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_HIDE, !enabled); } -void config_save(const struct config *c) +bool config_is_appindicator_label_enabled(const char *sid) { - set_background_color(c->graph_bgcolor); - set_foreground_color(c->graph_fgcolor); - set_graph_background_alpha(c->graph_bg_alpha); - set_sensorlist_position(c->sensorlist_position); - set_window_decoration_enabled(c->window_decoration_enabled); - set_window_keep_below_enabled(c->window_keep_below_enabled); - set_slog_enabled(c->slog_enabled); - set_slog_interval(c->slog_interval); + return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED); +} - gconf_client_set_int(client, - KEY_GRAPH_UPDATE_INTERVAL, - c->graph_update_interval, NULL); - - gconf_client_set_int(client, - KEY_GRAPH_MONITORING_DURATION, - c->graph_monitoring_duration, NULL); - - gconf_client_set_int(client, - KEY_SENSOR_UPDATE_INTERVAL, - c->sensor_update_interval, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_MENU_BAR_DISABLED, - c->menu_bar_disabled, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, - c->unity_launcher_count_disabled, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_HIDE_ON_STARTUP, - c->hide_on_startup, NULL); - - gconf_client_set_bool(client, - KEY_INTERFACE_WINDOW_RESTORE_ENABLED, - c->window_restore_enabled, - NULL); - - gconf_client_set_int(client, KEY_INTERFACE_WINDOW_X, c->window_x, NULL); - gconf_client_set_int(client, KEY_INTERFACE_WINDOW_Y, c->window_y, NULL); - gconf_client_set_int(client, KEY_INTERFACE_WINDOW_W, c->window_w, NULL); - gconf_client_set_int(client, KEY_INTERFACE_WINDOW_H, c->window_h, NULL); - - gconf_client_set_int(client, - KEY_INTERFACE_WINDOW_DIVIDER_POS, - c->window_divider_pos, - NULL); - - gconf_client_set_int(client, - KEY_INTERFACE_TEMPERATURE_UNIT, - c->temperature_unit, - NULL); +void config_set_appindicator_label_enabled(const char *sid, bool enabled) +{ + sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled); } diff --git a/src/cfg.h b/src/cfg.h index a63bcb0..aac38de 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -19,10 +19,8 @@ #ifndef _PSENSOR_CONFIG_H_ #define _PSENSOR_CONFIG_H_ -#include - -#include "bool.h" -#include "color.h" +#include +#include enum temperature_unit { CELSIUS, @@ -44,9 +42,7 @@ struct config { bool alpha_channel_enabled; - /* - * Position of the sensors list table - */ + /* Position of the sensors list table */ enum sensorlist_position sensorlist_position; bool window_decoration_enabled; @@ -79,9 +75,7 @@ struct config { int slog_interval; }; -/* - Loads config from GConf -*/ +/* Loads psensor configuration */ struct config *config_load(); void config_save(const struct config *); @@ -100,8 +94,8 @@ void config_set_sensor_alarm_low_threshold(const char *, int); bool config_get_sensor_alarm_enabled(const char *); void config_set_sensor_alarm_enabled(const char *, bool); -bool config_is_sensor_enabled(const char *); -void config_set_sensor_enabled(const char *, bool); +bool config_is_sensor_graph_enabled(const char *); +void config_set_sensor_graph_enabled(const char *, bool); char *config_get_sensor_name(const char *); void config_set_sensor_name(const char *, const char *); @@ -112,8 +106,8 @@ void config_set_appindicator_enabled(const char *, bool); bool config_is_appindicator_label_enabled(const char *); void config_set_appindicator_label_enabled(const char *, bool); -void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data); bool is_slog_enabled(); +void config_set_slog_enabled_changed_cbk(void (*)(void *), void *); int config_get_slog_interval(); @@ -122,4 +116,19 @@ void config_set_sensor_position(const char *, int); char *config_get_notif_script(); void config_set_notif_script(const char *); + +bool config_is_sensor_enabled(const char *sid); +void config_set_sensor_enabled(const char *sid, bool enabled); + +/* + * Returns the user directory containing psensor data (configuration + * and log). + * Corresponds to $HOME/.psensor/ + * Creates the directory if it does not exist; + * Returns NULL if it cannot be determined. + */ +const char *get_psensor_user_dir(); + +void config_sync(); + #endif diff --git a/src/description.txt b/src/description.txt deleted file mode 100644 index 3dfdd56..0000000 --- a/src/description.txt +++ /dev/null @@ -1,45 +0,0 @@ -[description] - -/psensor is a/ - -It displays a curve for each sensor, and uses Desktop Notification to -raise an alarm when a temperature is too high. On Ubuntu an -Application Indicator is also available, its icon changes when a -temperature alert is raised. - -It can monitor: - * the temperature of the motherboard and CPU sensors (using lm\-sensors). - * the temperature of the NVidia GPUs (using XNVCtrl). - * the temperature and fan rotation speed of the ATI GPUs. - * the temperature of the Hard Disk Drives (using hddtemp or atasmart - library). - * the rotation speed of the fans (using lm\-sensors). - * the sensors of a remote computer (using psensor\-server). - -Psensor requires lm\-sensors to be correctly installed and configured, -it can be checked by running the command 'sensors'. If it has never be -done, you may need to run the command 'sensors\-detect' and follow the -instruction. See the manpages of sensors(1) and sensors\-detect(8) for -more information. - -To retrieve the temperature of the Hard Disk Drives, the hddtemp -daemon must be running or atasmart used ('\-\-use\-libatasmart'). - -For remote monitoring: - * start psensor\-server(1) on the remote computer - * run psensor with '\-\-url' option: 'psensor \-\-url=http://localhost:3131' - -ATI/AMD GPUs monitoring is available if the library libatiadlxx is -present in the directory /usr/lib and psensor has been compiled with -the ATI ADL SDK. - -Log messages are written to '$HOME/.psensor/log'. - -By default, if a Psensor process is already running, the command -psensor will show the graph window then exit. -It is possible to run multiple instances of Psensor by using the -option '\-\-new\-instance'. - -[SEE ALSO] - -psensor\-server(1), sensors(1), sensors\-detect(8), hddtemp(8) diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index f77b250..2fdbf6b 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/glade -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(gladedir)" DATA = $(glade_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -313,11 +354,11 @@ uninstall-gladeDATA: @list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -455,16 +496,17 @@ uninstall-am: uninstall-gladeDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-gladeDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-gladeDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-gladeDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-gladeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade index 7c9703a..d70f9e9 100644 --- a/src/glade/psensor.glade +++ b/src/glade/psensor.glade @@ -103,6 +103,12 @@ + + True + False + + + AppIndicatorPreferencesAction True @@ -127,12 +133,6 @@ - - True - False - - - AboutAction True @@ -177,6 +177,8 @@ + + diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade index f04905b..a949f0a 100644 --- a/src/glade/sensor-edit.glade +++ b/src/glade/sensor-edit.glade @@ -335,7 +335,7 @@ 0 - 8 + 9 2 1 @@ -353,7 +353,7 @@ 0 - 9 + 10 2 1 @@ -368,7 +368,7 @@ 0 - 10 + 11 1 1 @@ -383,7 +383,7 @@ 0 - 11 + 12 1 1 @@ -401,7 +401,7 @@ 0 - 12 + 13 2 1 @@ -419,7 +419,7 @@ 0 - 13 + 14 2 1 @@ -437,7 +437,7 @@ 0 - 14 + 15 2 1 @@ -483,7 +483,7 @@ 1 - 10 + 11 1 1 @@ -531,11 +531,29 @@ 1 - 11 + 12 1 1 + + + Display sensor in the list of sensors + True + True + False + 4 + 0 + True + + + + 0 + 8 + 2 + 1 + + True diff --git a/src/graph.c b/src/graph.c index 7205e63..ab507c0 100644 --- a/src/graph.c +++ b/src/graph.c @@ -111,15 +111,15 @@ draw_graph_background(cairo_t *cr, cairo_fill(cr); if (config->alpha_channel_enabled) cairo_set_source_rgba(cr, - bgcolor->f_red, - bgcolor->f_green, - bgcolor->f_blue, + bgcolor->red, + bgcolor->green, + bgcolor->blue, config->graph_bg_alpha); else cairo_set_source_rgb(cr, - bgcolor->f_red, - bgcolor->f_green, - bgcolor->f_blue); + bgcolor->red, + bgcolor->green, + bgcolor->blue); cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height); cairo_fill(cr); @@ -144,7 +144,7 @@ static void draw_background_lines(cairo_t *cr, cairo_set_line_width(cr, 1); cairo_set_dash(cr, dashes, ndash, 0); cairo_set_source_rgb(cr, - color->f_red, color->f_green, color->f_blue); + color->red, color->green, color->blue); /* vertical lines representing time steps */ for (i = 0; i <= 5; i++) { @@ -184,9 +184,9 @@ static void draw_sensor_curve(struct psensor *s, double v; cairo_set_source_rgb(cr, - s->color->f_red, - s->color->f_green, - s->color->f_blue); + s->color->red, + s->color->green, + s->color->blue); dt = et - bt; first = 1; diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index df0c5eb..c7052b4 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,19 +1,21 @@ noinst_LIBRARIES = libpsensor.a libpsensor_a_SOURCES = \ - amd.h \ - bool.h \ - color.h color.c \ - cpu.h \ + amd.h\ + bool.h\ + color.h color.c\ + cpu.h\ hdd.h hdd_hddtemp.c\ - lmsensor.h lmsensor.c \ - plog.h plog.c \ + lmsensor.h lmsensor.c\ measure.h measure.c \ - ptime.h ptime.c \ - nvidia.h \ + nvidia.h\ + plog.h plog.c\ + pmutex.h pmutex.c\ psensor.h psensor.c\ - pio.h pio.c \ - slog.c slog.h \ + ptime.h ptime.c\ + pio.h pio.c\ + slog.c slog.h\ + temperature.c temperature.h\ url.c url.h AM_CPPFLAGS = -Wall -Werror diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index d9cd76d..dc55547 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -65,9 +92,14 @@ host_triplet = @host@ @JSON_TRUE@am__append_12 = $(JSON_LIBS) @JSON_TRUE@am__append_13 = $(JSON_CFLAGS) subdir = src/lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -76,32 +108,58 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libpsensor_a_AR = $(AR) $(ARFLAGS) libpsensor_a_LIBADD = am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \ - hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c \ - measure.h measure.c ptime.h ptime.c nvidia.h psensor.h \ - psensor.c pio.h pio.c slog.c slog.h url.c url.h hdd_atasmart.c \ - nvidia.c amd.c cpu.c psensor_json.h psensor_json.c + hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \ + nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \ + ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \ + temperature.h url.c url.h hdd_atasmart.c nvidia.c amd.c cpu.c \ + psensor_json.h psensor_json.c @ATASMART_TRUE@am__objects_1 = hdd_atasmart.$(OBJEXT) @NVIDIA_TRUE@am__objects_2 = nvidia.$(OBJEXT) @LIBATIADL_TRUE@am__objects_3 = amd.$(OBJEXT) @GTOP_TRUE@am__objects_4 = cpu.$(OBJEXT) @JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT) am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \ - lmsensor.$(OBJEXT) plog.$(OBJEXT) measure.$(OBJEXT) \ - ptime.$(OBJEXT) psensor.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) \ + lmsensor.$(OBJEXT) measure.$(OBJEXT) plog.$(OBJEXT) \ + pmutex.$(OBJEXT) psensor.$(OBJEXT) ptime.$(OBJEXT) \ + pio.$(OBJEXT) slog.$(OBJEXT) temperature.$(OBJEXT) \ url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libpsensor_a_SOURCES) DIST_SOURCES = $(am__libpsensor_a_SOURCES_DIST) am__can_run_installinfo = \ @@ -109,14 +167,33 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -138,15 +215,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -199,7 +272,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -214,7 +286,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -239,6 +310,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -269,11 +341,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libpsensor.a libpsensor_a_SOURCES = amd.h bool.h color.h color.c cpu.h hdd.h \ - hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c measure.h \ - measure.c ptime.h ptime.c nvidia.h psensor.h psensor.c pio.h \ - pio.c slog.c slog.h url.c url.h $(am__append_1) \ - $(am__append_4) $(am__append_7) $(am__append_8) \ - $(am__append_11) + hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \ + nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \ + ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \ + temperature.h url.c url.h $(am__append_1) $(am__append_4) \ + $(am__append_7) $(am__append_8) $(am__append_11) AM_CPPFLAGS = -Wall -Werror $(am__append_3) $(am__append_6) \ $(am__append_10) $(am__append_13) EXTRA_DIST = $(libpsensor_a_SOURCES) \ @@ -318,10 +390,11 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) $(EXTRA_libpsensor_a_DEPENDENCIES) - -rm -f libpsensor.a - $(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD) - $(RANLIB) libpsensor.a + $(AM_V_at)-rm -f libpsensor.a + $(AM_V_AR)$(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD) + $(AM_V_at)$(RANLIB) libpsensor.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -339,46 +412,37 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/temperature.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -390,15 +454,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -407,6 +467,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -546,17 +621,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff --git a/src/lib/color.c b/src/lib/color.c index 89a01a9..8474c72 100644 --- a/src/lib/color.c +++ b/src/lib/color.c @@ -23,25 +23,20 @@ #include "color.h" -void color_set(struct color *color, - unsigned int red, - unsigned int green, - unsigned int blue) +void color_set(struct color *c, double r, double g, double b) { - color->red = red; - color->green = green; - color->blue = blue; - - color->f_red = ((double)color->red) / 65535; - color->f_green = ((double)color->green) / 65535; - color->f_blue = ((double)color->blue) / 65535; + c->red = r; + c->green = g; + c->blue = b; } -struct color *color_new(unsigned int red, unsigned int green, unsigned int blue) +struct color *color_new(double r, double g, double b) { - struct color *color = malloc(sizeof(struct color)); + struct color *color; + + color = malloc(sizeof(struct color)); - color_set(color, red, green, blue); + color_set(color, r, g, b); return color; } @@ -86,14 +81,19 @@ struct color *str_to_color(const char *str) tmp[4] = '\0'; blue = strtol(tmp, NULL, 16); - return color_new(red, green, blue); + return color_new(((double)red)/65535, + ((double)green)/65535, + ((double)blue)/65535); } char *color_to_str(const struct color *color) { char *str = malloc(1 + 12 + 1); - sprintf(str, "#%.4x%.4x%.4x", color->red, color->green, color->blue); + sprintf(str, "#%.4x%.4x%.4x", + (int)(65535 * color->red), + (int)(65535 * color->green), + (int)(65535 * color->blue)); return str; } diff --git a/src/lib/color.h b/src/lib/color.h index cefb94b..2956654 100644 --- a/src/lib/color.h +++ b/src/lib/color.h @@ -19,36 +19,21 @@ #ifndef _PSENSOR_COLOR_H_ #define _PSENSOR_COLOR_H_ -/* - * Represents a RGB color. - * - * Contains integer and floating RGB representation to avoid useless - * conversion. - * - * Uses color_set to maintain the coherence of the both - * representation. - */ +/* Represents a RGB color. */ struct color { - /* rgb 0..65535 */ - unsigned int red; - unsigned int green; - unsigned int blue; - /* rgb floating 0..1 */ - double f_red; - double f_green; - double f_blue; + double red; + double green; + double blue; }; -struct color * -color_new(unsigned int red, unsigned int green, unsigned int blue); +/** rgb 0..1 */ +struct color *color_new(double r, double g, double b); struct color *color_dup(struct color *); -void color_set(struct color *, - unsigned int red, - unsigned int green, - unsigned int blue); +/** rgb 0..1 */ +void color_set(struct color *, double r, double g, double b); int is_color(const char *str); diff --git a/src/lib/pio.h b/src/lib/pio.h index 26867f8..385ad33 100644 --- a/src/lib/pio.h +++ b/src/lib/pio.h @@ -20,7 +20,7 @@ #ifndef _P_IO_H #define _P_IO_H -#define P_IO_VER 3 +#define P_IO_VER 4 /* Returns '1' if a given 'path' denotates a directory else returns 0 */ diff --git a/src/lib/pmutex.c b/src/lib/pmutex.c new file mode 100644 index 0000000..ec529bd --- /dev/null +++ b/src/lib/pmutex.c @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2010-2014 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include + +#include +#include + +int pmutex_lock(pthread_mutex_t *m) +{ + int ret; + + ret = pthread_mutex_lock(m); + + if (ret) + log_err("pmutex_lock: %p %d", m, ret); + + return ret; +} + +int pmutex_unlock(pthread_mutex_t *m) +{ + int ret; + + ret = pthread_mutex_unlock(m); + + if (ret) + log_err("pmutex_unlock: %p %d", m, ret); + + return ret; +} + +int pmutex_init(pthread_mutex_t *m) +{ + pthread_mutexattr_t attr; + int ret; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + + ret = pthread_mutex_init(m, &attr); + + if (ret) + log_err("pmutex_init: %p %d", m, ret); + + return ret; +} diff --git a/src/lib/pmutex.h b/src/lib/pmutex.h new file mode 100644 index 0000000..f27c6e5 --- /dev/null +++ b/src/lib/pmutex.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2010-2014 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#ifndef _P_PMUTEX_H_ +#define _P_PMUTEX_H_ + +#include + +int pmutex_lock(pthread_mutex_t *); +int pmutex_unlock(pthread_mutex_t *); +int pmutex_init(pthread_mutex_t *); + +#endif diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 348885a..9f063d0 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,9 +23,10 @@ #include #define _(str) gettext(str) -#include "hdd.h" -#include "psensor.h" -#include "lmsensor.h" +#include +#include +#include +#include #ifdef HAVE_GTOP #include "cpu.h" @@ -209,16 +210,6 @@ int is_fan_type(unsigned int type) return type & SENSOR_TYPE_FAN; } -double celsius_to_fahrenheit(double c) -{ - return c * (9.0/5.0) + 32; -} - -double fahrenheit_to_celsius(double f) -{ - return (f - 32) * (5.0/9.0); -} - char * psensor_value_to_str(unsigned int type, double value, int use_celsius) { diff --git a/src/lib/psensor.h b/src/lib/psensor.h index cb30cb9..b7d73b4 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -205,9 +205,6 @@ void psensor_cleanup(); double get_max_value(struct psensor **sensors, int type); -double celsius_to_fahrenheit(double c); -double fahrenheit_to_celsius(double c); - char *psensor_current_value_to_str(const struct psensor *, unsigned int); void psensor_log_measures(struct psensor **sensors); diff --git a/src/lib/slog.c b/src/lib/slog.c index 99eb536..15ccd0b 100644 --- a/src/lib/slog.c +++ b/src/lib/slog.c @@ -34,6 +34,7 @@ #include "bool.h" #include "config.h" #include +#include #include "ptime.h" #include "slog.h" @@ -133,7 +134,7 @@ static void slog_write_sensors(struct psensor **sensors) bool first_call; if (!file) { - log_err(_("Sensor log file not open.")); + log_debug(_("Sensor log file not open.")); return ; } @@ -169,9 +170,9 @@ static void *slog_routine(void *data) { while (1) { pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - pthread_mutex_lock(sensors_mutex); + pmutex_lock(sensors_mutex); slog_write_sensors(sensors); - pthread_mutex_unlock(sensors_mutex); + pmutex_unlock(sensors_mutex); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); sleep(period); } diff --git a/src/lib/temperature.c b/src/lib/temperature.c new file mode 100644 index 0000000..3e74898 --- /dev/null +++ b/src/lib/temperature.c @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2010-2014 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include + +double celsius_to_fahrenheit(double c) +{ + return c * (9.0/5.0) + 32; +} + +double fahrenheit_to_celsius(double f) +{ + return (f - 32) * (5.0/9.0); +} + diff --git a/src/lib/temperature.h b/src/lib/temperature.h new file mode 100644 index 0000000..b36c90e --- /dev/null +++ b/src/lib/temperature.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2010-2014 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#ifndef _PSENSOR_TEMPERATURE_H_ +#define _PSENSOR_TEMPERATURE_H_ + +double celsius_to_fahrenheit(double c); +double fahrenheit_to_celsius(double c); + +#endif diff --git a/src/main.c b/src/main.c index 99d249e..e9b10b2 100644 --- a/src/main.c +++ b/src/main.c @@ -38,6 +38,7 @@ #include "ui_color.h" #include "lmsensor.h" #include "notify_cmd.h" +#include #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" @@ -135,20 +136,22 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg) } } -static void update_measures(struct ui_psensor *ui) +static void *update_measures(void *data) { struct psensor **sensors; struct config *cfg; int period; + struct ui_psensor *ui; + ui = (struct ui_psensor *)data; cfg = ui->config; while (1) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); sensors = ui->sensors; if (!sensors) - return; + pthread_exit(NULL); update_psensor_values_size(sensors, cfg); @@ -167,7 +170,7 @@ static void update_measures(struct ui_psensor *ui) period = cfg->sensor_update_interval; - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); sleep(period); } @@ -207,7 +210,7 @@ gboolean ui_refresh_thread(gpointer data) ret = TRUE; cfg = ui->config; - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window); @@ -227,7 +230,7 @@ gboolean ui_refresh_thread(gpointer data) ret = FALSE; } - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); if (ret == FALSE) g_timeout_add(1000 * ui->graph_update_interval, @@ -251,16 +254,16 @@ static void associate_colors(struct psensor **sensors) /* number of uniq colors */ #define COLORS_COUNT 8 - unsigned int colors[COLORS_COUNT][3] = { - {0x0000, 0x0000, 0x0000}, /* black */ - {0xffff, 0x0000, 0x0000}, /* red */ - {0x0000, 0x0000, 0xffff}, /* blue */ - {0x0000, 0xffff, 0x0000}, /* green */ + double colors[COLORS_COUNT][3] = { + {0, 0, 0}, /* black */ + {1, 0, 0}, /* red */ + {0, 0, 1}, /* blue */ + {0, 1, 0}, /* green */ - {0x7fff, 0x7fff, 0x7fff}, /* grey */ - {0x7fff, 0x0000, 0x0000}, /* dark red */ - {0x0000, 0x0000, 0x7fff}, /* dark blue */ - {0x0000, 0x7fff, 0x0000} /* dark green */ + {0.5, 0.5, 0.5},/* grey */ + {0.5, 0, 0}, /* dark red */ + {0, 0, 0.5}, /* dark blue */ + {0, 0.5, 0} /* dark green */ }; struct psensor **cur; int i; @@ -310,7 +313,7 @@ static void associate_preferences(struct psensor **sensors) char *n; struct psensor *s = *sensor_cur; - s->graph_enabled = config_is_sensor_enabled(s->id); + s->graph_enabled = config_is_sensor_graph_enabled(s->id); n = config_get_sensor_name(s->id); @@ -327,23 +330,19 @@ static void associate_preferences(struct psensor **sensors) static void log_init() { - char *home, *path, *dir; + const char *dir; + char *path; - home = getenv("HOME"); + dir = get_psensor_user_dir(); - if (!home) + if (!dir) return ; - dir = malloc(strlen(home)+1+strlen(".psensor")+1); - sprintf(dir, "%s/%s", home, ".psensor"); - mkdir(dir, 0777); - path = malloc(strlen(dir)+1+strlen("log")+1); sprintf(path, "%s/%s", dir, "log"); log_open(path); - free(dir); free(path); } @@ -403,7 +402,7 @@ static void cb_activate(GApplication *application, */ static void cleanup(struct ui_psensor *ui) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); log_debug("Cleanup..."); @@ -428,7 +427,7 @@ static void cleanup(struct ui_psensor *ui) ui_status_cleanup(); - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); config_cleanup(); @@ -477,9 +476,8 @@ static struct psensor **create_sensors_list(const char *url, int main(int argc, char **argv) { struct ui_psensor ui; - GError *error; - GThread *thread; - int optc, cmdok, opti, use_libatasmart, new_instance; + pthread_t thread; + int optc, cmdok, opti, use_libatasmart, new_instance, ret; char *url = NULL; GApplication *app; @@ -555,11 +553,20 @@ int main(int argc, char **argv) g_thread_init(NULL); #endif +#ifdef HAVE_APPINDICATOR_029 + /* gdk_thread_enter/leave only used to workaround mutex bug + * of appindicator < 0.2.9, so do not call gdk_threads_init + * if useless. Calling this function leads to + * crash "Attempt to unlock mutex that was not locked" with + * GLib 2.41.2 (new checking) probably due to bugs in GTK + * itself. + */ gdk_threads_init(); +#endif gtk_init(NULL, NULL); - pthread_mutex_init(&ui.sensors_mutex, NULL); + pmutex_init(&ui.sensors_mutex); ui.config = config_load(); @@ -584,11 +591,10 @@ int main(int argc, char **argv) ui_enable_alpha_channel(&ui); - thread = g_thread_create((GThreadFunc) update_measures, - &ui, TRUE, &error); + ret = pthread_create(&thread, NULL, update_measures, &ui); - if (!thread) - g_error_free(error); + if (ret) + log_err(_("Failed to create thread for monitoring sensors")); ui.graph_update_interval = ui.config->graph_update_interval; diff --git a/src/notify_cmd.c b/src/notify_cmd.c index dfc1be1..793903a 100644 --- a/src/notify_cmd.c +++ b/src/notify_cmd.c @@ -38,6 +38,7 @@ void notify_cmd(struct psensor *s) + 1 + strlen(s->id) + 1 + + 1 + strlen(v) + 1); diff --git a/src/psensor.1 b/src/psensor.1 index 04a2eb6..1e006fc 100644 --- a/src/psensor.1 +++ b/src/psensor.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH PSENSOR "1" "June 2014" "psensor 1.0.2" "User Commands" +.TH PSENSOR "1" "September 2014" "psensor 1.1.1" "User Commands" .SH NAME psensor \- Temperature monitoring application .SH SYNOPSIS diff --git a/src/psensor.gschema.xml b/src/psensor.gschema.xml new file mode 100644 index 0000000..435fd91 --- /dev/null +++ b/src/psensor.gschema.xml @@ -0,0 +1,155 @@ + + + + false + Whether the alpha channel is enabled + Whether the alpha channel is enabled. Must be + enabled for changing the transparency of the background of the + graph window. + + + 1 + The alpha value of the background of the graph + window + The alpha value of the background of the graph + window. It must be a positive float between 0 and 1. '1' is the + maximum opacity. + + + '#e8f4e8f4a8f5' + The color of the background of the graph + canvas + The color of the background of the graph canvas as + a #rgb representation. + + + '#000000000000' + The color of the foreground of the graph + canvas + The color of the foreground of the graph canvas as + a #rgb representation. + + + 10 + The monitoring duration of the graph + The monitoring duration of the graph as minutes. It + must be greater than 1. + + + 2 + The interval between refreshs of the graph + The interval between refreshs of the graph as + seconds. It must be greater than 1. + + + false + Whether the graph window is hidden on startup + Whether the graph window is hidden on startup. The + graph will be hidden only if the Ubuntu Application Indicator or + status icon support is available. + + + false + Whether the menu of the graph window is + disabled + Whether the menu of the graph window is + disabled + + + 0 + Position of the sensor list in the graph + window + Position of the sensor list in the graph + window. Possible values are 0 (right), 1 (left), 2 (top), 3 + (bottom). + + + false + Whether the greatest temperature is displayed in Unity + launcher + If set to 'true' the greatest temperature will be + displayed in the Unity launcher. + + + 0 + The displayed temperature unit + The displayed temperature unit, '0' for Celsius, + '1' for Fahenrenheit. + + + false + Whether the decoration of the window is + disabled + Whether the decoration of the window is + disabled. + + + false + Whether the graph window is kept below all other + windows + Whether the graph window is kept below all other + windows. + + + false + Whether the position and size of the graph window are + restored + Whether the position and size of the graph window + are restored + + + 0 + Position of the divider between the graph window and + the list of sensors + Position of the divider between the graph window + and the list of sensors + + + 800 + Width of the graph window + Width of the graph window. + + + 200 + Height of the graph window + Height of the graph window. + + + 100 + Horizontal position of the graph window + Horizontal position of the graph + window. + + + 100 + Vertical position of the graph window + Vertical position of the graph + window. + + + '' + The script called when a notification is + raised. + The script called when a notification is + raised. + + + false + Whether the logging sensors is enabled. + Whether the logging sensors is + enabled. + + + 300 + Interval of the logging of sensors. + Interval of the logging of sensors in + seconds. + + + 2 + Update interface of the sensor values + Update interface of the sensor + values. + + + diff --git a/src/psensor.schemas b/src/psensor.schemas deleted file mode 100644 index 70c81fc..0000000 --- a/src/psensor.schemas +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - /schemas/apps/psensor/graph/alpha_channel_enabled - /apps/psensor/graph/alpha_channel_enabled - psensor - bool - false - - Whether the alpha channel is enabled - - Whether the alpha channel is enabled. Must be enabled for changing - the transparency of the background of the graph window. - - - - - - /schemas/apps/psensor/graph/background_alpha - /apps/psensor/graph/background_alpha - psensor - float - 1 - - The alpha value of the background of the graph window - - The alpha value of the background of the graph window. It must - be a positive float between 0 and 1. '1' is the maximum opacity. - - - - - - /schemas/apps/psensor/graph/background_color - /apps/psensor/graph/background_color - psensor - string - #e8f4e8f4a8f5 - - The color of the background of the graph canvas - - The color of the background of the graph canvas as a #rgb - representation. - - - - - - /schemas/apps/psensor/graph/foreground_color - /apps/psensor/graph/foreground_color - psensor - string - #000000000000 - - The color of the foreground of the graph canvas - - The color of the foreground of the graph canvas as a #rgb - representation. - - - - - - /schemas/apps/psensor/graph/monitoring_duration - /apps/psensor/graph/monitoring_duration - psensor - int - 10 - - The monitoring duration of the graph - - The monitoring duration of the graph as minutes. It must - be greater than 1. - - - - - - /schemas/apps/psensor/graph/update_interval - /apps/psensor/graph/update_interval - psensor - int - 1 - - The interval between refreshs of the graph - - The interval between refreshs of the graph as seconds. It - must be greater than 1. - - - - - - - - /schemas/apps/psensor/interface/hide_on_startup - /apps/psensor/interface/hide_on_startup - psensor - bool - false - - Whether the graph window is hidden on startup - - Whether the graph window is hidden on startup. The graph - will be hidden only if the Ubuntu Application Indicator or - status icon support is available. - - - - - - /schemas/apps/psensor/interface/menu_bar_disabled - /apps/psensor/interface/menu_bar_disabled - psensor - bool - false - - Whether the menu of the graph window is disabled - - Whether the menu of the graph window is disabled - - - - - - /schemas/apps/psensor/interface/sensorlist_position - /apps/psensor/interface/sensorlist_position - psensor - int - 0 - - Position of the sensor list in the graph window - Position of the sensor list in the graph - window. Possible values are 0 (right), 1 (left), 2 (top), 3 - (bottom). - - - - - /schemas/apps/psensor/interface/unity_launcher_count_disabled - /apps/psensor/interface/unity_launcher_count_disabled - psensor - bool - false - - Whether the greatest temperature is displayed in Unity - launcher - If set to 'true' the greatest temperature will be - displayed in the Unity launcher. - - - - - /schemas/apps/psensor/interface/temperature_unit - /apps/psensor/interface/temperature_unit - psensor - int - 0 - - The displayed temperature unit - The displayed temperature unit, '0' for Celsius, '1' for Fahenrenheit. - - - - - /schemas/apps/psensor/interface/window_decoration_disabled - /apps/psensor/interface/window_decoration_disabled - psensor - int - 0 - - Whether the decoration of the window is disabled - Whether the decoration of the window is disabled. - - - - - /schemas/apps/psensor/interface/window_keep_below_enabled - /apps/psensor/interface/window_keep_below_enabled - psensor - bool - false - - Whether the graph window is kept below all other windows - Whether the graph window is kept below all other windows. - - - - - /schemas/apps/psensor/interface/window_restore_enabled - /apps/psensor/interface/window_restore_enabled - psensor - bool - false - - Whether the position and size of the graph window are restored - Whether the position and size of the graph window are restored - - - - - /schemas/apps/psensor/interface/window_divider_pos - /apps/psensor/interface/window_divider_pos - psensor - int - - Position of the divider between the graph window and the list of sensors - Position of the divider between the graph window and the list of sensors - - - - - /schemas/apps/psensor/interface/window_w - /apps/psensor/interface/window_w - psensor - int - - Width of the graph window - Width of the graph window. - - - - - /schemas/apps/psensor/interface/window_h - /apps/psensor/interface/window_h - psensor - int - - Height of the graph window - Height of the graph window. - - - - - /schemas/apps/psensor/interface/window_x - /apps/psensor/interface/window_x - psensor - int - - Horizontal position of the graph window - Horizontal position of the graph window. - - - - - /schemas/apps/psensor/interface/window_y - /apps/psensor/interface/window_y - psensor - int - - Vertical position of the graph window - Vertical position of the graph window. - - - - - diff --git a/src/pxdg.c b/src/pxdg.c index 7c3cffa..6ef9d28 100644 --- a/src/pxdg.c +++ b/src/pxdg.c @@ -46,7 +46,7 @@ static char *get_user_desktop_file() char *dir, *path; dir = get_user_autostart_dir(); - path = path_append(dir, "psensor.desktop"); + path = path_append(dir, PSENSOR_DESKTOP_FILE); free(dir); @@ -55,7 +55,7 @@ static char *get_user_desktop_file() static const char *get_desktop_file() { - return DATADIR"/applications/psensor.desktop"; + return DATADIR"/applications/"PSENSOR_DESKTOP_FILE; } static int is_file_exists(const char *path) @@ -123,8 +123,8 @@ int pxdg_is_autostarted() ret = is_user_desktop_autostarted(kfile); else ret = -1; + g_key_file_free(kfile); } - g_key_file_free(kfile); } free(user_desktop); @@ -160,7 +160,7 @@ static void enable_gnome_autostart(const char *path) void pxdg_set_autostart(unsigned int enable) { - char *user_desktop; + char *user_desktop, *dir; log_fct_enter(); @@ -171,8 +171,12 @@ void pxdg_set_autostart(unsigned int enable) log_fct("desktop file: %s", get_desktop_file()); if (enable) { - if (!is_file_exists(user_desktop)) + if (!is_file_exists(user_desktop)) { + dir = get_user_autostart_dir(); + mkdirs(dir, 0700); + free(dir); file_copy(get_desktop_file(), user_desktop); + } enable_gnome_autostart(user_desktop); } else { /* because X-GNOME-Autostart-enabled does not turn off diff --git a/src/rsensor.c b/src/rsensor.c index 32c182c..8a5aa66 100644 --- a/src/rsensor.c +++ b/src/rsensor.c @@ -163,14 +163,14 @@ void remote_psensor_update(struct psensor *s) if (obj && !is_error(obj)) { json_object *om; - om = json_object_object_get(obj, "last_measure"); + json_object_object_get_ex(obj, "last_measure", &om); if (!is_error(obj)) { json_object *ov, *ot; struct timeval tv; - ov = json_object_object_get(om, "value"); - ot = json_object_object_get(om, "time"); + json_object_object_get_ex(om, "value", &ov); + json_object_object_get_ex(om, "time", &ot); tv.tv_sec = json_object_get_int(ot); tv.tv_usec = 0; diff --git a/src/server/Makefile.in b/src/server/Makefile.in index f240f32..f0cc41e 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -58,10 +85,14 @@ bin_PROGRAMS = psensor-server$(EXEEXT) @ATASMART_TRUE@am__append_4 = $(ATASMART_CFLAGS) @ATASMART_TRUE@am__append_5 = $(ATASMART_LIBS) subdir = src/server -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -76,14 +107,34 @@ am__psensor_server_SOURCES_DIST = server.c server.h sysinfo.h \ am_psensor_server_OBJECTS = server.$(OBJEXT) $(am__objects_1) psensor_server_OBJECTS = $(am_psensor_server_OBJECTS) psensor_server_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(psensor_server_SOURCES) DIST_SOURCES = $(am__psensor_server_SOURCES_DIST) am__can_run_installinfo = \ @@ -121,14 +172,33 @@ am__uninstall_files_from_dir = { \ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -150,15 +220,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -212,7 +278,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -227,7 +292,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -252,6 +316,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,10 +396,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -355,16 +421,18 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) $(EXTRA_psensor_server_DEPENDENCIES) @rm -f psensor-server$(EXEEXT) - $(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -376,18 +444,18 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -432,26 +500,15 @@ uninstall-man1: -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -463,15 +520,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -480,24 +533,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -637,19 +692,19 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-man uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-man uninstall-man1 psensor-server.1: server.c $(top_srcdir)/configure.ac $(MAKE) $(AM_MAKEFLAGS) psensor-server$(EXEEXT) diff --git a/src/server/psensor-server.1 b/src/server/psensor-server.1 index 8628bce..0558115 100644 --- a/src/server/psensor-server.1 +++ b/src/server/psensor-server.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. -.TH PSENSOR-SERVER "1" "June 2014" "psensor-server 1.0.2" "User Commands" +.TH PSENSOR-SERVER "1" "September 2014" "psensor-server 1.1.1" "User Commands" .SH NAME psensor-server \- Temperature and system monitoring Web server .SH SYNOPSIS diff --git a/src/server/server.c b/src/server/server.c index 55649b8..297d083 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -44,6 +44,7 @@ #include #include "psensor_json.h" +#include #include "url.h" #include "server.h" #include "slog.h" @@ -74,7 +75,7 @@ static struct option long_options[] = { static struct server_data server_data; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex; static int server_stop_requested; @@ -298,9 +299,9 @@ static int cbk_http_request(void *cls, nurl = url_normalize(url); - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); response = create_response(nurl, method, &resp_code); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); ret = MHD_queue_response(connection, resp_code, response); MHD_destroy_response(response); @@ -388,6 +389,8 @@ int main(int argc, char *argv[]) if (!log_file) log_file = strdup(DEFAULT_LOG_FILE); + pmutex_init(&mutex); + log_open(log_file); psensor_init(); @@ -426,7 +429,7 @@ int main(int argc, char *argv[]) } while (!server_stop_requested) { - pthread_mutex_lock(&mutex); + pmutex_lock(&mutex); #ifdef HAVE_GTOP sysinfo_update(&server_data.psysinfo); @@ -436,7 +439,7 @@ int main(int argc, char *argv[]) psensor_log_measures(server_data.sensors); - pthread_mutex_unlock(&mutex); + pmutex_unlock(&mutex); sleep(5); } diff --git a/src/ui.c b/src/ui.c index 967f31e..6876600 100644 --- a/src/ui.c +++ b/src/ui.c @@ -152,8 +152,7 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) } } -static void -slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data) +static void slog_enabled_cbk(void *data) { struct ui_psensor *ui; struct psensor **sensors; @@ -203,7 +202,7 @@ void ui_window_create(struct ui_psensor *ui) cfg->window_x, cfg->window_y); - config_slog_enabled_notify_add(slog_enabled_cbk, ui); + config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui); gtk_window_set_default_size(GTK_WINDOW(window), cfg->window_w, diff --git a/src/ui_color.c b/src/ui_color.c index d7f6eff..85277ff 100644 --- a/src/ui_color.c +++ b/src/ui_color.c @@ -63,7 +63,7 @@ int ui_change_color(const char *title, struct color *col, GtkWindow *win) else b = color.blue; - color_set(col, 65535*r, 65535*g, 65535*b); + color_set(col, r, g, b); } gtk_widget_destroy(GTK_WIDGET(colordlg)); diff --git a/src/ui_pref.c b/src/ui_pref.c index 4dd4bf8..e614da3 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -19,19 +19,20 @@ #include #include -#include "ui.h" -#include "cfg.h" -#include "ui_pref.h" -#include "ui_color.h" +#include +#include +#include +#include #include -GdkColor *color_to_gdkcolor(struct color *color) +GdkRGBA color_to_GdkRGBA(struct color *color) { - GdkColor *c = malloc(sizeof(GdkColor)); + GdkRGBA c; - c->red = color->red; - c->green = color->green; - c->blue = color->blue; + c.red = color->red; + c.green = color->green; + c.blue = color->blue; + c.alpha = 1.0; return c; } @@ -44,8 +45,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui) GtkBuilder *builder; guint ok; GError *error = NULL; - GdkColor *color_fg, *color_bg; - GtkColorButton *w_color_fg, *w_color_bg; + GdkRGBA color_fg, color_bg; + GtkColorChooser *w_color_fg, *w_color_bg; GtkScale *w_bg_opacity; GtkSpinButton *w_update_interval, *w_monitoring_duration, *w_s_update_interval, *w_slog_interval; @@ -82,15 +83,15 @@ void ui_pref_dialog_run(struct ui_psensor *ui) free(notif_script); } - color_fg = color_to_gdkcolor(cfg->graph_fgcolor); - w_color_fg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, - "color_fg")); - gtk_color_button_set_color(w_color_fg, color_fg); + color_fg = color_to_GdkRGBA(cfg->graph_fgcolor); + w_color_fg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder, + "color_fg")); + gtk_color_chooser_set_rgba(w_color_fg, &color_fg); - color_bg = color_to_gdkcolor(cfg->graph_bgcolor); - w_color_bg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, + color_bg = color_to_GdkRGBA(cfg->graph_bgcolor); + w_color_bg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder, "color_bg")); - gtk_color_button_set_color(w_color_bg, color_bg); + gtk_color_chooser_set_rgba(w_color_bg, &color_bg); w_bg_opacity = GTK_SCALE(gtk_builder_get_object(builder, "bg_opacity")); @@ -169,20 +170,24 @@ void ui_pref_dialog_run(struct ui_psensor *ui) if (result == GTK_RESPONSE_ACCEPT) { double value; - GdkColor color; + GdkRGBA color; pthread_mutex_lock(&ui->sensors_mutex); config_set_notif_script (gtk_entry_get_text(GTK_ENTRY(w_notif_script))); - gtk_color_button_get_color(w_color_fg, &color); + gtk_color_chooser_get_rgba(w_color_fg, &color); color_set(cfg->graph_fgcolor, - color.red, color.green, color.blue); + color.red, + color.green, + color.blue); - gtk_color_button_get_color(w_color_bg, &color); + gtk_color_chooser_get_rgba(w_color_bg, &color); color_set(cfg->graph_bgcolor, - color.red, color.green, color.blue); + color.red, + color.green, + color.blue); value = gtk_range_get_value(GTK_RANGE(w_bg_opacity)); cfg->graph_bg_alpha = value; diff --git a/src/ui_pref.h b/src/ui_pref.h index 9670624..2e669c5 100644 --- a/src/ui_pref.h +++ b/src/ui_pref.h @@ -22,6 +22,6 @@ #include "ui.h" void ui_pref_dialog_run(struct ui_psensor *); -GdkColor *color_to_gdkcolor(struct color *color); +GdkRGBA color_to_GdkRGBA(struct color *color); #endif diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index f7200c1..d0138c7 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -19,12 +19,12 @@ #include #include -#include "ui.h" -#include "ui_pref.h" -#include "ui_sensorlist.h" -#include "ui_sensorpref.h" -#include "cfg.h" -#include "ui_color.h" +#include +#include +#include +#include +#include +#include enum { COL_NAME = 0, @@ -33,9 +33,10 @@ enum { COL_TEMP_MAX, COL_COLOR, COL_COLOR_STR, - COL_ENABLED, + COL_GRAPH_ENABLED, COL_EMPTY, COL_SENSOR, + COL_DISPLAY_ENABLED }; struct cb_data { @@ -46,7 +47,7 @@ struct cb_data { static int col_index_to_col(int idx) { if (idx == 5) - return COL_ENABLED; + return COL_GRAPH_ENABLED; else if (idx > 5) return -1; @@ -57,9 +58,10 @@ static void populate(struct ui_psensor *ui) { GtkTreeIter iter; GtkListStore *store; - GdkColor color; + GdkRGBA color; char *scolor; struct psensor **ordered_sensors, **s_cur, *s; + unsigned int enabled; ordered_sensors = ui_get_sensors_ordered_by_position(ui); store = ui->sensors_store; @@ -74,14 +76,18 @@ static void populate(struct ui_psensor *ui) color.red = s->color->red; color.green = s->color->green; color.blue = s->color->blue; + color.alpha = 1.0; - scolor = gdk_color_to_string(&color); + scolor = gdk_rgba_to_string(&color); + + enabled = config_is_sensor_enabled(s->id); gtk_list_store_set(store, &iter, COL_NAME, s->name, COL_COLOR_STR, scolor, - COL_ENABLED, s->graph_enabled, + COL_GRAPH_ENABLED, s->graph_enabled, COL_SENSOR, s, + COL_DISPLAY_ENABLED, enabled, -1); free(scolor); } @@ -102,6 +108,8 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete) populate(ui); model = gtk_tree_view_get_model(ui->sensors_tree); + model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model)); + store = ui->sensors_store; use_celsius = ui->config->temperature_unit == CELSIUS; @@ -247,8 +255,9 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) GTK_WINDOW(ui->main_window))) { ui_sensorlist_update(ui, 1); config_set_sensor_color(s->id, s->color); + config_sync(); } - } else if (coli >= 0 && coli != COL_ENABLED) { + } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) { menu = create_sensor_popup(ui, s); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, @@ -263,34 +272,55 @@ static void toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) { struct ui_psensor *ui; - GtkTreeModel *model; + GtkTreeModel *model, *fmodel; GtkTreeIter iter; GtkTreePath *path; - struct psensor *s; + struct psensor *s, *s2; + gboolean valid; ui = (struct ui_psensor *)data; - model = gtk_tree_view_get_model(ui->sensors_tree); + fmodel = gtk_tree_view_get_model(ui->sensors_tree); + path = gtk_tree_path_new_from_string(path_str); - gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get_iter(fmodel, &iter, path); - gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1); + gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1); s->graph_enabled ^= 1; - config_set_sensor_enabled(s->id, s->graph_enabled); - - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COL_ENABLED, s->graph_enabled, -1); + config_set_sensor_graph_enabled(s->id, s->graph_enabled); gtk_tree_path_free(path); + + model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel)); + valid = gtk_tree_model_get_iter_first(model, &iter); + while (valid) { + gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1); + + if (s == s2) + gtk_list_store_set(ui->sensors_store, + &iter, + COL_GRAPH_ENABLED, + s->graph_enabled, + -1); + valid = gtk_tree_model_iter_next(model, &iter); + } } void ui_sensorlist_create(struct ui_psensor *ui) { GtkCellRenderer *renderer; + GtkTreeModel *fmodel, *model; log_debug("ui_sensorlist_create()"); + model = gtk_tree_view_get_model(ui->sensors_tree); + fmodel = gtk_tree_model_filter_new(model, NULL); + gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(fmodel), + COL_DISPLAY_ENABLED); + + gtk_tree_view_set_model(ui->sensors_tree, fmodel); + renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, @@ -333,7 +363,7 @@ void ui_sensorlist_create(struct ui_psensor *ui) -1, _("Graph"), renderer, - "active", COL_ENABLED, + "active", COL_GRAPH_ENABLED, NULL); g_signal_connect(G_OBJECT(renderer), "toggled", (GCallback) toggled_cbk, ui); diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 463deda..126f33c 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -20,11 +20,13 @@ #include -#include "cfg.h" -#include "ui_pref.h" -#include "ui_sensorlist.h" -#include "ui_sensorpref.h" -#include "ui_color.h" +#include +#include +#include +#include +#include +#include + #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) #include "ui_appindicator.h" @@ -38,13 +40,14 @@ enum { struct sensor_pref { struct psensor *sensor; char *name; - int enabled; + int graph_enabled; struct color *color; int alarm_enabled; int alarm_high_threshold; int alarm_low_threshold; unsigned int appindicator_enabled; unsigned int appindicator_label_enabled; + unsigned int display_enabled; }; struct cb_data { @@ -61,9 +64,10 @@ sensor_pref_new(struct psensor *s, struct config *cfg) p->sensor = s; p->name = strdup(s->name); - p->enabled = s->graph_enabled; + p->graph_enabled = s->graph_enabled; p->alarm_enabled = s->alarm_enabled; p->color = color_dup(s->color); + p->display_enabled = config_is_sensor_enabled(s->id); if (cfg->temperature_unit == CELSIUS) { p->alarm_high_threshold = s->alarm_high_threshold; @@ -131,7 +135,17 @@ void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data) p = get_selected_sensor_pref(GTK_TREE_VIEW(data)); if (p) - p->enabled = gtk_toggle_button_get_active(btn); + p->graph_enabled = gtk_toggle_button_get_active(btn); +} + +void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data) +{ + struct sensor_pref *p; + + p = get_selected_sensor_pref(GTK_TREE_VIEW(data)); + + if (p) + p->display_enabled = gtk_toggle_button_get_active(btn); } void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data) @@ -170,12 +184,12 @@ ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data) void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data) { struct sensor_pref *p; - GdkColor color; + GdkRGBA color; p = get_selected_sensor_pref(GTK_TREE_VIEW(data)); if (p) { - gtk_color_button_get_color(widget, &color); + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color); color_set(p->color, color.red, color.green, color.blue); } } @@ -209,10 +223,10 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) *w_chipname; GtkEntry *w_name; GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled, - *w_appindicator_label_enabled; + *w_appindicator_label_enabled, *w_display; GtkColorButton *w_color; GtkSpinButton *w_high_threshold, *w_low_threshold; - GdkColor *color; + GdkRGBA color; struct psensor *s; int use_celsius; @@ -235,12 +249,17 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_draw")); - gtk_toggle_button_set_active(w_draw, p->enabled); + gtk_toggle_button_set_active(w_draw, p->graph_enabled); - color = color_to_gdkcolor(p->color); + w_display = GTK_TOGGLE_BUTTON(gtk_builder_get_object + (builder, + "sensor_enable_checkbox")); + gtk_toggle_button_set_active(w_display, p->display_enabled); + + color = color_to_GdkRGBA(p->color); w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "sensor_color")); - gtk_color_button_set_color(w_color, color); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color); w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); @@ -271,7 +290,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) w_appindicator_label_enabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "indicator_label_checkbox")); - if (is_temp_type(s->type) || is_fan_type(s->type)) { gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); gtk_spin_button_set_value(w_high_threshold, @@ -344,9 +362,9 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) config_set_sensor_name(s->id, s->name); } - if (s->graph_enabled != p->enabled) { - s->graph_enabled = p->enabled; - config_set_sensor_enabled(s->id, s->graph_enabled); + if (s->graph_enabled != p->graph_enabled) { + s->graph_enabled = p->graph_enabled; + config_set_sensor_graph_enabled(s->id, s->graph_enabled); } if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) { @@ -367,7 +385,10 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) config_set_sensor_alarm_enabled(s->id, s->alarm_enabled); } - color_set(s->color, p->color->red, p->color->green, p->color->blue); + color_set(s->color, + p->color->red, + p->color->green, + p->color->blue); config_set_sensor_color(s->id, s->color); if (s->appindicator_enabled != p->appindicator_enabled) { @@ -379,6 +400,8 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) p->appindicator_label_enabled); config_set_sensor_position(s->id, pos); + + config_set_sensor_enabled(s->id, p->display_enabled); } static void apply_prefs(GtkTreeModel *model, struct config *cfg) @@ -396,6 +419,7 @@ static void apply_prefs(GtkTreeModel *model, struct config *cfg) valid = gtk_tree_model_iter_next(model, &iter); i++; } + config_sync(); } void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) diff --git a/src/ui_unity.c b/src/ui_unity.c index 17ee29d..2c00403 100644 --- a/src/ui_unity.c +++ b/src/ui_unity.c @@ -18,6 +18,7 @@ */ #include +#include #include static int initialized; @@ -32,7 +33,7 @@ void ui_unity_launcher_entry_update(struct psensor **sensors, if (!initialized) { psensor_entry = unity_launcher_entry_get_for_desktop_file - ("psensor.desktop"); + (PSENSOR_DESKTOP_FILE); unity_launcher_entry_set_count(psensor_entry, 0); initialized = 1; diff --git a/tests/Makefile.in b/tests/Makefile.in index d896f52..5e90630 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -61,9 +88,14 @@ TESTS = test-io-dir-list.sh test-psensor-type-to-unit-str$(EXEEXT) \ test-url-normalize$(EXEEXT) $(am__append_3) @CPPCHECK_TRUE@am__append_3 = test-cppcheck.sh subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -94,14 +126,38 @@ test_url_encode_LDADD = $(LDADD) am_test_url_normalize_OBJECTS = test_url_normalize.$(OBJEXT) test_url_normalize_OBJECTS = $(am_test_url_normalize_OBJECTS) test_url_normalize_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_io_dir_list_SOURCES) \ $(test_psensor_type_to_unit_str_SOURCES) \ $(test_psensor_value_to_str_SOURCES) \ @@ -115,16 +171,237 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +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__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -146,15 +423,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -207,7 +480,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -222,7 +494,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -247,6 +518,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -290,7 +562,7 @@ test_url_normalize_SOURCES = test_url_normalize.c all: all-am .SUFFIXES: -.SUFFIXES: .c .o .obj +.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -324,21 +596,26 @@ $(am__aclocal_m4_deps): clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + test-io-dir-list$(EXEEXT): $(test_io_dir_list_OBJECTS) $(test_io_dir_list_DEPENDENCIES) $(EXTRA_test_io_dir_list_DEPENDENCIES) @rm -f test-io-dir-list$(EXEEXT) - $(LINK) $(test_io_dir_list_OBJECTS) $(test_io_dir_list_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_io_dir_list_OBJECTS) $(test_io_dir_list_LDADD) $(LIBS) + test-psensor-type-to-unit-str$(EXEEXT): $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_DEPENDENCIES) $(EXTRA_test_psensor_type_to_unit_str_DEPENDENCIES) @rm -f test-psensor-type-to-unit-str$(EXEEXT) - $(test_psensor_type_to_unit_str_LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS) + $(AM_V_CCLD)$(test_psensor_type_to_unit_str_LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS) + test-psensor-value-to-str$(EXEEXT): $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_DEPENDENCIES) $(EXTRA_test_psensor_value_to_str_DEPENDENCIES) @rm -f test-psensor-value-to-str$(EXEEXT) - $(test_psensor_value_to_str_LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS) + $(AM_V_CCLD)$(test_psensor_value_to_str_LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS) + test-url-encode$(EXEEXT): $(test_url_encode_OBJECTS) $(test_url_encode_DEPENDENCIES) $(EXTRA_test_url_encode_DEPENDENCIES) @rm -f test-url-encode$(EXEEXT) - $(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS) + test-url-normalize$(EXEEXT): $(test_url_normalize_OBJECTS) $(test_url_normalize_DEPENDENCIES) $(EXTRA_test_url_normalize_DEPENDENCIES) @rm -f test-url-normalize$(EXEEXT) - $(LINK) $(test_url_normalize_OBJECTS) $(test_url_normalize_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_url_normalize_OBJECTS) $(test_url_normalize_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -353,67 +630,56 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_normalize.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o: test_psensor_type_to_unit_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj: test_psensor_type_to_unit_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi` test_psensor_value_to_str-test_psensor_value_to_str.o: test_psensor_value_to_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.o -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.o -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c test_psensor_value_to_str-test_psensor_value_to_str.obj: test_psensor_value_to_str.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -425,15 +691,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -442,102 +704,222 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-io-dir-list.sh.log: test-io-dir-list.sh + @p='test-io-dir-list.sh'; \ + b='test-io-dir-list.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-psensor-type-to-unit-str.log: test-psensor-type-to-unit-str$(EXEEXT) + @p='test-psensor-type-to-unit-str$(EXEEXT)'; \ + b='test-psensor-type-to-unit-str'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-psensor-value-to-str.log: test-psensor-value-to-str$(EXEEXT) + @p='test-psensor-value-to-str$(EXEEXT)'; \ + b='test-psensor-value-to-str'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-url-encode.log: test-url-encode$(EXEEXT) + @p='test-url-encode$(EXEEXT)'; \ + b='test-url-encode'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-url-normalize.log: test-url-normalize$(EXEEXT) + @p='test-url-normalize$(EXEEXT)'; \ + b='test-url-normalize'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-cppcheck.sh.log: test-cppcheck.sh + @p='test-cppcheck.sh'; \ + b='test-cppcheck.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -595,6 +977,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -676,18 +1061,19 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ - clean clean-checkPROGRAMS clean-generic ctags distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am \ + check-local clean clean-checkPROGRAMS clean-generic \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am + mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am check-local: checkpatch.pl find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; diff --git a/www/Makefile.in b/www/Makefile.in index 1c1ad73..1bab6e6 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = www -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,12 +140,15 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(defaultwwwdir)" DATA = $(defaultwww_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ +ASCIIDOC = @ASCIIDOC@ ATASMART_CFLAGS = @ATASMART_CFLAGS@ ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ @@ -124,15 +170,11 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ GTOP_CFLAGS = @GTOP_CFLAGS@ @@ -184,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -199,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -224,6 +264,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -319,11 +360,11 @@ uninstall-defaultwwwDATA: @list='$(defaultwww_DATA)'; test -n "$(defaultwwwdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(defaultwwwdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -461,17 +502,17 @@ uninstall-am: uninstall-defaultwwwDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-defaultwwwDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-defaultwwwDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-defaultwwwDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-defaultwwwDATA # Tell versions [3.59,3.63) of GNU make to not export all variables.