From: Jean-Philippe Orsini Date: Mon, 29 Sep 2014 07:45:54 +0000 (+0200) Subject: Merge branch 'v1.1' X-Git-Tag: v1.2.0~100 X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=d6141b1d4fea0db9b115b06c668be6195ac4e5c6;hp=9874462ec794c60f21737dfda4ae7aaab4fec781 Merge branch 'v1.1' Conflicts: NEWS --- diff --git a/NEWS b/NEWS index 5154de6..606c1d1 100644 --- a/NEWS +++ b/NEWS @@ -2,8 +2,9 @@ Psensor NEWS ============ v1.1.3 ------- +* Added tooltip explaining why a setting is not available. +* Removed support of old AppIndicator library < 3.0. * Fixed compilation issue with gtk+3.14 due to deprecation of GtkStatusIcon. (Closes: #763257). diff --git a/NEWS.html b/NEWS.html index 48e7c55..843a5a4 100644 --- a/NEWS.html +++ b/NEWS.html @@ -380,6 +380,23 @@ asciidoc.install();

Psensor NEWS

+
+
+

v1.1.3

+
    +
  • +

    +Added tooltip explaining why a setting is not available. +

    +
    • +
  • +

    +Removed support of old AppIndicator library < 3.0. +

    +
    • +
+
+

v1.1.2

@@ -2851,7 +2868,7 @@ Fixed BR1: crash when no temperature sensor is available
diff --git a/README b/README index c1d3c70..3b50a77 100644 --- a/README +++ b/README @@ -121,7 +121,7 @@ The compilation of +psensor+ requires: faq) * cppcheck (optional, static source checker) * library libnotify (optional) - * library libappindicator (optional) + * library libappindicator >= 3.0 (optional) * library libXNVCtrl (optional) * library json-c >= 0.11.99 and curl (optional, required for remote monitoring) * library unity (>=v3.4.2, optional) diff --git a/README.html b/README.html index a1942e9..0c81380 100644 --- a/README.html +++ b/README.html @@ -403,12 +403,18 @@ the temperature of the NVidia GPUs (using XNVCtrl).

  • -the temperature of the Hard Disk Drives (using hddtemp or libatasmart). +the temperature of ATI GPUs (using ATI ADL SDK).

  • -the rotation speed of the fans (using lm-sensors). +the temperature of the Hard Disk Drives (using hddtemp, libatasmart + or udisks2). +

    +
    • +
  • +

    +the rotation speed of the fans.

  • @@ -418,7 +424,7 @@ the temperature of a remote computer.

  • -the cpu load. +the CPU load.

    • @@ -569,7 +575,7 @@ library libnotify (optional)

  • -library libappindicator (optional) +library libappindicator >= 3.0 (optional)

  • @@ -597,6 +603,11 @@ library gtop2 (optional, required for CPU usage) library atasmart (optional, for disk monitoring)

    • +
  • +

    +library udisk2 (optional, for disk monitoring) +

    +

    • The specific requirements for psensor-server:

      @@ -644,11 +655,6 @@ been found.

    • -To monitor HDDs, the hddtemp daemon must be installed and running. -

      -
      • -
    • -

      Run: psensor

      • @@ -681,7 +687,7 @@ have extracted the ATI ADL SDK. Other steps are indentical.

    diff --git a/config.h.in b/config.h.in index 8d62e31..8877213 100644 --- a/config.h.in +++ b/config.h.in @@ -7,12 +7,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ADL_DEFINES_H -/* Use AppIndicator > 0.2.9 */ +/* Use AppIndicator3-0.1 */ #undef HAVE_APPINDICATOR -/* Use AppIndicator 0.2.9 */ -#undef HAVE_APPINDICATOR_029 - /* Use libatasmart */ #undef HAVE_ATASMART @@ -61,7 +58,7 @@ /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `sensors' library (-lsensors). */ +/* Use libsensors */ #undef HAVE_LIBSENSORS /* Use libudisks */ diff --git a/configure b/configure index 98bd186..12b5770 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for psensor 1.1.2. +# Generated by GNU Autoconf 2.69 for psensor 1.1.0.x. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='psensor 1.1.2' +PACKAGE_VERSION='1.1.0.x' +PACKAGE_STRING='psensor 1.1.0.x' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -691,6 +691,8 @@ X11_TRUE X11_LIBS X11_CFLAGS SENSORS_LIBS +SENSORS_FALSE +SENSORS_TRUE PTHREAD_LIBS GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -1404,7 +1406,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures psensor 1.1.2 to adapt to many kinds of systems. +\`configure' configures psensor 1.1.0.x to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1478,7 +1480,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 1.1.2:";; + short | recursive ) echo "Configuration of psensor 1.1.0.x:";; esac cat <<\_ACEOF @@ -1628,7 +1630,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 1.1.2 +psensor configure 1.1.0.x generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1930,7 +1932,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by psensor $as_me 1.1.2, which was +It was created by psensor $as_me 1.1.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2795,7 +2797,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='1.1.2' + VERSION='1.1.0.x' cat >>confdefs.h <<_ACEOF @@ -7124,11 +7126,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sensors_sensors_init" >&5 $as_echo "$ac_cv_lib_sensors_sensors_init" >&6; } if test "x$ac_cv_lib_sensors_sensors_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSENSORS 1 -_ACEOF + SENSORS_LIBS=-lsensors - LIBS="-lsensors $LIBS" +$as_echo "#define HAVE_LIBSENSORS 1" >>confdefs.h fi @@ -7145,7 +7145,14 @@ fi done -SENSORS_LIBS=-lsensors + if test -n "$SENSORS_LIBS"; then + SENSORS_TRUE= + SENSORS_FALSE='#' +else + SENSORS_TRUE='#' + SENSORS_FALSE= +fi + ############### psensor @@ -7678,7 +7685,6 @@ fi # Checks AppIndicator APPINDICATOR_LIBS= - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 $as_echo_n "checking for APPINDICATOR... " >&6; } @@ -7753,166 +7759,6 @@ $as_echo "yes" >&6; } $as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h fi - -if test "$APPINDICATOR_LIBS" == ""; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 -$as_echo_n "checking for APPINDICATOR... " >&6; } - -if test -n "$APPINDICATOR_CFLAGS"; then - pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 <= 0.2.9 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator-0.1 <= 0.2.9 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 <= 0.2.9 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$APPINDICATOR_LIBS"; then - pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 <= 0.2.9 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator-0.1 <= 0.2.9 ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 <= 0.2.9 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator-0.1 <= 0.2.9 " 2>&1` - else - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator-0.1 <= 0.2.9 " 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$APPINDICATOR_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 0.2.9 not present\"" >&5 -$as_echo "$as_me: WARNING: AppIndicator 0.2.9 not present\"" >&2;} -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 0.2.9 not present\"" >&5 -$as_echo "$as_me: WARNING: AppIndicator 0.2.9 not present\"" >&2;} -else - APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS - APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h - - -$as_echo "#define HAVE_APPINDICATOR_029 1" >>confdefs.h - - -fi -fi - -if test "$APPINDICATOR_LIBS" == ""; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 -$as_echo_n "checking for APPINDICATOR... " >&6; } - -if test -n "$APPINDICATOR_CFLAGS"; then - pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 > 0.2.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator-0.1 > 0.2.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 > 0.2.9" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$APPINDICATOR_LIBS"; then - pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 > 0.2.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "appindicator-0.1 > 0.2.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 > 0.2.9" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator-0.1 > 0.2.9" 2>&1` - else - APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator-0.1 > 0.2.9" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$APPINDICATOR_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"AppIndicator > 0.2.9 not present\"" >&5 -$as_echo "$as_me: WARNING: \"AppIndicator > 0.2.9 not present\"" >&2;} -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"AppIndicator > 0.2.9 not present\"" >&5 -$as_echo "$as_me: WARNING: \"AppIndicator > 0.2.9 not present\"" >&2;} -else - APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS - APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h - -fi -fi if test -n "$APPINDICATOR_LIBS"; then APPINDICATOR_TRUE= APPINDICATOR_FALSE='#' @@ -8903,6 +8749,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${SENSORS_TRUE}" && test -z "${SENSORS_FALSE}"; then + as_fn_error $? "conditional \"SENSORS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${X11_TRUE}" && test -z "${X11_FALSE}"; then as_fn_error $? "conditional \"X11\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -9364,7 +9214,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by psensor $as_me 1.1.2, which was +This file was extended by psensor $as_me 1.1.0.x, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9431,7 +9281,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -psensor config.status 1.1.2 +psensor config.status 1.1.0.x configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 37fc249..31eae2d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([psensor], [1.1.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) +AC_INIT([psensor], [1.1.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) AM_INIT_AUTOMAKE([-Wall gnu]) @@ -40,9 +40,11 @@ PTHREAD_LIBS=-pthread AC_SUBST(PTHREAD_LIBS) # Checks sensors, required by psensor and psensor-server -AC_CHECK_LIB(sensors, sensors_init) +AC_CHECK_LIB(sensors, sensors_init, + [SENSORS_LIBS=-lsensors + AC_DEFINE([HAVE_LIBSENSORS],[1],[Use libsensors])]) AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h]) -SENSORS_LIBS=-lsensors +AM_CONDITIONAL(SENSORS, test -n "$SENSORS_LIBS") AC_SUBST(SENSORS_LIBS) ############### psensor @@ -105,26 +107,9 @@ AC_SUBST(LIBNOTIFY_LIBS) # Checks AppIndicator APPINDICATOR_LIBS= - PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1, [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])], [AC_MSG_WARN(AppIndicator 3-0.1 not present")]) - -if test "$APPINDICATOR_LIBS" == ""; then - PKG_CHECK_MODULES(APPINDICATOR, - appindicator-0.1 <= 0.2.9 , - [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9]) - AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9]) - ], - [AC_MSG_WARN(AppIndicator 0.2.9 not present")]) -fi - -if test "$APPINDICATOR_LIBS" == ""; then - PKG_CHECK_MODULES(APPINDICATOR, - appindicator-0.1 > 0.2.9, - [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator > 0.2.9])], - [AC_MSG_WARN("AppIndicator > 0.2.9 not present")]) -fi AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS") AC_SUBST(APPINDICATOR_CFLAGS) AC_SUBST(APPINDICATOR_LIBS) diff --git a/po/Makefile.in b/po/Makefile.in index 61e7857..9bee9bc 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -11,7 +11,7 @@ # Origin: gettext-0.16 PACKAGE = psensor -VERSION = 1.1.2 +VERSION = 1.1.0.x PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh diff --git a/po/POTFILES.in b/po/POTFILES.in index fa87f3d..8fa4760 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ src/cfg.c src/glade/psensor.glade +src/glade/psensor-appindicator.glade src/glade/psensor-pref.glade src/glade/sensor-edit.glade src/lib/amd.c diff --git a/po/de.po b/po/de.po index b23c4b0..0db998a 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -33,65 +33,67 @@ msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." msgid "Failed to save configuration file %s." msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Einstellungen" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Sensoreinstellungen" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Beenden" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Anzeigen" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Sensoreinstellungen" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor – Temperaturüberwachung" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Hilfe" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Wert" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min." -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Max." -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Farbe" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Graph" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Anzeigen" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Menü aktivieren" msgid "Enable Unity Launcher counter" msgstr "Wert im Starter von Unity anzeigen" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Temperatureinheit:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Position der Sensorentabelle:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Benutzeroberfläche" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Fenster beim Programmstart ausblenden" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Fensterposition und -größe merken" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Vordergrund:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Hintergrund:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Hintergrunddeckkraft:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Farben" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Überwachungszeitraum:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Aktualisierungsintervall:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Messungen" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min." -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max." -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "Sekunde(n)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "Minute(n)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Messintervall:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Sensorenprotokollierung aktivieren" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "Sekunde(n)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensoren" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N/V" @@ -367,11 +399,16 @@ msgstr "Alarm" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -401,11 +438,11 @@ msgstr "Anzahl der AMD/ATI-Adapter: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open() gescheitert: %s." @@ -425,37 +462,37 @@ msgstr "%s: Öffnen der Verbindung gescheitert." msgid "%s: wrong string: %s." msgstr "%s: Falsche Zeichenkette: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: Wert der Unterfunktion %s kann nicht ermittelt werden: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: Falscher Funktionstyp." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: Initialisierung gescheitert: %s." @@ -481,41 +518,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Protokolldatei kann nicht geöffnet werden: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Verbindung zum X11-Server konnte nicht hergestellt werden." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "U/min" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -542,7 +579,7 @@ msgstr "" "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen " "werden." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -558,12 +595,12 @@ msgstr "" "weiterverbreiten.\n" "Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION] …\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -571,11 +608,11 @@ msgstr "" "Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, " "inklusive Temperaturen und Lüftergeschwindigkeiten." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Optionen:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -583,7 +620,7 @@ msgstr "" " -h, --help Diese Hilfe anzeigen und beenden\n" " -v, --version Versionsinformationen anzeigen und beenden" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -591,50 +628,50 @@ msgstr "" " -u, --url=URL Die Adresse (URL) von psensor-server,\n" " Beispiel: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Programmfehler melden an: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Website: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Fehlerdiagnosemodus wird aktiviert." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, 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:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Es existiert bereits eine Psensor-Instanz." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Erzeugen des Webservers ist gescheitert." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -712,40 +749,40 @@ msgstr "" " --sensor-log-interval=S Sensorenprotokollierungsintervall auf S (Sekunden) " "festlegen" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Abfrage: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Aktiviert den Fehlerdiagnosemodus: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Keine Sensoren erkannt." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Erzeugen des Webservers ist gescheitert." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Web-Server wurde gestartet auf Port: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW-Ordner: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "Adresse: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." @@ -769,15 +806,20 @@ msgstr "Psensor-Website" msgid "Failed to load Psensor icon." msgstr "Laden des Psensor-Symbols ist gescheitert." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Wählen Sie eine Vordergrundfarbe" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday ist gescheitert." @@ -791,7 +833,7 @@ msgstr "Temperaturalarm" msgid "Fan speed alert" msgstr "Lüfteralarm" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Unbekannt" diff --git a/po/es.po b/po/es.po index 070b60a..962d751 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Spanish \n" @@ -33,65 +33,67 @@ msgstr "Error al activar el registro de sensores" msgid "Failed to save configuration file %s." msgstr "Error al activar el registro de sensores" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Ajustes" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Ajustes de los Sensores" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Salir" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Mostrar" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Ajustes de los Sensores" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Ayuda" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Valor" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Mín" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Máx" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Color" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Gráfica" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Mostrar" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Activar menú" msgid "Enable Unity Launcher counter" msgstr "Inicio retardado al abrir sesión" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Unidad de temperatura" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Ubicación de los valores" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Interfaz" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Ocultar la ventana de gráficas al iniciar sesión." -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Restaurar tamaño y posición de la ventana" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Escalas y cuadrícula" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Fondo de gráfica" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Opacidad del fondo:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Colores" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Intervalo de la gráfica" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Intervalo de actualización:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Medidas" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Mín" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Máx" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "segundo(s)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minuto(s)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Medir sensores cada:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Activar registro de sensores" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Intervalo de registro de sensores:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "segundo(s)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensores" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "No disponible" @@ -368,12 +400,17 @@ msgstr "Alarma" msgid "Display sensor in the menu" msgstr "Mostrar sensor en el menú de aplicaciones" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor no ha sido compilado con soporte para sensores remotos." + +#: src/glade/sensor-edit.glade:651 #, fuzzy msgid "Display sensor in the label (experimental)" msgstr "Mostrar sensor en el menú de aplicaciones" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Indicador de aplicación" @@ -403,11 +440,11 @@ msgstr "Numero de adaptadores AMD/ATI: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Numero de adaptadores AMD/ATI: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open() Error: %s" @@ -427,37 +464,37 @@ msgstr "%s: fallo al establecer conexión" msgid "%s: wrong string: %s." msgstr "%s: argumento erróneo:%s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: imposible obtener el valor de subcaracterística %s:%s" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: Fallo de inicialización:%s." @@ -483,41 +520,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Imposible abrir el archivo de registro: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Error al obtener la información de NVIDIA" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Error al obtener la información de NVIDIA" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Error al obtener la información de NVIDIA" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Imposible establecer conexión con el servidor X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Error al obtener la información de NVIDIA" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Error al obtener la información de NVIDIA" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -542,7 +579,7 @@ msgstr "No se abrió el archivo de registro." msgid "Sensor log not open, cannot close." msgstr "¡No existe archivo que cerrar!" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -558,12 +595,12 @@ msgstr "" "apoyada por el autor. \n" "No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPTION]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -571,11 +608,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:97 +#: src/main.c:81 msgid "Options:" msgstr "Opciones" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -583,7 +620,7 @@ msgstr "" " -h, --help Muestra esta ayuda. \n" " -v, --versión Muestra información sobre la versión." -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -591,49 +628,49 @@ msgstr "" " -u, --url=URL La URL del servidor psensor,\n" " ejemplo: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Comunicar fallos: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Página Oficial: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor no ha sido compilado con soporte para sensores remotos." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Activa el modo de depuración" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Introducir `%s --ayuda' para obtener más información\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Ya existe un Psensor en ejecución." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Fallo al crear el servidor Web" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -709,40 +746,40 @@ msgstr " --sensor-log-file=PATH establecer el archivo de registro en PATH" 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:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "Petición HTTP:%s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Activa el modo de depuración:%d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "No se han detectado sensores." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Fallo al crear el servidor Web" -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado en el puerto:%d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "directorio WWW:%s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Error al activar el registro de sensores" @@ -768,15 +805,20 @@ msgstr "Web de Psensor" msgid "Failed to load Psensor icon." msgstr "Error al cargar el icono de Psensor" -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Seleccionar el color del primer plano" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Error al activar el registro de sensores" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "Error en la adquisición del horario." @@ -790,7 +832,7 @@ msgstr "Alarma por temperatura." msgid "Fan speed alert" msgstr "Alarma por parada de ventilador." -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Desconocido" diff --git a/po/fr.po b/po/fr.po index e415599..36ae957 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-21 09:39+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: French <>\n" @@ -33,65 +33,67 @@ msgstr "" msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Préférences" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Préférences des capteurs" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Quitter" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Afficher" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Préférences des capteurs" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Surveillance des températures" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Aide" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Capteur" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Valeur" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Max" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Couleur" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Graphe" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Afficher" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,203 @@ msgstr "Activer le menu" msgid "Enable Unity Launcher counter" msgstr "Activer le compteur du lanceur de Unity" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Unité de température :" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Position de la table des capteurs :" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Interface" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Cacher la fenêtre au lancement" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Rétablir la position et la taille de la fenêtre" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Avant-plan :" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Arrière-plan :" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Opacité de l'arrière-plan :" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Couleurs" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Durée de surveillance :" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Intervalle de mise à jour :" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Mesures" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "seconde(s)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minutes(s)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Intervalle de mise à jour des mesures :" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Activer la journalisation des capteurs" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Interval de journallisation des capteurs :" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "seconde(s)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Capteurs" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +345,7 @@ msgstr "Type :" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -367,11 +405,17 @@ msgstr "Alarme" msgid "Display sensor in the menu" msgstr "Afficher le capteur dans le menu" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "" +"Psensor n'a pas été compilé avec le support de surveillance à distance." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Indicateur d'application" @@ -401,11 +445,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disque" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s : échec de sk_disk_open() : %s." @@ -425,37 +469,37 @@ msgstr "%s : échec de l'ouverture de la connexion." msgid "%s: wrong string: %s." msgstr "%s : mauvaise chaîne: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s : impossible de récupérer la valeur de la sous-fonction %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "Processeur Intel" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "Processeur graphique NVIDIA" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s : échec de l'initialisation: %s." @@ -481,41 +525,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Impossible d'ouvrir le journal: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s : Impossible d'ouvrir la connexion au serveur X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s : Échec de la récupération des information NVIDIA." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "Tr/mn" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -540,7 +584,7 @@ msgstr "Le journal des capteurs n'est pas ouvert." msgid "Sensor log not open, cannot close." msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -557,12 +601,12 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisées par la loi.\n" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation : %s [OPTION]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -570,11 +614,11 @@ msgstr "" "Psensor est une application GTK+ pour surveiller les capteurs thermiques et " "les vitesses de ventilateurs." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Options :" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -582,58 +626,58 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/main.c:104 +#: src/main.c:88 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:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bogues à: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Page d'accueil de %s : <%s>\n" -#: src/main.c:473 +#: src/main.c:440 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:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Active le mode de débogage." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez « %s --help » pour plus d'informations.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Une instance de Psensor existe déjà." -#: src/main.c:631 +#: src/main.c:587 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -710,40 +754,40 @@ msgstr "" " --sensor-log-interval=S assigne l'intervalle de journalisation du capteur " "à S (secondes)" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "Requête HTTP : %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Activation du mode de déboguage: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Aucun capteur détecté." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Échec de la création du serveur Web." -#: src/server/server.c:419 +#: src/server/server.c:421 #, 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:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW répertoire : %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL : http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Échec de l'activation de la journalisation des capteurs." @@ -769,14 +813,19 @@ msgstr "Site internet de Psensor" msgid "Failed to load Psensor icon." msgstr "Échec du chargement de l’icône de Psensor." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 msgid "Select sensor color" msgstr "" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Échec du chargement de l’icône de Psensor." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "Échec de gettimeofday." @@ -789,7 +838,7 @@ msgstr "Alerte thermique" msgid "Fan speed alert" msgstr "Alerte ventilateur" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Inconnu" diff --git a/po/hr.po b/po/hr.po index adcdbb9..a63c303 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-21 06:25+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" @@ -33,65 +33,67 @@ msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s" msgid "Failed to save configuration file %s." msgstr "Neuspjelo spremanje datoteke podešavanja %s." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "O programu" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Osobitosti" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Osobitosti senzora" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Zatvori" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Prikaži" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Osobitosti senzora" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Nadziratelj temperature" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Pomoć" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Senzor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Vrijednost" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Maks" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Boja" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafikon" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Prikaži" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Omogući izbornik" msgid "Enable Unity Launcher counter" msgstr "Omogući brojač Unity pokretača" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celzijus" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Farenhajt" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Jedinica temperature:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Položaj okvira senzora:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Sučelje" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Pokreni pri pokretanju sesije" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Sakrij prozor pri pokretanju" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Vrati položaj i veličinu prozora" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Pokretanje" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Prednji plan:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Pozadina:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Prozirnost pozadine:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Boje" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Trajanje nadziranja:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Razdoblje ažuriranja:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Mjere" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Maks" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "sekunda(i)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minuta(e)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "Zaglađene krivulje" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "Krivulje" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Razdoblje ažuriranja mjera:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Omogući zapisivanje sensora" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Razdoblje zapisivanja senzora:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "sekunda(i)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Skripta za izvršavanje kada se alarm upali" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Senzori" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "Omogući podršku za lm-sensors" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "Omogući podršku za NVCtrl (NVidia)" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "Omogući podršku za ATI ADL" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "Omogući podršku za gtop2" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "Omogući podršku za hddtemp daemon" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "Omogući podršku za libatasmart" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "Omogući podršku za udisks2" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "Promjene će biti primjenjene nakon ponovnog pokretanja psensora." -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "Čvrsti disk" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "Korištenje CPU-a i memorije" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "GPU s vlasničkim upravljačkim programima" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "Matična ploča, CPU i GPU" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Vrsta:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Nedostupno" @@ -367,11 +399,16 @@ msgstr "Alarm" msgid "Display sensor in the menu" msgstr "Prikaži senzor u izbrniku" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "Prikaži senzor u oznaci (eksperimentalno)" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Programičić pokazivača" @@ -401,11 +438,11 @@ msgstr "Broj AMD/ATI adaptera: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Broj aktivnih AMD/ATI adaptera: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disk" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open() neuspjelo: %s." @@ -425,37 +462,37 @@ msgstr "%s: neuspjelo otvaranje povezivanja." msgid "%s: wrong string: %s." msgstr "%s: pogrešan string: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, fuzzy, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: nemoguće dobivanje vrijednosti podznačajki %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: pogrešna vrsta značajki." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "Intel CPU" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "AMD CPU" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "NVIDIA GPU" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "VIA CPU" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "ACPI" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: neuspjeh pokretanja: %s." @@ -481,41 +518,41 @@ msgstr "memorija" msgid "Cannot open log file: %s" msgstr "Nemoguće otvaranje datoteke: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "%s: Nepoznat naziv NVIDIA proizvoda za GPU %d" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "%s: Neuspjelo čitanje naziva NVIDIA proizvoda za GPU %d" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "%s: Neuspjelo čitanje mjernih jedinica %x za NVIDIA GPU %d" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Nemoguće povezivanje s X11 poslužiteljem." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Neuspjelo primanje NVIDIA informacija." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, c-format msgid "%s: Failed to retrieve number of fans." msgstr "%s: NVIDIA: nuespjelo očitavanje broja ventilatora." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "Okr/min" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -540,7 +577,7 @@ msgstr "Datoteka zapisa senzora nije otvorena." msgid "Sensor log not open, cannot close." msgstr "Datoteka zapisa senzora nije otvorena, nemoguće zatvaranje." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -555,12 +592,12 @@ msgstr "" "Ovo je slobodan softver: slobodno ga možete mijenjati i redistribuirati.\n" "Ne postoji nikakvo JAMSTVO, propisano zakonom.\n" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Upotreba: %s [MOGUĆNOST]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -568,11 +605,11 @@ msgstr "" "Psensor je GTK+ aplikacija za nadziranje hardverskih senzora, koja uključuje " "temperature i brzinu okretaja ventilatora." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Mogućnosti:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -580,7 +617,7 @@ msgstr "" " -h, --help prikaz pomoći\n" " -v, --version prikaz informacije inačice" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -588,48 +625,48 @@ msgstr "" " -u, --url=URL URL psensor-poslužitelja,\n" " npr: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance prisili stvaranje nove Psensor aplikacije" -#: src/main.c:110 +#: src/main.c:94 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL postavi razinu otklanjanja greške, cijeli broj između " "0 i 3" -#: src/main.c:115 src/server/server.c:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Prijavi grešku na: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s početna stranica: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Omogućava način otklanjanja greške." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pokušajte `%s --help` za više informacija.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Psensor primjerak je već pokrenut." -#: src/main.c:631 +#: src/main.c:587 msgid "Failed to create thread for monitoring sensors" msgstr "Neuspjelo stvaranje niza za nadziranje senzora" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -704,40 +741,40 @@ msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" " --sensor-log-interval=S postavite trajanje zapisa senzora u S (sekunde)" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Zahtjev: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Omogućuje način otklanjanja greške: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Nema otkrivenih senzora." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Neuspjelo stvaranje Web poslužitelja." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Web poslužitelj pokrenut na ulazu: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW direktorij: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Neuspjelo aktiviranje zapisivanja senzora." @@ -761,14 +798,19 @@ msgstr "Psensor web stranica" msgid "Failed to load Psensor icon." msgstr "Neuspjelo učitavanje ikone Psensora." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "Sakrij" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 msgid "Select sensor color" msgstr "Odaberi boju senzora" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "dobivanje-vremena-dana neuspjelo." @@ -781,6 +823,6 @@ msgstr "Upozorenje temperature" msgid "Fan speed alert" msgstr "Upozorenje brzine ventilatora" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Nepoznato" diff --git a/po/hu.po b/po/hu.po index 040c00c..ac345b2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Hungarian \n" @@ -34,65 +34,67 @@ msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s" msgid "Failed to save configuration file %s." msgstr "Nem sikerült a konfigurációs fájlt elmenteni: %s" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Beállítások" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Érzékelő beállításai" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Kilépés" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Megjelenítés" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Érzékelő beállításai" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - hőmérsékletfigyelő" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Súgó" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Érzékelő" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Érték" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Minimum" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Maximum" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Szín" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafikon" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Megjelenítés" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -130,167 +132,197 @@ msgstr "Menü engedélyezése" msgid "Enable Unity Launcher counter" msgstr "Unity indítón lévő számláló engedélyezése" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celsius" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Hőmérséklet mértékegysége:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Érzékelőtábla pozíciója:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Felület" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Indítás a munkamenettel" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Ablak elrejtése induláskor" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Ablak pozíciójának és méretének visszaállítása" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Indítás" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Előtér:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Háttér:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Háttér átlátszósága:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Színek" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Figyelés hossza:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Frissítési időköz:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Mérések" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "másodperc" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "perc" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Mérések frissítési időköze:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Érzékelők naplózásának engedélyezése" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Naplózás időköze:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "másodperc" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Parancsfájl futtatás riasztáskor:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Érzékelők" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -308,7 +340,7 @@ msgstr "Típus:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "---" @@ -368,11 +400,16 @@ msgstr "Riasztás" msgid "Display sensor in the menu" msgstr "Érzékelők megjelenítése az alkalmazásmenüben" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "Érzékelők megjelenítése a címkén (fejlesztés alatt)" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Alkalmazás Indikátor" @@ -402,11 +439,11 @@ msgstr "ADM/ATI adapterek száma: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Aktív ADM/ATI adapterek száma: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Lemez" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, fuzzy, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open() hiba: %s." @@ -426,37 +463,37 @@ msgstr "%s: a kapcsolat megnyitása nem sikerült." msgid "%s: wrong string: %s." msgstr "%s: rossz karakterlánc: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: alfunkció értékének lekérdezése meghiúsult %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: rossz funkciótípus." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "Intel processzor" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "AMD processzor" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "NVIDIA videokártya" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "VIA processzor" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: előkészítési hiba: %s." @@ -482,41 +519,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "A naplófájl megnyitása sikertelen: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: NVIDIA információinak lekérése meghiúsult." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -541,7 +578,7 @@ msgstr "Az érzékelő naplófájlja nincs nyitva." msgid "Sensor log not open, cannot close." msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -556,12 +593,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:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓK]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -569,11 +606,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:97 +#: src/main.c:81 msgid "Options:" msgstr "Kapcsolók:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -581,7 +618,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:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -589,48 +626,48 @@ msgstr "" " -u, --url=URL a psensor-server URL-címe,\n" " például: http://gepnev:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, 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:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 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:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Hibakeresési mód engedélyezése." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, 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:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "A Psensors egy példánya már létezik." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Nem sikerült a mappa létrehozása: %s - %s" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -708,40 +745,40 @@ msgstr "" " --sensor-log-interval=S érzékelő naplózási gyakoriságának beállítása S " "másodpercre" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-kérés: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Hibakeresési mód engedélyezése: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Nem találhatók érzékelők." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Nem sikerült létrehozni a webkiszolgálót." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "A webkiszolgáló elindult ezen a porton: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW könyvtár: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Érzékelők naplózásának aktiválása meghiúsult." @@ -765,15 +802,20 @@ msgstr "A Psensor honlapja" msgid "Failed to load Psensor icon." msgstr "Nem sikerült betölteni a Psensor ikonját." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Előtérszín kiválasztása" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday meghiúsult." @@ -787,7 +829,7 @@ msgstr "Hőmérséklet riasztás" msgid "Fan speed alert" msgstr "Ventilátor riasztás" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Ismeretlen" diff --git a/po/it.po b/po/it.po index 015cc50..4f7b198 100644 --- a/po/it.po +++ b/po/it.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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Italian\n" @@ -33,65 +33,67 @@ msgstr "Attivazione registro dei sensori fallita." msgid "Failed to save configuration file %s." msgstr "Attivazione registro dei sensori fallita." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Preferenze" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Preferenze Sensore" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Esci" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Mostra" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Preferenze Sensore" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor temperatura" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Aiuto" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensore" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Valore" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Minimo" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Massimo" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Colore" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafico" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Mostra" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Abilita il menù" msgid "Enable Unity Launcher counter" msgstr "Abilita contatore nel Launcher Unity" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celsius" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Unità di misura della temperatura" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Posizione della tabella dei sensori" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Interfaccia" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Lancia all'avvio" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Nascondi la finestra all'avvio" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Ripristina posizione e dimensione della finestra" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Avvio" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Primo piano:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Sfondo:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Opacità dello sfondo:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Colori" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Durata del monitoraggio:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Intervallo di aggiornamento:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Misure" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Minimo" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Massimo" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "secondo/i" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minuto/i" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Intervallo di aggiornamento delle misure" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Abilita registrazione sensori" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Intervallo registrazione sensori:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "secondo(i)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Script eseguito quando un allarme viene attivato:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensori" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -368,11 +400,16 @@ msgstr "Avviso" msgid "Display sensor in the menu" msgstr "Mostra sensore nel menu" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor è stato compilato senza il supporto per sensori remoti." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Indicatore Applicazione" @@ -402,11 +439,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disco" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: errore sk_disk_open(): %s." @@ -426,37 +463,37 @@ msgstr "%s: impossibile aprire la connessione." msgid "%s: wrong string: %s." msgstr "%s: errore di stringa: %s" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: impossibile rilevare il valore della sotto funzione %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: tipo di funzione errata." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "CPU Intel" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "CPU AMD" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "CPU NVIDIA" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "CPU VIA" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, fuzzy, c-format msgid "%s: initialization failure: %s." msgstr "lmsensor: inizializzazione fallita: %s" @@ -482,41 +519,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Impossibile aprire il file di log: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Impossibile connettersi al server X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Impossibile recuperare informazioni da NVIDIA" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -541,7 +578,7 @@ msgstr "File di registazione sensori non aperto." msgid "Sensor log not open, cannot close." msgstr "Registro sensori non aperto, impossibile chiuderlo." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -556,12 +593,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:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -569,11 +606,11 @@ msgstr "" "Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, " "incluse temperature e velocità delle ventole." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Opzioni:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -581,7 +618,7 @@ msgstr "" " -h, --help mostra questo help ed esce\n" " -v, --version mostra le informazioni sulla versione ed esce" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -589,49 +626,49 @@ msgstr "" " -u, --url=URL URL del server psensor,\n" " esempio: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Segnalare i bug a: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s home page: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor è stato compilato senza il supporto per sensori remoti." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Abilita la modalità debug." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare '%s --help' per maggiori informazioni.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Esiste già un'istanza di Psensor" -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Impossibile creare il Web server." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -709,40 +746,40 @@ msgstr "" " --sensor-log-interval=S imposta l'intervallo del registro di sensori come " "S (secondi)" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Request: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Abilita modalità di debug: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Nessun sensore rilevato." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Impossibile creare il Web server." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Web server inizializzato sulla porta: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW directory: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Attivazione registro dei sensori fallita." @@ -766,15 +803,20 @@ msgstr "Psensor Homepage" msgid "Failed to load Psensor icon." msgstr "Impossibile caricare l'icona di Psensor." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Colore di primo piano:" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Attivazione registro dei sensori fallita." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday fallito." @@ -788,7 +830,7 @@ msgstr "Allarme temperatura" msgid "Fan speed alert" msgstr "Allarme ventola" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Sconosciuto" diff --git a/po/lv.po b/po/lv.po index d84feaf..ba35ef4 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Latvian \n" @@ -33,65 +33,67 @@ msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." msgid "Failed to save configuration file %s." msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Iestatījumi" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Sensoru iestatījumi" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Iziet" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Rādīt" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Sensoru iestatījumi" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - temperatūras pārraugs" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Palīdzība" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensors" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Vērtība" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min." -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Maks." -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Krāsa" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafiks" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Rādīt" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Aktivizēt izvēlni" msgid "Enable Unity Launcher counter" msgstr "Aktivizēt Unity palaidēja skaitītāju" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celsijs" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Fārenheits" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Temperatūras mērvienība:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Sensoru tabulas novietojums:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Saskarne" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Palaist pieteicoties sistēmā" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Slēpt logu pieteicoties sistēmā" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Atjaunot loga pozīciju un izmēru" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Palaišana" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Priekšplāns:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Fons:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Fona necaurspīdība:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Krāsas" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Pārraudzības ilgums:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Atjaunināšanas intervāls:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Mērījumi" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min." -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Maks." -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "sekunde(s)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minūte(s)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Mērījumu atjaunināšanas intervāls:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Aktivizēt sensora žurnalēšanu" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Sensoru žurnalēšanas intervāls:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "sekunde(s)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Skrips izpildīts, kad trauksme ir aktivizēta:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensori" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Tips:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N/P" @@ -368,12 +400,17 @@ msgstr "Trauksme" msgid "Display sensor in the menu" msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." + +#: src/glade/sensor-edit.glade:651 #, fuzzy msgid "Display sensor in the label (experimental)" msgstr "Attēlot sensoru etiķetē (eksperimentāls)" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Aplikāciju indikators" @@ -403,11 +440,11 @@ msgstr "AMD/ATI adapteru skaits: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Aktīvo AMD/ATI adapteru skaits: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disks" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, fuzzy, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "atasmart: sk_disk_open() atteice: %s." @@ -427,37 +464,37 @@ msgstr "%s: neizdevās atvērt savienojumu." msgid "%s: wrong string: %s." msgstr "%s: nepareiza virkne: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: nevar iegūt vērtību no apakšīpašības %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: nepareis īpašības tips." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "Intel CPU" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "AMD CPU" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "NVIDIA GPU" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "VIA CPU" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: inicializācijas kļūda: %s." @@ -483,41 +520,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Nevar atvērt žurnāla failu: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Nevar atvērt savienojumu ar X11 server." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Neizdevās saņemt NVIDIA informāciju." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -542,7 +579,7 @@ msgstr "Sensora žurnāla fails nav atvērts." msgid "Sensor log not open, cannot close." msgstr "Sensora žurnāls nav atvērts, nevar aizvērt." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -552,12 +589,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Lietošana: %s [OPCIJAS]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -565,11 +602,11 @@ msgstr "" "Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot " "temperatūras un ventilatoru ātrumus." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Opcijas:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -577,7 +614,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:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -585,47 +622,47 @@ msgstr "" " -u, --url=SAITE psensor-server adrese,\n" " piemērs: http://saimniekdatoravārds:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Ziņojiet kļūdas uz: %s.\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s mājas lapa: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Aktivizēt atkļūdošanas režīmu." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, 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:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Psensor instance jau eksistē." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -699,40 +736,40 @@ 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:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP pieprasījums: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Aktivizē atkļūdošanas režīmu: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Sensori nav atklāti." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Tīmekļa serveris sākts uz porta: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW mape: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "Saite: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." @@ -759,15 +796,20 @@ msgstr "Psensor mājas lapa" msgid "Failed to load Psensor icon." msgstr "Neizdevās ielādēt Psensor ikonu." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Izvēlieties priekšplāna krāsu" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday neizdevās." @@ -781,7 +823,7 @@ msgstr "Temperatūras trauksme" msgid "Fan speed alert" msgstr "Ventilatora trauksme" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Nezināms" diff --git a/po/nl.po b/po/nl.po index 89049f0..6c972ee 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Dutch \n" @@ -33,65 +33,67 @@ msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." msgid "Failed to save configuration file %s." msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Voorkeuren" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Sensorvoorkeuren" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Afsluiten" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Tonen" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Sensorvoorkeuren" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Temperatuurbewaker" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Hulp" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Waarde" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Max" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Kleur" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafiek" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Tonen" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,203 @@ msgstr "Menu inschakelen" msgid "Enable Unity Launcher counter" msgstr "Teller voor Unity-starter inschakelen" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Temperatuureenheid:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Positie van sensorentabel:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Bedieningsschil" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Venster bij opstarten verbergen" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Vensterpositie en -grootte herstellen" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Voorgrond:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Achtergrond:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Ondoorzichtigheid van achtergrond:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Kleuren" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Duur van bewaking:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Tussenpoze voor bijwerken:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Metingen" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "seconde(n)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minu(u)t(en)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Tussenpoze voor bijwerken van meting:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Logboeken bijhouden inschakelen voor sensoren" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "seconden(s)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensoren" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +345,7 @@ msgstr "Soort:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N.v.t." @@ -368,12 +406,18 @@ msgstr "Alarm" msgid "Display sensor in the menu" msgstr "Sensor tonen in het menu van de Toepassingsindicator" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "" +"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." + +#: src/glade/sensor-edit.glade:651 #, fuzzy msgid "Display sensor in the label (experimental)" msgstr "Sensor tonen in het menu van de Toepassingsindicator" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 #, fuzzy msgid "Application Indicator" msgstr "Ubuntu Toepassingsindicator" @@ -404,11 +448,11 @@ msgstr "Aantal AMD/ATI-videokaarten: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Aantal actieve AMD/ATI-videokaarten: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, fuzzy, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "atasmart: sk_disk_open() mislukking: %s." @@ -428,37 +472,37 @@ msgstr "%s: kon verbinding niet openen." msgid "%s: wrong string: %s." msgstr "%s: verkeerde tekenreeks: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: kan waarde van subfunctie %s niet bepalen: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: verkeerd functietype." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: opstartfout: %s." @@ -484,41 +528,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Kan logboekbestand niet openen: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Kan verbinding met X11-server niet openen." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Kon Nvidia-informatie niet ophalen." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -543,7 +587,7 @@ msgstr "Logboekbestand van sensor niet geopend." msgid "Sensor log not open, cannot close." msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -558,12 +602,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:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Gebruik: %s [OPTIE]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -571,11 +615,11 @@ msgstr "" "Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, " "inclusief temperaturen en ventilatorsnelheden." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Opties:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -583,7 +627,7 @@ msgstr "" " -h, --help toon deze hulpinformatie en sluit af\n" " -v, --version toon versie-informatie en sluit af" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -591,50 +635,50 @@ msgstr "" " -u, --url=URL het webadres van de psensor-server,\n" " voorbeeld: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Meld fouten aan: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Schakelt foutopsporingsmodus in." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer '%s --help' voor meer informatie.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Er bestaat reeds een instantie van Psensor." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Kon geen webserver maken." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -710,40 +754,40 @@ msgstr "" " --sensor-log-interval=S stel de tussenpoze voor het sensorlogboek in op S " "(seconden)" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-verzoek: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Schakelt foutopsporingsmodus in: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Geen sensoren bespeurd." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Kon geen webserver maken." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Webserver gestart op poort: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW-map: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." @@ -767,15 +811,20 @@ msgstr "Thuispagina van Psensor" msgid "Failed to load Psensor icon." msgstr "Kon pictogram van Psensor niet laden." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Kies voorgrondkleur" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday (tijdbepaling) is mislukt." @@ -789,7 +838,7 @@ msgstr "Temperatuurwaarschuwing" msgid "Fan speed alert" msgstr "Ventilatorwaarschuwing" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Onbekend" diff --git a/po/psensor.pot b/po/psensor.pot index 1a3572a..d046522 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,65 +32,67 @@ msgstr "" msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "" -#: src/glade/psensor.glade:84 -msgid "Show" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -128,167 +130,191 @@ msgstr "" msgid "Enable Unity Launcher counter" msgstr "" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +msgid "Psensor has not been build with Unity Launcher support" msgstr "" #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +msgid "Psensor has not been build with NVCtrl support" +msgstr "" + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +msgid "Psensor has not been build with ATI ADL support" +msgstr "" + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +msgid "Psensor has not been build with gtop2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +msgid "Psensor has not been build with libatasmart support" +msgstr "" + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +msgid "Psensor has not been build with udisks2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -306,7 +332,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -366,11 +392,15 @@ msgstr "" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +msgid "Psensor has not been build with AppIndicator support" +msgstr "" + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -400,11 +430,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "" @@ -424,37 +454,37 @@ msgstr "" msgid "%s: wrong string: %s." msgstr "" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "" @@ -480,41 +510,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, c-format msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "" @@ -539,7 +569,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -549,73 +579,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:94 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:631 +#: src/main.c:587 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" @@ -676,40 +706,40 @@ msgstr "" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "" @@ -733,14 +763,19 @@ msgstr "" msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 msgid "Select sensor color" msgstr "" +#: src/ui_appindicator.c:148 +#, c-format +msgid "Failed to load glade file %s: %s" +msgstr "" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "" @@ -753,6 +788,6 @@ msgstr "" msgid "Fan speed alert" msgstr "" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index bdc142a..b5edfea 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Brazilian Portuguese\n" @@ -33,65 +33,67 @@ msgstr "Falhou ao criar servidor web." msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Preferências" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Preferências de sensores" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Sair" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Mostrar" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Preferências de sensores" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Monitor de temperatura" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "Ajuda" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Valor" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Max" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Cor" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafo" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Mostrar" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,191 @@ msgstr "Habilitar menu" msgid "Enable Unity Launcher counter" msgstr "" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +msgid "Psensor has not been build with Unity Launcher support" msgstr "" #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Unidade de temperatura:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Posição da tabela de sensores:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Interface" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Ocultar janela na inicialização" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Restaurar posição e tamanho da janela" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Primeiro plano:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Plano de fundo:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Opacidade do plano de fundo:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Cores" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Duração do monitoramento:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Intervalo de atualização:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Medidas" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "segundo(s)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minuto(s)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Intervalo de atualização das medições:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Habilitar registro (log) de sensores" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Intervalo de registro dos sensores:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "segundo(s)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensores" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +msgid "Psensor has not been build with NVCtrl support" +msgstr "" + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +msgid "Psensor has not been build with ATI ADL support" +msgstr "" + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +msgid "Psensor has not been build with gtop2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +msgid "Psensor has not been build with libatasmart support" +msgstr "" + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +msgid "Psensor has not been build with udisks2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +333,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "N/D" @@ -367,11 +393,15 @@ msgstr "Alarme" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +msgid "Psensor has not been build with AppIndicator support" +msgstr "" + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -401,11 +431,11 @@ msgstr "Número de adaptadores AMD/ATI: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Número de adaptadores AMD/ATI ativos: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: falha em sk_disk_open(): %s." @@ -425,37 +455,37 @@ msgstr "%s: falha em abrir conexão." msgid "%s: wrong string: %s." msgstr "" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: não foi possível obter valor do sub-recurso %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: falha na inicialização: %s." @@ -481,41 +511,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Não é possível abrir arquivo de log: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Não é possível abrir conexão com o servidor X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Falha ao recuperar informações de NVIDIA." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -540,7 +570,7 @@ msgstr "Arquivo de registros do sensor não foi aberto." msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -550,12 +580,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -563,11 +593,11 @@ msgstr "" "Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, " "incluindo temperatura e velocidade de ventoinhas." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Opções:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -575,7 +605,7 @@ msgstr "" " -h, --help exibir esta ajuda e sair\n" " -v, --version exibir informação de versão e sair" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -583,47 +613,47 @@ msgstr "" " -u, --url=URL a URL do psensor-server,\n" " exemplo: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:94 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Relatar falhas para: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Ativar o modo de depuração" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Utilize `%s --help' para mais informações.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Uma instancia de Psensor já existe." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Falhou ao criar servidor web." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -694,40 +724,40 @@ msgstr "" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "Requisição HTTP: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Habilita modo de depuração: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Nenhum sensor detectado" -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Falhou ao criar servidor web." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado na porta: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "Diretório WWW: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "" @@ -751,15 +781,20 @@ msgstr "Site do Psensor" msgid "Failed to load Psensor icon." msgstr "Falha ao carregar o ícone do Psensor." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Selecionar cor do primeiro plano" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Falhou ao criar servidor web." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "falha em gettimeofday." @@ -773,7 +808,7 @@ msgstr "Alerta de temperatura" msgid "Fan speed alert" msgstr "Alenta do ventilador" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Desconhecido" diff --git a/po/ru.po b/po/ru.po index dbbd180..d1e6d17 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Russian\n" @@ -34,65 +34,67 @@ msgstr "Не удалось включить журналирование дат msgid "Failed to save configuration file %s." msgstr "Не удалось включить журналирование датчиков." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "О программе" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Параметры" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Параметры датчиков" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Выход" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Показать" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Параметры датчиков" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - монитор температуры" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Справка" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Датчик" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Значение" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Мин." -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Макс." -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Цвет" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Диаграмма" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Показать" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -130,167 +132,197 @@ msgstr "Включить меню" msgid "Enable Unity Launcher counter" msgstr "Включить счётчик в панеле запуска Unity" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Единица измерения температуры:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Положение таблицы датчиков:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Внешний вид" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Скрыть окно при запуске" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Восстанавливать положение и размер окна" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Передний план:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Фон:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Непрозрачность фона:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Цвета" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Время мониторинга:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Интервал обновления:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Замеры" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Мин." -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Макс." -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "сек." -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "мин." -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Интервал обновления замеров:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Вести журнал событий датчиков" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Интервал ведения журнала событий датчиков:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "секунд(с)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Датчики" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -308,7 +340,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -369,11 +401,16 @@ msgstr "Уведомление" msgid "Display sensor in the menu" msgstr "Показать датчик в индикаторе меню приложений" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor не был собран с поддержкой удалённых датчиков." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Индикатор приложения" @@ -403,11 +440,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, fuzzy, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "atasmart: ошибка sk_disk_open(): %s." @@ -427,37 +464,37 @@ msgstr "%s: не удалось открыть соединение." msgid "%s: wrong string: %s." msgstr "%s: неправильная строка: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, fuzzy, c-format msgid "%s: initialization failure: %s." msgstr "lmsensor: ошибка инициализации: %s." @@ -483,41 +520,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Ошибка открытия файла журнала: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Ошибка открытия соединения к серверу X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Не удалось получить информацию NVIDIA." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/мин" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -542,7 +579,7 @@ msgstr "Файл журнала датчика не открыт." msgid "Sensor log not open, cannot close." msgstr "Файл журнала датчика не открыт, не удалось закрыть." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -552,12 +589,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -565,11 +602,11 @@ msgstr "" "Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая " "температуру и скорость вентилятора." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Опции:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -577,55 +614,55 @@ msgstr "" " -h, --help показать эту справку и выйти\n" " -v, --version показать версию и выйти" -#: src/main.c:104 +#: src/main.c:88 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:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance принудительно запускает новую копию программы Psensor" -#: src/main.c:110 +#: src/main.c:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Сообщайте об ошибках на: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашняя страница: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не был собран с поддержкой удалённых датчиков." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Включает режим отладки." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Копия Psensor уже запущена." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не удалось создать веб-сервер." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -701,40 +738,40 @@ msgstr "" " --sensor-log-interval=ПЕРИОД установить ПЕРИОД журналирования датчиков (в " "секундах)" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запрос: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Включает режим отладки: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Датчики не обнаружены." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Не удалось создать веб-сервер." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Веб-сервер запущен на порту: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW-каталог: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Не удалось включить журналирование датчиков." @@ -758,15 +795,20 @@ msgstr "Домашняя страница Psensor" msgid "Failed to load Psensor icon." msgstr "Не удалось загрузить значок Psensor." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Выберите цвет переднего плана" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Не удалось включить журналирование датчиков." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "ошибка gettimeofday." @@ -780,7 +822,7 @@ msgstr "Уведомление температуры" msgid "Fan speed alert" msgstr "Уведомление вентилятора" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "" diff --git a/po/sl.po b/po/sl.po index ea57a87..c81a216 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -33,65 +33,67 @@ msgstr "" msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "" -#: src/glade/psensor.glade:84 -msgid "Show" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,191 @@ msgstr "" msgid "Enable Unity Launcher counter" msgstr "" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +msgid "Psensor has not been build with Unity Launcher support" msgstr "" #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +msgid "Psensor has not been build with NVCtrl support" +msgstr "" + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +msgid "Psensor has not been build with ATI ADL support" +msgstr "" + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +msgid "Psensor has not been build with gtop2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +msgid "Psensor has not been build with libatasmart support" +msgstr "" + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +msgid "Psensor has not been build with udisks2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +333,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -367,11 +393,15 @@ msgstr "" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +msgid "Psensor has not been build with AppIndicator support" +msgstr "" + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -401,11 +431,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "" @@ -425,37 +455,37 @@ msgstr "" msgid "%s: wrong string: %s." msgstr "" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "" @@ -481,41 +511,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, c-format msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "" @@ -540,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -550,73 +580,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:94 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:631 +#: src/main.c:587 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -680,40 +710,40 @@ msgstr "" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "" @@ -737,14 +767,19 @@ msgstr "" msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 msgid "Select sensor color" msgstr "" +#: src/ui_appindicator.c:148 +#, c-format +msgid "Failed to load glade file %s: %s" +msgstr "" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "" @@ -757,6 +792,6 @@ msgstr "" msgid "Fan speed alert" msgstr "" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "" diff --git a/po/sr.po b/po/sr.po index 6402415..424f91c 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Serbian \n" @@ -33,65 +33,67 @@ msgstr "" msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "О програму" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Поставке" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Изађи" -#: src/glade/psensor.glade:84 -msgid "Show" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" msgstr "" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Сензор" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Најмање" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Највише" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "У боји" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,191 @@ msgstr "Укључено" msgid "Enable Unity Launcher counter" msgstr "" -#: src/glade/psensor-pref.glade:214 -msgid "Celsius" +#: src/glade/psensor-pref.glade:190 +msgid "Psensor has not been build with Unity Launcher support" msgstr "" #: src/glade/psensor-pref.glade:215 +msgid "Celsius" +msgstr "" + +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "У боји" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Сензор" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +msgid "Psensor has not been build with NVCtrl support" +msgstr "" + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +msgid "Psensor has not been build with ATI ADL support" +msgstr "" + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +msgid "Psensor has not been build with gtop2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +msgid "Psensor has not been build with libatasmart support" +msgstr "" + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +msgid "Psensor has not been build with udisks2 support" +msgstr "" + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +333,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Недоступно" @@ -367,11 +393,15 @@ msgstr "" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +msgid "Psensor has not been build with AppIndicator support" +msgstr "" + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -401,11 +431,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "" @@ -425,37 +455,37 @@ msgstr "" msgid "%s: wrong string: %s." msgstr "" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "" @@ -481,41 +511,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, c-format msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "" @@ -540,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -550,73 +580,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Употреба: %s [ОПЦИЈА]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Опције:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:110 +#: src/main.c:94 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Пријавите грешку на: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s матична страна: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Покушајте„%s --help“ за више информација.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:631 +#: src/main.c:587 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -680,40 +710,40 @@ msgstr "" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "" -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "" @@ -737,15 +767,20 @@ msgstr "Матична страница Псензора" msgid "Failed to load Psensor icon." msgstr "" -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Одаберите боју текста" +#: src/ui_appindicator.c:148 +#, c-format +msgid "Failed to load glade file %s: %s" +msgstr "" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "" @@ -758,7 +793,7 @@ msgstr "" msgid "Fan speed alert" msgstr "" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "" diff --git a/po/sv.po b/po/sv.po index 00f17a4..8ad1036 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 1.0.0.0\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Swedish\n" @@ -36,65 +36,67 @@ msgstr "Misslyckades med att tolka konfigurationsfilen: %s" msgid "Failed to save configuration file %s." msgstr "Misslyckades med att spara konfigurationsfilen %s." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Inställningar" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Sensorinställningar" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Avsluta" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Visa" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Sensorinställningar" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Temperaturövervakare" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Hjälp" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Sensor" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Värde" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Min" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Max" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Färg" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Graf" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Visa" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -132,167 +134,197 @@ msgstr "Aktivera meny" msgid "Enable Unity Launcher counter" msgstr "Aktivera räknare för Unity-programstartare" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celsius" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Fahrenheit" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Temperaturenhet:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Sensortabellens position:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Gränssnitt" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Starta vid sessionsuppstart" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Göm fönster vid uppstart" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Återställ fönsterposition och storlek" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Uppstart" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Förgrund:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Bakgrund:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Bakgrundsgenomskinlighet:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Färger" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Övervakningstid:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Uppdateringsintervall:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Mätningar" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Min" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Max" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "sekund(er)" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "minut(er)" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Uppdateringsintervall för mätning:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Aktivera sensorlogging" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Loggintervall för sensor:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "sekund(er)" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Skript att köra vid alarm:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Sensorer" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -310,7 +342,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Ej tillgänglig" @@ -371,11 +403,16 @@ msgstr "Alarm" msgid "Display sensor in the menu" msgstr "Visa sensor i meny" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor har inte kompilerats med fjärrsensorstöd." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "Visa sensor i etiketten (experimentell)" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Programindikator" @@ -405,11 +442,11 @@ msgstr "Antal AMD/ATI-adaptrar: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Antal aktiva AMD/ATI-adaptrar: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disk" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open()-fel: %s." @@ -429,37 +466,37 @@ msgstr "%s: misslyckades med att öppna anslutning." msgid "%s: wrong string: %s." msgstr "%s: fel sträng: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: kan inte hämta värdet för underegenskap %s: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: fel egenskapstyp." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "Intel CPU" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "AMD CPU" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "NVIDIA GPU" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "VIA CPU" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: initialiseringsfel: %s." @@ -485,41 +522,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Kan inte öppna loggfil: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Kan inte öppna anslutning till X11-server." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Misslyckades med att hämta NVIDIA-information." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -544,7 +581,7 @@ msgstr "Sensorloggfil ej öppen." msgid "Sensor log not open, cannot close." msgstr "Sensorloggfil ej öppen, kan inte stänga." -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -559,12 +596,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:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Användning: %s [FLAGGA]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -572,11 +609,11 @@ msgstr "" "Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive " "temperaturer och fläkthastigheter." -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Alternativ:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -584,7 +621,7 @@ msgstr "" " -h, --help visa denna hjälp och avsluta\n" " -v, --version visa versionsinformation och avsluta" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -592,48 +629,48 @@ msgstr "" " -u, --url=URL URL för psensor-server,\n" " exempelvis: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Rapportera fel till: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s webbplats <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor har inte kompilerats med fjärrsensorstöd." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Aktivera felsökningsläge." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova`%s --help' för mer information.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Det finns redan en Psensor-instans." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Misslyckades med att skapa katalogen %s: %s" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -705,40 +742,40 @@ 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:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-begäran: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Aktiverar felsökningsläge: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Inga sensorer hittades." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Misslyckades med att skapa webbserver." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Webbserver startade på port: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW-katalog: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Misslyckades med att aktivera sensorloggning." @@ -765,15 +802,20 @@ msgstr "Psensor-webbplats" msgid "Failed to load Psensor icon." msgstr "Misslyckades med att läsa in Psensor-ikon." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Välj förgrundsfärg" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Misslyckades med att tolka konfigurationsfilen: %s" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday misslyckades." @@ -787,7 +829,7 @@ msgstr "Temperaturlarm" msgid "Fan speed alert" msgstr "Fläktlarm" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Okänd" diff --git a/po/tr.po b/po/tr.po index 0782e41..3050a99 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-20 11:27+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Turkish \n" @@ -33,65 +33,67 @@ msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." msgid "Failed to save configuration file %s." msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.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:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Tercihler" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Algılayıcı Tercihleri" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Çıkış" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Göster" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Algılayıcı Tercihleri" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - Sıcaklık Gözlemleyici" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "_Psensor" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Yardım" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Algılayıcı" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Değer" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Asgari" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Azami" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Renk" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Grafik" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Göster" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Menüyü etkinleştir" msgid "Enable Unity Launcher counter" msgstr "Unity Başlatıcı sayacını etkinleştir" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "Celsius" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "Fahrenhayt" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Sıcaklık birimi:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Gözlemleyici tablosunun konumu:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Arayüz" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "Oturum başlangıcında başlat" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Başlangıçta pencereyi gizle" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Pencere konumunu ve boyutunu yeniden yükle" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "Başlangıç" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Önplan:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Arkaplan:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Arkaplan saydamlığı:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Renk" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Gözlemleme süresi:" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Güncelleme aralığı:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Ölçümler" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Asgari" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Azami" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "saniye" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "dakika" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Ölçüm güncelleştirme aralığı:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "Algılayıcı günlük kaydını etkinleştir" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "Algılayıcı günlük kaydı aralığı:" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "saniye" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "Alarm çaldığında betik çalıştırılır:" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Algılayıcılar" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Tür:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Bilinmeyen" @@ -368,12 +400,17 @@ msgstr "Alarm" msgid "Display sensor in the menu" msgstr "Algılayıcıları menüde göster" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." + +#: src/glade/sensor-edit.glade:651 #, fuzzy msgid "Display sensor in the label (experimental)" msgstr "Etikette algılayıcı göster (deneysel)" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "Uygulama Göstergesi" @@ -403,11 +440,11 @@ msgstr "AMD/ATI bağdaştırıcı sayısı: %d" msgid "Number of active AMD/ATI adapters: %d" msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "Disk" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s: sk_disk_open() hatası: %s." @@ -427,37 +464,37 @@ msgstr "%s: bağlantı açılamadı." msgid "%s: wrong string: %s." msgstr "%s: yanlış dizi: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s: %s alt özelliğinin değeri alınamıyor: %s." -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "%s: yanlış özellik tipi." -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "İntel işlemci" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "AMD işlemci" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "NVIDIA Ekran Kartı" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "VIA İşlemci" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s: başlatma hatası: %s." @@ -483,41 +520,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Günlükleme dosyası açılamadı: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: X11 sunucusu bağlantısı açılamıyor." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: NVIDIA bilgisi alınamıyor." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -542,7 +579,7 @@ msgstr "Algılayıcı günlük kaydı dosyası açık değil." 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:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -557,12 +594,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:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -570,11 +607,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:97 +#: src/main.c:81 msgid "Options:" msgstr "Seçenekler:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -582,7 +619,7 @@ msgstr "" " -h, --help yardımı göster ve çık\n" " -v, --version sürüm bilgisini göster ve çık" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -590,49 +627,49 @@ msgstr "" " -u, --url=URL psensor sunucusunun bağlantısı,\n" " example: http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 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:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Hata ayıklama modunu etkinleştirir." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "Bir Psensor örneği zaten mevcut." -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Web sunucusu oluşturulamadı." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -710,40 +747,40 @@ msgstr "" " --sensor-log-interval=S algılayıcı günlük kaydı aralığını S (saniye) " "olarak ayarla" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP İsteği: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "Hata ayıklama modunu etkinleştirir: %d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Hiçbir algılayıcı bulunamadı." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Web sunucusu oluşturulamadı." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "Web sunucusu şu noktadan başlatıldı: %d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW dizini: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." @@ -768,15 +805,20 @@ msgstr "Psensor Anasayfası" msgid "Failed to load Psensor icon." msgstr "Psensor simgesi yüklenemedi." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Önplan rengini seçin" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "gettimeofday başarısız." @@ -790,7 +832,7 @@ msgstr "Sıcaklık uyarısı" msgid "Fan speed alert" msgstr "Fan uyarısı" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "Bilinmeyen" diff --git a/po/uk.po b/po/uk.po index fe88100..c8569b9 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Ukrainian \n" @@ -33,65 +33,67 @@ msgstr "Не вдалося створити веб-сервер." msgid "Failed to save configuration file %s." msgstr "" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "Про програму" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "Налаштування" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "Налаштування датчиків" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "Вихід" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "Показати" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "Налаштування датчиків" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "_Довдіка" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "Датчик" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "Значення" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "Мін." -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "Макс." -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "Колір" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "Діаграма" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "Показати" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "Увімкнути меню" msgid "Enable Unity Launcher counter" msgstr "Увімкнути лічильник на панелі запуску Unity" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "Одиниця температури:" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "Положення таблиці датчиків:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "Зовнішній вигляд" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "Сховати вікно після запуску" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "Відновляти позицію і розмір вікна" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "Передній план:" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "Тло:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "Непрозорість тла:" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "Кольори" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "Тривалість спостереження" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "Інтервал оновлення:" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "Заміри" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "Мін." -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "Макс." -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "сек." -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "хв." -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "Інтервал оновлення замірів:" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "Датчики" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -367,11 +399,16 @@ msgstr "Оповіщення" msgid "Display sensor in the menu" msgstr "" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -401,11 +438,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, fuzzy, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "atasmart: помилка sk_disk_open(): %s." @@ -425,37 +462,37 @@ msgstr "%s: не вдалося встановити з'єднання." msgid "%s: wrong string: %s." msgstr "%s: неправильний рядок: %s." -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, fuzzy, c-format msgid "%s: initialization failure: %s." msgstr "lmsensor: помилка ініціалізації: %s." @@ -481,41 +518,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "Не вдалося відкрити лог-файл: %s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: Не вдалося встановити з'єднання до сервера X11." -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: Не вдалося отримати інформацію NVIDIA." -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/хв" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -540,7 +577,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -550,22 +587,22 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "Опції:" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -573,54 +610,54 @@ msgstr "" " -h, --help показати цю довідку і вийти\n" " -v, --version показати версію і вийти" -#: src/main.c:104 +#: src/main.c:88 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:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance примусово створювати нову копію програми Psensor" -#: src/main.c:110 +#: src/main.c:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Звітуйте про помилки до: %s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашня сторінка: <%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "Включає режим налагодження." -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не вдалося створити веб-сервер." -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -693,40 +730,40 @@ msgstr "" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запит: %s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "Датчики не знайдені." -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "Не вдалося створити веб-сервер." -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW-директорія: %s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "" @@ -750,15 +787,20 @@ msgstr "Домашня сторінка Psensor" msgid "Failed to load Psensor icon." msgstr "Не вдалося завантажити іконку Psensor." -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "Оберіть колір переднього плану" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "Не вдалося створити веб-сервер." + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "помилка gettimeofday." @@ -771,7 +813,7 @@ msgstr "" msgid "Fan speed alert" msgstr "" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0ce1b3d..4c3a6e9 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-09-21 18:26+0200\n" +"POT-Creation-Date: 2014-09-26 18:04+0200\n" "PO-Revision-Date: 2014-09-11 21:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Chinese (simplified)\n" @@ -33,65 +33,67 @@ msgstr "无法激活监测器日志。" msgid "Failed to save configuration file %s." msgstr "无法激活监测器日志。" -#: src/glade/psensor.glade:6 +#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6 msgid "About" msgstr "关于" -#: src/glade/psensor.glade:10 src/glade/psensor.glade:11 -#: src/glade/psensor.glade:20 src/ui_sensorlist.c:264 +#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10 +#: src/glade/psensor-appindicator.glade:11 +#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:265 msgid "Preferences" msgstr "首选项" -#: src/glade/psensor.glade:15 src/glade/psensor.glade:16 -#: src/glade/psensor.glade:28 -msgid "Sensor Preferences" -msgstr "传感器首选项" - -#: src/glade/psensor.glade:24 +#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24 msgid "Quit" msgstr "退出" -#: src/glade/psensor.glade:84 -msgid "Show" -msgstr "显示" +#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15 +#: src/glade/psensor-appindicator.glade:16 +#: src/glade/psensor-appindicator.glade:28 +msgid "Sensor Preferences" +msgstr "传感器首选项" -#: src/glade/psensor.glade:186 +#: src/glade/psensor.glade:99 src/glade/psensor-appindicator.glade:186 msgid "Psensor - Temperature Monitor" msgstr "Psensor - 温度监视器" -#: src/glade/psensor.glade:201 +#: src/glade/psensor.glade:114 src/glade/psensor-appindicator.glade:201 msgid "_Psensor" msgstr "" -#: src/glade/psensor.glade:248 +#: src/glade/psensor.glade:161 src/glade/psensor-appindicator.glade:248 msgid "_Help" msgstr "帮助(_H)" -#: src/glade/psensor.glade:312 +#: src/glade/psensor.glade:225 src/glade/psensor-appindicator.glade:312 msgid "Sensor" msgstr "监视设备" -#: src/glade/psensor.glade:323 +#: src/glade/psensor.glade:236 src/glade/psensor-appindicator.glade:323 msgid "Value" msgstr "值" -#: src/glade/psensor.glade:334 +#: src/glade/psensor.glade:247 src/glade/psensor-appindicator.glade:334 msgid "Min" msgstr "最小值" -#: src/glade/psensor.glade:345 +#: src/glade/psensor.glade:258 src/glade/psensor-appindicator.glade:345 msgid "Max" msgstr "最大值" -#: src/glade/psensor.glade:356 +#: src/glade/psensor.glade:269 src/glade/psensor-appindicator.glade:356 msgid "Color" msgstr "颜色" -#: src/glade/psensor.glade:367 src/glade/psensor-pref.glade:787 -#: src/glade/sensor-edit.glade:412 +#: src/glade/psensor.glade:280 src/glade/psensor-appindicator.glade:367 +#: src/glade/psensor-pref.glade:788 src/glade/sensor-edit.glade:412 msgid "Graph" msgstr "图表" +#: src/glade/psensor-appindicator.glade:84 +msgid "Show" +msgstr "显示" + #: src/glade/psensor-pref.glade:24 msgctxt "psensor" msgid "Right" @@ -129,167 +131,197 @@ msgstr "启用菜单" msgid "Enable Unity Launcher counter" msgstr "启用 Unity 启动器计数器" -#: src/glade/psensor-pref.glade:214 +#: src/glade/psensor-pref.glade:190 +#, fuzzy +msgid "Psensor has not been build with Unity Launcher support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:215 msgid "Celsius" msgstr "" -#: src/glade/psensor-pref.glade:215 +#: src/glade/psensor-pref.glade:216 msgid "Fahrenheit" msgstr "" -#: src/glade/psensor-pref.glade:259 +#: src/glade/psensor-pref.glade:260 msgid "Temperature unit:" msgstr "温度单位：" -#: src/glade/psensor-pref.glade:277 +#: src/glade/psensor-pref.glade:278 msgid "Position of sensors table:" msgstr "监视设备列表位置:" -#: src/glade/psensor-pref.glade:296 +#: src/glade/psensor-pref.glade:297 msgid "Interface" msgstr "界面" -#: src/glade/psensor-pref.glade:312 +#: src/glade/psensor-pref.glade:313 msgid "Launch on session startup" msgstr "" -#: src/glade/psensor-pref.glade:333 +#: src/glade/psensor-pref.glade:334 msgid "Hide window on startup" msgstr "启动时隐藏窗口" -#: src/glade/psensor-pref.glade:353 +#: src/glade/psensor-pref.glade:354 msgid "Restore window position and size" msgstr "恢复窗口位置和大小" -#: src/glade/psensor-pref.glade:384 +#: src/glade/psensor-pref.glade:385 msgid "Startup" msgstr "" -#: src/glade/psensor-pref.glade:428 +#: src/glade/psensor-pref.glade:429 msgid "Foreground:" msgstr "前景：" -#: src/glade/psensor-pref.glade:446 +#: src/glade/psensor-pref.glade:447 msgid "Background:" msgstr "背景:" -#: src/glade/psensor-pref.glade:482 +#: src/glade/psensor-pref.glade:483 msgid "Background opacity:" msgstr "背景透明：" -#: src/glade/psensor-pref.glade:500 +#: src/glade/psensor-pref.glade:501 msgid "Colors" msgstr "颜色" -#: src/glade/psensor-pref.glade:521 +#: src/glade/psensor-pref.glade:522 msgid "Monitoring duration:" msgstr "监视持续时长：" -#: src/glade/psensor-pref.glade:539 +#: src/glade/psensor-pref.glade:540 msgid "Update interval:" msgstr "更新间隔：" -#: src/glade/psensor-pref.glade:557 +#: src/glade/psensor-pref.glade:558 msgid "Measures" msgstr "测量" -#: src/glade/psensor-pref.glade:584 +#: src/glade/psensor-pref.glade:585 msgid "Min" msgstr "最小值" -#: src/glade/psensor-pref.glade:611 +#: src/glade/psensor-pref.glade:612 msgid "Max" msgstr "最大值" -#: src/glade/psensor-pref.glade:664 src/glade/psensor-pref.glade:851 +#: src/glade/psensor-pref.glade:665 src/glade/psensor-pref.glade:852 msgid "second(s)" msgstr "秒" -#: src/glade/psensor-pref.glade:716 +#: src/glade/psensor-pref.glade:717 msgid "minute(s)" msgstr "分钟" -#: src/glade/psensor-pref.glade:734 +#: src/glade/psensor-pref.glade:735 msgid "Smooth curves" msgstr "" -#: src/glade/psensor-pref.glade:761 +#: src/glade/psensor-pref.glade:762 msgid "Curves" msgstr "" -#: src/glade/psensor-pref.glade:814 +#: src/glade/psensor-pref.glade:815 msgid "Measure update interval:" msgstr "测量更新间隔：" -#: src/glade/psensor-pref.glade:862 +#: src/glade/psensor-pref.glade:863 msgid "Enable sensors logging" msgstr "启用监测器记录" -#: src/glade/psensor-pref.glade:909 +#: src/glade/psensor-pref.glade:910 msgid "Sensors logging interval:" msgstr "" -#: src/glade/psensor-pref.glade:926 +#: src/glade/psensor-pref.glade:927 msgid "seconds(s)" msgstr "秒" -#: src/glade/psensor-pref.glade:943 +#: src/glade/psensor-pref.glade:944 msgid "Script executed when an alarm is raised:" msgstr "" -#: src/glade/psensor-pref.glade:984 +#: src/glade/psensor-pref.glade:985 msgid "Sensors" msgstr "传感器" -#: src/glade/psensor-pref.glade:1002 +#: src/glade/psensor-pref.glade:1003 msgid "Enable support of lm-sensors" msgstr "" -#: src/glade/psensor-pref.glade:1022 +#: src/glade/psensor-pref.glade:1023 msgid "Enable support of NVCtrl (NVidia)" msgstr "" -#: src/glade/psensor-pref.glade:1042 +#: src/glade/psensor-pref.glade:1027 +#, fuzzy +msgid "Psensor has not been build with NVCtrl support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:1044 msgid "Enable support of ATI ADL" msgstr "" -#: src/glade/psensor-pref.glade:1062 +#: src/glade/psensor-pref.glade:1048 +#, fuzzy +msgid "Psensor has not been build with ATI ADL support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:1065 msgid "Enable support of gtop2" msgstr "" -#: src/glade/psensor-pref.glade:1082 +#: src/glade/psensor-pref.glade:1069 +#, fuzzy +msgid "Psensor has not been build with gtop2 support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:1086 msgid "Enable support of hddtemp daemon" msgstr "" -#: src/glade/psensor-pref.glade:1102 +#: src/glade/psensor-pref.glade:1106 msgid "Enable support of libatasmart" msgstr "" -#: src/glade/psensor-pref.glade:1122 +#: src/glade/psensor-pref.glade:1110 +#, fuzzy +msgid "Psensor has not been build with libatasmart support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:1127 msgid "Enable support of udisks2" msgstr "" -#: src/glade/psensor-pref.glade:1149 +#: src/glade/psensor-pref.glade:1131 +#, fuzzy +msgid "Psensor has not been build with udisks2 support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/psensor-pref.glade:1155 msgid "The changes are applied after the restart of psensor." msgstr "" -#: src/glade/psensor-pref.glade:1171 +#: src/glade/psensor-pref.glade:1177 msgid "Hard disk drive" msgstr "" -#: src/glade/psensor-pref.glade:1194 +#: src/glade/psensor-pref.glade:1200 msgid "CPU and memory usage" msgstr "" -#: src/glade/psensor-pref.glade:1217 +#: src/glade/psensor-pref.glade:1223 msgid "GPU with proprietary driver" msgstr "" -#: src/glade/psensor-pref.glade:1240 +#: src/glade/psensor-pref.glade:1246 msgid "Motherboard, CPU and GPU" msgstr "" -#: src/glade/psensor-pref.glade:1263 +#: src/glade/psensor-pref.glade:1269 msgid "Providers" msgstr "" @@ -307,7 +339,7 @@ msgstr "类型:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:431 src/ui_notify.c:81 msgid "N/A" msgstr "不可用" @@ -368,11 +400,16 @@ msgstr "警告" msgid "Display sensor in the menu" msgstr "在应用指示器菜单中显示监视器" -#: src/glade/sensor-edit.glade:650 +#: src/glade/sensor-edit.glade:633 src/glade/sensor-edit.glade:655 +#, fuzzy +msgid "Psensor has not been build with AppIndicator support" +msgstr "Psensor 不支持远程传感器。" + +#: src/glade/sensor-edit.glade:651 msgid "Display sensor in the label (experimental)" msgstr "" -#: src/glade/sensor-edit.glade:682 +#: src/glade/sensor-edit.glade:684 msgid "Application Indicator" msgstr "" @@ -402,11 +439,11 @@ msgstr "" msgid "Number of active AMD/ATI adapters: %d" msgstr "" -#: src/lib/hdd_atasmart.c:59 src/lib/hdd_hddtemp.c:125 +#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125 msgid "Disk" msgstr "" -#: src/lib/hdd_atasmart.c:141 +#: src/lib/hdd_atasmart.c:153 #, c-format msgid "%s: sk_disk_open() failure: %s." msgstr "%s：sk_disk_open() 失败：%s。" @@ -426,37 +463,37 @@ msgstr "硬盘温度：无法打开连接。" msgid "%s: wrong string: %s." msgstr "硬盘温度：错误字符：%s。" -#: src/lib/lmsensor.c:44 +#: src/lib/lmsensor.c:73 #, c-format msgid "%s: Cannot get value of subfeature %s: %s." msgstr "%s：无法获取子功能%s的值：%s。" -#: src/lib/lmsensor.c:137 +#: src/lib/lmsensor.c:169 #, c-format msgid "%s: Wrong feature type." msgstr "" -#: src/lib/lmsensor.c:166 +#: src/lib/lmsensor.c:198 msgid "Intel CPU" msgstr "" -#: src/lib/lmsensor.c:170 +#: src/lib/lmsensor.c:202 msgid "AMD CPU" msgstr "" -#: src/lib/lmsensor.c:172 +#: src/lib/lmsensor.c:204 msgid "NVIDIA GPU" msgstr "" -#: src/lib/lmsensor.c:174 +#: src/lib/lmsensor.c:206 msgid "VIA CPU" msgstr "" -#: src/lib/lmsensor.c:176 +#: src/lib/lmsensor.c:208 msgid "ACPI" msgstr "" -#: src/lib/lmsensor.c:201 +#: src/lib/lmsensor.c:232 #, c-format msgid "%s: initialization failure: %s." msgstr "%s：初始化失败：%s。" @@ -482,41 +519,41 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "无法打开日志文件：%s" -#: src/lib/nvidia.c:58 +#: src/lib/nvidia.c:69 #, fuzzy, c-format msgid "%s: Unknown NVIDIA product name for GPU %d" msgstr "无法获取 NVIDIA 信息。" -#: src/lib/nvidia.c:63 +#: src/lib/nvidia.c:74 #, fuzzy, c-format msgid "%s: Failed to retrieve NVIDIA product name for GPU %d" msgstr "无法获取 NVIDIA 信息。" -#: src/lib/nvidia.c:226 +#: src/lib/nvidia.c:240 #, fuzzy, c-format msgid "%s: Failed to retrieve measure of type %x for NVIDIA GPU %d" msgstr "无法获取 NVIDIA 信息。" -#: src/lib/nvidia.c:293 +#: src/lib/nvidia.c:308 #, c-format msgid "%s: Cannot open connection to X11 server." msgstr "%s: 无法打开到 X11 服务器的连接。" -#: src/lib/nvidia.c:301 +#: src/lib/nvidia.c:316 #, c-format msgid "%s: Failed to retrieve NVIDIA information." msgstr "%s: 无法获取 NVIDIA 信息。" -#: src/lib/nvidia.c:370 +#: src/lib/nvidia.c:385 #, fuzzy, c-format msgid "%s: Failed to retrieve number of fans." msgstr "无法获取 NVIDIA 信息。" -#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:427 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "转速" -#: src/lib/psensor.c:455 +#: src/lib/psensor.c:429 msgid "%" msgstr "%" @@ -541,7 +578,7 @@ msgstr "监测器日志文件未打开。" msgid "Sensor log not open, cannot close." msgstr "监测器日志未打开，故无法关闭。" -#: src/main.c:80 src/server/server.c:87 +#: src/main.c:64 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -556,22 +593,22 @@ msgstr "" "本软件为自由软件：您可以自由修改并分发。\n" "There is NO WARRANTY, to the extent permitted by law。\n" -#: src/main.c:91 src/server/server.c:97 +#: src/main.c:75 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" -#: src/main.c:93 +#: src/main.c:77 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。" -#: src/main.c:97 +#: src/main.c:81 msgid "Options:" msgstr "选项：" -#: src/main.c:98 +#: src/main.c:82 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -579,7 +616,7 @@ msgstr "" " -h, --help 显示这个帮助并退出\n" " -v, --version 显示版本信息并退出" -#: src/main.c:104 +#: src/main.c:88 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -587,47 +624,47 @@ msgstr "" " -u, --url=URL psensor 服务器 URL\n" " 例如：http://hostname:3131" -#: src/main.c:107 +#: src/main.c:91 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程" -#: src/main.c:110 +#: src/main.c:94 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:120 +#: src/main.c:99 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "报告问题至：%s\n" -#: src/main.c:117 src/server/server.c:122 +#: src/main.c:101 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页：<%s>\n" -#: src/main.c:473 +#: src/main.c:440 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor 不支持远程传感器。" -#: src/main.c:551 +#: src/main.c:518 msgid "Enables debug mode." msgstr "启用调试模式。" -#: src/main.c:563 src/server/server.c:384 +#: src/main.c:530 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用‘%s --help’来获得更多信息。\n" -#: src/main.c:576 +#: src/main.c:543 msgid "A Psensor instance already exists." msgstr "已存在一个 Psensor 例程。" -#: src/main.c:631 +#: src/main.c:587 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "无法创建网络服务器。" -#: src/main.c:654 src/ui.c:97 +#: src/main.c:610 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" @@ -697,40 +734,40 @@ msgstr " --sensor-log-file=路径 设置监测器日志文件的路径" msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)" msgstr "" -#: src/server/server.c:301 +#: src/server/server.c:303 #, c-format msgid "HTTP Request: %s" msgstr "HTTP 请求：%s" -#: src/server/server.c:364 +#: src/server/server.c:366 #, c-format msgid "Enables debug mode: %d" msgstr "启用调试模式：%d" -#: src/server/server.c:408 +#: src/server/server.c:410 msgid "No sensors detected." msgstr "未检测到传感器。" -#: src/server/server.c:415 +#: src/server/server.c:417 msgid "Failed to create Web server." msgstr "无法创建网络服务器。" -#: src/server/server.c:419 +#: src/server/server.c:421 #, c-format msgid "Web server started on port: %d" msgstr "网络服务器启动端口：%d" -#: src/server/server.c:420 +#: src/server/server.c:422 #, c-format msgid "WWW directory: %s" msgstr "WWW 目录：%s" -#: src/server/server.c:421 +#: src/server/server.c:423 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" -#: src/server/server.c:431 +#: src/server/server.c:433 msgid "Failed to activate logging of sensors." msgstr "无法激活监测器日志。" @@ -757,15 +794,20 @@ msgstr "Psensor 主页" msgid "Failed to load Psensor icon." msgstr "无法加载 Psensor 图标。" -#: src/ui_sensorlist.c:254 +#: src/ui_sensorlist.c:255 msgid "Hide" msgstr "" -#: src/ui_sensorlist.c:296 +#: src/ui_sensorlist.c:297 #, fuzzy msgid "Select sensor color" msgstr "选择前景色" +#: src/ui_appindicator.c:148 +#, fuzzy, c-format +msgid "Failed to load glade file %s: %s" +msgstr "无法激活监测器日志。" + #: src/ui_notify.c:48 msgid "gettimeofday failed." msgstr "获取时间失败。" @@ -779,7 +821,7 @@ msgstr "温度报警" msgid "Fan speed alert" msgstr "风扇警报" -#: src/ui_sensorpref.c:248 +#: src/ui_sensorpref.c:245 msgid "Unknown" msgstr "未知" diff --git a/scripts/check.sh b/scripts/check.sh new file mode 100755 index 0000000..c354a66 --- /dev/null +++ b/scripts/check.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +SCRIPT_DIR=`dirname $0` +cd $SCRIPT_DIR/.. + +./configure --prefix=/tmp CC=cgcc CPPFLAGS="-Wsparse-all -DCURL_DISABLE_TYPECHECK -Wno-old-initializer" || exit 1 +make clean || exit 1 +make all check install distcheck 3>&1 1>&2 2>&3 | grep -v "^/usr/include" | tee /tmp/err + +cat /tmp/err + +echo Number of warnings: `cat /tmp/err|wc -l` + +export G_DEBUG=fatal_warnings + +$SCRIPT_DIR/../src/psensor diff --git a/src/Makefile.am b/src/Makefile.am index 7611095..2e4bb19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,22 @@ SUBDIRS = lib glade +psensor_SOURCES = \ + cfg.h cfg.c \ + notify_cmd.c notify_cmd.h \ + graph.h graph.c \ + main.c \ + pxdg.h pxdg.c \ + ui.h ui.c \ + ui_appindicator.h \ + ui_color.h ui_color.c \ + ui_graph.h ui_graph.c \ + ui_notify.h \ + ui_pref.h ui_pref.c \ + ui_sensorlist.h ui_sensorlist.c \ + ui_sensorpref.h ui_sensorpref.c \ + ui_status.h ui_status.c \ + ui_unity.h + # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic @@ -35,28 +52,13 @@ endif endif endif -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 \ - ui_sensorlist.h ui_sensorlist.c \ - ui_sensorpref.h ui_sensorpref.c \ - ui_status.h ui_status.c \ - pxdg.h pxdg.c - if GTOP AM_CPPFLAGS += $(GTOP_CFLAGS) LIBS += $(GTOP_LIBS) endif if LIBNOTIFY -psensor_SOURCES += ui_notify.h ui_notify.c +psensor_SOURCES += ui_notify.c LIBS += $(LIBNOTIFY_LIBS) AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS) endif @@ -89,7 +91,7 @@ LIBS += $(LIBUDISKS2_LIBS) endif if UNITY -psensor_SOURCES += ui_unity.h ui_unity.c +psensor_SOURCES += ui_unity.c AM_CPPFLAGS += $(UNITY_CFLAGS) LIBS += $(UNITY_LIBS) endif @@ -107,6 +109,12 @@ psensor.1: main.c $(top_srcdir)/configure.ac help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT) gsettings_SCHEMAS=psensor.gschema.xml -EXTRA_DIST = description.txt $(gsettings_SCHEMAS) + +EXTRA_DIST = description.txt\ + $(gsettings_SCHEMAS)\ + rsensor.h rsensor.c\ + ui_appindicator.c\ + ui_notify.c\ + ui_unity.c @GSETTINGS_RULES@ diff --git a/src/Makefile.in b/src/Makefile.in index 40b3dcd..be03f99 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -82,7 +82,7 @@ host_triplet = @host@ @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 +@LIBNOTIFY_TRUE@am__append_4 = ui_notify.c @LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS) @LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS) @APPINDICATOR_TRUE@am__append_7 = ui_appindicator.c @@ -95,7 +95,7 @@ host_triplet = @host@ @ATASMART_TRUE@am__append_14 = $(ATASMART_CFLAGS) @ATASMART_TRUE@am__append_15 = $(ATASMART_LIBS) @LIBUDISKS2_TRUE@am__append_16 = $(LIBUDISKS2_LIBS) -@UNITY_TRUE@am__append_17 = ui_unity.h ui_unity.c +@UNITY_TRUE@am__append_17 = ui_unity.c @UNITY_TRUE@am__append_18 = $(UNITY_CFLAGS) @UNITY_TRUE@am__append_19 = $(UNITY_LIBS) @CURL_TRUE@@JSON_TRUE@am__append_20 = rsensor.h rsensor.c @@ -119,22 +119,22 @@ CONFIG_CLEAN_VPATH_FILES = 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 \ - ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \ - ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \ - ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \ - ui_notify.h ui_notify.c ui_appindicator.c ui_unity.h \ + graph.h graph.c main.c pxdg.h pxdg.c ui.h ui.c \ + ui_appindicator.h ui_color.h ui_color.c ui_graph.h ui_graph.c \ + ui_notify.h ui_pref.h ui_pref.c ui_sensorlist.h \ + ui_sensorlist.c ui_sensorpref.h ui_sensorpref.c ui_status.h \ + ui_status.c ui_unity.h ui_notify.c ui_appindicator.c \ ui_unity.c rsensor.h rsensor.c @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT) @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT) @UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT) @CURL_TRUE@@JSON_TRUE@am__objects_4 = rsensor.$(OBJEXT) am_psensor_OBJECTS = cfg.$(OBJEXT) notify_cmd.$(OBJEXT) \ - graph.$(OBJEXT) main.$(OBJEXT) ui.$(OBJEXT) ui_color.$(OBJEXT) \ - ui_graph.$(OBJEXT) ui_pref.$(OBJEXT) ui_sensorlist.$(OBJEXT) \ - ui_sensorpref.$(OBJEXT) ui_status.$(OBJEXT) pxdg.$(OBJEXT) \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) + graph.$(OBJEXT) main.$(OBJEXT) pxdg.$(OBJEXT) ui.$(OBJEXT) \ + ui_color.$(OBJEXT) ui_graph.$(OBJEXT) ui_pref.$(OBJEXT) \ + ui_sensorlist.$(OBJEXT) ui_sensorpref.$(OBJEXT) \ + ui_status.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ + $(am__objects_3) $(am__objects_4) psensor_OBJECTS = $(am_psensor_OBJECTS) psensor_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) @@ -421,6 +421,13 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = lib glade $(am__append_1) +psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \ + graph.c main.c pxdg.h pxdg.c ui.h ui.c ui_appindicator.h \ + ui_color.h ui_color.c ui_graph.h ui_graph.c ui_notify.h \ + ui_pref.h ui_pref.c ui_sensorlist.h ui_sensorlist.c \ + ui_sensorpref.h ui_sensorpref.c ui_status.h ui_status.c \ + ui_unity.h $(am__append_4) $(am__append_7) $(am__append_17) \ + $(am__append_20) # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic @@ -433,15 +440,14 @@ AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ $(am__append_12) $(am__append_14) $(am__append_18) \ $(am__append_22) @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 \ - ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \ - ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \ - $(am__append_4) $(am__append_7) $(am__append_17) \ - $(am__append_20) gsettings_SCHEMAS = psensor.gschema.xml -EXTRA_DIST = description.txt $(gsettings_SCHEMAS) +EXTRA_DIST = description.txt\ + $(gsettings_SCHEMAS)\ + rsensor.h rsensor.c\ + ui_appindicator.c\ + ui_notify.c\ + ui_unity.c + all: all-recursive .SUFFIXES: diff --git a/src/cfg.c b/src/cfg.c index 0f22ccb..3f140d9 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -170,7 +170,7 @@ static int get_int(const char *k) return g_settings_get_int(settings, k); } -char *config_get_notif_script() +char *config_get_notif_script(void) { char *str; @@ -191,7 +191,7 @@ void config_set_notif_script(const char *str) set_string(KEY_NOTIFICATION_SCRIPT, ""); } -static struct color *get_background_color() +static struct color *get_background_color(void) { char *scolor; struct color *c; @@ -207,7 +207,7 @@ static struct color *get_background_color() return c; } -static struct color *get_foreground_color() +static struct color *get_foreground_color(void) { char *scolor; struct color *c; @@ -223,7 +223,7 @@ static struct color *get_foreground_color() return c; } -static bool is_alpha_channel_enabled() +static bool is_alpha_channel_enabled(void) { return get_bool(KEY_ALPHA_CHANNEL_ENABLED); } @@ -233,7 +233,7 @@ static void set_alpha_channeld_enabled(bool b) set_bool(KEY_ALPHA_CHANNEL_ENABLED, b); } -static enum sensorlist_position get_sensorlist_position() +static enum sensorlist_position get_sensorlist_position(void) { return get_int(KEY_INTERFACE_SENSORLIST_POSITION); } @@ -243,7 +243,7 @@ static void set_sensorlist_position(enum sensorlist_position pos) set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos); } -static double get_graph_background_alpha() +static double get_graph_background_alpha(void) { return get_double(KEY_GRAPH_BACKGROUND_ALPHA); } @@ -279,7 +279,7 @@ static void set_foreground_color(const struct color *color) free(str); } -bool is_slog_enabled() +bool is_slog_enabled(void) { return get_bool(KEY_SLOG_ENABLED); } @@ -311,7 +311,7 @@ void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data) log_fct_exit(); } -int config_get_slog_interval() +int config_get_slog_interval(void) { return get_int(KEY_SLOG_INTERVAL); } @@ -324,12 +324,12 @@ static void set_slog_interval(int interval) set_int(KEY_SLOG_INTERVAL, interval); } -static bool is_window_decoration_enabled() +static bool is_window_decoration_enabled(void) { return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED); } -static bool is_window_keep_below_enabled() +static bool is_window_keep_below_enabled(void) { return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED); } @@ -344,7 +344,7 @@ static void set_window_keep_below_enabled(bool enabled) set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled); } -bool config_is_smooth_curves_enabled() +bool config_is_smooth_curves_enabled(void) { return get_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED); } @@ -355,7 +355,7 @@ void config_set_smooth_curves_enabled(bool b) } -static void init() +static void init(void) { log_fct_enter(); @@ -365,7 +365,7 @@ static void init() log_fct_exit(); } -void config_cleanup() +void config_cleanup(void) { config_sync(); @@ -393,7 +393,7 @@ void config_cleanup() slog_enabled_cbk = NULL; } -struct config *config_load() +struct config *config_load(void) { struct config *c; @@ -492,7 +492,7 @@ void config_save(const struct config *c) set_int(KEY_INTERFACE_TEMPERATURE_UNIT, c->temperature_unit); } -const char *get_psensor_user_dir() +const char *get_psensor_user_dir(void) { const char *home; @@ -521,7 +521,7 @@ const char *get_psensor_user_dir() return user_dir; } -static const char *get_sensor_config_path() +static const char *get_sensor_config_path(void) { const char *dir; @@ -535,7 +535,7 @@ static const char *get_sensor_config_path() return sensor_config_path; } -static GKeyFile *get_sensor_key_file() +static GKeyFile *get_sensor_key_file(void) { int ret; GError *err; @@ -562,7 +562,7 @@ static GKeyFile *get_sensor_key_file() return key_file; } -static void save_sensor_key_file() +static void save_sensor_key_file(void) { GKeyFile *kfile; const char *path; @@ -584,7 +584,7 @@ static void save_sensor_key_file() log_fct_exit(); } -void config_sync() +void config_sync(void) { log_fct_enter(); if (settings) @@ -724,9 +724,9 @@ bool config_is_appindicator_enabled(const char *sid) void config_set_appindicator_enabled(const char *sid, bool enabled) { - return sensor_set_bool(sid, - ATT_SENSOR_APPINDICATOR_MENU_DISABLED, - !enabled); + sensor_set_bool(sid, + ATT_SENSOR_APPINDICATOR_MENU_DISABLED, + !enabled); } int config_get_sensor_position(const char *sid) @@ -736,7 +736,7 @@ int config_get_sensor_position(const char *sid) void config_set_sensor_position(const char *sid, int pos) { - return sensor_set_int(sid, ATT_SENSOR_POSITION, pos); + sensor_set_int(sid, ATT_SENSOR_POSITION, pos); } bool config_get_sensor_alarm_enabled(const char *sid) @@ -769,42 +769,42 @@ void config_set_appindicator_label_enabled(const char *sid, bool enabled) sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled); } -GSettings *config_get_GSettings() +GSettings *config_get_GSettings(void) { return settings; } -bool config_is_lmsensor_enabled() +bool config_is_lmsensor_enabled(void) { return get_bool(KEY_PROVIDER_LMSENSORS_ENABLED); } -bool config_is_gtop2_enabled() +bool config_is_gtop2_enabled(void) { return get_bool(KEY_PROVIDER_GTOP2_ENABLED); } -bool config_is_udisks2_enabled() +bool config_is_udisks2_enabled(void) { return get_bool(KEY_PROVIDER_UDISKS2_ENABLED); } -bool config_is_hddtemp_enabled() +bool config_is_hddtemp_enabled(void) { return get_bool(KEY_PROVIDER_HDDTEMP_ENABLED); } -bool config_is_libatasmart_enabled() +bool config_is_libatasmart_enabled(void) { return get_bool(KEY_PROVIDER_LIBATASMART_ENABLED); } -bool config_is_nvctrl_enabled() +bool config_is_nvctrl_enabled(void) { return get_bool(KEY_PROVIDER_NVCTRL_ENABLED); } -bool config_is_atiadlsdk_enabled() +bool config_is_atiadlsdk_enabled(void) { return get_bool(KEY_PROVIDER_ATIADLSDK_ENABLED); } diff --git a/src/cfg.h b/src/cfg.h index ed2e20e..c7d764b 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -78,11 +78,11 @@ struct config { }; /* Loads psensor configuration */ -struct config *config_load(); +struct config *config_load(void); void config_save(const struct config *); -void config_cleanup(); +void config_cleanup(void); struct color *config_get_sensor_color(const char *sid, const struct color *); void config_set_sensor_color(const char *sid, const struct color *); @@ -108,42 +108,42 @@ 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); -bool is_slog_enabled(); +bool is_slog_enabled(void); void config_set_slog_enabled_changed_cbk(void (*)(void *), void *); -int config_get_slog_interval(); +int config_get_slog_interval(void); -bool config_is_smooth_curves_enabled(); +bool config_is_smooth_curves_enabled(void); void config_set_smooth_curves_enabled(bool); int config_get_sensor_position(const char *); void config_set_sensor_position(const char *, int); -char *config_get_notif_script(); +char *config_get_notif_script(void); 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); -bool config_is_lmsensor_enabled(); +bool config_is_lmsensor_enabled(void); void config_set_lmsensor_enable(bool); -bool config_is_gtop2_enabled(); +bool config_is_gtop2_enabled(void); void config_set_gtop2_enable(bool); -bool config_is_udisks2_enabled(); +bool config_is_udisks2_enabled(void); void config_set_udisks2_enable(bool); -bool config_is_hddtemp_enabled(); +bool config_is_hddtemp_enabled(void); void config_set_hddtemp_enable(bool); -bool config_is_libatasmart_enabled(); +bool config_is_libatasmart_enabled(void); void config_set_libatasmart_enable(bool); -bool config_is_nvctrl_enabled(); +bool config_is_nvctrl_enabled(void); void config_set_nvctrl_enable(bool); -bool config_is_atiadlsdk_enabled(); +bool config_is_atiadlsdk_enabled(void); void config_set_atiadlsdk_enable(bool); /* @@ -153,10 +153,10 @@ void config_set_atiadlsdk_enable(bool); * Creates the directory if it does not exist; * Returns NULL if it cannot be determined. */ -const char *get_psensor_user_dir(); +const char *get_psensor_user_dir(void); -void config_sync(); +void config_sync(void); -GSettings *config_get_GSettings(); +GSettings *config_get_GSettings(void); #endif diff --git a/src/glade/Makefile.am b/src/glade/Makefile.am index 3f01895..5ac0bca 100644 --- a/src/glade/Makefile.am +++ b/src/glade/Makefile.am @@ -1,6 +1,7 @@ gladedir = $(pkgdatadir) glade_DATA = \ psensor.glade \ + psensor-appindicator.glade \ sensor-edit.glade \ psensor-pref.glade diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index a6076fd..d794b5b 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -298,6 +298,7 @@ top_srcdir = @top_srcdir@ gladedir = $(pkgdatadir) glade_DATA = \ psensor.glade \ + psensor-appindicator.glade \ sensor-edit.glade \ psensor-pref.glade diff --git a/src/glade/psensor-appindicator.glade b/src/glade/psensor-appindicator.glade new file mode 100644 index 0000000..b08ec4b --- /dev/null +++ b/src/glade/psensor-appindicator.glade @@ -0,0 +1,396 @@ + + + + + + About + + + + Preferences + Preferences + + + + Sensor Preferences + Sensor Preferences + + + + Preferences + + + + Quit + + + + Sensor Preferences + + + + True + False + + + PreferencesAction + True + False + True + True + + + + + SensorPreferencesAction + True + False + True + True + + + + + True + False + + + + + AboutAction + True + False + True + True + + + + + True + False + + + + + QuitAction + True + False + True + True + + + + + Show + + + + True + False + + + ShowAction + True + False + True + True + + + + + True + False + + + + + True + False + + + + + AppIndicatorPreferencesAction + True + False + True + True + + + + + AppIndicatorSensorPreferencesAction + True + False + True + True + + + + + True + False + + + + + AboutAction + True + False + True + True + + + + + True + False + + + + + QuitAction + True + False + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + Psensor - Temperature Monitor + psensor + + + True + False + vertical + + + True + False + + + True + False + _Psensor + True + + + True + False + + + PreferencesAction + True + False + True + True + + + + + SensorPreferencesAction + True + False + True + True + + + + + True + False + + + + + QuitAction + True + False + True + True + + + + + + + + + True + False + _Help + True + + + True + False + + + AboutAction + True + False + True + True + + + + + + + + + False + True + 0 + + + + + True + True + + + True + False + True + True + + + True + True + + + + + True + True + never + in + + + True + True + start + True + sensors_store + 0 + True + + + none + + + + + Sensor + + + + 0 + + + + + + + Value + + + + 1 + + + + + + + Min + + + + 2 + + + + + + + Max + + + + 3 + + + + + + + Color + + + + 5 + + + + + + + Graph + + + + + + 6 + + + + + + + + + False + True + + + + + True + True + 1 + + + + + + diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade index 54b1ee1..868c682 100644 --- a/src/glade/psensor-pref.glade +++ b/src/glade/psensor-pref.glade @@ -187,6 +187,7 @@ True True False + Psensor has not been build with Unity Launcher support 4 4 4 @@ -1023,6 +1024,7 @@ True True False + Psensor has not been build with NVCtrl support 14 4 4 @@ -1043,6 +1045,7 @@ True True False + Psensor has not been build with ATI ADL support 14 4 4 @@ -1063,6 +1066,7 @@ True True False + Psensor has not been build with gtop2 support 14 4 4 @@ -1103,6 +1107,7 @@ True True False + Psensor has not been build with libatasmart support 14 4 4 @@ -1123,6 +1128,7 @@ True True False + Psensor has not been build with udisks2 support 14 4 4 diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade index 565d2dd..dbee7ef 100644 --- a/src/glade/psensor.glade +++ b/src/glade/psensor.glade @@ -6,16 +6,6 @@ About - - Preferences - Preferences - - - - Sensor Preferences - Sensor Preferences - - Preferences @@ -80,83 +70,6 @@ - - Show - - - - True - False - - - ShowAction - True - False - True - True - - - - - True - False - - - - - True - False - - - - - AppIndicatorPreferencesAction - True - False - True - True - - - - - AppIndicatorSensorPreferencesAction - True - False - True - True - - - - - True - False - - - - - AboutAction - True - False - True - True - - - - - True - False - - - - - QuitAction - True - False - True - True - - - diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade index 167c9eb..ad7d7ce 100644 --- a/src/glade/sensor-edit.glade +++ b/src/glade/sensor-edit.glade @@ -630,6 +630,7 @@ True True False + Psensor has not been build with AppIndicator support 4 4 4 @@ -651,6 +652,7 @@ True True False + Psensor has not been build with AppIndicator support 4 4 4 diff --git a/src/graph.c b/src/graph.c index 792bb25..9f87eda 100644 --- a/src/graph.c +++ b/src/graph.c @@ -27,13 +27,14 @@ #include #include +#include #include #include /* horizontal padding */ -const int GRAPH_H_PADDING = 4; +static const int GRAPH_H_PADDING = 4; /* vertical padding */ -const int GRAPH_V_PADDING = 4; +static const int GRAPH_V_PADDING = 4; bool is_smooth_curves_enabled; @@ -59,6 +60,29 @@ struct graph_info { GdkRGBA theme_fg_color; }; +static struct psensor **list_filter_graph_enabled(struct psensor **sensors) +{ + int n, i; + struct psensor **result, **cur, *s; + + if (!sensors) + return NULL; + + n = psensor_list_size(sensors); + result = malloc((n+1) * sizeof(struct psensor *)); + + for (cur = sensors, i = 0; *cur; cur++) { + s = *cur; + + if (config_is_sensor_graph_enabled(s->id)) + result[i++] = s; + } + + result[i] = NULL; + + return result; +} + /* Return the end time of the graph i.e. the more recent measure. If * no measure are available, return 0. * If Bezier curves are used return the measure n-3 to avoid to @@ -252,7 +276,7 @@ static void draw_background_lines(cairo_t *cr, cairo_stroke(cr); /* back to normal line style */ - cairo_set_dash(cr, 0, 0, 0); + cairo_set_dash(cr, NULL, 0, 0); } /* Keys: sensor identifier. @@ -448,7 +472,7 @@ graph_update(struct psensor **sensors, if (!gtk_widget_is_drawable(w_graph)) return; - enabled_sensors = psensor_list_filter_graph_enabled(sensors); + enabled_sensors = list_filter_graph_enabled(sensors); min_rpm = get_min_rpm(enabled_sensors); max_rpm = get_max_rpm(enabled_sensors); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6bf03c3..30e53c6 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -5,20 +5,27 @@ libpsensor_a_SOURCES = \ bool.h\ color.h color.c\ hdd.h hdd_hddtemp.c\ - lmsensor.h lmsensor.c\ - measure.h measure.c \ + lmsensor.h\ + measure.h measure.c\ nvidia.h\ + pgtop2.h\ plog.h plog.c\ pmutex.h pmutex.c\ psensor.h psensor.c\ ptime.h ptime.c\ pio.h pio.c\ + pudisks2.h\ slog.c slog.h\ temperature.c temperature.h\ url.c url.h AM_CPPFLAGS = -Wall -Werror +if SENSORS +libpsensor_a_SOURCES += lmsensor.c +LIBS += $(SENSORS_LIBS) +endif + if ATASMART libpsensor_a_SOURCES += hdd_atasmart.c LIBS += $(ATASMART_LIBS) @@ -36,7 +43,7 @@ libpsensor_a_SOURCES += amd.c endif if GTOP -libpsensor_a_SOURCES += pgtop2.c pgtop2.h +libpsensor_a_SOURCES += pgtop2.c LIBS += $(GTOP_LIBS) AM_CPPFLAGS += $(GTOP_CFLAGS) endif @@ -48,13 +55,15 @@ AM_CPPFLAGS += $(JSON_CFLAGS) endif if LIBUDISKS2 -libpsensor_a_SOURCES += pudisks2.c pudisks2.h +libpsensor_a_SOURCES += pudisks2.c LIBS += $(LIBUDISKS2_LIBS) AM_CPPFLAGS += $(LIBUDISKS2_CFLAGS) endif EXTRA_DIST=$(libpsensor_a_SOURCES) \ amd.c \ - pgtop2.c pgtop2.h \ + pgtop2.c \ + lmsensor.c \ nvidia.c \ - pudisks2.c pudisks2.h + psensor_json.h psensor_json.c \ + pudisks2.c diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 3c9431c..1563edd 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -78,22 +78,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ATASMART_TRUE@am__append_1 = hdd_atasmart.c -@ATASMART_TRUE@am__append_2 = $(ATASMART_LIBS) -@ATASMART_TRUE@am__append_3 = $(ATASMART_CFLAGS) -@NVIDIA_TRUE@am__append_4 = nvidia.c -@LIBATIADL_TRUE@am__append_5 = $(LIBATIADL_LIBS) -@LIBATIADL_TRUE@am__append_6 = $(LIBATIADL_CFLAGS) -@LIBATIADL_TRUE@am__append_7 = amd.c -@GTOP_TRUE@am__append_8 = pgtop2.c pgtop2.h -@GTOP_TRUE@am__append_9 = $(GTOP_LIBS) -@GTOP_TRUE@am__append_10 = $(GTOP_CFLAGS) -@JSON_TRUE@am__append_11 = psensor_json.h psensor_json.c -@JSON_TRUE@am__append_12 = $(JSON_LIBS) -@JSON_TRUE@am__append_13 = $(JSON_CFLAGS) -@LIBUDISKS2_TRUE@am__append_14 = pudisks2.c pudisks2.h -@LIBUDISKS2_TRUE@am__append_15 = $(LIBUDISKS2_LIBS) -@LIBUDISKS2_TRUE@am__append_16 = $(LIBUDISKS2_CFLAGS) +@SENSORS_TRUE@am__append_1 = lmsensor.c +@SENSORS_TRUE@am__append_2 = $(SENSORS_LIBS) +@ATASMART_TRUE@am__append_3 = hdd_atasmart.c +@ATASMART_TRUE@am__append_4 = $(ATASMART_LIBS) +@ATASMART_TRUE@am__append_5 = $(ATASMART_CFLAGS) +@NVIDIA_TRUE@am__append_6 = nvidia.c +@LIBATIADL_TRUE@am__append_7 = $(LIBATIADL_LIBS) +@LIBATIADL_TRUE@am__append_8 = $(LIBATIADL_CFLAGS) +@LIBATIADL_TRUE@am__append_9 = amd.c +@GTOP_TRUE@am__append_10 = pgtop2.c +@GTOP_TRUE@am__append_11 = $(GTOP_LIBS) +@GTOP_TRUE@am__append_12 = $(GTOP_CFLAGS) +@JSON_TRUE@am__append_13 = psensor_json.h psensor_json.c +@JSON_TRUE@am__append_14 = $(JSON_LIBS) +@JSON_TRUE@am__append_15 = $(JSON_CFLAGS) +@LIBUDISKS2_TRUE@am__append_16 = pudisks2.c +@LIBUDISKS2_TRUE@am__append_17 = $(LIBUDISKS2_LIBS) +@LIBUDISKS2_TRUE@am__append_18 = $(LIBUDISKS2_CFLAGS) subdir = src/lib DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -118,25 +120,24 @@ 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 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 \ - pgtop2.c pgtop2.h psensor_json.h psensor_json.c pudisks2.c \ - pudisks2.h -@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 = pgtop2.$(OBJEXT) -@JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT) -@LIBUDISKS2_TRUE@am__objects_6 = pudisks2.$(OBJEXT) + hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h pgtop2.h \ + plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c ptime.h \ + ptime.c pio.h pio.c pudisks2.h slog.c slog.h temperature.c \ + temperature.h url.c url.h lmsensor.c hdd_atasmart.c nvidia.c \ + amd.c pgtop2.c psensor_json.h psensor_json.c pudisks2.c +@SENSORS_TRUE@am__objects_1 = lmsensor.$(OBJEXT) +@ATASMART_TRUE@am__objects_2 = hdd_atasmart.$(OBJEXT) +@NVIDIA_TRUE@am__objects_3 = nvidia.$(OBJEXT) +@LIBATIADL_TRUE@am__objects_4 = amd.$(OBJEXT) +@GTOP_TRUE@am__objects_5 = pgtop2.$(OBJEXT) +@JSON_TRUE@am__objects_6 = psensor_json.$(OBJEXT) +@LIBUDISKS2_TRUE@am__objects_7 = pudisks2.$(OBJEXT) am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(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) \ - $(am__objects_6) + 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) $(am__objects_6) $(am__objects_7) libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -251,8 +252,8 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ $(am__append_2) $(am__append_5) $(am__append_9) \ - $(am__append_12) $(am__append_15) +LIBS = @LIBS@ $(am__append_2) $(am__append_4) $(am__append_7) \ + $(am__append_11) $(am__append_14) $(am__append_17) LIBUDISKS2_CFLAGS = @LIBUDISKS2_CFLAGS@ LIBUDISKS2_LIBS = @LIBUDISKS2_LIBS@ LTLIBICONV = @LTLIBICONV@ @@ -349,19 +350,21 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libpsensor.a libpsensor_a_SOURCES = amd.h bool.h color.h color.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 $(am__append_1) $(am__append_4) \ - $(am__append_7) $(am__append_8) $(am__append_11) \ - $(am__append_14) -AM_CPPFLAGS = -Wall -Werror $(am__append_3) $(am__append_6) \ - $(am__append_10) $(am__append_13) $(am__append_16) + hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h pgtop2.h \ + plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c ptime.h \ + ptime.c pio.h pio.c pudisks2.h slog.c slog.h temperature.c \ + temperature.h url.c url.h $(am__append_1) $(am__append_3) \ + $(am__append_6) $(am__append_9) $(am__append_10) \ + $(am__append_13) $(am__append_16) +AM_CPPFLAGS = -Wall -Werror $(am__append_5) $(am__append_8) \ + $(am__append_12) $(am__append_15) $(am__append_18) EXTRA_DIST = $(libpsensor_a_SOURCES) \ amd.c \ - pgtop2.c pgtop2.h \ + pgtop2.c \ + lmsensor.c \ nvidia.c \ - pudisks2.c pudisks2.h + psensor_json.h psensor_json.c \ + pudisks2.c all: all-am diff --git a/src/lib/amd.c b/src/lib/amd.c index c2ec5eb..f760360 100644 --- a/src/lib/amd.c +++ b/src/lib/amd.c @@ -156,7 +156,7 @@ static struct psensor *create_sensor(int id, int type, int values_len) Return 0 if no AMD/ATI GPUs or cannot get information. */ -static int init() +static int init(void) { LPAdapterInfo lpadapterinfo; int i, inumberadapters, inumberadaptersactive, lpstatus, iadapterindex; @@ -295,7 +295,7 @@ void amd_psensor_list_append(struct psensor ***sensors, int values_len) } } -void amd_cleanup() +void amd_cleanup(void) { if (hdll) { if (adl_main_control_done) diff --git a/src/lib/amd.h b/src/lib/amd.h index d7dde40..ef77c26 100644 --- a/src/lib/amd.h +++ b/src/lib/amd.h @@ -20,12 +20,25 @@ #ifndef _PSENSOR_AMD_H_ #define _PSENSOR_AMD_H_ -#include "psensor.h" +#include +#include -void amd_psensor_list_update(struct psensor **sensors); +#if defined(HAVE_LIBATIADL) && HAVE_LIBATIADL -void amd_psensor_list_append(struct psensor ***sensors, int values_max_length); +static inline bool amd_is_supported(void) { return true; } -void amd_cleanup(); +void amd_psensor_list_update(struct psensor **s); +void amd_psensor_list_append(struct psensor ***s, int n); +void amd_cleanup(void); + +#else + +static inline bool amd_is_supported(void) { return false; } + +static inline void amd_psensor_list_update(struct psensor **s) {} +static inline void amd_psensor_list_append(struct psensor ***s, int n) {} +static inline void amd_cleanup(void) {} + +#endif #endif diff --git a/src/lib/bool.h b/src/lib/bool.h index c31360d..c2ad205 100644 --- a/src/lib/bool.h +++ b/src/lib/bool.h @@ -21,7 +21,7 @@ #include "config.h" -#if HAVE_STDBOOL +#if HAVE_STDBOOL_H #include #else #define bool char diff --git a/src/lib/hdd.h b/src/lib/hdd.h index 8d4c316..b4e2a0d 100644 --- a/src/lib/hdd.h +++ b/src/lib/hdd.h @@ -19,12 +19,24 @@ #ifndef _PSENSOR_HDD_H_ #define _PSENSOR_HDD_H_ -#include "config.h" -#include "psensor.h" +#include +#include +#include + +#if defined(HAVE_ATASMART) && HAVE_ATASMART + +static inline bool atasmart_is_supported(void) { return true; } + +void atasmart_psensor_list_append(struct psensor ***, int); +void atasmart_psensor_list_update(struct psensor **); + +#else + +static inline bool atasmart_is_supported(void) { return false; } + +static inline void atasmart_psensor_list_append(struct psensor ***s, int n) {} +static inline void atasmart_psensor_list_update(struct psensor **s) {} -#ifdef HAVE_ATASMART -void atasmart_psensor_list_append(struct psensor ***sensors, int values_length); -void atasmart_psensor_list_update(struct psensor **sensors); #endif void hddtemp_psensor_list_append(struct psensor ***sensors, int values_length); diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c index 0fd7d5d..3c23509 100644 --- a/src/lib/hdd_atasmart.c +++ b/src/lib/hdd_atasmart.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -46,6 +47,16 @@ static int filter_sd(const char *p) return strlen(p) == 8 && !strncmp(p, "/dev/sd", 7); } +static void provider_data_free(void *data) +{ + sk_disk_free((SkDisk *)data); +} + +static SkDisk *get_disk(struct psensor *s) +{ + return (SkDisk *)s->provider_data; +} + static struct psensor * create_sensor(char *id, char *name, SkDisk *disk, int values_max_length) { @@ -60,7 +71,8 @@ create_sensor(char *id, char *name, SkDisk *disk, int values_max_length) t, values_max_length); - s->disk = disk; + s->provider_data = disk; + s->provider_data_free_fct = &provider_data_free; return s; } @@ -158,16 +170,19 @@ void atasmart_psensor_list_update(struct psensor **sensors) uint64_t kelvin; int ret; double c; + SkDisk *disk; cur = sensors; while (*cur) { s = *cur; if (!(s->type & SENSOR_TYPE_REMOTE) && s->type & SENSOR_TYPE_ATASMART) { - ret = sk_disk_smart_read_data(s->disk); + disk = get_disk(s); + + ret = sk_disk_smart_read_data(disk); if (!ret) { - ret = sk_disk_smart_get_temperature(s->disk, + ret = sk_disk_smart_get_temperature(disk, &kelvin); if (!ret) { diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c index 39c00c6..68797e1 100644 --- a/src/lib/hdd_hddtemp.c +++ b/src/lib/hdd_hddtemp.c @@ -48,7 +48,7 @@ struct hdd_info { int temp; }; -static char *fetch() +static char *fetch(void) { int sockfd, output_length; ssize_t n = 1; diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c index baa97ef..d72da3e 100644 --- a/src/lib/lmsensor.c +++ b/src/lib/lmsensor.c @@ -27,12 +27,41 @@ #include #include -#include +#include static int init_done; static const char *PROVIDER_NAME = "lmsensor"; +struct lmsensor_data { + const sensors_chip_name *chip; + + const sensors_feature *feature; +}; + +static const sensors_chip_name *get_chip_name(struct psensor *s) +{ + return ((struct lmsensor_data *)s->provider_data)->chip; +} + +static const sensors_feature *get_feature(struct psensor *s) +{ + return ((struct lmsensor_data *)s->provider_data)->feature; +} + +static void lmsensor_data_set(struct psensor *s, + const struct sensors_chip_name *chip, + const struct sensors_feature *feature) +{ + struct lmsensor_data *data; + + data = malloc(sizeof(struct lmsensor_data)); + data->chip = chip; + data->feature = feature; + + s->provider_data = data; +} + static double get_value(const sensors_chip_name *name, const sensors_subfeature *sub) { @@ -58,10 +87,10 @@ static double get_temp_input(struct psensor *sensor) const sensors_feature *feature; - chip = sensor->iname; - feature = sensor->feature; + chip = get_chip_name(sensor); + feature = get_feature(sensor); - sf = sensors_get_subfeature(sensor->iname, + sf = sensors_get_subfeature(chip, feature, SENSORS_SUBFEATURE_TEMP_INPUT); if (sf) @@ -72,11 +101,14 @@ static double get_temp_input(struct psensor *sensor) static double get_fan_input(struct psensor *sensor) { - const sensors_chip_name *chip = sensor->iname; - const sensors_feature *feature = sensor->feature; + const sensors_chip_name *chip; + const sensors_feature *feature; const sensors_subfeature *sf; + chip = get_chip_name(sensor); + feature = get_feature(sensor); + sf = sensors_get_subfeature(chip, feature, SENSORS_SUBFEATURE_FAN_INPUT); @@ -179,8 +211,7 @@ lmsensor_psensor_create(const sensors_chip_name *chip, psensor = psensor_create(id, label, cname, type, values_max_length); - psensor->iname = chip; - psensor->feature = feature; + lmsensor_data_set(psensor, chip, feature); if (feature->type == SENSORS_FEATURE_TEMP && (get_temp_input(psensor) == UNKNOWN_DBL_VALUE)) { @@ -191,7 +222,7 @@ lmsensor_psensor_create(const sensors_chip_name *chip, return psensor; } -void lmsensor_init() +static void lmsensor_init(void) { int err; @@ -237,7 +268,7 @@ void lmsensor_psensor_list_append(struct psensor ***sensors, int vn) } } -void lmsensor_cleanup() +void lmsensor_cleanup(void) { if (init_done) sensors_cleanup(); diff --git a/src/lib/lmsensor.h b/src/lib/lmsensor.h index 341863d..90d58f3 100644 --- a/src/lib/lmsensor.h +++ b/src/lib/lmsensor.h @@ -19,10 +19,25 @@ #ifndef _PSENSOR_LMSENSOR_H_ #define _PSENSOR_LMSENSOR_H_ -void lmsensor_psensor_list_update(struct psensor **sensors); +#include +#include -void lmsensor_psensor_list_append(struct psensor ***sensors, int values_length); +#if defined(HAVE_LIBSENSORS) && HAVE_LIBSENSORS -void lmsensor_cleanup(); +static inline bool lmsensor_is_supported(void) { return true; } + +void lmsensor_psensor_list_update(struct psensor **); +void lmsensor_psensor_list_append(struct psensor ***, int); +void lmsensor_cleanup(void); + +#else + +static inline bool lmsensor_is_supported(void) { return false; } + +static inline void lmsensor_psensor_list_update(struct psensor **s) {} +static inline void lmsensor_psensor_list_append(struct psensor ***s, int n) {} +static inline void lmsensor_cleanup(void) {} + +#endif #endif diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c index b77517b..d3bbb58 100644 --- a/src/lib/nvidia.c +++ b/src/lib/nvidia.c @@ -31,12 +31,23 @@ #include #include +#include #include -Display *display; +static Display *display; static const char *PROVIDER_NAME = "nvctrl"; +static void set_nvidia_id(struct psensor *s, int id) +{ + *(int *)s->provider_data = id; +} + +static int get_nvidia_id(struct psensor *s) +{ + return *(int *)s->provider_data; +} + static char *get_product_name(int id, int type) { char *name; @@ -219,15 +230,18 @@ static double get_value(int id, int type) static void update(struct psensor *sensor) { double v; + int id; - v = get_value(sensor->nvidia_id, sensor->type); + id = get_nvidia_id(sensor); + + v = get_value(id, sensor->type); if (v == UNKNOWN_DBL_VALUE) log_err(_("%s: Failed to retrieve measure of type %x " "for NVIDIA GPU %d"), PROVIDER_NAME, sensor->type, - sensor->nvidia_id); + id); psensor_set_current_value(sensor, v); } @@ -276,14 +290,15 @@ static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len) sprintf(sid, "%s %s", PROVIDER_NAME, name); s = psensor_create(sid, name, pname, type, value_len); - s->nvidia_id = id; + s->provider_data = malloc(sizeof(int)); + set_nvidia_id(s, id); free(strnid); return s; } -static int init() +static int init(void) { int evt, err; @@ -372,7 +387,7 @@ void nvidia_psensor_list_append(struct psensor ***ss, int values_len) } } -void nvidia_cleanup() +void nvidia_cleanup(void) { if (display) { XCloseDisplay(display); diff --git a/src/lib/nvidia.h b/src/lib/nvidia.h index a94d72e..b677670 100644 --- a/src/lib/nvidia.h +++ b/src/lib/nvidia.h @@ -19,12 +19,26 @@ #ifndef _PSENSOR_NVIDIA_H_ #define _PSENSOR_NVIDIA_H_ +#include #include -void nvidia_psensor_list_update(struct psensor **sensors); -void nvidia_psensor_list_append(struct psensor ***sensors, int values_length); +#if defined(HAVE_NVIDIA) && HAVE_NVIDIA -void nvidia_cleanup(); +static inline bool nvidia_is_supported(void) { return true; } + +void nvidia_psensor_list_update(struct psensor **); +void nvidia_psensor_list_append(struct psensor ***, int); +void nvidia_cleanup(void); + +#else + +static inline bool nvidia_is_supported(void) { return false; } + +static inline void nvidia_psensor_list_update(struct psensor **s) {} +static inline void nvidia_psensor_list_append(struct psensor ***s, int n) {} +static inline void nvidia_cleanup(void) {} + +#endif #endif diff --git a/src/lib/pgtop2.c b/src/lib/pgtop2.c index a25c705..23d1bcd 100644 --- a/src/lib/pgtop2.c +++ b/src/lib/pgtop2.c @@ -66,7 +66,7 @@ static struct psensor *create_mem_free_sensor(int measures_len) measures_len); } -static double get_usage() +static double get_usage(void) { glibtop_cpu cpu; unsigned long int used, dt; @@ -89,7 +89,7 @@ static double get_usage() return cpu_rate; } -static double get_mem_free() +static double get_mem_free(void) { glibtop_mem mem; double v; @@ -116,7 +116,7 @@ void cpu_usage_sensor_update(struct psensor *s) psensor_set_current_value(s, v); } -void mem_free_sensor_update(struct psensor *s) +static void mem_free_sensor_update(struct psensor *s) { double v; diff --git a/src/lib/pgtop2.h b/src/lib/pgtop2.h index c7c3968..ddf19fc 100644 --- a/src/lib/pgtop2.h +++ b/src/lib/pgtop2.h @@ -19,13 +19,29 @@ #ifndef _PSENSOR_PGTOP2_H_ #define _PSENSOR_PGTOP2_H_ +#include #include -struct psensor *create_cpu_usage_sensor(int measures_len); +#if defined(HAVE_GTOP) && HAVE_GTOP + +static inline bool gtop2_is_supported(void) { return true; } + +struct psensor *create_cpu_usage_sensor(int); void cpu_usage_sensor_update(struct psensor *); void gtop2_psensor_list_update(struct psensor **); +void gtop2_psensor_list_append(struct psensor ***, int); + +#else + +static inline bool gtop2_is_supported(void) { return false; } -void gtop2_psensor_list_append(struct psensor ***sensors, int values_max_len); +static inline struct psensor *create_cpu_usage_sensor(int n) { return NULL; } +static inline void cpu_usage_sensor_update(struct psensor *s) {} + +static inline void gtop2_psensor_list_update(struct psensor **s) {} +static inline void gtop2_psensor_list_append(struct psensor ***s, int n) {} + +#endif #endif diff --git a/src/lib/pio.c b/src/lib/pio.c index 217349b..bea067d 100644 --- a/src/lib/pio.c +++ b/src/lib/pio.c @@ -63,7 +63,7 @@ int is_file(const char *path) return 0; } -char *dir_normalize(const char *dpath) +static char *dir_normalize(const char *dpath) { char *npath; int n; diff --git a/src/lib/plog.c b/src/lib/plog.c index 48c6009..285ac03 100644 --- a/src/lib/plog.c +++ b/src/lib/plog.c @@ -43,7 +43,7 @@ void log_open(const char *path) log_printf(LOG_ERR, _("Cannot open log file: %s"), path); } -void log_close() +void log_close(void) { if (!file) return; diff --git a/src/lib/plog.h b/src/lib/plog.h index 29880e9..90796eb 100644 --- a/src/lib/plog.h +++ b/src/lib/plog.h @@ -29,7 +29,7 @@ enum log_level { }; void log_open(const char *path); -void log_close(); +void log_close(void); void log_printf(int lvl, const char *fmt, ...); void log_debug(const char *fmt, ...); diff --git a/src/lib/psensor.c b/src/lib/psensor.c index b9da81d..d151ac1 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,6 +23,8 @@ #include #define _(str) gettext(str) +#include + #include #include #include @@ -48,7 +50,6 @@ struct psensor *psensor_create(char *id, psensor->values_max_length = values_max_length; psensor->measures = measures_dbl_create(values_max_length); - psensor->alarm_enabled = 0; psensor->alarm_high_threshold = 0; psensor->alarm_low_threshold = 0; @@ -60,9 +61,6 @@ struct psensor *psensor_create(char *id, psensor->color = NULL; - psensor->graph_enabled = 1; - psensor->appindicator_enabled = 0; - psensor->provider_data = NULL; psensor->provider_data_free_fct = &free; @@ -159,11 +157,11 @@ struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor) { int size; + struct psensor **result; size = psensor_list_size(sensors); - struct psensor **result - = malloc((size + 1 + 1) * sizeof(struct psensor *)); + result = malloc((size + 1 + 1) * sizeof(struct psensor *)); if (sensors) memcpy(result, sensors, size * sizeof(struct psensor *)); @@ -264,15 +262,13 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv) if (s->max == UNKNOWN_DBL_VALUE || v > s->max) s->max = v; - if (s->alarm_enabled) { - if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { - if (!s->alarm_raised && s->cb_alarm_raised) - s->cb_alarm_raised(s, s->cb_alarm_raised_data); - - s->alarm_raised = 1; - } else { - s->alarm_raised = 0; + if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { + if (!s->alarm_raised && s->cb_alarm_raised) { + s->alarm_raised = true; + s->cb_alarm_raised(s, s->cb_alarm_raised_data); } + } else { + s->alarm_raised = false; } } @@ -350,28 +346,6 @@ double get_max_value(struct psensor **sensors, int type) return m; } -double -psensor_get_max_current_value(struct psensor **sensors, unsigned int type) -{ - double m = UNKNOWN_DBL_VALUE; - struct psensor **s_cur = sensors; - - while (*s_cur) { - struct psensor *s = *s_cur; - - if (s->graph_enabled && (s->type & type)) { - double v = psensor_get_current_value(s); - - if (m == UNKNOWN_DBL_VALUE || v > m) - m = v; - } - - s_cur++; - } - - return m; -} - double get_min_temp(struct psensor **sensors) { return get_min_value(sensors, SENSOR_TYPE_TEMP); @@ -490,26 +464,3 @@ psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius) psensor_get_current_value(s), use_celsius); } - -struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors) -{ - int n, i; - struct psensor **result, **cur, *s; - - if (!sensors) - return NULL; - - n = psensor_list_size(sensors); - result = malloc((n+1) * sizeof(struct psensor *)); - - for (cur = sensors, i = 0; *cur; cur++) { - s = *cur; - - if (s->graph_enabled) - result[i++] = s; - } - - result[i] = NULL; - - return result; -} diff --git a/src/lib/psensor.h b/src/lib/psensor.h index cec6d0f..3a3ffa7 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -19,17 +19,12 @@ #ifndef _PSENSOR_PSENSOR_H_ #define _PSENSOR_PSENSOR_H_ -#include +#include -#include "config.h" -#ifdef HAVE_ATASMART -#include -#endif - -#include "bool.h" -#include "color.h" +#include +#include +#include #include -#include "measure.h" enum psensor_type { /* type of sensor values */ @@ -76,11 +71,6 @@ struct psensor { /* Name of the chip. */ char *chip; - /* lm-sensor */ - const sensors_chip_name *iname; - - const sensors_feature *feature; - /* Maximum length of 'values' */ int values_max_length; @@ -91,9 +81,6 @@ struct psensor { /* Color of the sensor used for the graph */ struct color *color; - /* Whether the graph sensor is displayed. */ - bool graph_enabled; - /* see psensor_type */ unsigned int type; @@ -103,36 +90,24 @@ struct psensor { /* The minimum detected value of the sensor */ double min; - /* Whether alarm alert is enabled for this sensor */ - bool alarm_enabled; - int alarm_high_threshold; int alarm_low_threshold; /* Whether an alarm is raised for this sensor */ - unsigned int alarm_raised; + bool alarm_raised; void (*cb_alarm_raised)(struct psensor *, void *); void *cb_alarm_raised_data; -#ifdef HAVE_NVIDIA - /* Nvidia id for the nvctrl */ - int nvidia_id; -#endif #ifdef HAVE_LIBATIADL /* AMD id for the aticonfig */ int amd_id; #endif -#ifdef HAVE_ATASMART - SkDisk *disk; -#endif void *provider_data; void (*provider_data_free_fct)(void *); char *url; - - bool appindicator_enabled; }; struct psensor *psensor_create(char *id, @@ -148,8 +123,6 @@ void psensor_free(struct psensor *sensor); void psensor_list_free(struct psensor **sensors); int psensor_list_size(struct psensor **sensors); -struct psensor **psensor_list_filter_graph_enabled(struct psensor **); - struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id); @@ -161,10 +134,6 @@ double get_max_temp(struct psensor **sensors); double get_min_rpm(struct psensor **sensors); double get_max_rpm(struct psensor **sensors); -/* Get the maximal current value of all sensors of a given type. */ -double -psensor_get_max_current_value(struct psensor **sensors, unsigned int type); - /* * Converts the value of a sensor to a string. * diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c index 2402c1a..1f3a479 100644 --- a/src/lib/psensor_json.c +++ b/src/lib/psensor_json.c @@ -19,6 +19,8 @@ #include #include +#include + #include "psensor_json.h" #include "url.h" diff --git a/src/lib/ptime.c b/src/lib/ptime.c index faa0382..923b80d 100644 --- a/src/lib/ptime.c +++ b/src/lib/ptime.c @@ -74,7 +74,7 @@ char *tm_to_ISO8601_time(struct tm *tm) return NULL; } -char *get_current_ISO8601_time() +char *get_current_ISO8601_time(void) { time_t t; diff --git a/src/lib/pudisks2.c b/src/lib/pudisks2.c index 5a7503e..b378e0c 100644 --- a/src/lib/pudisks2.c +++ b/src/lib/pudisks2.c @@ -29,18 +29,18 @@ #include #include -const char *PROVIDER_NAME = "udisks2"; +static const char *PROVIDER_NAME = "udisks2"; static GDBusObjectManager *manager; -const time_t SMART_UPDATE_INTERVAL = 30; +static const time_t SMART_UPDATE_INTERVAL = 30; struct udisks_data { char *path; struct timeval last_smart_update; }; -void udisks_data_free(void *data) +static void udisks_data_free(void *data) { struct udisks_data *u; diff --git a/src/lib/pudisks2.h b/src/lib/pudisks2.h index 1a844bc..3a76789 100644 --- a/src/lib/pudisks2.h +++ b/src/lib/pudisks2.h @@ -21,7 +21,23 @@ #include -void udisks2_psensor_list_append(struct psensor ***sensors, int values_length); -void udisks2_psensor_list_update(struct psensor **sensors); +#if defined(HAVE_LIBUDISKS2) && HAVE_LIBUDISKS2 + +static inline bool udisks2_is_supported(void) { return true; } + +void udisks2_psensor_list_append(struct psensor ***, int); +void udisks2_psensor_list_update(struct psensor **); + +#else + +static inline bool udisks2_is_supported(void) { return false; } + +static inline void +udisks2_psensor_list_append(struct psensor ***s, int n) {} + +static inline void +udisks2_psensor_list_update(struct psensor **s) {} + +#endif #endif diff --git a/src/lib/slog.c b/src/lib/slog.c index 5b16526..d6c4bc2 100644 --- a/src/lib/slog.c +++ b/src/lib/slog.c @@ -65,7 +65,7 @@ static char *time_to_str(time_t *t) return NULL; } -static char *get_default_path() +static char *get_default_path(void) { char *home, *path, *dir; @@ -176,10 +176,10 @@ static void *slog_routine(void *data) sleep(period); } - pthread_exit(0); + pthread_exit(NULL); } -void slog_close() +void slog_close(void) { if (file) { pthread_cancel(thread); diff --git a/src/lib/slog.h b/src/lib/slog.h index ea2d6d1..4a39461 100644 --- a/src/lib/slog.h +++ b/src/lib/slog.h @@ -24,6 +24,6 @@ #include "psensor.h" bool slog_activate(const char *, struct psensor **, pthread_mutex_t *, int s); -void slog_close(); +void slog_close(void); #endif diff --git a/src/main.c b/src/main.c index 7840485..759f47d 100644 --- a/src/main.c +++ b/src/main.c @@ -28,53 +28,37 @@ #include -#include "config.h" +#include -#include "cfg.h" +#include +#include +#include #include -#include "psensor.h" -#include "graph.h" -#include "ui.h" -#include "ui_sensorlist.h" -#include "ui_color.h" -#include "lmsensor.h" -#include "notify_cmd.h" +#include +#include +#include +#include #include +#include #include -#include "slog.h" -#include "ui_pref.h" -#include "ui_graph.h" -#include "ui_status.h" - -#ifdef HAVE_UNITY -#include "ui_unity.h" -#endif - -#ifdef HAVE_NVIDIA -#include "nvidia.h" -#endif - -#ifdef HAVE_LIBATIADL -#include "amd.h" -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_REMOTE_SUPPORT #include "rsensor.h" #endif -#include "ui_appindicator.h" - -#ifdef HAVE_LIBNOTIFY -#include "ui_notify.h" -#endif - -#ifdef HAVE_GTOP -#include -#endif - static const char *program_name; -static void print_version() +static void print_version(void) { printf("psensor %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -86,7 +70,7 @@ static void print_version() "2010-2014"); } -static void print_help() +static void print_help(void) { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -155,25 +139,15 @@ static void *update_measures(void *data) update_psensor_values_size(sensors, cfg); lmsensor_psensor_list_update(sensors); + #ifdef HAVE_REMOTE_SUPPORT remote_psensor_list_update(sensors); #endif -#ifdef HAVE_NVIDIA nvidia_psensor_list_update(sensors); -#endif -#ifdef HAVE_LIBATIADL amd_psensor_list_update(sensors); -#endif -#ifdef HAVE_LIBUDISKS2 udisks2_psensor_list_update(sensors); -#endif -#ifdef HAVE_GTOP gtop2_psensor_list_update(sensors); -#endif -#ifdef HAVE_ATASMART atasmart_psensor_list_update(sensors); -#endif - hddtemp_psensor_list_update(sensors); psensor_log_measures(sensors); @@ -188,30 +162,30 @@ static void *update_measures(void *data) static void indicators_update(struct ui_psensor *ui) { - struct psensor **sensor_cur = ui->sensors; - unsigned int attention = 0; + struct psensor **ss, *s; + bool attention; - while (*sensor_cur) { - struct psensor *s = *sensor_cur; + attention = false; + ss = ui->sensors; + while (*ss) { + s = *ss; - if (s->alarm_enabled && s->alarm_raised) { - attention = 1; + if (s->alarm_raised && config_get_sensor_alarm_enabled(s->id)) { + attention = true; break; } - sensor_cur++; + ss++; } -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) if (is_appindicator_supported()) ui_appindicator_update(ui, attention); -#endif if (is_status_supported()) ui_status_update(ui, attention); } -gboolean ui_refresh_thread(gpointer data) +static gboolean ui_refresh_thread(gpointer data) { struct config *cfg; gboolean ret; @@ -229,11 +203,9 @@ gboolean ui_refresh_thread(gpointer data) if (is_appindicator_supported() || is_status_supported()) indicators_update(ui); -#ifdef HAVE_UNITY ui_unity_launcher_entry_update(ui->sensors, !cfg->unity_launcher_count_disabled, cfg->temperature_unit == CELSIUS); -#endif if (ui->graph_update_interval != cfg->graph_update_interval) { ui->graph_update_interval = cfg->graph_update_interval; @@ -251,12 +223,10 @@ gboolean ui_refresh_thread(gpointer data) static void cb_alarm_raised(struct psensor *sensor, void *data) { -#ifdef HAVE_LIBNOTIFY - if (sensor->alarm_enabled) + if (config_get_sensor_alarm_enabled(sensor->id)) { ui_notify(sensor, (struct ui_psensor *)data); -#endif - - notify_cmd(sensor); + notify_cmd(sensor); + } } static void associate_colors(struct psensor **sensors) @@ -323,9 +293,6 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) s->alarm_low_threshold = config_get_sensor_alarm_low_threshold(s->id); - s->alarm_enabled - = config_get_sensor_alarm_enabled(s->id); - sensor_cur++; } } @@ -338,8 +305,6 @@ static void associate_preferences(struct psensor **sensors) char *n; struct psensor *s = *sensor_cur; - s->graph_enabled = config_is_sensor_graph_enabled(s->id); - n = config_get_sensor_name(s->id); if (n) { @@ -347,13 +312,11 @@ static void associate_preferences(struct psensor **sensors) s->name = n; } - s->appindicator_enabled = config_is_appindicator_enabled(s->id); - sensor_cur++; } } -static void log_init() +static void log_init(void) { const char *dir; char *path; @@ -372,12 +335,12 @@ static void log_init() } static struct option long_options[] = { - {"version", no_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"url", required_argument, 0, 'u'}, - {"debug", required_argument, 0, 'd'}, - {"new-instance", no_argument, 0, 'n'}, - {0, 0, 0, 0} + {"version", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"url", required_argument, NULL, 'u'}, + {"debug", required_argument, NULL, 'd'}, + {"new-instance", no_argument, NULL, 'n'}, + {NULL, 0, NULL, 0} }; static gboolean initial_window_show(gpointer data) @@ -402,7 +365,7 @@ static gboolean initial_window_show(gpointer data) return FALSE; } -static void log_glib_info() +static void log_glib_info(void) { log_debug("Compiled with GLib %d.%d.%d", GLIB_MAJOR_VERSION, @@ -430,12 +393,9 @@ static void cleanup(struct ui_psensor *ui) log_debug("Cleanup..."); -#ifdef HAVE_NVIDIA nvidia_cleanup(); -#endif -#ifdef HAVE_LIBATIADL amd_cleanup(); -#endif + #ifdef HAVE_REMOTE_SUPPORT rsensor_cleanup(); #endif @@ -443,9 +403,7 @@ static void cleanup(struct ui_psensor *ui) psensor_list_free(ui->sensors); ui->sensors = NULL; -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) ui_appindicator_cleanup(); -#endif ui_status_cleanup(); @@ -484,27 +442,20 @@ static struct psensor **create_sensors_list(const char *url) if (config_is_hddtemp_enabled()) hddtemp_psensor_list_append(&sensors, 600); -#ifdef HAVE_ATASMART if (config_is_libatasmart_enabled()) atasmart_psensor_list_append(&sensors, 600); -#endif -#ifdef HAVE_NVIDIA if (config_is_nvctrl_enabled()) nvidia_psensor_list_append(&sensors, 600); -#endif -#ifdef HAVE_LIBATIADL + if (config_is_atiadlsdk_enabled()) amd_psensor_list_append(&sensors, 600); -#endif -#ifdef HAVE_GTOP + if (config_is_gtop2_enabled()) gtop2_psensor_list_append(&sensors, 600); -#endif -#ifdef HAVE_LIBUDISKS2 + if (config_is_udisks2_enabled()) udisks2_psensor_list_append(&sensors, 600); -#endif } associate_preferences(sensors); @@ -589,17 +540,6 @@ 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); pmutex_init(&ui.sensors_mutex); @@ -615,10 +555,8 @@ int main(int argc, char **argv) &ui.sensors_mutex, config_get_slog_interval()); -#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) ui_status_init(&ui); ui_status_set_visible(1); -#endif /* main window */ ui_window_create(&ui); @@ -634,9 +572,7 @@ int main(int argc, char **argv) g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) ui_appindicator_init(&ui); -#endif gdk_notify_startup_complete(); diff --git a/src/notify_cmd.c b/src/notify_cmd.c index 793903a..759aeb0 100644 --- a/src/notify_cmd.c +++ b/src/notify_cmd.c @@ -17,6 +17,7 @@ * 02110-1301 USA */ +#include #include #include diff --git a/src/pxdg.c b/src/pxdg.c index 14c3021..ec52fb0 100644 --- a/src/pxdg.c +++ b/src/pxdg.c @@ -27,10 +27,11 @@ #include #include +#include static const char *KEY_GNOME_AUTOSTART = "X-GNOME-Autostart-enabled"; -static char *get_user_autostart_dir() +static char *get_user_autostart_dir(void) { const char *xdg_cfg_dir; @@ -41,7 +42,7 @@ static char *get_user_autostart_dir() return path_append(xdg_cfg_dir, "autostart"); } -static char *get_user_desktop_file() +static char *get_user_desktop_file(void) { char *dir, *path; @@ -53,7 +54,7 @@ static char *get_user_desktop_file() return path; } -static const char *get_desktop_file() +static const char *get_desktop_file(void) { return DATADIR"/applications/"PSENSOR_DESKTOP_FILE; } @@ -98,7 +99,7 @@ static int is_user_desktop_autostarted(GKeyFile *f) NULL); } -int pxdg_is_autostarted() +int pxdg_is_autostarted(void) { char *user_desktop; unsigned int ret; diff --git a/src/pxdg.h b/src/pxdg.h index 78aa571..1b72035 100644 --- a/src/pxdg.h +++ b/src/pxdg.h @@ -25,7 +25,7 @@ * - 0 if psensor is not currently launch during session startup. * - -1 if it cannot be determined. */ -int pxdg_is_autostarted(); +int pxdg_is_autostarted(void); void pxdg_set_autostart(unsigned int); #endif diff --git a/src/rsensor.c b/src/rsensor.c index 8a5aa66..2ba964b 100644 --- a/src/rsensor.c +++ b/src/rsensor.c @@ -72,12 +72,12 @@ static char *create_api_1_1_sensors_url(const char *base_url) return ret; } -void rsensor_init() +void rsensor_init(void) { curl = curl_easy_init(); } -void rsensor_cleanup() +void rsensor_cleanup(void) { curl_easy_cleanup(curl); } @@ -154,7 +154,7 @@ struct psensor **get_remote_sensors(const char *server_url, return sensors; } -void remote_psensor_update(struct psensor *s) +static void remote_psensor_update(struct psensor *s) { json_object *obj; diff --git a/src/rsensor.h b/src/rsensor.h index 8269479..9aa0dd6 100644 --- a/src/rsensor.h +++ b/src/rsensor.h @@ -26,7 +26,7 @@ struct psensor **get_remote_sensors(const char *server_url, void remote_psensor_list_update(struct psensor **sensors); -void rsensor_init(); -void rsensor_cleanup(); +void rsensor_init(void); +void rsensor_cleanup(void); #endif diff --git a/src/server/server.c b/src/server/server.c index 5862586..3db6828 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -64,15 +64,15 @@ static const int DEFAULT_PORT = 3131; "Page not found - Go to Main page

    ")) static struct option long_options[] = { - {"version", no_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"port", required_argument, 0, 'p'}, - {"wdir", required_argument, 0, 'w'}, - {"debug", required_argument, 0, 'd'}, - {"log-file", required_argument, 0, 'l'}, - {"sensor-log-file", required_argument, 0, 0}, - {"sensor-log-interval", required_argument, 0, 0}, - {0, 0, 0, 0} + {"version", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"port", required_argument, NULL, 'p'}, + {"wdir", required_argument, NULL, 'w'}, + {"debug", required_argument, NULL, 'd'}, + {"log-file", required_argument, NULL, 'l'}, + {"sensor-log-file", required_argument, NULL, 0}, + {"sensor-log-interval", required_argument, NULL, 0}, + {NULL, 0, NULL, 0} }; static struct server_data server_data; @@ -81,7 +81,7 @@ static pthread_mutex_t mutex; static int server_stop_requested; -static void print_version() +static void print_version(void) { printf("psensor-server %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -92,7 +92,7 @@ static void print_version() "2010-2012"); } -static void print_help() +static void print_help(void) { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -245,12 +245,13 @@ static struct MHD_Response *create_response_file(const char *nurl, static struct MHD_Response * create_response(const char *nurl, const char *method, unsigned int *rp_code) { + char *page, *fpath; struct MHD_Response *resp = NULL; if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) { resp = create_response_api(nurl, method, rp_code); } else { - char *fpath = get_path(nurl, server_data.www_dir); + fpath = get_path(nurl, server_data.www_dir); resp = create_response_file(nurl, method, rp_code, fpath); @@ -260,7 +261,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) if (resp) return resp; - char *page = strdup(PAGE_NOT_FOUND); + page = strdup(PAGE_NOT_FOUND); *rp_code = MHD_HTTP_NOT_FOUND; return MHD_create_response_from_data(strlen(page), @@ -275,7 +276,8 @@ static int cbk_http_request(void *cls, const char *method, const char *version, const char *upload_data, - size_t *upload_data_size, void **ptr) + size_t *upload_data_size, + void **ptr) { static int dummy; struct MHD_Response *response; @@ -463,7 +465,7 @@ int main(int argc, char *argv[]) psensor_free(server_data.cpu_usage); #endif free(server_data.www_dir); - sensors_cleanup(); + lmsensor_cleanup(); #ifdef HAVE_GTOP sysinfo_cleanup(); diff --git a/src/server/sysinfo.c b/src/server/sysinfo.c index a278a3a..a1ea1de 100644 --- a/src/server/sysinfo.c +++ b/src/server/sysinfo.c @@ -67,7 +67,7 @@ void sysinfo_update(struct psysinfo *info) info->interfaces = glibtop_get_netlist(&buf); } -void sysinfo_cleanup() +void sysinfo_cleanup(void) { if (cpu) g_free(cpu); diff --git a/src/server/sysinfo.h b/src/server/sysinfo.h index 3330eb7..1d0537a 100644 --- a/src/server/sysinfo.h +++ b/src/server/sysinfo.h @@ -37,7 +37,7 @@ struct psysinfo { }; void sysinfo_update(struct psysinfo *sysinfo); -void sysinfo_cleanup(); +void sysinfo_cleanup(void); char *sysinfo_to_json_string(const struct psysinfo *sysinfo); diff --git a/src/ui.c b/src/ui.c index dcb3ea0..ddf7fd4 100644 --- a/src/ui.c +++ b/src/ui.c @@ -76,7 +76,7 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) return TRUE; } -void ui_show_about_dialog() +void ui_show_about_dialog(void) { static const char *const authors[] = { "jeanfi@gmail.com", NULL }; diff --git a/src/ui.h b/src/ui.h index af17b78..8232faf 100644 --- a/src/ui.h +++ b/src/ui.h @@ -26,7 +26,7 @@ #include #include -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) +#if defined(HAVE_APPINDICATOR) #include #endif @@ -89,7 +89,7 @@ void ui_window_create(struct ui_psensor *ui); void ui_menu_bar_show(unsigned int show, struct ui_psensor *ui); -void ui_show_about_dialog(); +void ui_show_about_dialog(void); void ui_enable_alpha_channel(struct ui_psensor *ui); diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index c25e270..a396f65 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -34,44 +34,31 @@ static const char *ICON = "psensor_normal"; static const char *ATTENTION_ICON = "psensor_hot"; +static const char *GLADE_FILE += PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade"; + static struct psensor **sensors; static GtkMenuItem **menu_items; -static int appindicator_supported = 1; +static bool appindicator_supported = true; static AppIndicator *indicator; static struct ui_psensor *ui_psensor; -void cb_menu_show(GtkMenuItem *mi, gpointer data) +void ui_appindicator_menu_show_cb(GtkMenuItem *mi, gpointer data) { ui_window_show((struct ui_psensor *)data); } void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data) { -#ifdef HAVE_APPINDICATOR_029 - gdk_threads_enter(); -#endif - ui_pref_dialog_run((struct ui_psensor *)data); - -#ifdef HAVE_APPINDICATOR_029 - gdk_threads_leave(); -#endif } void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data) { struct ui_psensor *ui = data; -#ifdef HAVE_APPINDICATOR_029 - gdk_threads_enter(); -#endif - if (ui->sensors && *ui->sensors) ui_sensorpref_dialog_run(*ui->sensors, ui); - -#ifdef HAVE_APPINDICATOR_029 - gdk_threads_leave(); -#endif } static void @@ -147,16 +134,20 @@ static GtkWidget *get_menu(struct ui_psensor *ui) guint ok; GtkBuilder *builder; + log_fct_enter(); + builder = gtk_builder_new(); error = NULL; ok = gtk_builder_add_from_file - (builder, - PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade", - &error); + (builder, + GLADE_FILE, + &error); if (!ok) { - log_printf(LOG_ERR, error->message); + log_err(_("Failed to load glade file %s: %s"), + GLADE_FILE, + error->message); g_error_free(error); return NULL; } @@ -168,6 +159,8 @@ static GtkWidget *get_menu(struct ui_psensor *ui) g_object_ref(G_OBJECT(menu)); g_object_unref(G_OBJECT(builder)); + log_fct_exit(); + return GTK_WIDGET(menu); } @@ -251,7 +244,7 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator) log_debug("ui_appindicator.unity_fallback()"); - appindicator_supported = 0; + appindicator_supported = false; ico = ui_status_get_icon(ui_psensor); @@ -267,7 +260,7 @@ unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon) ui_status_set_visible(0); - appindicator_supported = 1; + appindicator_supported = true; } void ui_appindicator_update_menu(struct ui_psensor *ui) @@ -298,12 +291,12 @@ void ui_appindicator_init(struct ui_psensor *ui) ui_appindicator_update_menu(ui); } -int is_appindicator_supported() +bool is_appindicator_supported(void) { return appindicator_supported; } -void ui_appindicator_cleanup() +void ui_appindicator_cleanup(void) { free(sensors); } diff --git a/src/ui_appindicator.h b/src/ui_appindicator.h index 1dc682e..c55e8e5 100644 --- a/src/ui_appindicator.h +++ b/src/ui_appindicator.h @@ -19,17 +19,31 @@ #ifndef _PSENSOR_UI_APPINDICATOR_H_ #define _PSENSOR_UI_APPINDICATOR_H_ -#include "config.h" -#include "ui.h" +#include + +#include +#include + +#if defined(HAVE_APPINDICATOR) && HAVE_APPINDICATOR + +bool is_appindicator_supported(void); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) void ui_appindicator_init(struct ui_psensor *ui); -void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention); +void ui_appindicator_update(struct ui_psensor *ui, bool alert); void ui_appindicator_update_menu(struct ui_psensor *ui); -int is_appindicator_supported(); -void ui_appindicator_cleanup(); +void ui_appindicator_cleanup(void); +void ui_appindicator_menu_show_cb(GtkMenuItem *, gpointer); + #else -#define is_appindicator_supported() 0 + +static inline bool is_appindicator_supported(void) { return false; } + +static inline void ui_appindicator_init(struct ui_psensor *ui) {} +static inline void ui_appindicator_update(struct ui_psensor *ui, bool alert) {} +static inline void ui_appindicator_update_menu(struct ui_psensor *ui) {} +static inline void ui_appindicator_cleanup(void) {} +static inline void ui_appindicator_menu_show_cb(GtkMenuItem *m, gpointer d) {} + #endif #endif diff --git a/src/ui_graph.c b/src/ui_graph.c index e5e0e76..0ea7bfe 100644 --- a/src/ui_graph.c +++ b/src/ui_graph.c @@ -45,7 +45,7 @@ on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) return FALSE; } -void smooth_curves_enabled_changed_cbk(void *data) +static void smooth_curves_enabled_changed_cbk(void *data) { is_smooth_curves_enabled = config_is_smooth_curves_enabled(); } diff --git a/src/ui_notify.h b/src/ui_notify.h index 82b66a1..5b30afe 100644 --- a/src/ui_notify.h +++ b/src/ui_notify.h @@ -19,9 +19,16 @@ #ifndef _PSENSOR_UI_NOTIFY_H_ #define _PSENSOR_UI_NOTIFY_H_ -#include "psensor.h" -#include "ui.h" +#include -void ui_notify(struct psensor *sensor, struct ui_psensor *ui); +#if defined(HAVE_LIBNOTIFY) && HAVE_LIBNOTIFY + +void ui_notify(struct psensor *, struct ui_psensor *); + +#else + +static inline void ui_notify(struct psensor *s, struct ui_psensor *u) {} + +#endif #endif diff --git a/src/ui_pref.c b/src/ui_pref.c index 5494777..4594a97 100644 --- a/src/ui_pref.c +++ b/src/ui_pref.c @@ -19,12 +19,19 @@ #include #include -#include +#include +#include #include #include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include GdkRGBA color_to_GdkRGBA(struct color *color) { @@ -144,6 +151,16 @@ void ui_pref_dialog_run(struct ui_psensor *ui) gtk_toggle_button_set_active(w_enable_launcher_counter, !cfg->unity_launcher_count_disabled); + if (ui_unity_is_supported()) { + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_enable_launcher_counter), FALSE); + } else { + gtk_widget_set_sensitive + (GTK_WIDGET(w_enable_launcher_counter), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_enable_launcher_counter), TRUE); + } + w_smooth_curves = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "graph_smooth_curves")); gtk_toggle_button_set_active(w_smooth_curves, @@ -180,29 +197,50 @@ void ui_pref_dialog_run(struct ui_psensor *ui) "lmsensors")); gtk_toggle_button_set_active(w_lmsensors, config_is_lmsensor_enabled()); + if (lmsensor_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_lmsensors), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_lmsensors), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_lmsensors), TRUE); + } + w_nvctrl = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "nvctrl")); -#if !HAVE_NVIDIA - gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0); -#endif + + if (nvidia_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_nvctrl), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_nvctrl), TRUE); + } + gtk_toggle_button_set_active(w_nvctrl, config_is_nvctrl_enabled()); w_atiadlsdk = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "atiadlsdk")); -#if !HAVE_LIBATIADL - gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0); -#endif + if (amd_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_atiadlsdk), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_atiadlsdk), TRUE); + } + gtk_toggle_button_set_active(w_atiadlsdk, config_is_atiadlsdk_enabled()); w_gtop2 = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "gtop2")); -#if !HAVE_GTOP - gtk_widget_set_sensitive(GTK_WIDGET(w_gtop2), 0); -#endif + + if (gtop2_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_gtop2), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_gtop2), TRUE); + } + gtk_toggle_button_set_active(w_gtop2, config_is_gtop2_enabled()); w_hddtemp @@ -214,18 +252,28 @@ void ui_pref_dialog_run(struct ui_psensor *ui) w_libatasmart = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "libatasmart")); -#if !HAVE_ATASMART - gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0); -#endif + + if (atasmart_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_libatasmart), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_libatasmart), TRUE); + } + gtk_toggle_button_set_active(w_libatasmart, config_is_libatasmart_enabled()); w_udisks2 = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "udisks2")); -#if !HAVE_LIBUDISKS2 - gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0); -#endif + + if (udisks2_is_supported()) { + gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), FALSE); + } else { + gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0); + gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), TRUE); + } + gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled()); result = gtk_dialog_run(diag); diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 5f1cb4f..53c7336 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -85,7 +85,8 @@ static void populate(struct ui_psensor *ui) gtk_list_store_set(store, &iter, COL_NAME, s->name, COL_COLOR_STR, scolor, - COL_GRAPH_ENABLED, s->graph_enabled, + COL_GRAPH_ENABLED, + config_is_sensor_graph_enabled(s->id), COL_SENSOR, s, COL_DISPLAY_ENABLED, enabled, -1); @@ -323,6 +324,7 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell, GtkTreePath *path; struct psensor *s, *s2; gboolean valid; + bool b; ui = (struct ui_psensor *)data; fmodel = gtk_tree_view_get_model(ui->sensors_tree); @@ -333,8 +335,9 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell, gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1); - s->graph_enabled ^= 1; - config_set_sensor_graph_enabled(s->id, s->graph_enabled); + b = config_is_sensor_graph_enabled(s->id) ^ 1; + config_set_sensor_graph_enabled(s->id, b); + config_sync(); gtk_tree_path_free(path); @@ -348,7 +351,7 @@ void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell, gtk_list_store_set(ui->sensors_store, &iter, COL_GRAPH_ENABLED, - s->graph_enabled, + b, -1); valid = gtk_tree_model_iter_next(model, &iter); } diff --git a/src/ui_sensorlist.h b/src/ui_sensorlist.h index 8e4d6c6..4b9b720 100644 --- a/src/ui_sensorlist.h +++ b/src/ui_sensorlist.h @@ -28,4 +28,6 @@ void ui_sensorlist_create(struct ui_psensor *); /* Update values current/min/max */ void ui_sensorlist_update(struct ui_psensor *ui, bool complete); +void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *, gchar *, gpointer); + #endif diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 6ca0815..78fb551 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -22,16 +22,13 @@ #include #include +#include #include #include #include #include -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) -#include "ui_appindicator.h" -#endif - enum { COL_NAME = 0, COL_SENSOR_PREF @@ -45,7 +42,7 @@ struct sensor_pref { int alarm_enabled; int alarm_high_threshold; int alarm_low_threshold; - unsigned int appindicator_enabled; + bool appindicator_enabled; unsigned int appindicator_label_enabled; unsigned int display_enabled; }; @@ -64,8 +61,8 @@ sensor_pref_new(struct psensor *s, struct config *cfg) p->sensor = s; p->name = strdup(s->name); - p->graph_enabled = s->graph_enabled; - p->alarm_enabled = s->alarm_enabled; + p->graph_enabled = config_is_sensor_graph_enabled(s->id); + p->alarm_enabled = config_get_sensor_alarm_enabled(s->id); p->color = color_dup(s->color); p->display_enabled = config_is_sensor_enabled(s->id); @@ -79,7 +76,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg) = celsius_to_fahrenheit(s->alarm_low_threshold); } - p->appindicator_enabled = s->appindicator_enabled; + p->appindicator_enabled = config_is_appindicator_enabled(s->id); p->appindicator_label_enabled = config_is_appindicator_label_enabled(s->id); @@ -290,6 +287,23 @@ 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_appindicator_supported()) { + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_label_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_enabled), FALSE); + } else { + gtk_widget_set_sensitive + (GTK_WIDGET(w_appindicator_label_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_label_enabled), TRUE); + gtk_widget_set_sensitive + (GTK_WIDGET(w_appindicator_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_enabled), TRUE); + } + gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); gtk_spin_button_set_value(w_high_threshold, p->alarm_high_threshold); gtk_spin_button_set_value(w_low_threshold, p->alarm_low_threshold); @@ -323,6 +337,7 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree) struct psensor **s_cur; int i; GtkTreePath *p; + GtkTreeSelection *sel; p = NULL; for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++) @@ -332,9 +347,9 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree) } if (p) { - GtkTreeSelection *s = gtk_tree_view_get_selection(tree); + sel = gtk_tree_view_get_selection(tree); - gtk_tree_selection_select_path(s, p); + gtk_tree_selection_select_path(sel, p); gtk_tree_path_free(p); } } @@ -351,10 +366,7 @@ 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->graph_enabled) { - s->graph_enabled = p->graph_enabled; - config_set_sensor_graph_enabled(s->id, s->graph_enabled); - } + config_set_sensor_graph_enabled(s->id, p->graph_enabled); if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) { s->alarm_high_threshold @@ -369,10 +381,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) config_set_sensor_alarm_high_threshold(s->id, s->alarm_high_threshold); config_set_sensor_alarm_low_threshold(s->id, s->alarm_low_threshold); - if (s->alarm_enabled != p->alarm_enabled) { - s->alarm_enabled = p->alarm_enabled; - config_set_sensor_alarm_enabled(s->id, s->alarm_enabled); - } + config_set_sensor_alarm_enabled(s->id, p->alarm_enabled); color_set(s->color, p->color->red, @@ -380,10 +389,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) p->color->blue); config_set_sensor_color(s->id, s->color); - if (s->appindicator_enabled != p->appindicator_enabled) { - s->appindicator_enabled = p->appindicator_enabled; - config_set_appindicator_enabled(s->id, s->appindicator_enabled); - } + config_set_appindicator_enabled(s->id, p->appindicator_enabled); config_set_appindicator_label_enabled(s->id, p->appindicator_label_enabled); @@ -482,7 +488,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) if (result == GTK_RESPONSE_ACCEPT) { apply_prefs(model, ui->config); ui_sensorlist_update(ui, 1); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) +#if defined(HAVE_APPINDICATOR) ui_appindicator_update_menu(ui); #endif } diff --git a/src/ui_sensorpref.h b/src/ui_sensorpref.h index e23c743..e433f4a 100644 --- a/src/ui_sensorpref.h +++ b/src/ui_sensorpref.h @@ -19,8 +19,18 @@ #ifndef _PSENSOR_UI_SENSORPREF_H_ #define _PSENSOR_UI_SENSORPREF_H_ -#include "ui.h" +#include void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui); +void ui_sensorpref_name_changed_cb(GtkEntry *, gpointer); +void ui_sensorpref_draw_toggled_cb(GtkToggleButton *, gpointer); +void ui_sensorpref_display_toggled_cb(GtkToggleButton *, gpointer); +void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *, gpointer); +void ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *, gpointer); +void ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *, gpointer); +void ui_sensorpref_color_set_cb(GtkColorButton *, gpointer); +void ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *, gpointer); +void ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *, gpointer); + #endif diff --git a/src/ui_status.c b/src/ui_status.c index 50dfc9c..a978929 100644 --- a/src/ui_status.c +++ b/src/ui_status.c @@ -62,12 +62,12 @@ void ui_status_init(struct ui_psensor *ui) ui); } -int is_status_supported() +int is_status_supported(void) { return status && gtk_status_icon_is_embedded(status); } -void ui_status_cleanup() +void ui_status_cleanup(void) { log_debug("ui_status_cleanup()"); diff --git a/src/ui_status.h b/src/ui_status.h index cd23300..9267b27 100644 --- a/src/ui_status.h +++ b/src/ui_status.h @@ -24,10 +24,10 @@ #include void ui_status_init(struct ui_psensor *ui); -void ui_status_cleanup(); +void ui_status_cleanup(void); void ui_status_update(struct ui_psensor *ui, unsigned int attention); /* Whether status icon is supported i.e. visible. */ -int is_status_supported(); +int is_status_supported(void); GtkStatusIcon *ui_status_get_icon(struct ui_psensor *ui); /* Whether the statuc icon should be visible.*/ void ui_status_set_visible(unsigned int visible); diff --git a/src/ui_unity.c b/src/ui_unity.c index 2c00403..0ab2e12 100644 --- a/src/ui_unity.c +++ b/src/ui_unity.c @@ -18,6 +18,7 @@ */ #include +#include #include #include @@ -25,6 +26,28 @@ static int initialized; static UnityLauncherEntry *psensor_entry; static unsigned int last_visible = -1; +static double get_max_current_value(struct psensor **sensors, unsigned int type) +{ + double m, v; + struct psensor *s; + + m = UNKNOWN_DBL_VALUE; + while (*sensors) { + s = *sensors; + + if ((s->type & type) && config_is_sensor_graph_enabled(s->id)) { + v = psensor_get_current_value(s); + + if (m == UNKNOWN_DBL_VALUE || v > m) + m = v; + } + + sensors++; + } + + return m; +} + void ui_unity_launcher_entry_update(struct psensor **sensors, unsigned int show, int use_celsius) @@ -50,7 +73,7 @@ void ui_unity_launcher_entry_update(struct psensor **sensors, } if (sensors && *sensors) { - v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP); + v = get_max_current_value(sensors, SENSOR_TYPE_TEMP); if (!use_celsius) v = celsius_to_fahrenheit(v); diff --git a/src/ui_unity.h b/src/ui_unity.h index d4c79a5..cf8fa7d 100644 --- a/src/ui_unity.h +++ b/src/ui_unity.h @@ -19,10 +19,24 @@ #ifndef _PSENSOR_UI_UNITY_H_ #define _PSENSOR_UI_UNITY_H_ +#include #include -void ui_unity_launcher_entry_update(struct psensor **sensors, - unsigned int show, - int use_celsius); +#if defined(HAVE_UNITY) && HAVE_UNITY + +static inline bool ui_unity_is_supported(void) { return true; } + +void ui_unity_launcher_entry_update(struct psensor **, unsigned int, int); + +#else + +static inline bool ui_unity_is_supported(void) { return false; } + +static inline void +ui_unity_launcher_entry_update(struct psensor **s, + unsigned int show, + int use_celsius) {} + +#endif #endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 9f59764..332c0a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ check-local: checkpatch.pl - find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore FUNCTION_WITHOUT_ARGS,SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; - find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl --ignore FUNCTION_WITHOUT_ARGS,SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; + find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; + find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ diff --git a/tests/Makefile.in b/tests/Makefile.in index f4f77ff..6b94785 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1078,8 +1078,8 @@ uninstall-am: uninstall uninstall-am check-local: checkpatch.pl - find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore FUNCTION_WITHOUT_ARGS,SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; - find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl --ignore FUNCTION_WITHOUT_ARGS,SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; + find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; + find $(top_srcdir)/src -name \*.h -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \; # 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/tests/test_io_dir_list.c b/tests/test_io_dir_list.c index 29a9c31..1d3ec17 100644 --- a/tests/test_io_dir_list.c +++ b/tests/test_io_dir_list.c @@ -23,7 +23,7 @@ #include "../src/lib/pio.h" -static int test_empty_dir() +static int test_empty_dir(void) { int ret; char **paths; @@ -38,12 +38,12 @@ static int test_empty_dir() } paths_free(paths); - } + } return ret; } -static int test_2files_dir() +static int test_2files_dir(void) { int ret, one, two; char **paths, **cur; @@ -68,21 +68,21 @@ static int test_2files_dir() ret = 1; } - + cur++; } - + if (!ret && one == 1 && two == 1) ret = 0; else ret = 1; - + paths_free(paths); return ret; } -static int tests_dir_list() { +static int tests_dir_list(void) { int failures; failures = test_empty_dir(); @@ -98,7 +98,7 @@ int main(int argc, char **argv) failures = tests_dir_list(); - if (failures) + if (failures) exit(EXIT_FAILURE); else exit(EXIT_SUCCESS); diff --git a/tests/test_psensor_type_to_unit_str.c b/tests/test_psensor_type_to_unit_str.c index 3ce27f8..6be91d5 100644 --- a/tests/test_psensor_type_to_unit_str.c +++ b/tests/test_psensor_type_to_unit_str.c @@ -42,7 +42,7 @@ test_fct(unsigned int type, int use_celsius, const char *ref) return 1; } -static int test() { +static int test(void) { int failures; failures = 0; @@ -75,7 +75,7 @@ int main(int argc, char **argv) failures = test(); - if (failures) + if (failures) exit(EXIT_FAILURE); else exit(EXIT_SUCCESS); diff --git a/tests/test_url_encode.c b/tests/test_url_encode.c index 0b64aef..1ffe0ca 100644 --- a/tests/test_url_encode.c +++ b/tests/test_url_encode.c @@ -24,7 +24,7 @@ #include "../src/lib/url.h" -int test_url_encode(char *url, char *ref_url) +static int test_url_encode(char *url, char *ref_url) { char *res_url; int ret; @@ -45,7 +45,7 @@ int test_url_encode(char *url, char *ref_url) return ret; } -int tests_url_encode() +static int tests_url_encode(void) { int failures; diff --git a/tests/test_url_normalize.c b/tests/test_url_normalize.c index ef48203..9736c66 100644 --- a/tests/test_url_normalize.c +++ b/tests/test_url_normalize.c @@ -24,7 +24,7 @@ #include "../src/lib/url.h" -int test_url_normalize(const char *url, const char *ref_url) +static int test_url_normalize(const char *url, const char *ref_url) { int ret; char *tmp = url_normalize(url); @@ -46,7 +46,7 @@ int test_url_normalize(const char *url, const char *ref_url) return ret; } -int tests_url_normalize() +static int tests_url_normalize(void) { int failures; @@ -69,7 +69,7 @@ int main(int argc, char **argv) failures += tests_url_normalize(); - if (failures) + if (failures) exit(EXIT_FAILURE); else exit(EXIT_SUCCESS);