[Goodies-commits] r3465 - in xfce4-sensors-plugin/trunk: icons panel-plugin po

Fabian Nowak timystery at xfce.org
Sun Oct 28 19:21:02 CET 2007


Author: timystery
Date: 2007-10-28 18:21:02 +0000 (Sun, 28 Oct 2007)
New Revision: 3465

Added:
   xfce4-sensors-plugin/trunk/panel-plugin/configuration.c
   xfce4-sensors-plugin/trunk/panel-plugin/configuration.h
Modified:
   xfce4-sensors-plugin/trunk/icons/Makefile
   xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
   xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c
   xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h
   xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
   xfce4-sensors-plugin/trunk/panel-plugin/sensors.h
   xfce4-sensors-plugin/trunk/po/POTFILES.in
   xfce4-sensors-plugin/trunk/po/ca.po
   xfce4-sensors-plugin/trunk/po/cs.po
   xfce4-sensors-plugin/trunk/po/de.po
   xfce4-sensors-plugin/trunk/po/el.po
   xfce4-sensors-plugin/trunk/po/en_GB.po
   xfce4-sensors-plugin/trunk/po/eu.po
   xfce4-sensors-plugin/trunk/po/fr.po
   xfce4-sensors-plugin/trunk/po/hu.po
   xfce4-sensors-plugin/trunk/po/ja.po
   xfce4-sensors-plugin/trunk/po/ko.po
   xfce4-sensors-plugin/trunk/po/lt.po
   xfce4-sensors-plugin/trunk/po/pl.po
   xfce4-sensors-plugin/trunk/po/ru.po
   xfce4-sensors-plugin/trunk/po/sq.po
   xfce4-sensors-plugin/trunk/po/vi.po
   xfce4-sensors-plugin/trunk/po/zh_TW.po
Log:
- code cleanup, function renaming
- new files for reading and writing configuration
- more changes for displaying values as text in panel


Modified: xfce4-sensors-plugin/trunk/icons/Makefile
===================================================================
--- xfce4-sensors-plugin/trunk/icons/Makefile	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/icons/Makefile	2007-10-28 18:21:02 UTC (rev 3465)
@@ -171,7 +171,7 @@
 USE_NLS = yes
 VERSION = 0.10.99.2
 XGETTEXT = /usr/bin/xgettext
-XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
+XGETTEXT_ARGS = --keyword=Q_
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 

Modified: xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/panel-plugin/Makefile.am	2007-10-28 18:21:02 UTC (rev 3465)
@@ -22,6 +22,8 @@
 	$(SENSORS_SOURCES)												\
 	$(HDDTEMP_SOURCES)												\
 	$(ACPI_SOURCES)													\
+	configuration.c													\
+	configuration.h													\
 	sensors.c														\
 	sensors.h														\
 	types.h

Added: xfce4-sensors-plugin/trunk/panel-plugin/configuration.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/configuration.c	                        (rev 0)
+++ xfce4-sensors-plugin/trunk/panel-plugin/configuration.c	2007-10-28 18:21:02 UTC (rev 3465)
@@ -0,0 +1,332 @@
+/* File configuration.c
+ *
+ *  Copyright 2004-2007 Fabian Nowak (timystery at arcor.de)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* Note for programmers and editors: Try to use 4 spaces instead of Tab! */
+
+
+#include "configuration.h"
+
+#include <stdlib.h>
+
+
+gint
+get_Id_from_address (gint chipnumber, gint addr, t_sensors *sensors)
+{
+    gint feature;
+    t_chip *chip;
+    t_chipfeature *chipfeature;
+
+    TRACE ("enters get_Id_from_address");
+
+    chip = (t_chip *) g_ptr_array_index (sensors->chips, chipnumber);
+
+    for (feature=0; feature<chip->num_features; feature++) {
+        chipfeature = g_ptr_array_index(chip->chip_features, feature);
+        if (addr == chipfeature->address) {
+            TRACE ("leaves get_Id_from_address with %d", feature);
+            return feature;
+        }
+    }
+
+    TRACE ("leaves get_Id_from_address with -1");
+
+    return (gint) -1;
+}
+
+
+/* Write the configuration at exit */
+void
+sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors)
+{
+    XfceRc *rc;
+    char *file, *tmp, rc_chip[8], feature[20];
+    int i, j;
+    t_chip *chip;
+    t_chipfeature *chipfeature;
+
+    TRACE ("enters sensors_write_config");
+
+    if (!(file = xfce_panel_plugin_save_location (plugin, TRUE))) {
+        TRACE ("leaves sensors_write_config: No file location specified.");
+        return;
+    }
+
+    unlink (file);
+
+    rc = xfce_rc_simple_open (file, FALSE);
+    g_free (file);
+
+    if (!rc) {
+        TRACE ("leaves sensors_write_config: No rc file opened");
+        return;
+    }
+
+    xfce_rc_set_group (rc, "General");
+
+    xfce_rc_write_bool_entry (rc, "Show_Title", sensors->show_title);
+
+    xfce_rc_write_bool_entry (rc, "Show_Labels", sensors->show_labels);
+
+    xfce_rc_write_bool_entry (rc, "Use_Bar_UI", sensors->display_values_graphically);
+
+    xfce_rc_write_bool_entry (rc, "Show_Colored_Bars", sensors->show_colored_bars);
+
+    xfce_rc_write_int_entry (rc, "Scale", sensors->scale);
+
+    xfce_rc_write_entry (rc, "Font_Size", sensors->font_size);
+
+    xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
+                                sensors->font_size_numerical);
+
+    xfce_rc_write_int_entry (rc, "Update_Interval", sensors->sensors_refresh_time);
+
+    xfce_rc_write_bool_entry (rc, "Exec_Command", sensors->exec_command);
+
+    xfce_rc_write_entry (rc, "Command_Name", sensors->command_name);
+
+    xfce_rc_write_int_entry (rc, "Number_Chips", sensors->num_sensorchips);
+
+
+    for (i=0; i<sensors->num_sensorchips; i++) {
+
+        chip = (t_chip *) g_ptr_array_index(sensors->chips, i);
+        g_assert (chip!=NULL);
+
+        g_snprintf (rc_chip, 8, "Chip%d", i);
+
+        xfce_rc_set_group (rc, rc_chip);
+
+        xfce_rc_write_entry (rc, "Name", chip->sensorId);
+
+        /* number of sensors is still limited */
+        xfce_rc_write_int_entry (rc, "Number", i);
+
+        for (j=0; j<chip->num_features; j++) {
+            chipfeature = g_ptr_array_index(chip->chip_features, j);
+            g_assert (chipfeature!=NULL);
+
+            if (chipfeature->show == TRUE) {
+
+               g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
+
+               xfce_rc_set_group (rc, feature);
+
+               xfce_rc_write_int_entry (rc, "Id", get_Id_from_address(i, j, sensors));
+
+               /* only use this if no hddtemp sensor */
+               if ( strcmp(chipfeature->name, _("Hard disks")) != 0 )
+                    xfce_rc_write_int_entry (rc, "Address", j);
+
+               xfce_rc_write_entry (rc, "Name", chipfeature->name);
+
+               xfce_rc_write_entry (rc, "Color", chipfeature->color);
+
+               xfce_rc_write_bool_entry (rc, "Show", chipfeature->show);
+
+                tmp = g_strdup_printf("%.2f", chipfeature->min_value);
+               xfce_rc_write_entry (rc, "Min", tmp);
+
+               tmp = g_strdup_printf("%.2f", chipfeature->max_value);
+               xfce_rc_write_entry (rc, "Max", tmp);
+            } /* end if */
+
+        } /* end for j */
+
+    } /* end for i */
+
+    xfce_rc_close (rc);
+
+    TRACE ("leaves sensors_write_config");
+}
+
+
+void
+sensors_read_general_config (XfceRc *rc, t_sensors *sensors)
+{
+    const char *value;
+    gint num_chips;
+
+    TRACE ("enters sensors_read_general_config");
+
+    if (xfce_rc_has_group (rc, "General") ) {
+
+        xfce_rc_set_group (rc, "General");
+
+        sensors->show_title = xfce_rc_read_bool_entry (rc, "Show_Title", TRUE);
+
+        sensors->show_labels = xfce_rc_read_bool_entry (rc, "Show_Labels", TRUE);
+
+        sensors->display_values_graphically = xfce_rc_read_bool_entry (rc, "Use_Bar_UI", FALSE);
+
+        sensors->show_colored_bars = xfce_rc_read_bool_entry (rc, "Show_Colored_Bars", FALSE);
+
+        sensors->scale = xfce_rc_read_int_entry (rc, "Scale", 0);
+
+        if ((value = xfce_rc_read_entry (rc, "Font_Size", NULL)) && *value) {
+            sensors->font_size = g_strdup(value);
+        }
+
+        sensors->font_size_numerical = xfce_rc_read_int_entry (rc,
+                                                 "Font_Size_Numerical", 2);
+
+        sensors->sensors_refresh_time = xfce_rc_read_int_entry (rc, "Update_Interval",
+                                                  60);
+
+        sensors->exec_command = xfce_rc_read_bool_entry (rc, "Exec_Command", TRUE);
+
+        if ((value = xfce_rc_read_entry (rc, "Command_Name", NULL)) && *value) {
+            sensors->command_name = g_strdup (value);
+        }
+
+        num_chips = xfce_rc_read_int_entry (rc, "Number_Chips", 0);
+        /* or could use 1 or the always existent dummy entry */
+    }
+
+    TRACE ("leaves sensors_read_general_config");
+}
+
+
+/* Read the configuration file at init */
+void
+sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
+{
+    const char *value;
+    char *file;
+    XfceRc *rc;
+    int i, j;
+    char rc_chip[8], feature[20];
+    gchar* sensorName=NULL;
+    gint num_sensorchip, id, address;
+    t_chip *chip;
+    t_chipfeature *chipfeature;
+
+    TRACE ("enters sensors_read_config");
+
+    if (!(file = xfce_panel_plugin_lookup_rc_file (plugin)))
+        return;
+
+    rc = xfce_rc_simple_open (file, TRUE);
+    g_free (file);
+
+    if (!rc)
+        return;
+
+    sensors_read_general_config (rc, sensors);
+
+    for (i = 0; i<sensors->num_sensorchips; i++) {
+        chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
+        if (chip==NULL)
+            break;
+
+        g_snprintf (rc_chip, 8, "Chip%d", i);
+
+        if (xfce_rc_has_group (rc, rc_chip)) {
+
+            xfce_rc_set_group (rc, rc_chip);
+
+            num_sensorchip=0;
+
+            if ((value = xfce_rc_read_entry (rc, "Name", NULL)) && *value) {
+                sensorName = g_strdup (value);
+            }
+
+            num_sensorchip = (gint) xfce_rc_read_int_entry (rc, "Number", 0);
+
+            /* assert that file does not contain more information
+              than does exist on system */
+              /* ??? At least, it works. */
+            g_return_if_fail (num_sensorchip < sensors->num_sensorchips);
+
+            /* now featuring enhanced string comparison */
+            g_assert (chip!=NULL);
+            if ( strcmp(chip->sensorId, sensorName)==0 ) {
+
+                for (j=0; j<chip->num_features; j++) {
+                    chipfeature = (t_chipfeature *) g_ptr_array_index (
+                                                        chip->chip_features,
+                                                        j);
+                    g_assert (chipfeature!=NULL);
+
+                    g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
+
+                    if (xfce_rc_has_group (rc, feature)) {
+                        xfce_rc_set_group (rc, feature);
+
+                        id=0; address=0;
+
+                        id = (gint) xfce_rc_read_int_entry (rc, "Id", 0);
+
+                        if ( strcmp(chip->name, _("Hard disks")) != 0 )
+                            address = (gint) xfce_rc_read_int_entry (rc, "Address", 0);
+                        else
+                         /* FIXME: compare strings, or also have hddtmep and acpi store numeric values */
+
+                        /* assert correctly saved file */
+                        if (strcmp(chip->name, _("Hard disks")) != 0) {
+                            chipfeature = g_ptr_array_index(chip->chip_features, id);
+                            /* FIXME: it might be necessary to use sensors->addresses here */
+                            /* g_return_if_fail
+                                (chipfeature->address == address); */
+                            if (chipfeature->address != address)
+                                continue;
+                        }
+
+                        if ((value = xfce_rc_read_entry (rc, "Name", NULL))
+                                && *value) {
+                            chipfeature->name = g_strdup (value);
+                            /* g_free (value); */
+                        }
+
+                        if ((value = xfce_rc_read_entry (rc, "Color", NULL))
+                                && *value) {
+                            chipfeature->color = g_strdup (value);
+                            /* g_free (value); */
+                        }
+
+                        chipfeature->show =
+                            xfce_rc_read_bool_entry (rc, "Show", FALSE);
+
+                        if ((value = xfce_rc_read_entry (rc, "Min", NULL))
+                                && *value)
+                            chipfeature->min_value = atof (value);
+
+                        if ((value = xfce_rc_read_entry (rc, "Max", NULL))
+                                && *value)
+                            chipfeature->max_value = atof (value);
+
+                    } /* end if */
+
+                } /* end for */
+
+            } /* end if */
+
+            g_free (sensorName);
+
+        } /* end if */
+
+    } /* end for */
+
+    xfce_rc_close (rc);
+
+    if (!sensors->exec_command) {
+        g_signal_handler_block ( G_OBJECT(sensors->eventbox), sensors->doubleclick_id );
+    }
+
+    TRACE ("leaves sensors_read_config");
+}

