diff --git a/COPYRIGHT b/COPYRIGHT index 9289cd8..9c40b15 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -The code in the GKrellM distribution is Copyright (C) 1999-2010 by Bill Wilson +The code in the GKrellM distribution is Copyright (C) 1999-2014 by Bill Wilson except for: base64.c which is Copyright 1997 by Eric S. Raymond and is under the GPL, and diff --git a/Makefile b/Makefile index d557b27..695e23f 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ BINMODE = 755 #GTOP_LIBS_D = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps #export GTOP_INCLUDE GTOP_LIBS GTOP_LIBS_D -VERSION = 2.3.5 +VERSION = 2.3.6-RC1 INSTALLROOT ?= $(DESTDIR)$(PREFIX) diff --git a/README b/README index b64505c..84df8ac 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Author: Bill Wilson Email: billw--at--gkrellm.net Homepage: http://gkrellm.net -Copyright (c) 1999-2010 by Bill Wilson. This program is free software +Copyright (c) 1999-2014 by Bill Wilson. This program is free software which I release under the GNU General Public License. Read the COPYRIGHT file for more info. diff --git a/gkrellm.1 b/gkrellm.1 index be3960b..f7530ae 100644 --- a/gkrellm.1 +++ b/gkrellm.1 @@ -1,4 +1,4 @@ -.TH gkrellm 1 "Sep 15, 2010" "GNU/Linux" "User's Manual" +.TH gkrellm 1 "Oct 14, 2014" "GNU/Linux" "User's Manual" .SH "NAME" gkrellm \- The GNU Krell Monitors diff --git a/gkrellmd.1 b/gkrellmd.1 index a307341..073a665 100644 --- a/gkrellmd.1 +++ b/gkrellmd.1 @@ -1,4 +1,4 @@ -.TH gkrellmd 1 "Sep 15, 2010" "GNU/Linux" "User's Manual" +.TH gkrellmd 1 "Oct 14, 2014" "GNU/Linux" "User's Manual" .SH "NAME" gkrellmd \- The GNU Krell Monitors Server diff --git a/po/bg.po b/po/bg.po index 8517a44..f909330 100644 --- a/po/bg.po +++ b/po/bg.po @@ -932,7 +932,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -941,7 +941,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/cs.po b/po/cs.po index af01a6c..a3f3701 100644 --- a/po/cs.po +++ b/po/cs.po @@ -900,7 +900,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -909,7 +909,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 Bill Wilson\n" +"Copyright (c) 1999-2014 Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/da.po b/po/da.po index 49e8663..422bde9 100644 --- a/po/da.po +++ b/po/da.po @@ -914,7 +914,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -923,7 +923,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/de.po b/po/de.po index a53b6b0..3a4e251 100644 --- a/po/de.po +++ b/po/de.po @@ -931,7 +931,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -940,7 +940,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/es.po b/po/es.po index 560ea80..9099d32 100644 --- a/po/es.po +++ b/po/es.po @@ -1281,7 +1281,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -1290,7 +1290,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "Monitores GNU Krell\n" "\n" -"Copyright (c) 1999-2010 por Bill Wilson\n" +"Copyright (c) 1999-2014 por Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/fr.po b/po/fr.po index a1d4c18..1bf56c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -968,7 +968,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -977,7 +977,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 par Bill Wilson\n" +"Copyright (c) 1999-2014 par Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/gkrellm.pot b/po/gkrellm.pot index e3c4664..383c510 100644 --- a/po/gkrellm.pot +++ b/po/gkrellm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-07 10:00-0500\n" +"POT-Creation-Date: 2014-10-14 20:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,8 +21,8 @@ msgstr "" msgid "GKrellM Set Alerts" msgstr "" -#: ../src/alerts.c:1177 ../src/battery.c:1134 ../src/gui.c:567 -#: ../src/sensors.c:2820 +#: ../src/alerts.c:1177 ../src/battery.c:1134 ../src/gui.c:555 +#: ../src/sensors.c:2805 msgid "Alerts" msgstr "" @@ -99,7 +99,7 @@ msgid "" "and the alert must be reconfigured." msgstr "" -#: ../src/battery.c:1117 ../src/mail.c:3848 ../src/sensors.c:2688 +#: ../src/battery.c:1117 ../src/mail.c:3826 ../src/sensors.c:2674 msgid "Setup\n" msgstr "" @@ -137,8 +137,8 @@ msgid "" "Select the exponential model for more accuracy in this case.\n" msgstr "" -#: ../src/battery.c:1136 ../src/cpu.c:1284 ../src/disk.c:1360 ../src/fs.c:2494 -#: ../src/mem.c:1281 ../src/net.c:2934 ../src/proc.c:904 ../src/sensors.c:2698 +#: ../src/battery.c:1136 ../src/cpu.c:1352 ../src/disk.c:1359 ../src/fs.c:2496 +#: ../src/mem.c:1281 ../src/net.c:2945 ../src/proc.c:903 ../src/sensors.c:2684 msgid "Substitution variables may be used in alert commands.\n" msgstr "" @@ -162,12 +162,12 @@ msgstr "" msgid "\t$c charging state (boolean).\n" msgstr "" -#: ../src/battery.c:1143 ../src/fs.c:2496 ../src/inet.c:1823 ../src/mem.c:1284 +#: ../src/battery.c:1143 ../src/fs.c:2498 ../src/inet.c:1823 ../src/mem.c:1284 msgid "Mouse Button Actions:\n" msgstr "" -#: ../src/battery.c:1144 ../src/fs.c:2497 ../src/gui.c:1038 ../src/inet.c:1824 -#: ../src/mail.c:3889 ../src/mail.c:3892 ../src/mem.c:1285 +#: ../src/battery.c:1144 ../src/fs.c:2499 ../src/gui.c:1026 ../src/inet.c:1824 +#: ../src/mail.c:3867 ../src/mail.c:3870 ../src/mem.c:1285 msgid "\tLeft " msgstr "" @@ -177,7 +177,7 @@ msgid "" "\t\tbetween a minutes, percentage, or charging rate display.\n" msgstr "" -#: ../src/battery.c:1147 ../src/inet.c:1827 ../src/mail.c:3895 +#: ../src/battery.c:1147 ../src/inet.c:1827 ../src/mail.c:3873 msgid "\tMiddle " msgstr "" @@ -186,15 +186,15 @@ msgid "" " clicking anywhere on the Battery panel also toggles the display mode.\n" msgstr "" -#: ../src/battery.c:1164 ../src/clock.c:714 ../src/cpu.c:1307 -#: ../src/disk.c:1385 ../src/fs.c:2532 ../src/gui.c:1063 ../src/gui.c:1926 -#: ../src/mail.c:4243 ../src/mem.c:1307 ../src/proc.c:918 -#: ../src/sensors.c:2836 ../src/sensors.c:2871 ../src/uptime.c:277 +#: ../src/battery.c:1164 ../src/clock.c:717 ../src/cpu.c:1374 +#: ../src/disk.c:1384 ../src/fs.c:2534 ../src/gui.c:1051 ../src/gui.c:1896 +#: ../src/mail.c:4215 ../src/mem.c:1307 ../src/proc.c:917 +#: ../src/sensors.c:2821 ../src/sensors.c:2856 ../src/uptime.c:277 msgid "Options" msgstr "" -#: ../src/battery.c:1169 ../src/clock.c:720 ../src/clock.c:739 -#: ../src/disk.c:1398 ../src/plugins.c:1746 ../src/sensors.c:2768 +#: ../src/battery.c:1169 ../src/clock.c:723 ../src/clock.c:742 +#: ../src/disk.c:1397 ../src/plugins.c:1734 ../src/sensors.c:2754 msgid "Enable" msgstr "" @@ -230,16 +230,16 @@ msgstr "" msgid "Seconds between updates" msgstr "" -#: ../src/battery.c:1222 ../src/clock.c:755 ../src/cpu.c:1358 -#: ../src/disk.c:1431 ../src/fs.c:2529 ../src/inet.c:2011 ../src/mail.c:3932 -#: ../src/mem.c:1346 ../src/net.c:3075 ../src/proc.c:958 ../src/sensors.c:2737 +#: ../src/battery.c:1222 ../src/clock.c:758 ../src/cpu.c:1430 +#: ../src/disk.c:1430 ../src/fs.c:2531 ../src/inet.c:2011 ../src/mail.c:3906 +#: ../src/mem.c:1346 ../src/net.c:3086 ../src/proc.c:957 ../src/sensors.c:2723 #: ../src/uptime.c:274 msgid "Setup" msgstr "" -#: ../src/battery.c:1225 ../src/clock.c:782 ../src/cpu.c:1389 -#: ../src/disk.c:1453 ../src/inet.c:2041 ../src/mem.c:1418 ../src/net.c:3063 -#: ../src/proc.c:977 ../src/uptime.c:285 +#: ../src/battery.c:1225 ../src/clock.c:785 ../src/cpu.c:1464 +#: ../src/disk.c:1452 ../src/inet.c:2041 ../src/mem.c:1418 ../src/net.c:3074 +#: ../src/proc.c:976 ../src/uptime.c:285 msgid "Launch Commands" msgstr "" @@ -247,10 +247,10 @@ msgstr "" msgid "Alerts check for percent capacity remaining." msgstr "" -#: ../src/battery.c:1251 ../src/clock.c:790 ../src/cpu.c:1412 -#: ../src/disk.c:1467 ../src/fs.c:2574 ../src/gui.c:1173 ../src/gui.c:2007 -#: ../src/inet.c:2054 ../src/mail.c:4311 ../src/mem.c:1436 ../src/net.c:3105 -#: ../src/proc.c:989 ../src/sensors.c:2917 +#: ../src/battery.c:1251 ../src/clock.c:793 ../src/cpu.c:1487 +#: ../src/disk.c:1466 ../src/fs.c:2576 ../src/gui.c:1161 ../src/gui.c:1977 +#: ../src/inet.c:2054 ../src/mail.c:4283 ../src/mem.c:1436 ../src/net.c:3121 +#: ../src/proc.c:988 ../src/sensors.c:2902 msgid "Info" msgstr "" @@ -258,67 +258,67 @@ msgstr "" msgid "Ag8" msgstr "" -#: ../src/chart.c:2310 ../src/chart.c:2467 -msgid "/Control/Auto mode sticks at peak value" +#: ../src/chart.c:2472 +msgid "Control" msgstr "" -#: ../src/chart.c:2314 ../src/chart.c:2465 -msgid "/Control/Auto mode recalibrate" +#: ../src/chart.c:2474 +msgid "Sequence..." msgstr "" -#: ../src/chart.c:2463 -msgid "/Control" +#: ../src/chart.c:2476 +msgid "Auto mode recalibrate" msgstr "" -#: ../src/chart.c:2464 ../src/chart.c:2469 ../src/chart.c:2475 -msgid "/Control/-" +#: ../src/chart.c:2483 +msgid "Auto mode sticks at peak value" msgstr "" -#: ../src/chart.c:2470 ../src/chart.c:2474 ../src/chart.c:2501 -msgid "/Control/Sequence.../1 2 5" +#: ../src/chart.c:2490 +msgid "1 2 5" msgstr "" -#: ../src/chart.c:2472 ../src/chart.c:2503 -msgid "/Control/Sequence.../1 1.5 2 3 5 7" +#: ../src/chart.c:2492 +msgid "1 1.5 2 3 5 7" msgstr "" -#: ../src/chart.c:2538 +#: ../src/chart.c:2561 msgid "GKrellM Chart Config" msgstr "" -#: ../src/chart.c:2559 +#: ../src/chart.c:2582 msgid "Line style" msgstr "" -#: ../src/chart.c:2566 +#: ../src/chart.c:2589 msgid "Inverted" msgstr "" -#: ../src/chart.c:2574 +#: ../src/chart.c:2597 msgid "Split view" msgstr "" -#: ../src/chart.c:2586 +#: ../src/chart.c:2609 msgid "Hide" msgstr "" -#: ../src/chart.c:2601 +#: ../src/chart.c:2624 msgid "Resolution per Grid" msgstr "" -#: ../src/chart.c:2621 +#: ../src/chart.c:2644 msgid "Auto" msgstr "" -#: ../src/chart.c:2633 +#: ../src/chart.c:2656 msgid "Number of Grids" msgstr "" -#: ../src/chart.c:2638 +#: ../src/chart.c:2661 msgid "0: Auto 1-5: Constant" msgstr "" -#: ../src/chart.c:2647 +#: ../src/chart.c:2670 msgid "Chart height" msgstr "" @@ -330,54 +330,54 @@ msgstr "" msgid "%a %e %b" msgstr "" -#: ../src/clock.c:688 +#: ../src/clock.c:691 msgid "Clock/Calendar Format Strings\n" msgstr "" -#: ../src/clock.c:689 +#: ../src/clock.c:692 msgid "" "The display format strings should contain strftime conversion\n" "characters and Pango text attribute markup strings.\n" msgstr "" -#: ../src/clock.c:692 +#: ../src/clock.c:695 msgid "" "For the clock, the provided default strings will display a 12 hour\n" "clock with seconds, a 12 hour clock with AM/PM indicator, or a 24 hour\n" "clock with seconds.\n" msgstr "" -#: ../src/clock.c:696 +#: ../src/clock.c:699 msgid "" "The special $A substitution variable expands to the current theme\n" "alternate color and is for use with the Pango \"foreground\" attribute.\n" msgstr "" -#: ../src/clock.c:716 ../src/clock.c:787 ../src/clock.c:850 +#: ../src/clock.c:719 ../src/clock.c:790 ../src/clock.c:853 msgid "Calendar" msgstr "" -#: ../src/clock.c:723 ../src/clock.c:742 +#: ../src/clock.c:726 ../src/clock.c:745 msgid "Display format string:" msgstr "" -#: ../src/clock.c:735 ../src/clock.c:801 ../src/clock.c:811 +#: ../src/clock.c:738 ../src/clock.c:804 ../src/clock.c:814 msgid "Clock" msgstr "" -#: ../src/clock.c:757 +#: ../src/clock.c:760 msgid "Clock Chime Commands" msgstr "" -#: ../src/clock.c:762 +#: ../src/clock.c:765 msgid "Hour" msgstr "" -#: ../src/clock.c:770 +#: ../src/clock.c:773 msgid "Quarter hour" msgstr "" -#: ../src/clock.c:780 +#: ../src/clock.c:783 msgid "Loop hour chime command" msgstr "" @@ -412,165 +412,170 @@ msgstr "" msgid "Cannot open config file %s for writing.\n" msgstr "" -#: ../src/cpu.c:187 +#: ../src/cpu.c:196 #, c-format msgid "CPU%s" msgstr "" -#: ../src/cpu.c:855 +#: ../src/cpu.c:854 msgid "sys time" msgstr "" -#: ../src/cpu.c:856 +#: ../src/cpu.c:855 msgid "user time" msgstr "" -#: ../src/cpu.c:865 ../src/cpu.c:869 ../src/cpu.c:1117 +#: ../src/cpu.c:864 ../src/cpu.c:868 ../src/cpu.c:1142 msgid "nice time" msgstr "" -#: ../src/cpu.c:977 ../src/cpu.c:1444 +#: ../src/cpu.c:981 ../src/cpu.c:1519 msgid "CPU" msgstr "" -#: ../src/cpu.c:978 ../src/fs.c:1301 ../src/mem.c:998 +#: ../src/cpu.c:982 ../src/fs.c:1308 ../src/mem.c:998 msgid "Percent Usage" msgstr "" -#: ../src/cpu.c:1276 ../src/disk.c:1352 ../src/gui.c:1010 ../src/inet.c:1812 -#: ../src/mem.c:1254 ../src/net.c:2918 ../src/proc.c:895 +#: ../src/cpu.c:1343 ../src/disk.c:1351 ../src/gui.c:998 ../src/inet.c:1812 +#: ../src/mem.c:1254 ../src/net.c:2929 ../src/proc.c:894 msgid "Chart Labels\n" msgstr "" -#: ../src/cpu.c:1277 ../src/disk.c:1353 ../src/inet.c:1813 ../src/mem.c:1255 -#: ../src/net.c:2919 ../src/proc.c:896 +#: ../src/cpu.c:1344 ../src/disk.c:1352 ../src/inet.c:1813 ../src/mem.c:1255 +#: ../src/net.c:2930 ../src/proc.c:895 msgid "Substitution variables for the format string for chart labels:\n" msgstr "" -#: ../src/cpu.c:1278 +#: ../src/cpu.c:1345 msgid "\t$L the CPU label\n" msgstr "" -#: ../src/cpu.c:1279 +#: ../src/cpu.c:1346 +msgid "\t$N the CPU number\n" +msgstr "" + +#: ../src/cpu.c:1347 msgid "\t$T total CPU time percent usage\n" msgstr "" -#: ../src/cpu.c:1280 +#: ../src/cpu.c:1348 msgid "\t$s sys time percent usage\n" msgstr "" -#: ../src/cpu.c:1281 +#: ../src/cpu.c:1349 msgid "\t$u user time percent usage\n" msgstr "" -#: ../src/cpu.c:1282 +#: ../src/cpu.c:1350 msgid "\t$n nice time percent usage\n" msgstr "" -#: ../src/cpu.c:1311 +#: ../src/cpu.c:1381 msgid "Enable CPU" msgstr "" -#: ../src/cpu.c:1316 +#: ../src/cpu.c:1389 msgid "Exclude nice CPU time from krell even if nice is shown on chart" msgstr "" -#: ../src/cpu.c:1321 ../src/proc.c:928 +#: ../src/cpu.c:1394 ../src/proc.c:927 msgid "Draw fan and temperature values separately (not alternating)." msgstr "" -#: ../src/cpu.c:1328 +#: ../src/cpu.c:1401 msgid "Apply any CPU chart config height change to all CPU charts" msgstr "" -#: ../src/cpu.c:1331 +#: ../src/cpu.c:1406 +msgid "Show labels in panels (no labels reduces vertical space)" +msgstr "" + +#: ../src/cpu.c:1409 msgid "SMP Charts Select" msgstr "" -#: ../src/cpu.c:1334 -msgid "Real CPUs." -msgstr "" - -#: ../src/cpu.c:1339 +#: ../src/cpu.c:1419 +#, c-format msgid "Composite CPU." msgstr "" -#: ../src/cpu.c:1345 -msgid "Composite and real" -msgstr "" - -#: ../src/cpu.c:1361 ../src/disk.c:1434 ../src/inet.c:2023 ../src/mem.c:1349 -#: ../src/net.c:3078 ../src/proc.c:961 -msgid "Format String for Chart Labels" -msgstr "" - -#: ../src/cpu.c:1374 -msgid "\\fu \\.$u\\n\\fs \\.$s" -msgstr "" - -#: ../src/cpu.c:1376 -msgid "\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s" -msgstr "" - -#: ../src/cpu.c:1378 -msgid "\\ww\\D3\\f\\au\\.$u\\D0\\f\\as\\.$s" -msgstr "" - -#: ../src/cpu.c:1397 +#: ../src/cpu.c:1421 ../src/cpu.c:1472 #, c-format msgid "%s" msgstr "" -#: ../src/disk.c:325 ../src/disk.c:1406 ../src/disk.c:1476 ../src/disk.c:1504 -#: ../src/sensors.c:2297 ../src/sensors.c:2375 ../src/sysdeps/openbsd.c:410 +#: ../src/cpu.c:1433 ../src/disk.c:1433 ../src/inet.c:2023 ../src/mem.c:1349 +#: ../src/net.c:3089 ../src/proc.c:960 +msgid "Format String for Chart Labels" +msgstr "" + +#: ../src/cpu.c:1446 +msgid "\\fu \\.$u\\n\\fs \\.$s" +msgstr "" + +#: ../src/cpu.c:1448 +msgid "\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s" +msgstr "" + +#: ../src/cpu.c:1450 +msgid "\\ww\\D3\\f\\au\\.$u\\D0\\f\\as\\.$s" +msgstr "" + +#: ../src/cpu.c:1452 +msgid "\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D1\\f\\r$L" +msgstr "" + +#: ../src/disk.c:325 ../src/disk.c:1405 ../src/disk.c:1475 ../src/disk.c:1503 +#: ../src/sensors.c:2305 ../src/sensors.c:2369 ../src/sysdeps/openbsd.c:410 msgid "Disk" msgstr "" -#: ../src/disk.c:766 ../src/disk.c:1228 +#: ../src/disk.c:765 ../src/disk.c:1227 msgid "Write bytes" msgstr "" -#: ../src/disk.c:767 ../src/disk.c:1225 +#: ../src/disk.c:766 ../src/disk.c:1224 msgid "Read bytes" msgstr "" -#: ../src/disk.c:778 +#: ../src/disk.c:777 msgid "Disk I/O blocks per sec" msgstr "" -#: ../src/disk.c:778 +#: ../src/disk.c:777 msgid "Disk I/O bytes per sec" msgstr "" -#: ../src/disk.c:894 ../src/net.c:2419 +#: ../src/disk.c:893 ../src/net.c:2421 msgid "Bytes per second" msgstr "" -#: ../src/disk.c:1092 +#: ../src/disk.c:1091 msgid "Composite chart combines data for all disks" msgstr "" -#: ../src/disk.c:1354 +#: ../src/disk.c:1353 msgid "\t$L the Disk label\n" msgstr "" -#: ../src/disk.c:1355 ../src/inet.c:1814 ../src/mem.c:1256 ../src/net.c:2920 +#: ../src/disk.c:1354 ../src/inet.c:1814 ../src/mem.c:1256 ../src/net.c:2931 msgid "\t$M maximum chart value\n" msgstr "" -#: ../src/disk.c:1356 +#: ../src/disk.c:1355 msgid "\t$T total read bytes + write bytes\n" msgstr "" -#: ../src/disk.c:1357 +#: ../src/disk.c:1356 msgid "\t$r read bytes\n" msgstr "" -#: ../src/disk.c:1358 +#: ../src/disk.c:1357 msgid "\t$w write bytes\n" msgstr "" -#: ../src/disk.c:1447 +#: ../src/disk.c:1446 msgid "\\f\\ww\\r\\f$M\\D2\\f\\ar\\. $r\\D1\\f\\aw\\. $w" msgstr "" @@ -586,78 +591,78 @@ msgstr "" msgid "$t - $U" msgstr "" -#: ../src/fs.c:880 +#: ../src/fs.c:889 msgid "GKrellM Mount Error" msgstr "" -#: ../src/fs.c:1570 +#: ../src/fs.c:1577 msgid "Primary" msgstr "" -#: ../src/fs.c:1584 ../src/fs.c:2309 +#: ../src/fs.c:1591 ../src/fs.c:2311 msgid "Secondary" msgstr "" -#: ../src/fs.c:1926 ../src/fs.c:2023 ../src/fs.c:2035 ../src/fs.c:2043 +#: ../src/fs.c:1933 ../src/fs.c:2030 ../src/fs.c:2042 ../src/fs.c:2050 msgid "Entry Error" msgstr "" -#: ../src/fs.c:1927 +#: ../src/fs.c:1934 msgid "" "At least one primary fs monitor must exist to click on in order to show\n" "secondary ones.\n" msgstr "" -#: ../src/fs.c:2025 +#: ../src/fs.c:2032 msgid "Both a label and a mount point must be entered." msgstr "" -#: ../src/fs.c:2036 +#: ../src/fs.c:2043 msgid "Both mount and umount commands must be entered." msgstr "" -#: ../src/fs.c:2044 +#: ../src/fs.c:2051 msgid "Missing ejectable device entry." msgstr "" -#: ../src/fs.c:2276 ../src/fs.c:2398 ../src/inet.c:1873 ../src/inet.c:1879 -#: ../src/inet.c:1964 ../src/inet.c:1984 ../src/sensors.c:2777 +#: ../src/fs.c:2278 ../src/fs.c:2400 ../src/inet.c:1873 ../src/inet.c:1879 +#: ../src/inet.c:1964 ../src/inet.c:1984 ../src/sensors.c:2763 msgid "Label" msgstr "" -#: ../src/fs.c:2285 ../src/fs.c:2402 +#: ../src/fs.c:2287 ../src/fs.c:2404 msgid "Mount Point" msgstr "" -#: ../src/fs.c:2316 +#: ../src/fs.c:2318 msgid "Show if mounted" msgstr "" -#: ../src/fs.c:2322 +#: ../src/fs.c:2324 msgid "Enable /etc/fstab mounting" msgstr "" -#: ../src/fs.c:2336 +#: ../src/fs.c:2338 msgid "Ejectable" msgstr "" -#: ../src/fs.c:2342 +#: ../src/fs.c:2344 msgid "Device" msgstr "" -#: ../src/fs.c:2357 +#: ../src/fs.c:2359 msgid "mount" msgstr "" -#: ../src/fs.c:2359 +#: ../src/fs.c:2361 msgid "umount" msgstr "" -#: ../src/fs.c:2425 +#: ../src/fs.c:2427 msgid "Mounting\n" msgstr "" -#: ../src/fs.c:2426 +#: ../src/fs.c:2428 msgid "" "Enter file system mount points to monitor and enter a label to describe\n" "the mount point. The krell shows the ratio of blocks used to total blocks\n" @@ -666,11 +671,11 @@ msgid "" "\n" msgstr "" -#: ../src/fs.c:2431 +#: ../src/fs.c:2433 msgid "\t1) Mounting using /etc/fstab: " msgstr "" -#: ../src/fs.c:2433 +#: ../src/fs.c:2435 msgid "" "If a mount point is in your\n" "\t/etc/fstab and you have mount permission then mount and umount\n" @@ -683,25 +688,25 @@ msgid "" "\teither of:\n" msgstr "" -#: ../src/fs.c:2443 +#: ../src/fs.c:2445 msgid "\t\t/dev/fd0 /mnt/floppy ext2 user,noauto,rw,exec 0 0\n" msgstr "" -#: ../src/fs.c:2444 +#: ../src/fs.c:2446 msgid "\tor\n" msgstr "" -#: ../src/fs.c:2445 +#: ../src/fs.c:2447 msgid "" "\t\t/dev/fd0 /mnt/floppy ext2 user,defaults 0 0\n" "\n" msgstr "" -#: ../src/fs.c:2447 +#: ../src/fs.c:2449 msgid "\t2) Mounting using custom commands: " msgstr "" -#: ../src/fs.c:2448 +#: ../src/fs.c:2450 msgid "" "If GKrellM is run as root or if\n" "\tyou have sudo permission to run the mount commands, then a custom\n" @@ -710,15 +715,15 @@ msgid "" "\tmethod. Example mount and umount entries using sudo:\n" msgstr "" -#: ../src/fs.c:2454 +#: ../src/fs.c:2456 msgid "\t\tsudo /bin/mount -t msdos /dev/fd0 /mnt/A\n" msgstr "" -#: ../src/fs.c:2455 +#: ../src/fs.c:2457 msgid "\t\tsudo /bin/umount /mnt/A\n" msgstr "" -#: ../src/fs.c:2457 +#: ../src/fs.c:2459 msgid "" "\tNotes: the mount point specified in a custom mount command\n" "\t(/mnt/A in this example) must be the same as entered in the\n" @@ -727,11 +732,11 @@ msgid "" "\n" msgstr "" -#: ../src/fs.c:2462 +#: ../src/fs.c:2464 msgid "Primary and Secondary Monitors\n" msgstr "" -#: ../src/fs.c:2463 +#: ../src/fs.c:2465 #, no-c-format msgid "" "File system monitors can be created as primary (always visible)\n" @@ -750,113 +755,113 @@ msgid "" "\n" msgstr "" -#: ../src/fs.c:2480 ../src/mem.c:1261 +#: ../src/fs.c:2482 ../src/mem.c:1261 msgid "Panel Labels\n" msgstr "" -#: ../src/fs.c:2481 +#: ../src/fs.c:2483 msgid "Substitution variables for the format string for file system panels:\n" msgstr "" -#: ../src/fs.c:2482 +#: ../src/fs.c:2484 msgid "\t$t total capacity\n" msgstr "" -#: ../src/fs.c:2483 +#: ../src/fs.c:2485 msgid "\t$u used space\n" msgstr "" -#: ../src/fs.c:2484 +#: ../src/fs.c:2486 msgid "\t$f free space\n" msgstr "" -#: ../src/fs.c:2485 +#: ../src/fs.c:2487 msgid "\t$U used %,\n" msgstr "" -#: ../src/fs.c:2486 ../src/mem.c:1270 +#: ../src/fs.c:2488 ../src/mem.c:1270 msgid "\t$F free %\n" msgstr "" -#: ../src/fs.c:2487 +#: ../src/fs.c:2489 msgid "\t$l the panel label\n" msgstr "" -#: ../src/fs.c:2489 +#: ../src/fs.c:2491 msgid "\t$D the mount point\n" msgstr "" -#: ../src/fs.c:2491 +#: ../src/fs.c:2493 msgid "\t$D the disk\n" msgstr "" -#: ../src/fs.c:2498 +#: ../src/fs.c:2500 msgid "click on a panel to scroll a programmable display\n" msgstr "" -#: ../src/fs.c:2499 +#: ../src/fs.c:2501 msgid "\t\tof file system capacities (default is total and free space).\n" msgstr "" -#: ../src/fs.c:2500 +#: ../src/fs.c:2502 msgid "\tWheel " msgstr "" -#: ../src/fs.c:2501 +#: ../src/fs.c:2503 msgid "Shows and hides the secondary file system monitors.\n" msgstr "" -#: ../src/fs.c:2519 +#: ../src/fs.c:2521 msgid "Panels" msgstr "" -#: ../src/fs.c:2537 +#: ../src/fs.c:2539 msgid "Use binary units (MiB, GiG) for reporting disk capacities." msgstr "" -#: ../src/fs.c:2543 +#: ../src/fs.c:2545 msgid "Auto eject when ejectable devices are unmounted" msgstr "" -#: ../src/fs.c:2552 +#: ../src/fs.c:2554 msgid "Seconds between data updates for local mounted file systems" msgstr "" -#: ../src/fs.c:2557 +#: ../src/fs.c:2559 msgid "Seconds between data updates for remote mounted file systems" msgstr "" -#: ../src/fs.c:2561 ../src/mem.c:1371 +#: ../src/fs.c:2563 ../src/mem.c:1371 msgid "Format String for Panel Labels" msgstr "" -#: ../src/fs.c:2588 +#: ../src/fs.c:2590 msgid "File System" msgstr "" -#: ../src/gui.c:403 +#: ../src/gui.c:391 #, c-format msgid "%s command" msgstr "" -#: ../src/gui.c:421 +#: ../src/gui.c:409 msgid "comment" msgstr "" -#: ../src/gui.c:770 +#: ../src/gui.c:758 #, c-format msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" "Released under the GNU General Public License" msgstr "" -#: ../src/gui.c:786 +#: ../src/gui.c:774 msgid "" "Mac OS X code was contributed by:\n" "Ben Hines \n" @@ -864,53 +869,53 @@ msgid "" "Hajimu UMEMOTO " msgstr "" -#: ../src/gui.c:796 +#: ../src/gui.c:784 msgid "" "FreeBSD system dependent code was contributed by:\n" "Hajimu UMEMOTO " msgstr "" -#: ../src/gui.c:804 +#: ../src/gui.c:792 msgid "" "DragonFly system dependent code was contributed by:\n" "Joerg Sonnenberger " msgstr "" -#: ../src/gui.c:812 +#: ../src/gui.c:800 msgid "" "NetBSD system dependent code was contributed by:\n" "Anthony Mallet " msgstr "" -#: ../src/gui.c:820 +#: ../src/gui.c:808 msgid "" "Solaris system dependent code was contributed by:\n" "Daisuke Yabuki " msgstr "" -#: ../src/gui.c:828 +#: ../src/gui.c:816 msgid "" "Windows system dependent code was contributed by:\n" "Bill Nalen \n" "Stefan Gehn \n" msgstr "" -#: ../src/gui.c:996 +#: ../src/gui.c:984 msgid "Krells\n" msgstr "" -#: ../src/gui.c:997 +#: ../src/gui.c:985 msgid "" "Krells are the horizontally moving indicators below each chart and\n" "on meter style monitors. Depending on the monitor, they show fast\n" "response data rates, a percentage of some capacity, or something else.\n" msgstr "" -#: ../src/gui.c:1001 +#: ../src/gui.c:989 msgid "Charts\n" msgstr "" -#: ../src/gui.c:1002 +#: ../src/gui.c:990 msgid "" "The default for most charts is to automatically adjust the number of\n" "grid lines drawn and the resolution per grid so drawn data will be\n" @@ -919,82 +924,82 @@ msgid "" "some combination of the auto scaling modes may give best results.\n" msgstr "" -#: ../src/gui.c:1008 ../src/gui.c:1034 ../src/sensors.c:2908 +#: ../src/gui.c:996 ../src/gui.c:1022 ../src/sensors.c:2893 msgid "See the README or do a \"man gkrellm\" for more information.\n" msgstr "" -#: ../src/gui.c:1011 +#: ../src/gui.c:999 msgid "Chart label format strings place text on charts using position codes:\n" msgstr "" -#: ../src/gui.c:1012 +#: ../src/gui.c:1000 msgid "\t\\t top left\n" msgstr "" -#: ../src/gui.c:1013 +#: ../src/gui.c:1001 msgid "\t\\b bottom left\n" msgstr "" -#: ../src/gui.c:1014 +#: ../src/gui.c:1002 msgid "\t\\n next line\n" msgstr "" -#: ../src/gui.c:1015 +#: ../src/gui.c:1003 msgid "\t\\N next line only if last string had visible characters\n" msgstr "" -#: ../src/gui.c:1016 +#: ../src/gui.c:1004 msgid "\t\\p previous line\n" msgstr "" -#: ../src/gui.c:1017 +#: ../src/gui.c:1005 msgid "\t\\c center the text\n" msgstr "" -#: ../src/gui.c:1018 +#: ../src/gui.c:1006 msgid "\t\\C begin drawing text at the center\n" msgstr "" -#: ../src/gui.c:1019 +#: ../src/gui.c:1007 msgid "\t\\r right justify\n" msgstr "" -#: ../src/gui.c:1020 +#: ../src/gui.c:1008 msgid "\t\\f use alternate font for the next string\n" msgstr "" -#: ../src/gui.c:1021 +#: ../src/gui.c:1009 msgid "\t\\w use the following string to define a field width\n" msgstr "" -#: ../src/gui.c:1022 +#: ../src/gui.c:1010 msgid "\t\\a draw left justified in the defined field width\n" msgstr "" -#: ../src/gui.c:1023 +#: ../src/gui.c:1011 msgid "\t\\e draw right justified in the defined field width\n" msgstr "" -#: ../src/gui.c:1024 +#: ../src/gui.c:1012 msgid "\t\\. no-op. Used to break a string into two strings.\n" msgstr "" -#: ../src/gui.c:1025 +#: ../src/gui.c:1013 msgid "" "\t\\D0 bottom of charts first data view (D2 for second data view ...)\n" msgstr "" -#: ../src/gui.c:1026 +#: ../src/gui.c:1014 msgid "\t\\D1 top of charts first data view (D3 for second data view ...)\n" msgstr "" -#: ../src/gui.c:1028 +#: ../src/gui.c:1016 msgid "" "\n" "Commands\n" msgstr "" -#: ../src/gui.c:1029 +#: ../src/gui.c:1017 msgid "" "\tMany monitors can be configured to launch commands. Just enter the\n" "\tcommand where you see a \"command\" entry and also a comment if you\n" @@ -1004,219 +1009,231 @@ msgid "" "\n" msgstr "" -#: ../src/gui.c:1037 ../src/mail.c:3888 +#: ../src/gui.c:1025 ../src/mail.c:3866 msgid "" "\n" "Mouse Button Actions:\n" msgstr "" -#: ../src/gui.c:1039 +#: ../src/gui.c:1027 msgid "clicking on charts will toggle a display of some extra info.\n" msgstr "" -#: ../src/gui.c:1040 ../src/gui.c:1042 +#: ../src/gui.c:1028 ../src/gui.c:1030 msgid "\tRight " msgstr "" -#: ../src/gui.c:1041 +#: ../src/gui.c:1029 msgid "clicking on charts brings up a chart configuration window.\n" msgstr "" -#: ../src/gui.c:1043 +#: ../src/gui.c:1031 msgid "clicking on many panels opens its monitor configuration window.\n" msgstr "" -#: ../src/gui.c:1072 +#: ../src/gui.c:1060 msgid "Hostname display" msgstr "" -#: ../src/gui.c:1078 +#: ../src/gui.c:1066 msgid "Short hostname" msgstr "" -#: ../src/gui.c:1083 +#: ../src/gui.c:1071 msgid "System name display" msgstr "" -#: ../src/gui.c:1088 +#: ../src/gui.c:1076 msgid "Remember screen location at exit and move to it at next startup" msgstr "" -#: ../src/gui.c:1094 +#: ../src/gui.c:1082 msgid "Allow multiple instances" msgstr "" -#: ../src/gui.c:1101 +#: ../src/gui.c:1089 msgid "" "Make gkrellm a topmost window (restart gkrellm for this to take effect)." msgstr "" -#: ../src/gui.c:1110 ../src/hostname.c:400 +#: ../src/gui.c:1098 ../src/hostname.c:400 msgid "gkrellmd server disconnect" msgstr "" -#: ../src/gui.c:1118 +#: ../src/gui.c:1106 msgid "Krell and LED updates per second." msgstr "" -#: ../src/gui.c:1124 +#: ../src/gui.c:1112 msgid "GKrellM width" msgstr "" -#: ../src/gui.c:1128 +#: ../src/gui.c:1116 msgid "Properties" msgstr "" -#: ../src/gui.c:1131 +#: ../src/gui.c:1119 msgid "Set sticky state" msgstr "" -#: ../src/gui.c:1134 +#: ../src/gui.c:1122 msgid "Set on top of other windows of the same type" msgstr "" -#: ../src/gui.c:1137 +#: ../src/gui.c:1125 msgid "Set below other windows of the same type" msgstr "" -#: ../src/gui.c:1144 +#: ../src/gui.c:1132 msgid "Set window type to be a dock or panel" msgstr "" -#: ../src/gui.c:1149 +#: ../src/gui.c:1137 msgid "Use window manager decorations" msgstr "" -#: ../src/gui.c:1153 +#: ../src/gui.c:1141 msgid "Do not include on a taskbar" msgstr "" -#: ../src/gui.c:1157 +#: ../src/gui.c:1145 msgid "Do not include on a pager" msgstr "" -#: ../src/gui.c:1167 +#: ../src/gui.c:1155 msgid "" "Some of these properties require a standards compliant window manager.\n" "You may have to restart gkrellm for them to take effect.\n" msgstr "" -#: ../src/gui.c:1575 +#: ../src/gui.c:1545 #, c-format msgid "%d total theme alternatives" msgstr "" -#: ../src/gui.c:1874 ../src/gui.c:1906 +#: ../src/gui.c:1844 ../src/gui.c:1876 ../src/gui.c:2481 msgid "Theme" msgstr "" -#: ../src/gui.c:1878 +#: ../src/gui.c:1848 msgid "Theme:" msgstr "" -#: ../src/gui.c:1888 +#: ../src/gui.c:1858 msgid "Author:" msgstr "" -#: ../src/gui.c:1934 +#: ../src/gui.c:1904 msgid "Track Gtk theme changes for similarly named themes" msgstr "" -#: ../src/gui.c:1941 +#: ../src/gui.c:1911 msgid "Default" msgstr "" -#: ../src/gui.c:1956 +#: ../src/gui.c:1926 msgid "Scale" msgstr "" -#: ../src/gui.c:1962 +#: ../src/gui.c:1932 msgid "Fonts" msgstr "" -#: ../src/gui.c:1965 +#: ../src/gui.c:1935 msgid "Large font" msgstr "" -#: ../src/gui.c:1977 ../src/gui.c:1991 ../src/gui.c:2004 +#: ../src/gui.c:1947 ../src/gui.c:1961 ../src/gui.c:1974 msgid "Browse" msgstr "" -#: ../src/gui.c:1979 +#: ../src/gui.c:1949 msgid "Normal font" msgstr "" -#: ../src/gui.c:1993 +#: ../src/gui.c:1963 msgid "Small font" msgstr "" -#: ../src/gui.c:2008 +#: ../src/gui.c:1978 #, c-format msgid "Untar your theme tar files in %s/%s" msgstr "" -#: ../src/gui.c:2017 +#: ../src/gui.c:1987 msgid "Download themes from the GKrellM theme site at www.muhri.net" msgstr "" -#: ../src/gui.c:2311 +#: ../src/gui.c:2281 ../src/gui.c:2479 msgid "Configuration" msgstr "" -#: ../src/gui.c:2339 +#: ../src/gui.c:2309 msgid "General" msgstr "" -#: ../src/gui.c:2344 +#: ../src/gui.c:2314 msgid "Builtins" msgstr "" -#: ../src/gui.c:2364 ../src/plugins.c:1733 +#: ../src/gui.c:2334 ../src/plugins.c:1721 msgid "Plugins" msgstr "" -#: ../src/gui.c:2369 +#: ../src/gui.c:2339 msgid "Themes" msgstr "" -#: ../src/gui.c:2374 +#: ../src/gui.c:2344 msgid "About" msgstr "" -#: ../src/gui.c:2399 +#: ../src/gui.c:2369 msgid "Monitors" msgstr "" -#: ../src/gui.c:2471 ../src/gui.c:2482 -msgid "/Quit" +#: ../src/gui.c:2477 +msgid "Quit" msgstr "" -#: ../src/gui.c:2478 -msgid "/Configuration" +#: ../src/gui.c:2483 +msgid "Next" msgstr "" -#: ../src/gui.c:2479 -msgid "/Theme/Prev" +#: ../src/gui.c:2485 +msgid "Prev" msgstr "" -#: ../src/gui.c:2480 -msgid "/Theme/Next" +#: ../src/gui.c:2487 +msgid "Theme next" msgstr "" #: ../src/gui.c:2489 -msgid "/Theme prev" +msgid "Theme prev" msgstr "" -#: ../src/gui.c:2490 -msgid "/Theme next" +#: ../src/gui.c:2491 +msgid "Menu Popup" msgstr "" -#: ../src/inet.c:628 +#: ../src/gui.c:2493 +msgid "Reload Theme" +msgstr "" + +#: ../src/gui.c:2495 +msgid "Scale Theme Up" +msgstr "" + +#: ../src/gui.c:2497 +msgid "Scale Theme Dn" +msgstr "" + +#: ../src/inet.c:626 #, c-format msgid "%s Connections" msgstr "" -#: ../src/inet.c:719 +#: ../src/inet.c:717 msgid "No current connections." msgstr "" @@ -1334,142 +1351,142 @@ msgstr "" msgid "create_krell: NULL image or style\n" msgstr "" -#: ../src/mail.c:733 +#: ../src/mail.c:739 msgid "Unable to connect." msgstr "" -#: ../src/mail.c:734 +#: ../src/mail.c:740 msgid "Bad response after connect." msgstr "" -#: ../src/mail.c:735 +#: ../src/mail.c:741 msgid "Bad response after username." msgstr "" -#: ../src/mail.c:736 +#: ../src/mail.c:742 msgid "Bad response after password." msgstr "" -#: ../src/mail.c:737 +#: ../src/mail.c:743 msgid "Bad response after STAT or STATUS." msgstr "" -#: ../src/mail.c:738 +#: ../src/mail.c:744 msgid "Bad response after UIDL." msgstr "" -#: ../src/mail.c:739 +#: ../src/mail.c:745 msgid "Bad APOP response after connect." msgstr "" -#: ../src/mail.c:740 +#: ../src/mail.c:746 msgid "Bad CRAM_MD5 response after connect." msgstr "" -#: ../src/mail.c:788 +#: ../src/mail.c:794 #, c-format msgid "Mail TCP Error: %s - %s\n" msgstr "" -#: ../src/mail.c:819 +#: ../src/mail.c:825 msgid "Cannot initialize SSL method." msgstr "" -#: ../src/mail.c:823 +#: ../src/mail.c:829 msgid "Cannot initialize SSL server certificate handler." msgstr "" -#: ../src/mail.c:829 +#: ../src/mail.c:835 msgid "Cannot initialize SSL handler." msgstr "" -#: ../src/mail.c:955 ../src/mail.c:1027 +#: ../src/mail.c:961 ../src/mail.c:1033 msgid "could not decode BASE64 challenge\n" msgstr "" -#: ../src/mail.c:962 +#: ../src/mail.c:968 #, c-format msgid "decoded as %s\n" msgstr "" -#: ../src/mail.c:1079 +#: ../src/mail.c:1085 msgid "Bad response after STLS." msgstr "" -#: ../src/mail.c:1254 +#: ../src/mail.c:1260 msgid "Bad response after STARTTLS." msgstr "" -#: ../src/mail.c:1272 +#: ../src/mail.c:1278 msgid "Bad response after CAPABILITY." msgstr "" -#: ../src/mail.c:1834 +#: ../src/mail.c:1840 #, c-format msgid "mute" msgstr "" -#: ../src/mail.c:2109 +#: ../src/mail.c:2115 msgid "seen" msgstr "" -#: ../src/mail.c:3573 +#: ../src/mail.c:3578 msgid "GKrellM Config Error" msgstr "" -#: ../src/mail.c:3574 +#: ../src/mail.c:3579 msgid "Incomplete mailbox entries" msgstr "" -#: ../src/mail.c:3838 +#: ../src/mail.c:3816 msgid "Mailboxes\n" msgstr "" -#: ../src/mail.c:3840 +#: ../src/mail.c:3818 msgid "Mailboxes to monitor can be local or remote mailbox types.\n" msgstr "" -#: ../src/mail.c:3841 +#: ../src/mail.c:3819 msgid "" "For local mailboxes, the path name may be a mbox file or it may be\n" "a Maildir or MH mail style directory.\n" msgstr "" -#: ../src/mail.c:3849 +#: ../src/mail.c:3827 msgid "Mail reading program\n" msgstr "" -#: ../src/mail.c:3850 +#: ../src/mail.c:3828 msgid "" "If you enter a mail reading program (your mail user agent or MUA)\n" "it can be launched by clicking on the mail monitor message count button.\n" msgstr "" -#: ../src/mail.c:3853 +#: ../src/mail.c:3831 msgid "Sound notify program\n" msgstr "" -#: ../src/mail.c:3854 +#: ../src/mail.c:3832 msgid "" "If you enter a notify (sound) command, it will be run when new mail\n" "is detected.\n" msgstr "" -#: ../src/mail.c:3861 +#: ../src/mail.c:3839 msgid "fetch/check Program\n" msgstr "" -#: ../src/mail.c:3862 +#: ../src/mail.c:3840 msgid "" "If you want to download remote mail or check for remote mail without\n" "using the builtin POP3 or IMAP mail checking which is set up in the\n" msgstr "" -#: ../src/mail.c:3864 ../src/mail.c:3882 +#: ../src/mail.c:3842 ../src/mail.c:3860 msgid "Mailboxes" msgstr "" -#: ../src/mail.c:3865 +#: ../src/mail.c:3843 msgid "" " tab, then do this by entering a mail fetch/check command.\n" "For example, fetchmail can be run periodically to download mail\n" @@ -1483,228 +1500,228 @@ msgid "" "Options tab:\n" msgstr "" -#: ../src/mail.c:3875 +#: ../src/mail.c:3853 msgid "\tFetch/check program checks messages only\n" msgstr "" -#: ../src/mail.c:3876 +#: ../src/mail.c:3854 msgid "" "For checking messages on a remote server, GKrellM can read the\n" "output of the program " msgstr "" -#: ../src/mail.c:3878 +#: ../src/mail.c:3856 msgid "fetchmail -c" msgstr "" -#: ../src/mail.c:3879 +#: ../src/mail.c:3857 msgid " (you must append the -c).\n" msgstr "" -#: ../src/mail.c:3880 +#: ../src/mail.c:3858 msgid "" "But, do not combine these methods for the same mailbox! If you enter a\n" "POP3 mailbox in the " msgstr "" -#: ../src/mail.c:3883 +#: ../src/mail.c:3861 msgid " tab, then don't check it again with fetchmail.\n" msgstr "" -#: ../src/mail.c:3890 +#: ../src/mail.c:3868 msgid "click the mail count button to launch the mail reading program.\n" msgstr "" -#: ../src/mail.c:3891 +#: ../src/mail.c:3869 msgid "\t\tIf options permit, also stop animations and reset remote counts.\n" msgstr "" -#: ../src/mail.c:3893 +#: ../src/mail.c:3871 msgid "" "click the envelope decal to force a mail check regardless of\n" "\t\tany mute mode or inhibit mail checking option settings.\n" msgstr "" -#: ../src/mail.c:3896 +#: ../src/mail.c:3874 msgid "" "click the mail panel to toggle a mute mode which inhibits\n" "\t\tthe sound notify program and optionally inhibits all mail\n" "\t\tchecking.\n" msgstr "" -#: ../src/mail.c:3937 +#: ../src/mail.c:3911 msgid "Enable Mailcheck" msgstr "" -#: ../src/mail.c:3949 +#: ../src/mail.c:3923 msgid "Mail reading program:" msgstr "" -#: ../src/mail.c:3964 +#: ../src/mail.c:3938 msgid "Notify (sound) program:" msgstr "" -#: ../src/mail.c:3981 +#: ../src/mail.c:3955 msgid "Mail fetch/check program:" msgstr "" -#: ../src/mail.c:4000 +#: ../src/mail.c:3974 msgid "Run fetch/check program at local interval" msgstr "" -#: ../src/mail.c:4010 +#: ../src/mail.c:3984 msgid "Check local mailboxes every" msgstr "" -#: ../src/mail.c:4017 +#: ../src/mail.c:3991 msgid "seconds" msgstr "" -#: ../src/mail.c:4023 +#: ../src/mail.c:3997 msgid "Do remote checks every" msgstr "" -#: ../src/mail.c:4025 +#: ../src/mail.c:3999 msgid "Check mail every" msgstr "" -#: ../src/mail.c:4032 +#: ../src/mail.c:4006 msgid "minutes" msgstr "" -#: ../src/mail.c:4035 +#: ../src/mail.c:4009 msgid "Mailboxes" msgstr "" -#: ../src/mail.c:4051 +#: ../src/mail.c:4025 msgid "Path name:" msgstr "" -#: ../src/mail.c:4069 +#: ../src/mail.c:4043 msgid "Server" msgstr "" -#: ../src/mail.c:4076 +#: ../src/mail.c:4050 msgid "User name" msgstr "" -#: ../src/mail.c:4083 +#: ../src/mail.c:4057 msgid "Password" msgstr "" -#: ../src/mail.c:4091 ../src/mail.c:4183 +#: ../src/mail.c:4065 ../src/mail.c:4155 msgid "Protocol" msgstr "" -#: ../src/mail.c:4106 +#: ../src/mail.c:4079 msgid "Use SSL" msgstr "" -#: ../src/mail.c:4114 +#: ../src/mail.c:4086 msgid "No" msgstr "" -#: ../src/mail.c:4122 +#: ../src/mail.c:4094 msgid "IMAP folder" msgstr "" -#: ../src/mail.c:4132 +#: ../src/mail.c:4104 msgid "Specify port" msgstr "" -#: ../src/mail.c:4151 +#: ../src/mail.c:4123 msgid "Local mailbox" msgstr "" -#: ../src/mail.c:4157 +#: ../src/mail.c:4129 msgid "Remote mailbox" msgstr "" -#: ../src/mail.c:4193 +#: ../src/mail.c:4165 msgid "Mailbox" msgstr "" -#: ../src/mail.c:4204 +#: ../src/mail.c:4176 msgid "Animation" msgstr "" -#: ../src/mail.c:4207 +#: ../src/mail.c:4179 msgid "Animation Select" msgstr "" -#: ../src/mail.c:4212 +#: ../src/mail.c:4184 msgid "None" msgstr "" -#: ../src/mail.c:4215 +#: ../src/mail.c:4187 msgid "Envelope" msgstr "" -#: ../src/mail.c:4220 +#: ../src/mail.c:4192 msgid "Daemon" msgstr "" -#: ../src/mail.c:4222 +#: ../src/mail.c:4194 msgid "Penguin" msgstr "" -#: ../src/mail.c:4226 +#: ../src/mail.c:4198 msgid "Both" msgstr "" -#: ../src/mail.c:4239 +#: ../src/mail.c:4211 msgid "Run animation continuously as long as there is a new mail count" msgstr "" -#: ../src/mail.c:4246 +#: ../src/mail.c:4218 msgid "Message Counting" msgstr "" -#: ../src/mail.c:4251 +#: ../src/mail.c:4223 msgid "new/total" msgstr "" -#: ../src/mail.c:4255 +#: ../src/mail.c:4227 msgid "new" msgstr "" -#: ../src/mail.c:4259 +#: ../src/mail.c:4231 msgid "do not count" msgstr "" -#: ../src/mail.c:4272 +#: ../src/mail.c:4244 msgid "Fetch/check program checks messages only (see Mail Info tab)" msgstr "" -#: ../src/mail.c:4277 +#: ../src/mail.c:4249 msgid "Reset remote message counts when message count button is pressed." msgstr "" -#: ../src/mail.c:4282 +#: ../src/mail.c:4254 msgid "Count accessed but unseen mail as new (if this status is available)" msgstr "" -#: ../src/mail.c:4287 +#: ../src/mail.c:4259 msgid "Mute mode inhibits all mail checking, not just notify (sound) program" msgstr "" -#: ../src/mail.c:4292 +#: ../src/mail.c:4264 msgid "Inhibit all mail checking while the mail reader is running" msgstr "" -#: ../src/mail.c:4297 +#: ../src/mail.c:4269 msgid "Allow multiple launches of the mail reader program" msgstr "" -#: ../src/mail.c:4302 +#: ../src/mail.c:4274 msgid "List mailboxes containing new mail in a tooltip" msgstr "" -#: ../src/mail.c:4308 +#: ../src/mail.c:4280 msgid "Ignore .mh_sequences when checking MH mail." msgstr "" -#: ../src/mail.c:4331 +#: ../src/mail.c:4303 msgid "Mail" msgstr "" @@ -1721,49 +1738,49 @@ msgstr "" msgid "Error: Could not load all fonts.\n" msgstr "" -#: ../src/main.c:1704 +#: ../src/main.c:1703 msgid "GKrellM Introduction" msgstr "" -#: ../src/main.c:1782 +#: ../src/main.c:1781 msgid "" "usage: gkrellm [options]\n" "options:\n" msgstr "" -#: ../src/main.c:1784 +#: ../src/main.c:1783 msgid " -t, --theme theme_dir Select a theme directory.\n" msgstr "" -#: ../src/main.c:1785 +#: ../src/main.c:1784 msgid " -g, --geometry +x+y Position the window on the screen.\n" msgstr "" -#: ../src/main.c:1786 +#: ../src/main.c:1785 msgid " --wm Allow window manager decorations.\n" msgstr "" -#: ../src/main.c:1787 +#: ../src/main.c:1786 msgid "" " --m2 Left button side frame shading (for 2 btn " "mice).\n" msgstr "" -#: ../src/main.c:1788 +#: ../src/main.c:1787 msgid " --nt No transparency.\n" msgstr "" -#: ../src/main.c:1789 +#: ../src/main.c:1788 msgid " -w, --withdrawn Draw GKrellM in withdrawn mode.\n" msgstr "" -#: ../src/main.c:1790 +#: ../src/main.c:1789 msgid "" " -c, --config suffix Use alternate config files generated by\n" " appending \"suffix\" to config file names.\n" msgstr "" -#: ../src/main.c:1792 +#: ../src/main.c:1791 msgid "" " -f, --force-host-config Creates config files generated by appending the\n" " hostname to config file names. Subsequent runs\n" @@ -1775,51 +1792,51 @@ msgid "" " This option has no effect in client mode.\n" msgstr "" -#: ../src/main.c:1800 +#: ../src/main.c:1799 msgid "" " -s, --server hostname Run in client mode: connect to \"hostname\" and\n" " read monitor data from a gkrellmd server.\n" msgstr "" -#: ../src/main.c:1802 +#: ../src/main.c:1801 msgid "" " -P, --port server_port Use \"server_port\" for the server connection.\n" msgstr "" -#: ../src/main.c:1803 +#: ../src/main.c:1802 msgid "" " --nc No config mode prevents configuration changes.\n" msgstr "" -#: ../src/main.c:1804 +#: ../src/main.c:1803 msgid " --config-clean Clean out unused configs on config write.\n" msgstr "" -#: ../src/main.c:1805 +#: ../src/main.c:1804 msgid " --nolock Allow multiple gkrellm instances.\n" msgstr "" -#: ../src/main.c:1806 +#: ../src/main.c:1805 msgid "" " -p, --plugin plugin.so While developing, load your plugin under test.\n" msgstr "" -#: ../src/main.c:1807 +#: ../src/main.c:1806 msgid "" " --demo Force enabling of many monitors so themers can\n" " see everything. All config saving is inhibited.\n" msgstr "" -#: ../src/main.c:1810 +#: ../src/main.c:1809 msgid " -v, --version Print GKrellM version number and exit.\n" msgstr "" -#: ../src/main.c:1811 +#: ../src/main.c:1810 msgid "" " -d, --debug-level n Turn debugging on for selective code sections.\n" msgstr "" -#: ../src/main.c:1813 +#: ../src/main.c:1812 msgid "" "\n" "debug-level numbers are (bitwise OR to debug multiple sections):\n" @@ -1835,27 +1852,27 @@ msgid "" "\n" msgstr "" -#: ../src/main.c:1832 +#: ../src/main.c:1831 msgid "GKrellM" msgstr "" -#: ../src/main.c:2025 +#: ../src/main.c:2024 msgid "segmentation fault" msgstr "" -#: ../src/main.c:2027 +#: ../src/main.c:2026 msgid "floating point exception" msgstr "" -#: ../src/main.c:2029 +#: ../src/main.c:2028 msgid "aborted" msgstr "" -#: ../src/main.c:2032 +#: ../src/main.c:2031 msgid "initializing" msgstr "" -#: ../src/main.c:2217 +#: ../src/main.c:2215 #, c-format msgid "Bad arg: %s\n" msgstr "" @@ -1988,91 +2005,91 @@ msgstr "" msgid "$t - $u used $s sh $b bf $c ca" msgstr "" -#: ../src/net.c:687 +#: ../src/net.c:690 msgid "Received" msgstr "" -#: ../src/net.c:691 +#: ../src/net.c:694 msgid "Transmitted" msgstr "" -#: ../src/net.c:695 +#: ../src/net.c:698 msgid "Total" msgstr "" -#: ../src/net.c:703 +#: ../src/net.c:706 msgid "Connect Time" msgstr "" -#: ../src/net.c:720 +#: ../src/net.c:723 #, c-format msgid "%s Statistics" msgstr "" -#: ../src/net.c:740 +#: ../src/net.c:743 msgid "Daily" msgstr "" -#: ../src/net.c:741 +#: ../src/net.c:744 msgid "Date" msgstr "" -#: ../src/net.c:743 +#: ../src/net.c:746 msgid "Weekly" msgstr "" -#: ../src/net.c:745 +#: ../src/net.c:748 msgid "Week Ending" msgstr "" -#: ../src/net.c:747 +#: ../src/net.c:750 msgid "Monthly" msgstr "" -#: ../src/net.c:749 +#: ../src/net.c:752 msgid "Month" msgstr "" -#: ../src/net.c:806 +#: ../src/net.c:809 #, c-format msgid "get_connect_state changed from %d to %d (check=%d)\n" msgstr "" -#: ../src/net.c:849 +#: ../src/net.c:852 #, c-format msgid "set_timer_button_state from %d to %d (check=%d)\n" msgstr "" -#: ../src/net.c:862 +#: ../src/net.c:865 #, c-format msgid "update_timer_button net_timed old_state=%d new_state=%d\n" msgstr "" -#: ../src/net.c:923 +#: ../src/net.c:926 msgid " **** Stale pppd pppX.pid file detected!\n" msgstr "" -#: ../src/net.c:1524 ../src/net.c:2752 +#: ../src/net.c:1526 ../src/net.c:2757 msgid "tx bytes" msgstr "" -#: ../src/net.c:1525 ../src/net.c:2749 +#: ../src/net.c:1527 ../src/net.c:2754 msgid "rx bytes" msgstr "" -#: ../src/net.c:1536 +#: ../src/net.c:1538 msgid "rx/tx bytes per sec" msgstr "" -#: ../src/net.c:2790 ../src/net.c:2979 +#: ../src/net.c:2795 ../src/net.c:2990 msgid "none" msgstr "" -#: ../src/net.c:2883 +#: ../src/net.c:2894 msgid "Timer Button\n" msgstr "" -#: ../src/net.c:2884 +#: ../src/net.c:2895 msgid "" "\tThe timer button may be used as a stand alone timer with start and\n" "\tstop commands, but it is usually linked to a dial up net interface\n" @@ -2080,7 +2097,7 @@ msgid "" "\tbutton colors can show connect states:\n" msgstr "" -#: ../src/net.c:2894 +#: ../src/net.c:2905 msgid "" "Standby state is while the modem phone line is locked while\n" "\tppp is connecting, and the on state is the ppp link connected.\n" @@ -2089,18 +2106,18 @@ msgid "" "\tuse /dev/modem, then you can configure an alternative with:\n" msgstr "" -#: ../src/net.c:2899 +#: ../src/net.c:2910 msgid "\t\tln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem\n" msgstr "" -#: ../src/net.c:2900 +#: ../src/net.c:2911 msgid "" "\twhere ttySx is the tty device your modem uses. The ppp on\n" "\tstate is detected by the existence of /var/run/pppX.pid and\n" "\tthe time stamp of this file is the base for the on line time.\n" msgstr "" -#: ../src/net.c:2906 +#: ../src/net.c:2917 msgid "" "The timer button standby state is not applicable to isdn\n" "\tinterfaces that are always routed. The on state is isdn on line\n" @@ -2109,103 +2126,107 @@ msgid "" "\tstate\n" msgstr "" -#: ../src/net.c:2921 +#: ../src/net.c:2932 msgid "\t$T receive + transmit bytes\n" msgstr "" -#: ../src/net.c:2922 +#: ../src/net.c:2933 msgid "\t$r receive bytes\n" msgstr "" -#: ../src/net.c:2923 +#: ../src/net.c:2934 msgid "\t$t transmit bytes\n" msgstr "" -#: ../src/net.c:2924 +#: ../src/net.c:2935 msgid "\t$O cumulative receive + transmit bytes\n" msgstr "" -#: ../src/net.c:2925 +#: ../src/net.c:2936 msgid "\t$i cumulative receive bytes\n" msgstr "" -#: ../src/net.c:2926 +#: ../src/net.c:2937 msgid "\t$o cumulative transmit bytes\n" msgstr "" -#: ../src/net.c:2927 +#: ../src/net.c:2938 msgid "\t$L the optional chart label\n" msgstr "" -#: ../src/net.c:2928 +#: ../src/net.c:2939 msgid "\t$I the net interface name\n" msgstr "" -#: ../src/net.c:2930 +#: ../src/net.c:2941 msgid "" "The cumulative variables may have a 'd', 'w', or 'm' qualifier for\n" "daily, weekly, or monthly totals. For example: $Ow for a\n" "cumulative weekly receive + transmit bytes.\n" msgstr "" -#: ../src/net.c:2956 +#: ../src/net.c:2967 msgid "Timer Button" msgstr "" -#: ../src/net.c:2962 +#: ../src/net.c:2973 msgid "Enable timer button" msgstr "" -#: ../src/net.c:2967 +#: ../src/net.c:2978 msgid "Show seconds" msgstr "" -#: ../src/net.c:2991 +#: ../src/net.c:3002 msgid "Interface to link to the timer button" msgstr "" -#: ../src/net.c:3002 +#: ../src/net.c:3013 msgid "Start Command" msgstr "" -#: ../src/net.c:3013 +#: ../src/net.c:3024 msgid "Stop Command" msgstr "" -#: ../src/net.c:3027 +#: ../src/net.c:3038 #, c-format msgid "Enable %s" msgstr "" -#: ../src/net.c:3044 +#: ../src/net.c:3055 msgid "Force chart to be always shown even if interface is not routed." msgstr "" -#: ../src/net.c:3057 +#: ../src/net.c:3068 msgid "Optional label for this interface." msgstr "" -#: ../src/net.c:3089 +#: ../src/net.c:3100 msgid "\\f\\ww\\c\\f$M\\n\\f\\at\\.$t\\n\\f\\ar\\.$r\\b\\c\\f$L" msgstr "" -#: ../src/net.c:3091 +#: ../src/net.c:3102 msgid "\\f\\ww\\c\\f$M\\n\\f\\at\\.$o\\n\\f\\ar\\.$i\\b\\c\\f$L" msgstr "" -#: ../src/net.c:3093 +#: ../src/net.c:3104 msgid "\\f\\ww\\c\\f$M\\D2\\f\\ar\\.$r\\D1\\f\\at\\.$t\\b\\c\\f$L" msgstr "" -#: ../src/net.c:3102 +#: ../src/net.c:3113 msgid "Start day for cumulative monthly transmit and receive bytes" msgstr "" -#: ../src/net.c:3121 +#: ../src/net.c:3118 +msgid "Enable new interfaces" +msgstr "" + +#: ../src/net.c:3137 msgid "Net" msgstr "" -#: ../src/net.c:3182 +#: ../src/net.c:3201 msgid "Net Timer" msgstr "" @@ -2222,114 +2243,114 @@ msgstr "" msgid "before" msgstr "" -#: ../src/plugins.c:896 ../src/plugins.c:903 ../src/plugins.c:919 +#: ../src/plugins.c:895 ../src/plugins.c:902 ../src/plugins.c:918 #, c-format msgid "\tError: %s\n" msgstr "" -#: ../src/plugins.c:938 +#: ../src/plugins.c:937 msgid "\tOoops! plugin returned NULL, aborting\n" msgstr "" -#: ../src/plugins.c:950 +#: ../src/plugins.c:949 msgid "\tWarning: style name \"" msgstr "" -#: ../src/plugins.c:951 ../src/plugins.c:961 +#: ../src/plugins.c:950 ../src/plugins.c:960 msgid "" "\" already used by:\n" "\t\t" msgstr "" -#: ../src/plugins.c:960 +#: ../src/plugins.c:959 msgid "\tWarning: config keyword \"" msgstr "" -#: ../src/plugins.c:1218 +#: ../src/plugins.c:1217 msgid "Ignoring duplicate plugin " msgstr "" -#: ../src/plugins.c:1250 +#: ../src/plugins.c:1249 msgid "*** Command line plugin:\n" msgstr "" -#: ../src/plugins.c:1526 +#: ../src/plugins.c:1515 msgid "GKrellM Place Plugin" msgstr "" -#: ../src/plugins.c:1537 +#: ../src/plugins.c:1526 msgid "Builtin Monitors" msgstr "" -#: ../src/plugins.c:1567 +#: ../src/plugins.c:1555 msgid "Place Plugin" msgstr "" -#: ../src/plugins.c:1573 +#: ../src/plugins.c:1561 msgid "Before selected builtin monitor" msgstr "" -#: ../src/plugins.c:1580 +#: ../src/plugins.c:1568 msgid "With gravity" msgstr "" -#: ../src/plugins.c:1585 +#: ../src/plugins.c:1573 msgid "After selected builtin monitor" msgstr "" -#: ../src/plugins.c:1593 +#: ../src/plugins.c:1581 msgid "Plugin Defaults" msgstr "" -#: ../src/plugins.c:1696 +#: ../src/plugins.c:1684 msgid "from command line" msgstr "" -#: ../src/plugins.c:1753 +#: ../src/plugins.c:1741 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1774 +#: ../src/plugins.c:1762 msgid "Place" msgstr "" -#: ../src/plugins.c:1781 +#: ../src/plugins.c:1769 msgid "Install Log" msgstr "" -#: ../src/plugins.c:1789 +#: ../src/plugins.c:1777 msgid "No plugins found." msgstr "" -#: ../src/proc.c:556 ../src/proc.c:656 ../src/proc.c:948 +#: ../src/proc.c:555 ../src/proc.c:655 ../src/proc.c:947 msgid "Load" msgstr "" -#: ../src/proc.c:559 +#: ../src/proc.c:558 msgid "Forks" msgstr "" -#: ../src/proc.c:568 +#: ../src/proc.c:567 msgid "Average process load per minute" msgstr "" -#: ../src/proc.c:670 ../src/proc.c:941 +#: ../src/proc.c:669 ../src/proc.c:940 msgid "Users" msgstr "" -#: ../src/proc.c:682 ../src/proc.c:934 +#: ../src/proc.c:681 ../src/proc.c:933 msgid "Processes" msgstr "" -#: ../src/proc.c:887 +#: ../src/proc.c:886 msgid "Proc Chart" msgstr "" -#: ../src/proc.c:889 +#: ../src/proc.c:888 msgid "The krell shows process forks with a full scale value of 10 forks.\n" msgstr "" -#: ../src/proc.c:890 +#: ../src/proc.c:889 msgid "" "While both load and fork data are drawn on the chart, the grid\n" "resolution can be set for load only. The resolution per grid for forks is\n" @@ -2337,150 +2358,150 @@ msgid "" "the number of grids when using a fixed number of grids mode.\n" msgstr "" -#: ../src/proc.c:897 +#: ../src/proc.c:896 msgid "\t$L maximum chart value (load)\n" msgstr "" -#: ../src/proc.c:898 +#: ../src/proc.c:897 msgid "\t$F maximum chart value (forks)\n" msgstr "" -#: ../src/proc.c:899 +#: ../src/proc.c:898 msgid "\t$l load\n" msgstr "" -#: ../src/proc.c:900 +#: ../src/proc.c:899 msgid "\t$f forks\n" msgstr "" -#: ../src/proc.c:901 +#: ../src/proc.c:900 msgid "\t$p processes\n" msgstr "" -#: ../src/proc.c:902 +#: ../src/proc.c:901 msgid "\t$u users\n" msgstr "" -#: ../src/proc.c:922 +#: ../src/proc.c:921 msgid "Enable Proc chart" msgstr "" -#: ../src/proc.c:971 +#: ../src/proc.c:970 msgid "\\f$L\\r\\f$F \\w88\\b\\p\\a$p\\f procs\\n\\e$u\\f users" msgstr "" -#: ../src/proc.c:982 ../src/proc.c:1011 ../src/proc.c:1038 +#: ../src/proc.c:981 ../src/proc.c:1010 ../src/proc.c:1037 msgid "Proc" msgstr "" -#: ../src/sensors.c:733 +#: ../src/sensors.c:742 #, c-format msgid "Can't find a %s panel to relocate sensor to." msgstr "" -#: ../src/sensors.c:1620 ../src/sensors.c:2941 +#: ../src/sensors.c:1629 ../src/sensors.c:2926 msgid "Sensors" msgstr "" -#: ../src/sensors.c:1692 +#: ../src/sensors.c:1701 msgid "Sensor Volt Limits" msgstr "" -#: ../src/sensors.c:1696 +#: ../src/sensors.c:1705 msgid "Sensor Temperature Limits (in displayed degree units)" msgstr "" -#: ../src/sensors.c:1700 +#: ../src/sensors.c:1709 msgid "Sensor Fan RPM Limits" msgstr "" -#: ../src/sensors.c:2036 ../src/sensors.c:2838 +#: ../src/sensors.c:2044 ../src/sensors.c:2823 msgid "Temperatures" msgstr "" -#: ../src/sensors.c:2043 +#: ../src/sensors.c:2051 msgid "Fans" msgstr "" -#: ../src/sensors.c:2050 ../src/sensors.c:2851 +#: ../src/sensors.c:2058 ../src/sensors.c:2836 msgid "Voltages" msgstr "" -#: ../src/sensors.c:2660 +#: ../src/sensors.c:2646 msgid "" "Can't read sensor data from mbmon daemon.\n" "Check mbmon port number and '-r' option.\n" "Run gkrellm -d 0x80 for debug output.\n" msgstr "" -#: ../src/sensors.c:2682 +#: ../src/sensors.c:2668 msgid "No sensors detected.\n" msgstr "" -#: ../src/sensors.c:2689 +#: ../src/sensors.c:2675 msgid "" "Enter data scaling factors and offsets for the sensors if the default\n" "values are not correct for your motherboard. Do a man gkrellm or\n" "see the GKrellM README for more information.\n" msgstr "" -#: ../src/sensors.c:2692 +#: ../src/sensors.c:2678 msgid "Enter a zero factor and a blank label to restore default values.\n" msgstr "" -#: ../src/sensors.c:2694 +#: ../src/sensors.c:2680 msgid "Drag and drop sensor rows to change the displayed order.\n" msgstr "" -#: ../src/sensors.c:2696 +#: ../src/sensors.c:2682 msgid "Temperature offset values must be in centigrade units.\n" msgstr "" -#: ../src/sensors.c:2699 +#: ../src/sensors.c:2685 msgid "\t$s current sensor value.\n" msgstr "" -#: ../src/sensors.c:2700 +#: ../src/sensors.c:2686 msgid "\t$l sensor label.\n" msgstr "" -#: ../src/sensors.c:2762 +#: ../src/sensors.c:2748 msgid "Sensor" msgstr "" -#: ../src/sensors.c:2800 +#: ../src/sensors.c:2786 msgid "Factor" msgstr "" -#: ../src/sensors.c:2805 +#: ../src/sensors.c:2791 msgid "Offset" msgstr "" -#: ../src/sensors.c:2810 +#: ../src/sensors.c:2796 msgid "Location" msgstr "" -#: ../src/sensors.c:2842 +#: ../src/sensors.c:2827 msgid "Display fahrenheit" msgstr "" -#: ../src/sensors.c:2846 +#: ../src/sensors.c:2831 msgid "Show units" msgstr "" -#: ../src/sensors.c:2853 +#: ../src/sensors.c:2838 msgid "Normal with labels" msgstr "" -#: ../src/sensors.c:2863 +#: ../src/sensors.c:2848 msgid "Compact with no labels" msgstr "" -#: ../src/sensors.c:2888 +#: ../src/sensors.c:2873 msgid "MBmon Daemon Port" msgstr "" -#: ../src/sensors.c:2893 +#: ../src/sensors.c:2878 msgid "" "Daemon command must be: mbmon -r -P port\n" "where 'port' must match the port number entered here:" @@ -2503,14 +2524,14 @@ msgstr "" msgid "Cannot create directory: %s\n" msgstr "" -#: ../src/winops-gtk-mac.c:133 ../src/winops-x11.c:387 +#: ../src/winops-gtk-mac.c:133 ../src/winops-x11.c:393 msgid "Exiting because multiple instances option is off.\n" msgstr "" -#: ../src/winops-x11.c:458 +#: ../src/winops-x11.c:464 msgid "Warning: -w flag is ignored when the window dock type is set" msgstr "" -#: ../src/sysdeps/linux.c:3877 +#: ../src/sysdeps/linux.c:3982 msgid "Use nvclock for NVIDIA GPU temperatures" msgstr "" diff --git a/po/it.po b/po/it.po index ed01247..bf8bf72 100644 --- a/po/it.po +++ b/po/it.po @@ -918,7 +918,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -927,7 +927,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 di Bill Wilson\n" +"Copyright (c) 1999-2014 di Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/ja.po b/po/ja.po index 5fea7eb..8b008a2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5 +1,5 @@ # GKrellM - GNU (or Gtk) Krell Monitors (or Meters) -# Copyright (C) 1999-2010 Bill Wilson. +# Copyright (C) 1999-2014 Bill Wilson. # Japanese translations # Yuuki NINOMIYA , 2000. # Takeshi Aihana , 2000-2005. @@ -920,7 +920,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -929,7 +929,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell モニタ\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/nl.po b/po/nl.po index 2c33846..ce69246 100644 --- a/po/nl.po +++ b/po/nl.po @@ -938,7 +938,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -947,7 +947,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitoren\n" "\n" -"Copyright (c) 1999-2010 bij Bill Wilson\n" +"Copyright (c) 1999-2014 bij Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/pl.po b/po/pl.po index 8ed40d9..93649b1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -926,7 +926,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -935,7 +935,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "Monitory GNU Krell\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/pt.po b/po/pt.po index 935d72e..50a2ce4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -946,7 +946,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -955,7 +955,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "Monitorizadores Krell GNU\n" "\n" -"Direitos de autor (c) 1999-2010 por Bill Wilson\n" +"Direitos de autor (c) 1999-2014 por Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 31519ff..df2f35e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -952,7 +952,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -961,7 +961,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitor\n" "\n" -"Copyright (c) 1999-2010 por Bill Wilson\n" +"Copyright (c) 1999-2014 por Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/ru.po b/po/ru.po index 284400a..6804805 100644 --- a/po/ru.po +++ b/po/ru.po @@ -910,7 +910,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -919,7 +919,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Авторские права (c) 1999-2010 принадлежат Bill Wilson\n" +"Авторские права (c) 1999-2014 принадлежат Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/sl.po b/po/sl.po index 7244a34..e83536c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1264,7 +1264,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -1273,7 +1273,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/sv.po b/po/sv.po index 43975ef..cb45a62 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1218,7 +1218,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -1227,7 +1227,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell-övervakare\n" "\n" -"Copyright © 1999-2010 Bill Wilson\n" +"Copyright © 1999-2014 Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/po/uk.po b/po/uk.po index 73140b2..9250e63 100644 --- a/po/uk.po +++ b/po/uk.po @@ -907,7 +907,7 @@ msgid "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Copyright (c) 1999-2010 by Bill Wilson\n" +"Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" @@ -916,7 +916,7 @@ msgstr "" "GKrellM %d.%d.%d%s\n" "GNU Krell Monitors\n" "\n" -"Авторські права (c) 1999-2010 належать Bill Wilson\n" +"Авторські права (c) 1999-2014 належать Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n" "\n" diff --git a/server/gkrellmd-private.h b/server/gkrellmd-private.h index a6c3949..efebadb 100644 --- a/server/gkrellmd-private.h +++ b/server/gkrellmd-private.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/gkrellmd.h b/server/gkrellmd.h index d14d27b..13ec05b 100644 --- a/server/gkrellmd.h +++ b/server/gkrellmd.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net @@ -108,8 +108,8 @@ */ #define GKRELLMD_VERSION_MAJOR 2 #define GKRELLMD_VERSION_MINOR 3 -#define GKRELLMD_VERSION_REV 5 -#define GKRELLMD_EXTRAVERSION "" +#define GKRELLMD_VERSION_REV 6 +#define GKRELLMD_EXTRAVERSION "-RC1" #define GKRELLMD_CHECK_VERSION(major,minor,rev) \ (GKRELLMD_VERSION_MAJOR > (major) || \ diff --git a/server/mail.c b/server/mail.c index 6f078df..83a8a7b 100644 --- a/server/mail.c +++ b/server/mail.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/main.c b/server/main.c index 3c1be09..ef8a11d 100644 --- a/server/main.c +++ b/server/main.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/monitor.c b/server/monitor.c index dbef233..e59ce6d 100644 --- a/server/monitor.c +++ b/server/monitor.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/plugins.c b/server/plugins.c index ae2263c..3382545 100644 --- a/server/plugins.c +++ b/server/plugins.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/sysdeps-unix.c b/server/sysdeps-unix.c index 237dfbc..044857d 100644 --- a/server/sysdeps-unix.c +++ b/server/sysdeps-unix.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/utils.c b/server/utils.c index 2570ccd..9e37bcb 100644 --- a/server/utils.c +++ b/server/utils.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/win32-libgkrellmd.c b/server/win32-libgkrellmd.c index 854cd77..2461372 100644 --- a/server/win32-libgkrellmd.c +++ b/server/win32-libgkrellmd.c @@ -1,6 +1,6 @@ /* GKrellM Windows Portion | Copyright (C) 2002 Bill Nalen -| 2007-2010 Stefan Gehn +| 2007-2014 Stefan Gehn | | Authors: Bill Nalen bill@nalens.com | Stefan Gehn stefan+gkrellm@srcbox.net diff --git a/server/win32-plugin.c b/server/win32-plugin.c index 145d3b2..5704321 100644 --- a/server/win32-plugin.c +++ b/server/win32-plugin.c @@ -1,5 +1,5 @@ /* GKrellM Windows Portion -| Copyright (C) 2006-2010 Stefan Gehn +| Copyright (C) 2006-2014 Stefan Gehn | | Authors: Stefan Gehn stefan+gkrellm@srcbox.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/win32-plugin.h b/server/win32-plugin.h index d41466d..46a1216 100644 --- a/server/win32-plugin.h +++ b/server/win32-plugin.h @@ -1,6 +1,6 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson -| 2007-2010 Stefan Gehn +| Copyright (C) 1999-2014 Bill Wilson +| 2007-2014 Stefan Gehn | | Author: Stefan Gehn stefan+gkrellm@srcbox.net | Latest versions might be found at: http://gkrellm.net diff --git a/server/win32-resource.rc b/server/win32-resource.rc index e26d1e7..53d1d53 100644 --- a/server/win32-resource.rc +++ b/server/win32-resource.rc @@ -22,12 +22,12 @@ BEGIN BEGIN VALUE "CompanyName", "" VALUE "FileDescription", "GKrellM Daemon" - VALUE "FileVersion", "2.3.5" + VALUE "FileVersion", "2.3.6" VALUE "InternalName", "gkrellmd" - VALUE "LegalCopyright", "Copyright (C) 1999-2010 Bill Wilson" + VALUE "LegalCopyright", "Copyright (C) 1999-2014 Bill Wilson" VALUE "OriginalFilename", "gkrellmd.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.5" + VALUE "ProductVersion", "2.3.6" END END BLOCK "VarFileInfo" diff --git a/src/alerts.c b/src/alerts.c index 3aa0c41..16b53ff 100644 --- a/src/alerts.c +++ b/src/alerts.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/battery.c b/src/battery.c index 1fa40cb..949a773 100644 --- a/src/battery.c +++ b/src/battery.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/chart.c b/src/chart.c index 8187e60..411156f 100644 --- a/src/chart.c +++ b/src/chart.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/client.c b/src/client.c index 8caeff3..e7c5116 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/clock.c b/src/clock.c index edefcfc..dd1eb92 100644 --- a/src/clock.c +++ b/src/clock.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/config.c b/src/config.c index 0444a2a..143e18a 100644 --- a/src/config.c +++ b/src/config.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/cpu.c b/src/cpu.c index 9ab3723..56f6d23 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/deprecated.c b/src/deprecated.c index 42b1eeb..f1aea12 100644 --- a/src/deprecated.c +++ b/src/deprecated.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/disk.c b/src/disk.c index 3303506..42127d6 100644 --- a/src/disk.c +++ b/src/disk.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/fs.c b/src/fs.c index 23c39c5..aff54d1 100644 --- a/src/fs.c +++ b/src/fs.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/gkrellm-private.h b/src/gkrellm-private.h index 139ece6..ac48379 100644 --- a/src/gkrellm-private.h +++ b/src/gkrellm-private.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/gkrellm-public-proto.h b/src/gkrellm-public-proto.h index 6fd5ed1..630c153 100644 --- a/src/gkrellm-public-proto.h +++ b/src/gkrellm-public-proto.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h index 41f28e9..aa6947d 100644 --- a/src/gkrellm-sysdeps.h +++ b/src/gkrellm-sysdeps.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/gkrellm.h b/src/gkrellm.h index af218ee..f940847 100644 --- a/src/gkrellm.h +++ b/src/gkrellm.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net @@ -108,8 +108,8 @@ */ #define GKRELLM_VERSION_MAJOR 2 #define GKRELLM_VERSION_MINOR 3 -#define GKRELLM_VERSION_REV 5 -#define GKRELLM_EXTRAVERSION "" +#define GKRELLM_VERSION_REV 6 +#define GKRELLM_EXTRAVERSION "-RC1" #define GKRELLM_CHECK_VERSION(major,minor,rev) \ (GKRELLM_VERSION_MAJOR > (major) || \ diff --git a/src/gui.c b/src/gui.c index 12848ea..e4c8c37 100644 --- a/src/gui.c +++ b/src/gui.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net @@ -756,7 +756,7 @@ create_about_tab(GtkWidget *vbox) gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); buf = g_strdup_printf(_("GKrellM %d.%d.%d%s\nGNU Krell Monitors\n\n" - "Copyright (c) 1999-2010 by Bill Wilson\n" + "Copyright (c) 1999-2014 by Bill Wilson\n" "billw@gkrellm.net\n" "http://gkrellm.net\n\n" "Released under the GNU General Public License"), diff --git a/src/hostname.c b/src/hostname.c index a1eef07..8752381 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/inet.c b/src/inet.c index f3d9e1d..c77a4ca 100644 --- a/src/inet.c +++ b/src/inet.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/inet.h b/src/inet.h index da12a56..fc4e6ca 100644 --- a/src/inet.h +++ b/src/inet.h @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/krell.c b/src/krell.c index 9004341..697c4a0 100644 --- a/src/krell.c +++ b/src/krell.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/mail.c b/src/mail.c index fcb2e0c..a47cf01 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/main.c b/src/main.c index 87f3836..205f462 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/mem.c b/src/mem.c index bf2d2bd..88081f6 100644 --- a/src/mem.c +++ b/src/mem.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/net.c b/src/net.c index fa817da..61ac211 100644 --- a/src/net.c +++ b/src/net.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/panel.c b/src/panel.c index 90153be..b1c0542 100644 --- a/src/panel.c +++ b/src/panel.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/pixops.c b/src/pixops.c index f5652b7..e765d06 100644 --- a/src/pixops.c +++ b/src/pixops.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/plugins.c b/src/plugins.c index 22e65b1..18278fa 100644 --- a/src/plugins.c +++ b/src/plugins.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/proc.c b/src/proc.c index 0b7066f..a813066 100644 --- a/src/proc.c +++ b/src/proc.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sensors.c b/src/sensors.c index 27b9881..1d68fae 100644 --- a/src/sensors.c +++ b/src/sensors.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps-unix.c b/src/sysdeps-unix.c index 1d561f5..fb1754a 100644 --- a/src/sysdeps-unix.c +++ b/src/sysdeps-unix.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/bsd-common.c b/src/sysdeps/bsd-common.c index 0fc19bf..4e67def 100644 --- a/src/sysdeps/bsd-common.c +++ b/src/sysdeps/bsd-common.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/bsd-net-open.c b/src/sysdeps/bsd-net-open.c index 9238b09..cd5258a 100644 --- a/src/sysdeps/bsd-net-open.c +++ b/src/sysdeps/bsd-net-open.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/darwin.c b/src/sysdeps/darwin.c index f506a29..a9a56ed 100644 --- a/src/sysdeps/darwin.c +++ b/src/sysdeps/darwin.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/dragonfly.c b/src/sysdeps/dragonfly.c index 42b135a..ef146dd 100644 --- a/src/sysdeps/dragonfly.c +++ b/src/sysdeps/dragonfly.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2005 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson bill@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/freebsd.c b/src/sysdeps/freebsd.c index c6e5758..493fb32 100644 --- a/src/sysdeps/freebsd.c +++ b/src/sysdeps/freebsd.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/gtop.c b/src/sysdeps/gtop.c index 37aa0f3..61e0cda 100644 --- a/src/sysdeps/gtop.c +++ b/src/sysdeps/gtop.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c index ea59fd0..ad82439 100644 --- a/src/sysdeps/linux.c +++ b/src/sysdeps/linux.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/netbsd.c b/src/sysdeps/netbsd.c index a429dd0..ba185d8 100644 --- a/src/sysdeps/netbsd.c +++ b/src/sysdeps/netbsd.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/openbsd.c b/src/sysdeps/openbsd.c index 2cbbfce..44a857e 100644 --- a/src/sysdeps/openbsd.c +++ b/src/sysdeps/openbsd.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/sensors-common.c b/src/sysdeps/sensors-common.c index 0a8e7e4..8ef0ead 100644 --- a/src/sysdeps/sensors-common.c +++ b/src/sysdeps/sensors-common.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/solaris.c b/src/sysdeps/solaris.c index b458d8f..6868c39 100644 --- a/src/sysdeps/solaris.c +++ b/src/sysdeps/solaris.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/sysdeps/win32.c b/src/sysdeps/win32.c index 5e916fe..21397e5 100644 --- a/src/sysdeps/win32.c +++ b/src/sysdeps/win32.c @@ -1,7 +1,7 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | 2002 Bill Nalen -| 2007-2010 Stefan Gehn +| 2007-2014 Stefan Gehn | | Authors: Bill Wilson billw@gkrellm.net | Bill Nalen bill@nalens.com diff --git a/src/uptime.c b/src/uptime.c index 5a99a26..ec80ed9 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/utils.c b/src/utils.c index c6a2773..175158a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/win32-libgkrellm.c b/src/win32-libgkrellm.c index 178f50e..6eee594 100644 --- a/src/win32-libgkrellm.c +++ b/src/win32-libgkrellm.c @@ -1,6 +1,6 @@ /* GKrellM Windows Portion | Copyright (C) 2002 Bill Nalen -| 2007-2010 Stefan Gehn +| 2007-2014 Stefan Gehn | | Authors: Bill Nalen bill@nalens.com | Stefan Gehn stefan+gkrellm@srcbox.net diff --git a/src/win32-plugin.c b/src/win32-plugin.c index 04edbd9..d993664 100644 --- a/src/win32-plugin.c +++ b/src/win32-plugin.c @@ -1,6 +1,6 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson -| 2007-2010 Stefan Gehn +| Copyright (C) 1999-2014 Bill Wilson +| 2007-2014 Stefan Gehn | | Authors: Bill Wilson billw@gkrellm.net | Stefan Gehn stefan+gkrellm@srcbox.net diff --git a/src/win32-plugin.h b/src/win32-plugin.h index 1172f50..0451b19 100644 --- a/src/win32-plugin.h +++ b/src/win32-plugin.h @@ -1,6 +1,6 @@ /* GKrellM Windows Portion | Copyright (C) 2002 Bill Nalen -| 2007-2010 Stefan Gehn +| 2007-2014 Stefan Gehn | | Authors: Bill Nalen bill@nalens.com | Stefan Gehn stefan+gkrellm@srcbox.net diff --git a/src/win32-resource.rc b/src/win32-resource.rc index e02c3d4..94d607d 100644 --- a/src/win32-resource.rc +++ b/src/win32-resource.rc @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "" VALUE "FileDescription", "GKrellM" - VALUE "FileVersion", "2.3.5" + VALUE "FileVersion", "2.3.6" VALUE "InternalName", "gkrellm" - VALUE "LegalCopyright", "Copyright (C) 1999-2010 Bill Wilson" + VALUE "LegalCopyright", "Copyright (C) 1999-2014 Bill Wilson" VALUE "OriginalFilename", "gkrellm.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.5" + VALUE "ProductVersion", "2.3.6" END END BLOCK "VarFileInfo" diff --git a/src/winops-gtk-mac.c b/src/winops-gtk-mac.c index 8f14fa2..e153829 100644 --- a/src/winops-gtk-mac.c +++ b/src/winops-gtk-mac.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net diff --git a/src/winops-win32.c b/src/winops-win32.c index 42cd700..e3b4ffa 100644 --- a/src/winops-win32.c +++ b/src/winops-win32.c @@ -1,6 +1,6 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson -| 2007-2010 Stefan Gehn +| Copyright (C) 1999-2014 Bill Wilson +| 2007-2014 Stefan Gehn | | Authors: Bill Wilson billw@gkrellm.net | Stefan Gehn stefan+gkrellm@srcbox.net diff --git a/src/winops-x11.c b/src/winops-x11.c index 2d02581..9abb757 100644 --- a/src/winops-x11.c +++ b/src/winops-x11.c @@ -1,5 +1,5 @@ /* GKrellM -| Copyright (C) 1999-2010 Bill Wilson +| Copyright (C) 1999-2014 Bill Wilson | | Author: Bill Wilson billw@gkrellm.net | Latest versions might be found at: http://gkrellm.net