Added: xfce4-sensors-plugin/trunk/panel-plugin/configuration.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/configuration.h	                        (rev 0)
+++ xfce4-sensors-plugin/trunk/panel-plugin/configuration.h	2007-10-28 18:21:02 UTC (rev 3465)
@@ -0,0 +1,36 @@
+/* File configuration.h
+ *
+ *  Copyright 2004-2007 Fabian Nowak (timystery at arcor.de)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* Note for programmers and editors: Try to use 4 spaces instead of Tab! */
+
+#ifndef XFCE4_SENSORS_CONFIGURATION_H
+ #define XFCE4_SENSORS_CONFIGURATION_H
+
+
+#include "sensors.h"
+
+gint get_Id_from_address (gint chipnumber, gint addr, t_sensors *sensors);
+
+void sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors);
+
+void sensors_read_general_config (XfceRc *rc, t_sensors *sensors);
+
+void sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors);
+
+#endif  /* define XFCE4_SENSORS_CONFIGURATION_H */

Modified: xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c	2007-10-28 18:21:02 UTC (rev 3465)
@@ -182,3 +182,11 @@
     }
     return -1;
 }
+
+void
+sensor_interface_cleanup()
+{
+    #ifdef HAVE_LIBSENSORS
+        sensors_cleanup();
+    #endif
+}

Modified: xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h	2007-10-28 18:21:02 UTC (rev 3465)
@@ -73,23 +73,8 @@
  */
 int sensors_get_feature_wrapper (t_chip *chip, int number, double *value);
 
-/*
- * Returns temperature for parameter "/dev/hda" for example
+/* Clean up structures and call library routines for ending "session".
  */
-/* double get_hddtemp_value (char* disk);
+void sensor_interface_cleanup ();
 
-
-double get_acpi_zone_value (char *zone);
-
-
-char *get_acpi_info ();
-
-
-char *get_acpi_value (char *filename);
-
-
-int acpi_ignore_directory_entry (struct dirent *de); */
-
-
-
 #endif /* XFCE4_SENSORS_MIDDLELAYER_H */

Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors.c	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors.c	2007-10-28 18:21:02 UTC (rev 3465)
@@ -26,10 +26,18 @@
 
 
 #include "sensors.h"
+#include "configuration.h"
 
 #include <math.h>
 #include <stdlib.h>
 
+
+/*
+ * Tooltips to display for any part of this plugin
+ */
+static GtkTooltips *tooltips = NULL;
+
+
 static void
 sensors_set_bar_size (GtkWidget *bar, int size, int orientation)
 {
@@ -57,13 +65,11 @@
 
     TRACE ("enters sensors_set_bar_color");
 
-    /* check arguments */
-    g_return_if_fail(G_IS_OBJECT(bar));
+    g_return_if_fail (G_IS_OBJECT(bar));
 
     rc = gtk_widget_get_modifier_style(GTK_WIDGET(bar));
-    if (!rc) {
+    if (!rc)
         rc = gtk_rc_style_new();
-    }
 
     if (fraction >= 1)
         gdk_color_parse(COLOR_ERROR, &color);
@@ -97,11 +103,12 @@
     max = chipfeature->max_value;
     percentage = (value - min) / (max - min);
 
-    if ((percentage > 1) || (percentage <= 0)) {
-        TRACE ("leaves sensors_get_percentage with 1.0");
-        return 1.0;
-    }
+    if (percentage > 1.0)
+        percentage = 1.0;
 
+    else if (percentage <= 0.0)
+        percentage = 0.0;
+
     TRACE ("leaves sensors_get_percentage with %f", percentage);
     return percentage;
 }
@@ -137,7 +144,6 @@
     }
     sensors->bars_created = FALSE;
     gtk_widget_hide (sensors->panel_label_text);
-    /* gtk_widget_hide (sensors->panel_label_data); */
 
     TRACE ("leaves sensors_remove_graphical_panel");
 }
@@ -185,7 +191,7 @@
 
 
 static void
-sensors_add_graphical_panel (t_sensors *sensors)
+sensors_add_graphical_display (t_sensors *sensors)
 {
     int chipNum, feature;
     t_chip *chip;
@@ -193,14 +199,13 @@
     t_barpanel *panel;
     gboolean has_bars = FALSE;
     GtkWidget *progbar, *databox, *label;
-    gchar *caption, *myLabelText;
+    gchar *caption, *text;
 
-    TRACE ("enters sensors_add_graphical_panel");
+    TRACE ("enters sensors_add_graphical_display");
 
-    myLabelText = g_strdup (_("<span foreground=\"#000000\">"
-                                     "<b>Sensors</b></span>\n"));
-    gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), myLabelText);
-    gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_text), 0.0, 0.5);
+    text = g_strdup (_("<span foreground=\"#000000\">"
+                                     "<b>Sensors</b></span>"));
+    gtk_label_set_markup (GTK_LABEL(sensors->panel_label_text), text);
 
     for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
         chip = (t_chip *) g_ptr_array_index(sensors->chips, chipNum);
@@ -213,7 +218,6 @@
             if (chipfeature->show == TRUE) {
                 has_bars = TRUE;
 
-                /* prepare the progress bar */
                 progbar = gtk_progress_bar_new();
 
                 if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -229,7 +233,6 @@
                                       sensors->orientation);
                 gtk_widget_show (progbar);
 
-                /* put it all in the box */
                 if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL)
                     databox = gtk_hbox_new (FALSE, 0);
 
@@ -245,30 +248,24 @@
                 /* create the label stuff only if needed - saves some memory! */
                 if (sensors->show_labels == TRUE) {
                     caption = g_strdup (chipfeature->name);
-                    if (strlen(caption)>16) {
-                        caption[12]='.'; caption[13]='.';
-                        caption[14]='.'; caption[15]='\n';
-                        g_free (caption+16);
-                    }
                     label = gtk_label_new (caption);
-                    gtk_misc_set_padding (GTK_MISC(label), INNER_BORDER, 0);
+                    gtk_label_set_max_width_chars (GTK_LABEL(label), 12);
+                    gtk_label_set_ellipsize (GTK_LABEL(label),
+                                             PANGO_ELLIPSIZE_END);
                     gtk_widget_show (label);
                     panel->label = label;
 
-                    gtk_box_pack_start (GTK_BOX(databox), label, FALSE, FALSE, 0);
+                    gtk_box_pack_start (GTK_BOX(databox), label, FALSE, FALSE, INNER_BORDER);
                 }
                 else
                     panel->label = NULL;
 
                 gtk_box_pack_start (GTK_BOX(databox), progbar, FALSE, FALSE, 0);
 
-                /* gtk_misc_set_padding (GTK_MISC(databox), 0, OUTER_BORDER); */
-
                 panel->databox = databox;
                 sensors->panels[chipNum][feature] = (GtkWidget*) panel;
 
-                /* and add it to the outer box */
-                gtk_container_set_border_width (GTK_CONTAINER(sensors->widget_sensors), OUTER_BORDER);
+                gtk_container_set_border_width (GTK_CONTAINER(sensors->widget_sensors), 0);
                 gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
                                     databox, FALSE, FALSE, INNER_BORDER);
             }
@@ -284,21 +281,21 @@
     sensors->bars_created = TRUE;
     sensors_update_graphical_panel (sensors);
 
-    TRACE ("leaves sensors_add_graphical_panel");
+    TRACE ("leaves sensors_add_graphical_display");
 }
 
 
 static gboolean
-sensors_show_graphical_panel (t_sensors *sensors)
+sensors_show_graphical_display (t_sensors *sensors)
 {
-    TRACE ("enters sensors_show_graphical_panel");
+    TRACE ("enters sensors_show_graphical_display");
 
     if (sensors->bars_created == TRUE)
         sensors_update_graphical_panel (sensors);
     else
-        sensors_add_graphical_panel (sensors);
+        sensors_add_graphical_display (sensors);
 
-    TRACE ("leaves sensors_show_graphical_panel");
+    TRACE ("leaves sensors_show_graphical_display");
 
     return TRUE;
 }
@@ -307,7 +304,7 @@
 static int
 determine_number_of_rows (t_sensors *sensors)
 {
-    gint numRows, gtk_font_size, additional_offset;
+    gint numRows, gtk_font_size, additional_offset, avail_height;
     gdouble divisor;
     GtkStyle *style;
     PangoFontDescription *descr;
@@ -318,60 +315,65 @@
 
     style = gtk_widget_get_style (sensors->panel_label_data);
 
-    descr = style->font_desc; /* Note that stupid GTK guys forgot the r' */
+    descr = style->font_desc; /* Note that stupid GTK guys forgot the 'r' */
 
     is_absolute = FALSE;
     mask = pango_font_description_get_set_fields (descr);
-    //g_printf ("mask=%x\n", (int) mask);
     if (mask>=PANGO_FONT_MASK_SIZE) {
         is_absolute = pango_font_description_get_size_is_absolute (descr);
-        //g_printf ("absolute=%d\n", (int) is_absolute);
         if (!is_absolute) {
-            gtk_font_size = pango_font_description_get_size (descr) / 10;
-            //g_printf ("fontsize=%d\n", gtk_font_size);
+            gtk_font_size = pango_font_description_get_size (descr) / 1000;
         }
     }
+
     if (mask<PANGO_FONT_MASK_SIZE || is_absolute) {
         gtk_font_size = 10; /* not many people will want a bigger font size,
                                 and so only few rows are gonna be displayed. */
     }
 
-    // g_printf ("fontsize=%d, absolute=%d, mask=%x", gtk_font_size, is_absolute, (int) mask);
+    DBG    ("fontsize=%d, absolute=%d, mask=%x, font_size_numerical=%d, "
+                 "panelsize=%d\n", gtk_font_size, (int) is_absolute,
+                 (int) mask, sensors->font_size_numerical,
+                 sensors->panel_size);
 
     g_assert (gtk_font_size!=0);
 
     if (sensors->orientation == GTK_ORIENTATION_HORIZONTAL) {
-        //numRows = sensors->panel_size / (sensors->font_size_numerical+3)*3;
         switch (gtk_font_size) {
             case 8:
                 switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=8; divisor = 12; break;
-                    case 1: additional_offset=9; divisor = 12; break;
+                    case 0: additional_offset=10; divisor = 12; break;
+                    case 1: additional_offset=11; divisor = 12; break;
                     case 2: additional_offset=12; divisor = 12; break;
                     case 3: additional_offset=13; divisor = 13; break;
-                    default: additional_offset=16; divisor = 17; break;
+                    default: additional_offset=16; divisor = 17;
                 }
+                break;
 
             case 9:
                 switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=9; divisor = 13; break;
-                    case 1: additional_offset=10; divisor = 13; break;
-                    case 2: additional_offset=12; divisor = 14; break;
-                    case 3: additional_offset=13; divisor = 17; break;
-                    default: additional_offset=16; divisor = 20; break;
+                    case 0: additional_offset=12; divisor = 13; break;
+                    case 1: additional_offset=13; divisor = 13; break;
+                    case 2: additional_offset=14; divisor = 14; break;
+                    case 3: additional_offset=14; divisor = 17; break;
+                    default: additional_offset=16; divisor = 20;
                 }
+                break;
 
-
             default: /* case 10 */
                  switch (sensors->font_size_numerical) {
-                    case 0: additional_offset=10; divisor = 14; break;
-                    case 1: additional_offset=12; divisor = 14; break;
+                    case 0: additional_offset=13; divisor = 14; break;
+                    case 1: additional_offset=14; divisor = 14; break;
                     case 2: additional_offset=14; divisor = 14; break;
                     case 3: additional_offset=16; divisor = 17; break;
-                    default: additional_offset=20; divisor = 20; break;
+                    default: additional_offset=20; divisor = 20;
                 }
         }
-        numRows = (int) floor ((sensors->panel_size-additional_offset)  / divisor);
+        avail_height = sensors->panel_size - additional_offset;
+        if (avail_height < 0)
+            avail_height = 0;
+
+        numRows = (int) floor (avail_height / divisor);
         if (numRows < 0)
             numRows = 0;
 
@@ -383,7 +385,7 @@
     if (numRows<=0)
         numRows = 1;
 
-    TRACE ("leaves determine_number_of_rows");
+    TRACE ("leaves determine_number_of_rows with rows=%d", numRows);
 
     return numRows;
 }
@@ -427,7 +429,7 @@
     }
 
     currentColumn = 0;
-    myLabelText = g_strdup ("");
+    myLabelText = g_strdup (""); /* don't use NULL because of g_strconcat */
 
     for (chipNum=0; chipNum < sensors->num_sensorchips; chipNum++) {
         chip = (t_chip *) g_ptr_array_index (sensors->chips, chipNum);
@@ -461,8 +463,7 @@
     g_assert (itemsToDisplay==0);
 
     gtk_label_set_markup (GTK_LABEL(sensors->panel_label_data), myLabelText);
-    gtk_misc_set_padding (GTK_MISC(sensors->panel_label_data), 0, 0);
-    gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_data), 0.0, 0.0);
+    gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_data), 0.0, 0.5);
     gtk_widget_show (sensors->panel_label_data);
 
     TRACE ("leaves sensors_set_text_panel_label");
@@ -504,12 +505,12 @@
 
 /* draw label with sensor values into panel's vbox */
 static gboolean
-sensors_show_text_panel (t_sensors *sensors)
+sensors_show_text_display (t_sensors *sensors)
 {
     gint itemsToDisplay, numRows, numCols;
     gchar *myLabelText;
 
-    TRACE ("enters sensors_show_text_panel");
+    TRACE ("enters sensors_show_text_display");
 
     /* count number of checked sensors to display.
        this could also be done by every toggle/untoggle action
@@ -522,8 +523,6 @@
         myLabelText = g_strdup (_("<span foreground=\"#000000\"><b>Sensors"
                                     "</b></span>"));
         gtk_label_set_markup(GTK_LABEL(sensors->panel_label_text), myLabelText);
-        gtk_misc_set_padding (GTK_MISC(sensors->panel_label_text), OUTER_BORDER, 0);
-        gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_text), 0.0, 0.5);
         gtk_widget_show (sensors->panel_label_text);
     }
     else
@@ -533,7 +532,7 @@
 
     sensors_set_text_panel_label (sensors, numCols, itemsToDisplay);
 
-    TRACE ("leaves sensors_show_text_panel\n");
+    TRACE ("leaves sensors_show_text_display\n");
 
     return TRUE;
 }
@@ -619,7 +618,7 @@
                                                      chip->sensorId, NULL);
 
                     prependedChipName = TRUE;
-                } /* end if prepended chipname */
+                }
 
                 res = sensors_get_feature_wrapper (chip, chipfeature->address,
                                                     &sensorFeature);
@@ -638,14 +637,12 @@
                                              chipfeature->name, ": ", tmp,
                                              NULL);
 
-                /* FIXME: uuh, we update the values in here. how ugly.
-                Put me in another function. */
                 chipfeature->formatted_value = g_strdup (tmp);
                 chipfeature->raw_value = sensorFeature;
 
                 g_free (tmp);
             } /* end if chipfeature->valid */
-        } /* end while chipfeature != NULL */
+        }
     }
 
     if (!tooltips)
@@ -675,9 +672,9 @@
     sensors_create_tooltip ((gpointer) sensors);
 
     if (sensors->display_values_graphically == FALSE)
-        result = sensors_show_text_panel (sensors);
+        result = sensors_show_text_display (sensors);
     else
-        result = sensors_show_graphical_panel (sensors);
+        result = sensors_show_graphical_display (sensors);
 
     TRACE ("leaves sensors_show_panel\n");
     return result;
@@ -755,27 +752,27 @@
 
     /* initialize value label widget */
     sensors->panel_label_text = gtk_label_new (NULL);
-    sensors->panel_label_data = gtk_label_new (NULL);
+    gtk_misc_set_padding (GTK_MISC(sensors->panel_label_text), INNER_BORDER, 0);
+    gtk_misc_set_alignment(GTK_MISC(sensors->panel_label_text), 0.0, 0.5);
     gtk_widget_show (sensors->panel_label_text);
+
+    sensors->panel_label_data = gtk_label_new (NULL);
     gtk_widget_show (sensors->panel_label_data);
 
     /* create 'valued' label */
     sensors_show_panel (sensors);
 
-    /* g_assert (sensors->panel_label_text!=NULL); */
-
     /* add newly created label to box */
     gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
                         sensors->panel_label_text, FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (sensors->widget_sensors),
-                        sensors->panel_label_data, FALSE, FALSE, 0);
+                        sensors->panel_label_data, TRUE, TRUE, 0);
 
 
     TRACE ("leaves create_panel_widget");
 }
 
 
-
 /* double-click improvement */
 static gboolean
 execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data)
@@ -816,7 +813,7 @@
     sensors->bars_created = FALSE;
     sensors->font_size = "medium";
     sensors->font_size_numerical = 2;
-    sensors->panel_size = 32;
+    sensors->panel_size = xfce_panel_plugin_get_size (plugin);
     sensors->sensors_refresh_time = 60;
     sensors->scale = CELSIUS;
 
@@ -893,7 +890,7 @@
                        sensors->widget_sensors);
 
     /* double-click improvement */
-     sensors->doubleclick_id = g_signal_connect (G_OBJECT(sensors->eventbox),
+    sensors->doubleclick_id = g_signal_connect (G_OBJECT(sensors->eventbox),
                                                  "button-press-event",
                                                  G_CALLBACK (execute_command),
                                                  (gpointer) sensors);
@@ -910,10 +907,8 @@
 
     g_return_if_fail (sensors != NULL);
 
-    /* stop association to libsensors */
-    #ifdef HAVE_LIBSENSORS
-        sensors_cleanup();
-    #endif
+    /* stop association to libsensors and others*/
+    sensor_interface_cleanup();
 
     /* remove timeout functions */
     if (sensors->timeout_id)
@@ -924,8 +919,6 @@
 
     /* free structures and arrays */
     g_ptr_array_free (sensors->chips, TRUE);
-    /*    g_ptr_array_free (sensors->disklist, TRUE);
-    g_ptr_array_free (sensors->acpi_zones, TRUE); */
 
     g_free (sensors);
 
@@ -946,342 +939,8 @@
     TRACE ("leaves sensors_free");
 }
 
-static gint
-getIdFromAddress (gint chipnumber, gint addr, t_sensors *sensors)
-{
-    gint feature;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
 
-    TRACE ("enters getIdFromAddress");
-
-    chip = (t_chip *) g_ptr_array_index (sensors->chips, chipnumber);
-
-    for (feature=0; feature<chip->num_features; feature++) {
-        chipfeature = g_ptr_array_index(chip->chip_features, feature);
-        if (addr == chipfeature->address) {
-            TRACE ("leaves getIdFromAddress with %d", feature);
-            return feature;
-        }
-    }
-
-    TRACE ("leaves getIdFromAddress with -1");
-
-    return (gint) -1;
-}
-
-/* Write the configuration at exit */
 static void
-sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors)
-{
-    XfceRc *rc;
-    char *file, *tmp;
-    int i, j;
-    char rc_chip[8], feature[20];
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters sensors_write_config");
-
-    if (!(file = xfce_panel_plugin_save_location (plugin, TRUE))) {
-        TRACE ("leaves sensors_write_config: No file location specified.");
-        return;
-    }
-
-    /* int res = */ unlink (file);
-
-    rc = xfce_rc_simple_open (file, FALSE);
-    g_free (file);
-
-    if (!rc) {
-        TRACE ("leaves sensors_write_config: No rc file opened");
-        return;
-    }
-
-    xfce_rc_set_group (rc, "General");
-
-    xfce_rc_write_bool_entry (rc, "Show_Title", sensors->show_title);
-
-    xfce_rc_write_bool_entry (rc, "Show_Labels", sensors->show_labels);
-
-    xfce_rc_write_bool_entry (rc, "Use_Bar_UI", sensors->display_values_graphically);
-
-    xfce_rc_write_bool_entry (rc, "Show_Colored_Bars", sensors->show_colored_bars);
-
-    xfce_rc_write_int_entry (rc, "Scale", sensors->scale);
-
-    xfce_rc_write_entry (rc, "Font_Size", sensors->font_size);
-
-    xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
-                                sensors->font_size_numerical);
-
-    xfce_rc_write_int_entry (rc, "Update_Interval", sensors->sensors_refresh_time);
-
-    xfce_rc_write_bool_entry (rc, "Exec_Command", sensors->exec_command);
-
-    xfce_rc_write_entry (rc, "Command_Name", sensors->command_name);
-
-    xfce_rc_write_int_entry (rc, "Number_Chips", sensors->num_sensorchips);
-
-
-    for (i=0; i<sensors->num_sensorchips; i++) {
-
-        chip = (t_chip *) g_ptr_array_index(sensors->chips, i);
-        g_assert (chip!=NULL);
-
-        g_snprintf (rc_chip, 8, "Chip%d", i);
-
-        xfce_rc_set_group (rc, rc_chip);
-
-        xfce_rc_write_entry (rc, "Name", chip->sensorId);
-
-        /* number of sensors is still limited */
-        xfce_rc_write_int_entry (rc, "Number", i);
-
-        /* only save what was displayed to save time */
-
-
-        for (j=0; j<chip->num_features; j++) {
-            chipfeature = g_ptr_array_index(chip->chip_features, j);
-            g_assert (chipfeature!=NULL);
-
-            if (chipfeature->show == TRUE) {
-
-               g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
-
-               xfce_rc_set_group (rc, feature);
-
-               xfce_rc_write_int_entry (rc, "Id", getIdFromAddress(i, j, sensors));
-               /*    #ifdef DEBUG
-               g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-               #endif */
-
-               /* only use this if no hddtemp sensor */
-               if ( strcmp(chipfeature->name, _("Hard disks")) != 0 )
-                    xfce_rc_write_int_entry (rc, "Address", j);
-
-               xfce_rc_write_entry (rc, "Name", chipfeature->name);
-               /*    #ifdef DEBUG
-               g_printf(" %s \n", chipfeature->name);
-               #endif */
-
-               xfce_rc_write_entry (rc, "Color", chipfeature->color);
-               /*    #ifdef DEBUG
-               g_printf(" %s \n", chipfeature->color);
-               #endif */
-
-               xfce_rc_write_bool_entry (rc, "Show", chipfeature->show);
-               /*    #ifdef DEBUG
-               g_printf(" %d \n", chipfeature->show);
-               #endif */
-
-                tmp = g_strdup_printf("%.2f", chipfeature->min_value);
-               xfce_rc_write_entry (rc, "Min", tmp);
-               /*    #ifdef DEBUG
-               g_printf("Min %s \n", tmp);
-               #endif */
-
-               tmp = g_strdup_printf("%.2f", chipfeature->max_value);
-               xfce_rc_write_entry (rc, "Max", tmp);
-               /* #ifdef DEBUG
-               g_printf("Max %s \n", tmp);
-               #endif */
-            } /* end if */
-
-        } /* end for j */
-
-    } /* end for i */
-
-    xfce_rc_close (rc);
-
-    TRACE ("leaves sensors_write_config");
-}
-
-
-static void
-sensors_read_general_config (XfceRc *rc, t_sensors *sensors)
-{
-    const char *value;
-    gint num_chips;
-
-    TRACE ("enters sensors_read_general_config");
-
-    if (xfce_rc_has_group (rc, "General") ) {
-
-        xfce_rc_set_group (rc, "General");
-
-        sensors->show_title = xfce_rc_read_bool_entry (rc, "Show_Title", TRUE);
-
-        sensors->show_labels = xfce_rc_read_bool_entry (rc, "Show_Labels", TRUE);
-
-        sensors->display_values_graphically = xfce_rc_read_bool_entry (rc, "Use_Bar_UI", FALSE);
-
-        sensors->show_colored_bars = xfce_rc_read_bool_entry (rc, "Show_Colored_Bars", FALSE);
-
-        sensors->scale = xfce_rc_read_int_entry (rc, "Scale", 0);
-
-        if ((value = xfce_rc_read_entry (rc, "Font_Size", NULL)) && *value) {
-            sensors->font_size = g_strdup(value);
-        }
-
-        sensors->font_size_numerical = xfce_rc_read_int_entry (rc,
-                                                 "Font_Size_Numerical", 2);
-
-        sensors->sensors_refresh_time = xfce_rc_read_int_entry (rc, "Update_Interval",
-                                                  60);
-
-        sensors->exec_command = xfce_rc_read_bool_entry (rc, "Exec_Command", TRUE);
-
-        if ((value = xfce_rc_read_entry (rc, "Command_Name", NULL)) && *value) {
-            sensors->command_name = g_strdup (value);
-        }
-
-        num_chips = xfce_rc_read_int_entry (rc, "Number_Chips", 0);
-        /* or could use 1 or the always existent dummy entry */
-    }
-
-    TRACE ("leaves sensors_read_general_config");
-}
-
-
-/* Read the configuration file at init */
-static void
-sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
-{
-    const char *value;
-    char *file;
-    XfceRc *rc;
-    int i, j;
-    char rc_chip[8], feature[20];
-    gchar* sensorName=NULL;
-    gint num_sensorchip, id, address;
-    t_chip *chip;
-    t_chipfeature *chipfeature;
-
-    TRACE ("enters sensors_read_config");
-
-    if (!(file = xfce_panel_plugin_lookup_rc_file (plugin)))
-        return;
-
-    rc = xfce_rc_simple_open (file, TRUE);
-    g_free (file);
-
-    if (!rc)
-        return;
-
-    sensors_read_general_config (rc, sensors);
-
-    for (i = 0; i<sensors->num_sensorchips; i++) {
-        chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
-        if (chip==NULL)
-            break;
-
-        g_snprintf (rc_chip, 8, "Chip%d", i);
-
-        if (xfce_rc_has_group (rc, rc_chip)) {
-
-            xfce_rc_set_group (rc, rc_chip);
-
-            num_sensorchip=0;
-
-            if ((value = xfce_rc_read_entry (rc, "Name", NULL)) && *value) {
-                sensorName = g_strdup (value);
-            }
-
-            num_sensorchip = (gint) xfce_rc_read_int_entry (rc, "Number", 0);
-
-            /* assert that file does not contain more information
-              than does exist on system */
-              /* ??? At least, it works. */
-            g_return_if_fail (num_sensorchip < sensors->num_sensorchips);
-
-            /* now featuring enhanced string comparison */
-            g_assert (chip!=NULL);
-            if ( strcmp(chip->sensorId, sensorName)==0 ) {
-
-                for (j=0; j<chip->num_features; j++) {
-                    chipfeature = (t_chipfeature *) g_ptr_array_index (
-                                                        chip->chip_features,
-                                                        j);
-                    g_assert (chipfeature!=NULL);
-
-                    g_snprintf (feature, 20, "%s_Feature%d", rc_chip, j);
-
-                    if (xfce_rc_has_group (rc, feature)) {
-                        xfce_rc_set_group (rc, feature);
-
-                        id=0; address=0;
-
-                        id = (gint) xfce_rc_read_int_entry (rc, "Id", 0);
-
-                        if ( strcmp(chip->name, _("Hard disks")) != 0 )
-                            address = (gint) xfce_rc_read_int_entry (rc, "Address", 0);
-                        else
-                         /* FIXME: compare strings, or also have hddtmep and acpi store numeric values */
-
-                        /* assert correctly saved file */
-                        if (strcmp(chip->name, _("Hard disks")) != 0) {
-                            chipfeature = g_ptr_array_index(chip->chip_features, id);
-                            /* FIXME: it might be necessary to use sensors->addresses here */
-                            /* g_return_if_fail
-                                (chipfeature->address == address); */
-                            if (chipfeature->address != address)
-                                continue;
-                        }
-
-                        if ((value = xfce_rc_read_entry (rc, "Name", NULL))
-                                && *value) {
-                            chipfeature->name = g_strdup (value);
-                            /* g_free (value); */
-                        }
-
-                        if ((value = xfce_rc_read_entry (rc, "Color", NULL))
-                                && *value) {
-                            chipfeature->color = g_strdup (value);
-                            /* g_free (value); */
-                        }
-
-                        chipfeature->show =
-                            xfce_rc_read_bool_entry (rc, "Show", FALSE);
-
-                        if ((value = xfce_rc_read_entry (rc, "Min", NULL))
-                                && *value)
-                            chipfeature->min_value = atof (value);
-
-                        if ((value = xfce_rc_read_entry (rc, "Max", NULL))
-                                && *value)
-                            chipfeature->max_value = atof (value);
-
-                    } /* end if */
-
-                } /* end for */
-
-            } /* end if */
-
-            g_free (sensorName);
-
-        } /* end if */
-
-    } /* end for */
-
-    /* g_free (value); */    /* issues WARNING:  Verarbeiten des Argumentes 1 von
-       »g_free« streicht Qualifizierer von Zeiger-Zieltypen */
-
-    xfce_rc_close (rc);
-
-    if (!sensors->exec_command) {
-        g_signal_handler_block ( G_OBJECT(sensors->eventbox), sensors->doubleclick_id );
-    }
-
-    /* Try to resize the sensors to fit the user settings.
-       Do also modify the tooltip text. */
-    sensors_show_panel ((gpointer) sensors);
-
-    TRACE ("leaves sensors_read_config");
-}
-
-
-static void
 show_title_toggled (GtkWidget *widget, t_sensors_dialog *sd)
 {
     TRACE ("enters show_title_toggled");
@@ -1328,9 +987,9 @@
 }
 
 static void
-ui_style_changed (GtkWidget *widget, t_sensors_dialog *sd)
+display_style_changed (GtkWidget *widget, t_sensors_dialog *sd)
 {
-    TRACE ("enters ui_style_changed");
+    TRACE ("enters display_style_changed");
 
     if (sd->sensors->display_values_graphically == TRUE) {
         sensors_remove_graphical_panel(sd->sensors);
@@ -1346,14 +1005,10 @@
 
     sd->sensors->display_values_graphically = gtk_toggle_button_get_active
         ( GTK_TOGGLE_BUTTON(widget) );
-    /*
-    gtk_widget_set_sensitive(sd->labelsBox, sd->sensors->display_values_graphically);
-    gtk_widget_set_sensitive(sd->fontBox, !sd->sensors->display_values_graphically);
-    */
 
     sensors_show_panel ((gpointer) sd->sensors);
 
-    TRACE ("leaves ui_style_changed");
+    TRACE ("leaves display_style_changed");
 }
 
 
@@ -1362,36 +1017,26 @@
 {
     gint gtk_combo_box_active;
     t_chip *chip;
-    /*    t_chipfeature *chipfeature; */
 
     TRACE ("enters sensor_entry_changed");
 
-    gtk_combo_box_active =
-        gtk_combo_box_get_active(GTK_COMBO_BOX (widget));
+    gtk_combo_box_active = gtk_combo_box_get_active(GTK_COMBO_BOX (widget));
 
-    /* widget should be sd->myComboBox */
-    /* const char* adapter_name; */
-    /*if ( gtk_combo_box_active!=sd->sensors->num_sensorchips-1 ) { */
-        chip = (t_chip *) g_ptr_array_index(sd->sensors->chips, gtk_combo_box_active);
-        gtk_label_set_label (GTK_LABEL(sd->mySensorLabel), chip->description);
-                /* sensors_get_adapter_name
-                    (chip->chip_name->bus) ); */
-    /*    } */
-    /* else gtk_label_set_label (GTK_LABEL(sd->mySensorLabel),
-                g_strdup(_("Hard disk temperature sensors")) ); */
+    chip = (t_chip *) g_ptr_array_index (sd->sensors->chips,
+                                         gtk_combo_box_active);
+    gtk_label_set_label (GTK_LABEL(sd->mySensorLabel), chip->description);
 
-    gtk_tree_view_set_model (
-        GTK_TREE_VIEW (sd->myTreeView),
-        GTK_TREE_MODEL (sd->myListStore [ gtk_combo_box_active ]) );
+    gtk_tree_view_set_model (GTK_TREE_VIEW (sd->myTreeView),
+                    GTK_TREE_MODEL ( sd->myListStore[gtk_combo_box_active] ) );
 
     TRACE ("leaves sensor_entry_changed");
 }
 
 
 static void
-gtk_font_size_change (GtkWidget *widget, t_sensors_dialog *sd)
+font_size_change (GtkWidget *widget, t_sensors_dialog *sd)
 {
-    TRACE ("enters gtk_font_size_change");
+    TRACE ("enters font_size_change");
 
     switch ( gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) ) {
 
@@ -1408,7 +1053,7 @@
     /* refresh the panel content */
     sensors_show_panel ((gpointer) sd->sensors);
 
-    TRACE ("leaves gtk_font_size_change");
+    TRACE ("leaves font_size_change");
 }
 
 
@@ -1486,9 +1131,9 @@
 
 
 static void
-gtk_temperature_unit_change (GtkWidget *widget, t_sensors_dialog *sd)
+temperature_unit_change (GtkWidget *widget, t_sensors_dialog *sd)
 {
-    TRACE ("enters gtk_temperature_unit_change ");
+    TRACE ("enters temperature_unit_change ");
 
     /* toggle celsius-fahrenheit by use of mathematics ;) */
     sd->sensors->scale = 1 - sd->sensors->scale;
@@ -1498,7 +1143,7 @@
 
     reload_listbox (sd);
 
-    TRACE ("laeves gtk_temperature_unit_change ");
+    TRACE ("laeves temperature_unit_change ");
 }
 
 
@@ -1637,7 +1282,7 @@
 
 
 static void
-gtk_cell_color_edited (GtkCellRendererText *cellrenderertext, gchar *path_str,
+list_cell_color_edited (GtkCellRendererText *cellrenderertext, gchar *path_str,
                        gchar *new_color, t_sensors_dialog *sd)
 {
     gint gtk_combo_box_active;
@@ -1648,7 +1293,7 @@
     t_chip *chip;
     t_chipfeature *chipfeature;
 
-    TRACE ("enters gtk_cell_color_edited");
+    TRACE ("enters list_cell_color_edited");
 
     /* store new color in appropriate array */
     hexColor = g_str_has_prefix (new_color, "#");
@@ -1687,12 +1332,12 @@
         sensors_show_panel ((gpointer) sd->sensors);
     }
 
-    TRACE ("leaves gtk_cell_color_edited");
+    TRACE ("leaves list_cell_color_edited");
 }
 
 
 static void
-gtk_cell_text_edited (GtkCellRendererText *cellrenderertext,
+list_cell_text_edited (GtkCellRendererText *cellrenderertext,
                       gchar *path_str, gchar *new_text, t_sensors_dialog *sd)
 {
     gint gtk_combo_box_active;
@@ -1702,7 +1347,7 @@
     t_chip *chip;
     t_chipfeature *chipfeature;
 
-    TRACE ("enters gtk_cell_text_edited");
+    TRACE ("enters list_cell_text_edited");
 
     if (sd->sensors->display_values_graphically == TRUE) {
         sensors_remove_graphical_panel(sd->sensors);
@@ -1731,12 +1376,12 @@
     /* update panel */
     sensors_show_panel ((gpointer) sd->sensors);
 
-    TRACE ("leaves gtk_cell_text_edited");
+    TRACE ("leaves list_cell_text_edited");
 }
 
 
 static void
-gtk_cell_toggle (GtkCellRendererToggle *cell, gchar *path_str,
+list_cell_toggle (GtkCellRendererToggle *cell, gchar *path_str,
                   t_sensors_dialog *sd)
 {
     t_chip *chip;
@@ -1747,7 +1392,7 @@
     GtkTreeIter iter;
     gboolean toggle_item;
 
-    TRACE ("enters gtk_cell_toggle");
+    TRACE ("enters list_cell_toggle");
 
     if (sd->sensors->display_values_graphically == TRUE) {
         sensors_remove_graphical_panel(sd->sensors);
@@ -1782,7 +1427,7 @@
     /* update tooltip and panel widget */
     sensors_show_panel ((gpointer) sd->sensors);
 
-    TRACE ("leaves gtk_cell_toggle");
+    TRACE ("leaves list_cell_toggle");
 }
 
 
@@ -1877,7 +1522,7 @@
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
     g_signal_connect (G_OBJECT (radioBars), "toggled",
-                      G_CALLBACK (ui_style_changed), sd );
+                      G_CALLBACK (display_style_changed), sd );
 
     TRACE ("leaves add_ui_style_box");
 }
@@ -2035,7 +1680,7 @@
     aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Name"),
                         myCellRendererText, "text", 0, NULL);
     g_signal_connect    (G_OBJECT (myCellRendererText), "edited",
-                        G_CALLBACK (gtk_cell_text_edited), sd);
+                        G_CALLBACK (list_cell_text_edited), sd);
     gtk_tree_view_column_set_expand (aTreeViewColumn, TRUE);
     gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
                         GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
@@ -2050,7 +1695,7 @@
     aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Show"),
                         myCellRendererToggle, "active", 2, NULL);
     g_signal_connect    (G_OBJECT (myCellRendererToggle), "toggled",
-                        G_CALLBACK (gtk_cell_toggle), sd );
+                        G_CALLBACK (list_cell_toggle), sd );
     gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
                         GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
 
@@ -2059,7 +1704,7 @@
     aTreeViewColumn = gtk_tree_view_column_new_with_attributes (_("Color"),
                         myCellRendererText, "text", 3, NULL);
     g_signal_connect    (G_OBJECT (myCellRendererText), "edited",
-                        G_CALLBACK (gtk_cell_color_edited), sd);
+                        G_CALLBACK (list_cell_color_edited), sd);
     gtk_tree_view_append_column (GTK_TREE_VIEW (sd->myTreeView),
                         GTK_TREE_VIEW_COLUMN (aTreeViewColumn));
 
@@ -2136,7 +1781,7 @@
         gtk_widget_hide(sd->font_Box);
 
     g_signal_connect   (G_OBJECT (myFontSizeComboBox), "changed",
-                        G_CALLBACK (gtk_font_size_change), sd );
+                        G_CALLBACK (font_size_change), sd );
 
     TRACE ("leaves add_font_size_box");
 }
@@ -2173,7 +1818,7 @@
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
     g_signal_connect (G_OBJECT (radioCelsius), "toggled",
-                      G_CALLBACK (gtk_temperature_unit_change), sd );
+                      G_CALLBACK (temperature_unit_change), sd );
 
     TRACE ("leaves add_temperature_unit_box");
 }
@@ -2383,7 +2028,7 @@
 
     header = xfce_create_header (NULL, _("Sensors Plugin"));
     gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
+    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER-2);
     gtk_widget_show (header);
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
                         FALSE, TRUE, 0);
@@ -2456,6 +2101,10 @@
 
     sensors_read_config (plugin, sensors);
 
+    /* Try to resize the sensors to fit the user settings.
+       Do also modify the tooltip text. */
+    sensors_show_panel ((gpointer) sensors);
+
     sensors->timeout_id = g_timeout_add (sensors->sensors_refresh_time * 1000,
                                          (GtkFunction) sensors_show_panel,
                                          (gpointer) sensors);

Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors.h	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors.h	2007-10-28 18:21:02 UTC (rev 3465)
@@ -223,10 +223,6 @@
 }
 t_sensors_dialog;
 
-/*
- * Tooltips to display for any part of this plugin
- */
-static GtkTooltips *tooltips = NULL;
 
 
 #endif /* XFCE4_SENSORS_SENSORS_H */

Modified: xfce4-sensors-plugin/trunk/po/POTFILES.in
===================================================================
--- xfce4-sensors-plugin/trunk/po/POTFILES.in	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/POTFILES.in	2007-10-28 18:21:02 UTC (rev 3465)
@@ -1,5 +1,6 @@
 panel-plugin/sensors.c
 panel-plugin/sensors.h
+panel-plugin/configuration.c
 panel-plugin/acpi.c
 panel-plugin/hddtemp.c
 panel-plugin/lmsensors.c

Modified: xfce4-sensors-plugin/trunk/po/ca.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ca.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/ca.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-09-20 13:53+0200\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan at bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -16,26 +16,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "No s’ha seleccionat cap sensor"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "S’ha produït un error durant la lectura dels sensors.\n"
 "No es podrà assegurar un bon funcionament.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "No s’han trobat sensors"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Discs durs"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,137 +59,169 @@
 "S’ha produït un error durant la lectura dels sensors.\n"
 "No es podrà assegurar un bon funcionament.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Estil de la interfície:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "text"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "gràfic"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Mostra les etiquetes a l’interfície gràfica"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Mostra títol"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Tipus de sensors:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Nom"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Valor"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Mostra"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Color"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Mín."
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Màx."
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Mida de la lletra"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "molt petit"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "petit"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "mitjà"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "gran"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "extra gran"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Escala de temperatura:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Interval d’actualització (segons):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Executa en fer doble clic:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Tipus de sensors:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Miscel·lània</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Edita propietats"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Connector de sensors"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Discs durs"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Sensors de temperatura dels discs durs"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Tipus de sensors:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "No s’ha pogut connectar als sensors"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Connector de sensors"
@@ -214,17 +230,14 @@
 msgid "Show sensor values."
 msgstr "Mostra els valors dels sensors"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Sensors</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "No s’ha pogut connectar als sensors"
-
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Sensors de temperatura dels discs durs"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Visualitza</b>"

Modified: xfce4-sensors-plugin/trunk/po/cs.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/cs.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/cs.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-09-17 09:44+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,26 +16,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f otáček za minutu"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Nebyly nalezeny žádné senzory!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "Došlo k potížím při čtení hodnoty senzoru. \n"
 "Správná funkčnost nemůže být zaručena.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Nebyly nalezeny žádné senzory!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Pevné disky"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,137 +59,169 @@
 "Došlo k potížím při čtení hodnoty senzoru. \n"
 "Správná funkčnost nemůže být zaručena.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Styl grafického rozhraní UI:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "text"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "graficky"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Zobrazovat popisky v grafickém rozhraní"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Zobrazovat titulek"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Typ senzorů:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Název"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Barva"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Velikost písma:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "x-small"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "small"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "medium"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "large"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "x-large"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Rozsah teplot:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Stupně Celsia"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Stupně Fahrenheita"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Interval obnovení (vteřiny):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Spustit při dvojitém kliknutí:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Typ senzorů:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Ostatní</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Zásuvný modul senzory"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Pevné disky"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Teplotní čidla pevných disků"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Typ senzorů:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Chyba: Nelze se připojit k senzorům!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Zásuvný modul senzor"
@@ -214,17 +230,14 @@
 msgid "Show sensor values."
 msgstr "Zobrazovat hodnoty senzorů."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senzory</b></span>"
 
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Senzory</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Chyba: Nelze se připojit k senzorům!"
-
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Teplotní čidla pevných disků"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Zobrazit</b>"

Modified: xfce4-sensors-plugin/trunk/po/de.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/de.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/de.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,33 +7,28 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
-"PO-Revision-Date: 2007-10-07 14:05+0100\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
+"PO-Revision-Date: 2007-10-28 17:22+0000\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\"><b>Sensoren</b></span>\n"
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
+msgstr "<span foreground=\"#000000\"><b>Sensoren</b></span>"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoren</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f U/min"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Keine Sensoren ausgewählt!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -44,22 +39,11 @@
 "Anscheinend gab es ein Problem beim Auslesen eines Wertes. \n"
 "Sauberes Weiterlaufen kann nicht gewährleistet werden.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Keine Sensoren gefunden!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Festplatten"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, c-format
 msgid ""
 "\n"
@@ -72,123 +56,153 @@
 "Anscheinend gab es ein Problem beim Auslesen eines Wertes. \n"
 "Sauberes Weiterlaufen kann nicht gewährleistet werden.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr "_Darstellung:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr "_textuell"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr "g_raphisch"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr "_Beschriftungen im graphischen Modus anzeigen"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "B_alken farbig darstellen"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 msgid "_Show title"
 msgstr "T_itel anzeigen"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 msgid "Sensors t_ype:"
 msgstr "Sensort_yp:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Name"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Wert"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Farbe"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 msgid "F_ont size:"
 msgstr "Sc_hriftgröße:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "extra-klein"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "klein"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "normal"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "groß"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "extra-groß"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr "T_emperaturskala"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr "_Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 msgid "U_pdate interval (seconds):"
 msgstr "A_uffrischungsintervall (Sekunden):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr "Bei D_oppel-Klick ausführen:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr "Aussehen"
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 msgid "Miscellaneous"
 msgstr "Sonstige Einstellungen"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
-msgstr "Eingeschaften einstellen"
+msgstr "Eigenschaften einstellen"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Sensor Plugin"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Festplatten"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr "ACPI"
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr "Erweiterte Konfigurations- und Stromschnittstelle"
+
+#: ../panel-plugin/hddtemp.c:172
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "S.M.A.R.T.-Sensoren der Festplatten"
+
+#: ../panel-plugin/lmsensors.c:52
+msgid "LM Sensors"
+msgstr "LM Sensoren"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Fehler: Konnte nicht mit Sensoren verbinden!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Sensor Plugin"
@@ -197,14 +211,11 @@
 msgid "Show sensor values."
 msgstr "Sensorwerte erkannter Sensoren überwachen."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoren</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoren</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Temperatursensoren der Festplatten"
-
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Fehler: Konnte nicht mit Sensoren verbinden!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Ansicht</b>"

Modified: xfce4-sensors-plugin/trunk/po/el.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/el.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/el.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-10-14 19:59+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg at serverhive.com>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -16,26 +16,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span> \n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span> \n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Δεν επιλέχθηκαν αισθητήρες!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "Από οτι φαίνεται υπήρξε πρόβλημα κατά την ανάγνωση κάποιου αισθητήρα. \n"
 "Δεν είναι εγγυημένη η κανονική συνέχεια.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Δε βρέθηκαν αισθητήρες!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Σκληροί δίσκοι"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,137 +59,169 @@
 "Από οτι φαίνεται υπήρξε πρόβλημα κατά την ανάγνωση κάποιου αισθητήρα. \n"
 "Δεν είναι εγγυημένη η κανονική συνέχεια.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Στυλ UI:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "κείμενο"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "γραφικό"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Εμφάνιση ετικετών σε γραφικό UI"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Εμφάνιση τίτλου"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Τύπος αισθητήρα:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Ελαχ"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Μεγ"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Μέγεθος γραμματοσειράς:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "πολύ μικρό"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "Μικρό"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "μεσαίο"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "μεγάλο"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "πολύ μεγάλο"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Κλίμακα θερμοκρασίας:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Κελσίου"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Φαρενάϊτ"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Διάστημα ανανέωσης (δευτερόλεπτα):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Εκτέλεση στο διπλό κλικ:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Τύπος αισθητήρα:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Διάφορα</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Ιδιότητες"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Πρόσθετο αισθητήρων"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Σκληροί δίσκοι"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Αισθητήρες θερμοκρασίας σκληρών δίσκων"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Τύπος αισθητήρα:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Σφάλμα: Δεν ήταν δυνατή η σύνδεση με τους αισθητήρες!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Πρόσθετο αισθητήρων"
@@ -214,17 +230,15 @@
 msgid "Show sensor values."
 msgstr "Εμφάνιση τιμών αισθητήρων."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr ""
+#~ "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span> \n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Αισθητήρες</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Αισθητήρες θερμοκρασίας σκληρών δίσκων"
-
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Αισθητήρες</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Σφάλμα: Δεν ήταν δυνατή η σύνδεση με τους αισθητήρες!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Προβολή</b>"

Modified: xfce4-sensors-plugin/trunk/po/en_GB.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/en_GB.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/en_GB.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2007-03-31 10:24+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -17,26 +17,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "No sensors selected!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -48,22 +43,11 @@
 "Seems like there was a problem reading a sensor feature value. \n"
 "Proper proceeding cannot be guaranteed.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "No sensors found!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Hard disks"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -76,137 +60,169 @@
 "Seems like there was a problem reading a sensor feature value. \n"
 "Proper proceeding cannot be guaranteed.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "UI style:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "text"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "graphical"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Show labels in graphical UI"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Show title"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Sensors type:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Name"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Value"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Show"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Colour"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Font size:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "x-small"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "small"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "medium"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "large"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "x-large"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Temperature scale:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Update interval (seconds):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Execute on double click:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Sensors type:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Miscellaneous</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Edit Properties"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Sensors Plugin"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Hard disks"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Hard disk temperature sensors"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Sensors type:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Error: Could not connect to sensors!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Sensor plugin "
@@ -215,17 +231,14 @@
 msgid "Show sensor values."
 msgstr "Show sensor values."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Sensors</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Error: Could not connect to sensors!"
-
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Hard disk temperature sensors"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>View</b>"

Modified: xfce4-sensors-plugin/trunk/po/eu.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/eu.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/eu.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-02-13 22:20+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Librezale <librezale at librezale.org>\n"
@@ -16,26 +16,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 0.6.3.20060126\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f b/min"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Ez da sentsorerik hautatu!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "Dirudienez arazo bat dago sentsore ezaugarri balioa irakurtzerakoan. \n"
 "Ezin da behar ebzala ibiliko den ziurtatu.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Ez da sentsorerik aurkitu!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Diska Gogorrak"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,125 +59,157 @@
 "Dirudienez arazo bat dago sentsore ezaugarri balioa irakurtzerakoan. \n"
 "Ezin da behar ebzala ibiliko den ziurtatu.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr "_UI estiloa:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr "_testua"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr "g_rafikoa"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr "_Etitketa bistarazi UI grafikoan"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "Koloretako _barrak ikusi"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 msgid "_Show title"
 msgstr "_Izenburua ikusi"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 msgid "Sensors t_ype:"
 msgstr "Sentsore m_ota:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Izena"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Balioa"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Bistarazi"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Kolorea"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Geh"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 msgid "F_ont size:"
 msgstr "Letra-tip_o tamaina:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "oso txikia"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "txikia"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "ertaina"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "handia"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "oso handia"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr "T_enperatura eskala:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr "_Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 msgid "U_pdate interval (seconds):"
 msgstr "Egunera_keta aldia (segundu):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr "Klik bikoitzarekin e_xekutatu:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>Sentsoreak</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Bestelakoak</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Propietateak Editatu"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Sentsore Plugin-a"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Diska Gogorrak"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Diska gogor tenperatura sentsoreak"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>Sentsoreak</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Errorea: Ezin da sentsoreetara konektatu!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Sentsore plugin-a "
@@ -202,14 +218,11 @@
 msgid "Show sensor values."
 msgstr "Sentsore balioak bistarazi."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sentsoreak</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Diska gogor tenperatura sentsoreak"
-
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Errorea: Ezin da sentsoreetara konektatu!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Bistarazi</b>"

Modified: xfce4-sensors-plugin/trunk/po/fr.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/fr.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/fr.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2007-10-24 11:46+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -17,25 +17,21 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
+#, fuzzy
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\"><b>Senseurs</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senseurs</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Aucun senseur sélectionné !"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -46,22 +42,11 @@
 "Il semblerait qu'il y ait un problème de lecture de valeur sur un senseur. \n"
 "L'exécution normale ne peut pas être garantie.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Aucun senseur trouvé !"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Disques dur"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, c-format
 msgid ""
 "\n"
@@ -74,123 +59,155 @@
 "Il semblerait qu'il y ait un problème de lecture de valeur sur un senseur. \n"
 "L'exécution normale ne peut pas être garantie.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr "Style de l'interface :"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr "_texte"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr "g_raphique"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr "Afficher les étiquettes dans l'interface graphique"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "Afficher les _barres en couleur"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 msgid "_Show title"
 msgstr "_Afficher le titre"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 msgid "Sensors t_ype:"
 msgstr "T_ype de senseurs :"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Nom"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Valeur"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Afficher"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Couleur"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 msgid "F_ont size:"
 msgstr "Taille de la _police :"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "très petite"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "petite"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "normale"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "très grande"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr "Échelle de température :"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr "_Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 msgid "U_pdate interval (seconds):"
 msgstr "_Intervalle de mise-à-jour (secondes) :"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr "E_xécute après un double clic :"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr "Afficher"
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 msgid "Sensors"
 msgstr "Senseurs"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Ajouter propriétés"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Plugin senseurs"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Disques dur"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Sondes de température du disque dur"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Senseurs"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Erreur : ne peut pas se connecter aux senseurs !"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Greffon senseur"
@@ -199,14 +216,11 @@
 msgid "Show sensor values."
 msgstr "Afficher les valeurs du senseur."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senseurs</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Senseurs</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Sondes de température du disque dur"
-
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Erreur : ne peut pas se connecter aux senseurs !"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Vue</b>"

Modified: xfce4-sensors-plugin/trunk/po/hu.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/hu.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/hu.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-10-01 21:31+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: hu\n"
@@ -12,26 +12,21 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Nincsenek érzékelők!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -43,22 +38,11 @@
 "Úgy tűnik, gond van egy érzékelő értékeinek kiolvasásával. \n"
 "A helyes működés nem szavatolt.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Nem leltem érzékelőket!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Merevlemezek"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -71,125 +55,157 @@
 "Úgy tűnik, gond van egy érzékelő értékeinek kiolvasásával. \n"
 "A helyes működés nem szavatolt.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr "_UI stílus:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr "s_zöveg"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr "g_rafikus"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr "Címkék a grafikus UI-ben"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "Színes sá_vok mutatása"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 msgid "_Show title"
 msgstr "Cím mutatá_sa"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 msgid "Sensors t_ype:"
 msgstr "Érzékelők tí_pusa:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Név"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Érték"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Szín"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 msgid "F_ont size:"
 msgstr "_Betű mérete:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "törpe"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "kicsi"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "közepes"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "nagy"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "óriás"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr "_Hőfok skála:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr "_Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 msgid "U_pdate interval (seconds):"
 msgstr "Frissítési időközök (másodpercben):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr "Futtatás dupla kattintásra:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>Érzékelők</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Egyebek</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Tulajdonságok szerkesztése"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Érzékelők"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Merevlemezek"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Merevlemez hőmérséklet érzékelők"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>Érzékelők</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Hiba: nem lehet érzékelőkhöz kapcsolódni!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Érzékelő"
@@ -198,14 +214,11 @@
 msgid "Show sensor values."
 msgstr "Értékek mutatása"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Érzékelők</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Merevlemez hőmérséklet érzékelők"
-
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Hiba: nem lehet érzékelőkhöz kapcsolódni!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Nézet</b>"

Modified: xfce4-sensors-plugin/trunk/po/ja.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ja.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/ja.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-01-04 00:28+0900\n"
 "Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
 "Language-Team: xfce-users-jp <xfce-users-jp at ml.fdiary.net>\n"
@@ -15,26 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "センサーが選択されていません!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -46,22 +41,11 @@
 "センサーの機能値の読み込みに問題があるようです。 \n"
 "正確な値は保証されません。\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "センサーが見つかりません!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -74,137 +58,168 @@
 "センサーの機能値の読み込みに問題があるようです。 \n"
 "正確な値は保証されません。\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "UIのスタイル:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "テキスト"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "グラフィック"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "UIにラベルを表示する"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "タイトルを表示する"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "センサーの種類:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "名前"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "値"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "表示"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "色"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "最小"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "最大"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "フォントのサイズ:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "極小"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "小"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "普通"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "大"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "巨大"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "温度の目盛:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "摂氏"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "華氏"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "更新の間隔 (秒):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "ダブルクリックで実行:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>センサー</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>その他</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "センサープラグイン"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr ""
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>センサー</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "エラー: センサーに接続できませんでした!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "センサー"
@@ -213,11 +228,11 @@
 msgid "Show sensor values."
 msgstr "センサーの値を表示します。"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>センサー</b></span>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "エラー: センサーに接続できませんでした!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>表示</b>"

Modified: xfce4-sensors-plugin/trunk/po/ko.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ko.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/ko.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2005-12-11 02:20+0900\n"
 "Last-Translator: ByungHyun Choi <byunghyun.choi at debianusers.org>\n"
 "Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge."
@@ -16,26 +16,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span> \n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span> \n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f RPM"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "센서를 선택하지 않았습니다!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "센서의 기능과 측정치를 읽는 도중 문제가 생긴 것 같습니다.\n"
 "따라서 정상적인 동작을 보장할 수 없습니다.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "센서를 못 찾았습니다!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "하드 디스크"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,125 +59,157 @@
 "센서의 기능과 측정치를 읽는 도중 문제가 생긴 것 같습니다.\n"
 "따라서 정상적인 동작을 보장할 수 없습니다.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr "UI 스타일(_U):"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr "글자(_t)"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr "그림(_r)"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr "GUI에 레이블 보이기(_l)"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "색깔있는 막대 보이기(_b)"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 msgid "_Show title"
 msgstr "이름 보여주기(_S)"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 msgid "Sensors t_ype:"
 msgstr "센서 종류(_t):"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "이름"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "값"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "보이기"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "색상"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "최소"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "최대"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 msgid "F_ont size:"
 msgstr "글꼴 크기(_o):"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "아주 작게"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "작게"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "중간"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "크게"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "아주 크게"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr "온도 단위(_e):"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr "섭씨(_C)"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr "화씨(_F)"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 msgid "U_pdate interval (seconds):"
 msgstr "검사 간격 (초)(_p):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr "따닥(더블클릭)하면 실행합니다(_x):"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>센서</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>기타</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "속성 변경"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "센서 플러그인"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "하드 디스크"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "하드디스크 온도 센서"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>센서</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "오류: 선세에 연결하지 못 했습니다."
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "센서 플러그인"
@@ -202,14 +218,11 @@
 msgid "Show sensor values."
 msgstr "센서 값 보이기"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span> \n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>센서</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "하드디스크 온도 센서"
-
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "오류: 선세에 연결하지 못 했습니다."
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>보기</b>"

Modified: xfce4-sensors-plugin/trunk/po/lt.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/lt.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/lt.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2005-02-04 21:07+0200\n"
 "Last-Translator: Rimas Kudelis <rq at akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -15,26 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span> \n"
 
-#: ../panel-plugin/sensors.c:480
-#, fuzzy, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span> \n"
-
-#: ../panel-plugin/sensors.c:524
+#: ../panel-plugin/sensors.c:552
 #, c-format
 msgid "%5.0f rpm"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Nepasirinkti jokie sensoriai!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "savybės                         reikšmę. \n"
 "Tvarkingas tolesnis darbas negali būti užtikrinamas. \n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Jokių sensorių nerasta!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -76,128 +60,160 @@
 "savybės                         reikšmę. \n"
 "Tvarkingas tolesnis darbas negali būti užtikrinamas. \n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 msgid "_UI style:"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 msgid "_text"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 msgid "g_raphical"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 msgid "Show _labels in graphical UI"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Rodyti pavadinimą"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Sensorių tipas:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Šrifto dydis:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "labai mažas"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "mažas"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "vidutinis"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "didelis"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "labai didelis"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 msgid "T_emperature scale:"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 msgid "_Celsius"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 msgid "_Fahrenheit"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Atnaujinimo dažnumas (sek.):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 msgid "E_xecute on double click:"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Sensorių tipas:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr ""
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Aparatiniai sensoriai"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Sensorių tipas:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr ""
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr ""
@@ -206,14 +222,14 @@
 msgid "Show sensor values."
 msgstr ""
 
+#, fuzzy
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span> \n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Sensoriai</b></span>"
 
 #, fuzzy
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Aparatiniai sensoriai"
-
-#, fuzzy
 #~ msgid ""
 #~ "A problem occured while trying to close the config file. Restart your "
 #~ "computer ... err ... restart the sensor daemon only :-) \n"

Modified: xfce4-sensors-plugin/trunk/po/pl.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/pl.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/pl.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-04-08 13:17+0900\n"
 "Last-Translator: Piotr Maliński <admin at rk.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -16,26 +16,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Brak wykrytych czujników!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -47,22 +42,11 @@
 "Chyba wystąpił problem przy czytaniu wartości z czujnika. \n"
 "Podane wartości mogą być niezgodne z prawdą.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Brak czujników!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Dyski twarde"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,137 +59,169 @@
 "Chyba wystąpił problem przy czytaniu wartości z czujnika. \n"
 "Podane wartości mogą być niezgodne z prawdą.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Styl GUI:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "tekst"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "graficzny"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Pokazuj etykiety w GUI"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr "Pokazuj kolorowe _słupki"
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Pokazuj tutuł"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Typ sensorów:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Wartość"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Pokaż"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Kolor"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Minimum"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Maximum"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Rozmiar czcionki:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "x-mała"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "mała"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "średnia"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "duża"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "x-duża"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Skala temperatury:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Celcjusze"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Farenhaity"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Czas aktualizacji (sek):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Wykonaj przy podwójnym kliknięciu:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Typ sensorów:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Inne</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Edytuj właściowości"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Wtyczka Czujników"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Dyski twarde"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Czujniki temperatury dysku"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Typ sensorów:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Błąd: nie mogę połączyć się z czujnikiem!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Wtyczka czujników "
@@ -214,17 +230,14 @@
 msgid "Show sensor values."
 msgstr "Pokazuj wartości z czujników"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Czujniki</b></span>"
 
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Czujniki temperatury dysku"
-
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Czujniki</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Błąd: nie mogę połączyć się z czujnikiem!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Widok</b>"

Modified: xfce4-sensors-plugin/trunk/po/ru.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/ru.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/ru.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-04-09 17:07+0600\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -15,26 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f оборотов/мин"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Сенсоры не выбраны!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -42,22 +37,11 @@
 "Proper proceeding cannot be guaranteed.\n"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Сенсоры на найдены!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, c-format
 msgid ""
 "\n"
@@ -66,137 +50,168 @@
 "Proper proceeding cannot be guaranteed.\n"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Стиль отображения"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "текстовый"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "графический"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Отображать метки"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Отображать заголовок"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Тип сенсоров:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Имя"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Значение"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Отображать"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Цвет"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Мин."
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Макс."
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Размер шрифта:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "крошечный"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "маленький"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "средний"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "большой"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "огромный"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Температурная шкала:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "По Цельсию"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "По Фаренгейту"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Интервал обновления (сек.):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Выполнить по двойному щелчку:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>Сенсоры</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Дополнительно</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Свойства"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Сенсоры"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr ""
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>Сенсоры</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Ошибка: Не удается соединиться с сенсорами!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Сенсоры"
@@ -205,11 +220,11 @@
 msgid "Show sensor values."
 msgstr "Отображает значения сенсоров."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Сенсоры</b></span>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Ошибка: Не удается соединиться с сенсорами!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Вид</b>"

Modified: xfce4-sensors-plugin/trunk/po/sq.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/sq.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/sq.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2007-01-30 21:21+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,26 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Pa ndijuesa të përzgjedhur!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -46,22 +41,11 @@
 "Duket se ka problem me leximin e vlerës së një ndijuesi. \n"
 "Nuk garantoj dot ecurinë e duhur.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "S'u gjetën ndijuesa!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr "Hard disqe"
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -74,137 +58,169 @@
 "Duket se ka problem me leximin e vlerës së një ndijuesi. \n"
 "Nuk garantoj dot ecurinë e duhur.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Stil UI-je:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "tekst"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "grafik"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Shfaq etiketa në UI grafike"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Shfaq titull"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Tip ndijuesish:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Emër"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Vlerë"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Shfaq"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Ngjyrë"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min."
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Maks."
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Madhësi gërmash:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "x-small"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "të vogla"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "të mesme"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "të mëdha"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "shumë të mëdha"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Shkallë temperature:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Celsius"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Fahrenheit"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Interval përditësimi (sekonda):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Veprim kur dyklikohet:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "Tip ndijuesish:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Të ndryshme</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Përpunoni Veti"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Shtojcë Ndijuesish"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr "Hard disqe"
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+#, fuzzy
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr "Nidjuesa temperature hard disku"
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "Tip ndijuesish:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Gabim: Nuk u lidha dot me ndijuesat!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Shtojcë ndijuesi"
@@ -213,17 +229,14 @@
 msgid "Show sensor values."
 msgstr "Shfaq vlera ndijuesish."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Ndijuesa</b></span>"
 
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>Ndijuesa</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Gabim: Nuk u lidha dot me ndijuesat!"
-
-#~ msgid "Hard disk temperature sensors"
-#~ msgstr "Nidjuesa temperature hard disku"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Parje</b>"

Modified: xfce4-sensors-plugin/trunk/po/vi.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/vi.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/vi.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-02-19 22:51+0300\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
 "Language-Team: Vietnamese <none at li.org>\n"
@@ -15,26 +15,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "Chưa chọn bộ cảm ứng nào!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -46,22 +41,11 @@
 "Có vẻ như có vấn đề đọc một giá trị cảm ứng. \n"
 "Không có bảo đảm cho sự thực hiện.\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "Không tìm thấy bộ cảm ứng!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -74,137 +58,168 @@
 "Có vẻ như có vấn đề đọc một giá trị cảm ứng. \n"
 "Không có bảo đảm cho sự thực hiện.\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "Dạng giao diện:"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "văn bản"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "đồ hoạ"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "Hiển thị nhãn trong giao diện đồ hoạ"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "Hiển thị tiêu đề"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "Dạng cảm ứng:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "Tên"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "Giá trị"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "Hiện"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "Màu"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "Min"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "Max"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "Kích cỡ phông:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "rất nhỏ"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "nhỏ"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "trung bình"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "lớn"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "rất lớn"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "Thang nhiệt độ:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "Độ C"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "Độ F"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "Cập nhật sau (giây):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "Thực hiện khi nháy kép:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "<b>Cảm ứng</b>"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>Khác</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "Sửa thuộc tính"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "Plugin cảm ứng"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr ""
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "<b>Cảm ứng</b>"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "Lỗi: Không thể kết nối tới bộ cảm ứng!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "Plugin cảm ứng "
@@ -213,11 +228,11 @@
 msgid "Show sensor values."
 msgstr "Hiển thị các giá trị cảm ứng."
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>Cảm ứng</b></span>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "Lỗi: Không thể kết nối tới bộ cảm ứng!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>Xem</b>"

Modified: xfce4-sensors-plugin/trunk/po/zh_TW.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/zh_TW.po	2007-10-28 15:24:13 UTC (rev 3464)
+++ xfce4-sensors-plugin/trunk/po/zh_TW.po	2007-10-28 18:21:02 UTC (rev 3465)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-20 20:12+0200\n"
+"POT-Creation-Date: 2007-10-28 17:21+0100\n"
 "PO-Revision-Date: 2006-06-26 22:37+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore at educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -15,26 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/sensors.c:196
+#: ../panel-plugin/sensors.c:199 ../panel-plugin/sensors.c:512
 #, fuzzy
-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>\n"
+msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
 msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>\n"
 
-#: ../panel-plugin/sensors.c:480
+#: ../panel-plugin/sensors.c:552
 #, c-format
-msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
-msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>\n"
-
-#: ../panel-plugin/sensors.c:524
-#, c-format
 msgid "%5.0f rpm"
 msgstr "%5.0f rpm"
 
-#: ../panel-plugin/sensors.c:556
+#: ../panel-plugin/sensors.c:584
 msgid "No sensors selected!"
 msgstr "沒有感測器被選用!"
 
-#: ../panel-plugin/sensors.c:588
+#: ../panel-plugin/sensors.c:616
 #, fuzzy, c-format
 msgid ""
 "Xfce Hardware Sensors Plugin:\n"
@@ -46,22 +41,11 @@
 "在讀取感測器數值時似乎有點問題。\n"
 "無法保證能夠正常運作。\n"
 
-#: ../panel-plugin/sensors.c:820
+#: ../panel-plugin/sensors.c:852
 msgid "No sensors found!"
 msgstr "找不到感測器!"
 
-#. #ifdef DEBUG
-#. g_printf(" %d \n", getIdFromAddress(i, j, sensors));
-#. #endif
-#. only use this if no hddtemp sensor
-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
-#. assert correctly saved file
-#: ../panel-plugin/sensors.c:1014 ../panel-plugin/sensors.c:1171
-#: ../panel-plugin/sensors.c:1177
-msgid "Hard disks"
-msgstr ""
-
-#: ../panel-plugin/sensors.c:1390
+#: ../panel-plugin/sensors.c:1070
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -74,137 +58,168 @@
 "在讀取感測器數值時似乎有點問題。\n"
 "無法保證能夠正常運作。\n"
 
-#: ../panel-plugin/sensors.c:1813
+#: ../panel-plugin/sensors.c:1493
 #, fuzzy
 msgid "_UI style:"
 msgstr "使用介面風格"
 
-#: ../panel-plugin/sensors.c:1814
+#: ../panel-plugin/sensors.c:1494
 #, fuzzy
 msgid "_text"
 msgstr "文字"
 
-#: ../panel-plugin/sensors.c:1816
+#: ../panel-plugin/sensors.c:1496
 #, fuzzy
 msgid "g_raphical"
 msgstr "圖形"
 
-#: ../panel-plugin/sensors.c:1853
+#: ../panel-plugin/sensors.c:1533
 #, fuzzy
 msgid "Show _labels in graphical UI"
 msgstr "在圖形介面中顯示標籤"
 
-#: ../panel-plugin/sensors.c:1883
+#: ../panel-plugin/sensors.c:1563
 msgid "Show colored _bars"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:1911
+#: ../panel-plugin/sensors.c:1591
 #, fuzzy
 msgid "_Show title"
 msgstr "顯示標題"
 
-#: ../panel-plugin/sensors.c:1939
+#: ../panel-plugin/sensors.c:1619
 #, fuzzy
 msgid "Sensors t_ype:"
 msgstr "感測器類型:"
 
-#: ../panel-plugin/sensors.c:1989
+#: ../panel-plugin/sensors.c:1669
 msgid "Name"
 msgstr "名稱"
 
-#: ../panel-plugin/sensors.c:1998
+#: ../panel-plugin/sensors.c:1678
 msgid "Value"
 msgstr "數值"
 
-#: ../panel-plugin/sensors.c:2004
+#: ../panel-plugin/sensors.c:1684
 msgid "Show"
 msgstr "顯示"
 
-#: ../panel-plugin/sensors.c:2013
+#: ../panel-plugin/sensors.c:1693
 msgid "Color"
 msgstr "顏色"
 
-#: ../panel-plugin/sensors.c:2023
+#: ../panel-plugin/sensors.c:1703
 msgid "Min"
 msgstr "最小"
 
-#: ../panel-plugin/sensors.c:2032
+#: ../panel-plugin/sensors.c:1712
 msgid "Max"
 msgstr "最大"
 
-#: ../panel-plugin/sensors.c:2064
+#: ../panel-plugin/sensors.c:1745
 #, fuzzy
 msgid "F_ont size:"
 msgstr "字型大小:"
 
 #. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
-#: ../panel-plugin/sensors.c:2071
+#: ../panel-plugin/sensors.c:1752
 msgid "x-small"
 msgstr "極小"
 
-#: ../panel-plugin/sensors.c:2072
+#: ../panel-plugin/sensors.c:1753
 msgid "small"
 msgstr "小"
 
-#: ../panel-plugin/sensors.c:2073
+#: ../panel-plugin/sensors.c:1754
 msgid "medium"
 msgstr "普通"
 
-#: ../panel-plugin/sensors.c:2074
+#: ../panel-plugin/sensors.c:1755
 msgid "large"
 msgstr "大"
 
-#: ../panel-plugin/sensors.c:2075
+#: ../panel-plugin/sensors.c:1756
 msgid "x-large"
 msgstr "巨大"
 
-#: ../panel-plugin/sensors.c:2107
+#: ../panel-plugin/sensors.c:1788
 #, fuzzy
 msgid "T_emperature scale:"
 msgstr "温標:"
 
-#: ../panel-plugin/sensors.c:2109
+#: ../panel-plugin/sensors.c:1790
 #, fuzzy
 msgid "_Celsius"
 msgstr "攝氏"
 
-#: ../panel-plugin/sensors.c:2111
+#: ../panel-plugin/sensors.c:1792
 #, fuzzy
 msgid "_Fahrenheit"
 msgstr "華氏"
 
-#: ../panel-plugin/sensors.c:2150
+#: ../panel-plugin/sensors.c:1831
 #, fuzzy
 msgid "U_pdate interval (seconds):"
 msgstr "更新間隔時間(秒):"
 
-#: ../panel-plugin/sensors.c:2178
+#: ../panel-plugin/sensors.c:1859
 #, fuzzy
 msgid "E_xecute on double click:"
 msgstr "於雙擊時執行:"
 
-#: ../panel-plugin/sensors.c:2222
+#: ../panel-plugin/sensors.c:1903
 msgid "View"
 msgstr ""
 
-#: ../panel-plugin/sensors.c:2253
+#: ../panel-plugin/sensors.c:1934
 #, fuzzy
 msgid "Sensors"
 msgstr "感測器類型:"
 
-#: ../panel-plugin/sensors.c:2282
+#: ../panel-plugin/sensors.c:1963
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "<b>雜項</b>"
 
-#: ../panel-plugin/sensors.c:2330
+#: ../panel-plugin/sensors.c:2011
 msgid "Edit Properties"
 msgstr "編輯屬性"
 
-#: ../panel-plugin/sensors.c:2337 ../panel-plugin/sensors.h:40
+#: ../panel-plugin/sensors.c:2018 ../panel-plugin/sensors.h:40
 msgid "Sensors Plugin"
 msgstr "感測器外掛程式"
 
+#. only use this if no hddtemp sensor
+#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
+#. assert correctly saved file
+#: ../panel-plugin/configuration.c:133 ../panel-plugin/configuration.c:275
+#: ../panel-plugin/configuration.c:281 ../panel-plugin/hddtemp.c:129
+#: ../panel-plugin/hddtemp.c:168 ../panel-plugin/hddtemp.c:173
+msgid "Hard disks"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:46 ../panel-plugin/acpi.c:53
+msgid "ACPI"
+msgstr ""
+
+#: ../panel-plugin/acpi.c:47
+msgid "Advanced Configuration and Power Interface"
+msgstr ""
+
+#: ../panel-plugin/hddtemp.c:172
+msgid "S.M.A.R.T. harddisk temperatures"
+msgstr ""
+
+#: ../panel-plugin/lmsensors.c:52
+#, fuzzy
+msgid "LM Sensors"
+msgstr "感測器類型:"
+
+#: ../panel-plugin/lmsensors.c:131
+#, c-format
+msgid "Error: Could not connect to sensors!"
+msgstr "錯誤:無法連線至感測器!"
+
 #: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
 msgid "Sensor plugin "
 msgstr "感測器外掛程式"
@@ -213,14 +228,14 @@
 msgid "Show sensor values."
 msgstr "顯示感測器數值。"
 
+#~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>\n"
+#~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>\n"
+
 #~ msgid "<span foreground=\"#000000\" size=\"%s\"><b>Sensors</b></span>"
 #~ msgstr "<span foreground=\"#000000\" size=\"%s\"><b>感測器</b></span>"
 
 #~ msgid "<b>Sensors</b>"
 #~ msgstr "<b>感測器</b>"
 
-#~ msgid "Error: Could not connect to sensors!"
-#~ msgstr "錯誤:無法連線至感測器!"
-
 #~ msgid "<b>View</b>"
 #~ msgstr "<b>檢視</b>"




More information about the Goodies-commits mailing list