[gpointing-device-settings] add a new setting that disabling touchpad while other device exists.

From: Hiroyuki Ikezoe <hiikezoe src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gpointing-device-settings] add a new setting that disabling touchpad while other device exists.
Date: Wed, 13 Jan 2010 10:09:34 +0000 (UTC)
commit ae3e83372f28ed29a4cc051adcc4d62a01482f97
Author: Hiroyuki Ikezoe <poincare ikezoe net>
Date:   Wed Jan 13 19:08:59 2010 +0900

    add a new setting that disabling touchpad while other device exists.

 data/touchpad.ui                                   |   11 ++
 modules/common/gpds-touchpad-definitions.h         |    2 +
 modules/gnome-settings-daemon-plugins/Makefile.am  |    1 +
 .../gsd-touchpad-manager.c                         |  127 +++++++++++++++++++-
 modules/gpds-touchpad-ui.c                         |   11 ++
 po/cs.po                                           |   46 ++++----
 po/de.po                                           |   46 ++++----
 po/el.po                                           |   46 ++++----
 po/en_GB.po                                        |   46 ++++----
 po/es.po                                           |   46 ++++----
 po/fr.po                                           |   46 ++++----
 po/gl.po                                           |   46 ++++----
 po/ja.po                                           |   46 ++++----
 po/pa.po                                           |   46 ++++----
 po/pt.po                                           |   46 ++++----
 po/sl.po                                           |   83 +++++++------
 po/sv.po                                           |   46 ++++----
 po/zh_CN.po                                        |   46 ++++----
 18 files changed, 496 insertions(+), 291 deletions(-)
---
diff --git a/data/touchpad.ui b/data/touchpad.ui
index 202ef86..7bc935d 100644
--- a/data/touchpad.ui
+++ b/data/touchpad.ui
@@ -141,6 +141,17 @@
                           </object>
                         </child>
                         <child>
+                          <object class="GtkCheckButton" id="disable_while_other_device_exists">
+                            <property name="label" translatable="yes">Disable while _other device is connected</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="padding">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkLabel" id="guest_mouse_label">
                             <property name="label" translatable="yes">&lt;b&gt;Guest Mouse&lt;/b&gt;</property>
                             <property name="use_underline">False</property>
diff --git a/modules/common/gpds-touchpad-definitions.h b/modules/common/gpds-touchpad-definitions.h
index 0742143..62f105f 100644
--- a/modules/common/gpds-touchpad-definitions.h
+++ b/modules/common/gpds-touchpad-definitions.h
@@ -21,6 +21,8 @@
 #define __GPDS_TOUCHPAD_GCONF_H__
 
 #define GPDS_TOUCHPAD_OFF_KEY                             "off"
+#define GPDS_TOUCHPAD_DISABLE_WHILE_OTHER_DEVICE_EXISTS_KEY \
+                                                          "disable_while_other_device_exists"
 #define GPDS_TOUCHPAD_GUEST_MOUSE_OFF_KEY                 "guest_mouse"
 #define GPDS_TOUCHPAD_TAP_TIME_KEY                        "tap_time"
 #define GPDS_TOUCHPAD_TAP_MOVE_KEY                        "tap_move"
diff --git a/modules/gnome-settings-daemon-plugins/Makefile.am b/modules/gnome-settings-daemon-plugins/Makefile.am
index 6fcceca..890ff74 100644
--- a/modules/gnome-settings-daemon-plugins/Makefile.am
+++ b/modules/gnome-settings-daemon-plugins/Makefile.am
@@ -27,6 +27,7 @@ gsd_plugin_LTLIBRARIES =		\
 
 gsd_plugin_CFLAGS =					\
 	$(AM_CFLAGS)					\
+	-DG_LOG_DOMAIN=\"GPDS-Plugins\"			\
 	$(GNOME_SETTINGS_DAEMON_CFLAGS)			\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(localedir)"\"
 
diff --git a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
index c527e47..d86d2c0 100644
--- a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
+++ b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
@@ -23,9 +23,12 @@
 
 #include "gsd-touchpad-manager.h"
 #include <glib/gi18n.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gconf/gconf-client.h>
 #include <gpds-xinput.h>
 #include <gpds-xinput-utils.h>
+#include <gpds-xinput-pointer-info.h>
 #include <gpds-gconf.h>
 
 #include "gpds-touchpad-definitions.h"
@@ -145,6 +148,122 @@ set_click_action (GsdPointingDeviceManager *manager,
                                    3);
 }
 
+static void
+set_disable_while_other_device_exists (GsdPointingDeviceManager *manager,
+                                       GpdsXInput *xinput,
+                                       GConfClient *gconf)
+{
+    gint properties[1];
+    gboolean disable = FALSE;
+    GList *node, *pointer_infos;;
+    gboolean exists_other_device = FALSE;
+    gint use_type;
+
+    gsd_pointing_device_manager_get_gconf_boolean(manager,
+                                                  gconf,
+                                                  GPDS_TOUCHPAD_DISABLE_WHILE_OTHER_DEVICE_EXISTS_KEY,
+                                                  &disable);
+
+    pointer_infos = gpds_xinput_utils_collect_pointer_infos();
+    for (node = pointer_infos; node; node = g_list_next(node)) {
+        GpdsXInputPointerInfo *info = node->data;
+
+        if (!g_ascii_strcasecmp(gpds_xinput_pointer_info_get_type_name(info),
+                                XI_TOUCHPAD)) {
+            continue;
+        }
+        if (!strcmp(gpds_xinput_pointer_info_get_name(info),
+                    "Macintosh mouse button emulation")) {
+            continue;
+        }
+        exists_other_device = TRUE;
+        break;
+    }
+    g_list_foreach(pointer_infos, (GFunc)gpds_xinput_pointer_info_free, NULL);
+    g_list_free(pointer_infos);
+
+    gsd_pointing_device_manager_get_gconf_int(manager,
+                                              gconf,
+                                              GPDS_TOUCHPAD_OFF_KEY,
+                                              &use_type);
+    if (disable && exists_other_device)
+        properties[0] = GPDS_TOUCHPAD_USE_TYPE_OFF;
+    else
+        properties[0] = use_type;
+
+    gpds_xinput_set_int_properties(xinput,
+                                   GPDS_TOUCHPAD_OFF,
+                                   NULL,
+                                   properties,
+                                   1);
+}
+
+static GdkFilterReturn
+device_presence_filter (GdkXEvent *xevent,
+                        GdkEvent  *event,
+                        gpointer   data)
+{
+    XEvent *xev = (XEvent *)xevent;
+    XEventClass class_presence;
+    int xi_presence;
+    GpdsXInput *xinput;
+    GsdPointingDeviceManager *manager = GSD_POINTING_DEVICE_MANAGER(data);
+
+    xinput = gsd_pointing_device_manager_get_xinput(manager);
+    if (!xinput)
+        return GDK_FILTER_CONTINUE;
+
+    DevicePresence(gdk_x11_get_default_xdisplay(), xi_presence, class_presence);
+
+    if (xev->type == xi_presence) {
+        XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
+        if (notify_event->devchange == DeviceEnabled) {
+            set_disable_while_other_device_exists(manager,
+                                                  xinput,
+                                                  gconf_client_get_default());
+        }
+    }
+    g_object_unref(xinput);
+
+    return GDK_FILTER_CONTINUE;
+}
+
+
+static void
+add_device_presence_filter (GsdPointingDeviceManager *manager)
+{
+    Display *display;
+    XEventClass class_presence;
+    gint xi_presence;
+
+    gint op_code, event, error;
+
+    if (!XQueryExtension(GDK_DISPLAY(),
+                         "XInputExtension",
+                         &op_code,
+                         &event,
+                         &error)) {
+        return;
+    }
+
+    display = gdk_x11_get_default_xdisplay();
+
+    gdk_error_trap_push();
+    DevicePresence(display, xi_presence, class_presence);
+    XSelectExtensionEvent(display,
+                          RootWindow(display, DefaultScreen(display)),
+                          &class_presence, 1);
+    gdk_flush();
+    if (!gdk_error_trap_pop())
+        gdk_window_add_filter(NULL, device_presence_filter, manager);
+}
+
+static void
+remove_device_presence_filter (GsdPointingDeviceManager *manager)
+{
+    gdk_window_remove_filter(NULL, device_presence_filter, manager);
+}
+
 static gboolean
 start_manager (GsdPointingDeviceManager *manager)
 {
@@ -178,6 +297,9 @@ start_manager (GsdPointingDeviceManager *manager)
     set_two_finger_scrolling(manager, xinput, gconf);
     set_click_action(manager, xinput, gconf);
 
+    set_disable_while_other_device_exists(manager, xinput, gconf);
+    add_device_presence_filter(manager);
+
     g_object_unref(gconf);
     g_object_unref(xinput);
 
@@ -195,6 +317,7 @@ _start (GsdPointingDeviceManager *manager, GError **error)
 static void
 _stop (GsdPointingDeviceManager *manager)
 {
+    remove_device_presence_filter(manager);
 }
 
 static void
@@ -218,7 +341,9 @@ _gconf_client_notify (GsdPointingDeviceManager *manager,
 
     switch (value->type) {
     case GCONF_VALUE_BOOL:
-        if (!strcmp(key, GPDS_TOUCHPAD_PALM_DETECTION_KEY)) {
+        if (!strcmp(key, GPDS_TOUCHPAD_DISABLE_WHILE_OTHER_DEVICE_EXISTS_KEY)) {
+            set_disable_while_other_device_exists(manager, xinput, client);
+        } else if (!strcmp(key, GPDS_TOUCHPAD_PALM_DETECTION_KEY)) {
             set_palm_detection(manager, xinput, client);
         } else if (!strcmp(key, GPDS_TOUCHPAD_GUEST_MOUSE_OFF_KEY)) {
             set_guest_mouse_off(manager, xinput, client);
diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c
index a534855..11b2d31 100644
--- a/modules/gpds-touchpad-ui.c
+++ b/modules/gpds-touchpad-ui.c
@@ -499,6 +499,16 @@ cb_touchpad_use_type_changed (GtkComboBox *combo, gpointer user_data)
 }
 
 static void
+cb_disable_while_other_device_exists_toggled (GtkToggleButton *button, gpointer user_data)
+{
+    GpdsUI *ui = GPDS_UI(user_data);
+
+    gpds_ui_set_gconf_bool(ui,
+                           GPDS_TOUCHPAD_DISABLE_WHILE_OTHER_DEVICE_EXISTS_KEY,
+                           gtk_toggle_button_get_active(button));
+}
+
+static void
 setup_signals (GpdsUI *ui, GtkBuilder *builder)
 {
     GObject *object;
@@ -510,6 +520,7 @@ setup_signals (GpdsUI *ui, GtkBuilder *builder)
                      ui)
 
     CONNECT(touchpad_use_type, changed);
+    CONNECT(disable_while_other_device_exists, toggled);
     CONNECT(guest_mouse_off, toggled);
     CONNECT(palm_detection, toggled);
     CONNECT(palm_detection_width_scale, value_changed);
diff --git a/po/cs.po b/po/cs.po
index 28ab5e1..c149ec3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings 1.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-10-20 09:340200\n"
 "Last-Translator: Michal Ä?ihaÅ? <michal cihar com>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -50,12 +50,12 @@ msgstr "NepodaÅ?ilo se otevÅ?Ãt zaÅ?ÃzenÃ %s."
 msgid "No float atom in XServer"
 msgstr "XServer nemÃ¡ float atom"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "NepodaÅ?ilo se otevÅ?Ãt soubor %s."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Widget (%s) neexistuje."
@@ -103,7 +103,7 @@ msgstr "_tlaÄ?Ãtko:"
 msgid "_inertia:"
 msgstr "_setrvaÄ?nost:"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "_interval:"
 
@@ -152,74 +152,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Å irokÃ©</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Povolit _kruhovÃ© posouvÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Povolit _rychlejÅ¡Ã klepÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Povolit _vodorovnÃ© posouvÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "Povolit _zamknutÃ© tahÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "Povolit _detekci dlanÄ?"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Povolit _svislÃ© posouvÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Povolit trvalÃ© posouvÃ¡nÃ na krajÃch"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Povolit vodorovnÃ© posouvÃ¡nÃ dvÄ?ma prsty"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Povolit svislÃ© posouvÃ¡nÃ dvÄ?ma prsty"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "ObecnÃ©"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "PosouvÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "Vypnout _pÅ?ipojenou myÅ¡"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "PoÄ?Ã¡teÄ?nÃ bod kruhovÃ©ho posouvÃ¡nÃ:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "KlepÃ¡nÃ"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "Pohyb pÅ?i klepÃ¡nÃ: "
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Doba klepÃ¡nÃ: "
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "_rozsah:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "_tlak:"
 
diff --git a/po/de.po b/po/de.po
index daa93d4..f28bdd7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointin-device-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-05-04 18:23+0200\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -47,12 +47,12 @@ msgstr "GerÃ¤t %s konnte nicht geÃ¶ffnet werden."
 msgid "No float atom in XServer"
 msgstr ""
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s wurde nicht gefunden."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Es gibt kein Widget(%s)."
@@ -100,7 +100,7 @@ msgstr "_Taste:"
 msgid "_inertia:"
 msgstr ""
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr ""
 
@@ -149,74 +149,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Weit</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Zi_rkulares Scrollen aktivieren"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr ""
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "_Horizontales Scrollen aktivieren"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr ""
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr ""
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "_Vertikales Scrollen aktivieren"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "Allgemein"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Scrollen"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr ""
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Startpunkt des zirkularen Scrollens:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr ""
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "Be_reich:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "Dru_ck:"
 
diff --git a/po/el.po b/po/el.po
index 4d03897..e517d62 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-10-20 13:40+0300\n"
 "Last-Translator: Simos Xenitellis <simos lists googlemail com>\n"
 "Language-Team: Greek <team gnome gr>\n"
@@ -49,12 +49,12 @@ msgstr "Î?Î´Ï?Î½Î±Ï?Î¿ Ï?Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Ï?Î·Ï? Ï?Ï?Ï?ÎºÎµÏ?Î®Ï? %s."
 msgid "No float atom in XServer"
 msgstr ""
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s Î´Îµ Î²Ï?ÎÎ¸Î·ÎºÎµ."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
 msgid "_inertia:"
 msgstr ""
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr ""
 
@@ -151,74 +151,78 @@ msgid "<i>Wide</i>"
 msgstr ""
 
 #: ../data/touchpad.ui.h:13
-msgid "Enable Ci_rcular scrolling"
+msgid "Disable while _other device is connected"
 msgstr ""
 
 #: ../data/touchpad.ui.h:14
-msgid "Enable _faster tapping"
+msgid "Enable Ci_rcular scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:15
-msgid "Enable _horizontal scrolling"
+msgid "Enable _faster tapping"
 msgstr ""
 
 #: ../data/touchpad.ui.h:16
-msgid "Enable _locked drags"
+msgid "Enable _horizontal scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:17
-msgid "Enable _palm detection"
+msgid "Enable _locked drags"
 msgstr ""
 
 #: ../data/touchpad.ui.h:18
-msgid "Enable _vertical scrolling"
+msgid "Enable _palm detection"
 msgstr ""
 
 #: ../data/touchpad.ui.h:19
-msgid "Enable continuous edge scrolling"
+msgid "Enable _vertical scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:20
-msgid "Enable horizontal scrolling when dragging with two fingers"
+msgid "Enable continuous edge scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:21
-msgid "Enable vertical scrolling when dragging with two fingers"
+msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr ""
 
 #: ../data/touchpad.ui.h:22
+msgid "Enable vertical scrolling when dragging with two fingers"
+msgstr ""
+
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "Î?ÎµÎ½Î¹ÎºÎ¬"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr ""
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr ""
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 9e44acc..dce5fee 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-03-11 21:03+0000\n"
 "Last-Translator: Jen Ockwell <jenfraggleubuntu gmail com>\n"
 "Language-Team: English/GB <en li org>\n"
@@ -51,12 +51,12 @@ msgstr "Could not open %s device."
 msgid "No float atom in XServer"
 msgstr "No float atom in XServer"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s did not find."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "There is no widget (%s)."
@@ -106,7 +106,7 @@ msgstr ""
 msgid "_inertia:"
 msgstr ""
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr ""
 
@@ -159,76 +159,80 @@ msgid "<i>Wide</i>"
 msgstr "<i>Fast</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Enable Ci_rcular scrolling"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Enable _faster tapping"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Enable _horizontal scrolling"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr ""
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 #, fuzzy
 msgid "Enable _palm detection"
 msgstr "Enable _faster tapping"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Enable _vertical scrolling"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Enable continuous edge scrolling"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Enable horizontal scrolling when dragging with two fingers"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Enable vertical scrolling when dragging with two fingers"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "General"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Scrolling"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr ""
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Start point of circular scrolling:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Tapping"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 #, fuzzy
 msgid "Tapping move: "
 msgstr "Tapping time: "
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Tapping time: "
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 3d702b3..62c45b6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 10:47+0000\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2010-01-09 09:14+0100\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
@@ -50,12 +50,12 @@ msgstr "No se pudo abrir el dispositivo %s."
 msgid "No float atom in XServer"
 msgstr "No hay Ã¡tomo flotante en el servidor X"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "No se encontrÃ³ %s."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "No existe el widget (%s)."
@@ -103,7 +103,7 @@ msgstr "_botÃ³n:"
 msgid "_inertia:"
 msgstr "_inercia:"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "_tiempo de expiraciÃ³n:"
 
@@ -152,74 +152,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Ancho</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Activar desplazamiento c_ircular"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Activar toques rÃ¡pidos"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Activar desplazamiento _horizontal"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "Activar arrastrar _bloqueado"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "Activar detecciÃ³n de pal_m"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Activar desplazamiento _vertical"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Activar desplazamiento continuo del borde"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Activar desplazamiento horizontal al arrastrar con dos dedos"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Activar desplazamiento vertical al arrastrar con dos dedos"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "General"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Desplazamiento"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "RatÃ³n _externo apagado"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Punto de inicio del desplazamiento circular"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Toque"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "Movimiento al toque: "
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Tiempo del toque: "
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "_rango:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "pre_siÃ³n:"
 
diff --git a/po/fr.po b/po/fr.po
index 0acb213..9d40c30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-12-05 12:24+0100\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -52,12 +52,12 @@ msgstr "Impossible d'ouvrir le pÃ©riphÃ©rique %s."
 msgid "No float atom in XServer"
 msgstr "Pas de Â«Â float atomÂ Â» dans XServer"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s n'a pas Ã©tÃ© trouvÃ©."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Il n'y a pas d'Ã©lÃ©ment graphique (%s)."
@@ -105,7 +105,7 @@ msgstr "_boutonÂ :"
 msgid "_inertia:"
 msgstr "_inertieÂ :"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "_dÃ©laiÂ :"
 
@@ -154,74 +154,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Large</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Activer le dÃ©filement ci_rculaire"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Activer le tapotement ra_pide"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Activer le dÃ©filement _horizontal"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "Activer les _glisser-dÃ©poser bloquÃ©s"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "Activer la _dÃ©tection de la paume"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Activer le dÃ©filement _vertical"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Activer le dÃ©filement continu en bordure"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Activer le dÃ©filement horizontal lorsque l'on glisse avec deux doigts"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Activer le dÃ©filement vertical lorsque l'on glisse avec deux doigts"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "GÃ©nÃ©ral"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "DÃ©filement"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "DÃ©sactiver la _souris annexe"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Point de dÃ©part du dÃ©filement circulaireÂ :"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Tapotement"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "DÃ©placement du tapotementÂ : "
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "DurÃ©e du tapotementÂ : "
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "su_rfaceÂ :"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "pre_ssionÂ :"
 
diff --git a/po/gl.po b/po/gl.po
index a909066..946f866 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-08-18 21:33+0100\n"
 "Last-Translator: Fran DiÃ©guez <fran dieguez glug es>\n"
 "Language-Team: Galician <gnome mancomun org>\n"
@@ -49,12 +49,12 @@ msgstr "Non foi posÃbel abrir o dispositivo %s."
 msgid "No float atom in XServer"
 msgstr "Non se atopou un Ã¡tomo flotante en XServer"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s non se atopou."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Non hai un widget(%s)."
@@ -102,7 +102,7 @@ msgstr "_botÃ³n:"
 msgid "_inertia:"
 msgstr "_inercia:"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "_tempo de espera:"
 
@@ -151,74 +151,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Amplo</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Activar desprazamento ci_rcular"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Activar toques _rÃ¡pidos"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Activar desprazamento _horizontal"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "Activar _bloqueo do arrastre"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "Activar a detecciÃ³n de _palm"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Activar desprazamento _vertical"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Activar desprazamento continuo de bordes"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Activar desprazamento horizontal ao arrastrar con dous dedos"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Activar desprazamento vertical ao arrastrar con dous dedos"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "Xeral"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Desprazamento"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "Desactivar o rato _invitado"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Punto de inicio do desprazamento circular:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Toque"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "Movemento do toque:"
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Tempo de toque:"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "_rango:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "pre_siÃ³n:"
 
diff --git a/po/ja.po b/po/ja.po
index 469a8a4..f8cfd91 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-02-27 18:59+0900\n"
 "Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -42,12 +42,12 @@ msgstr "%sã??é??ã??ã?¾ã??ã??ã??"
 msgid "No float atom in XServer"
 msgstr "float atomã??XServerã?«ã??ã??ã?¾ã??ã??"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%sã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??"
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "ã?¦ã?£ã?¸ã?§ã??ã??(%s)ã??ã??ã??ã?¾ã??ã??ã??"
@@ -95,7 +95,7 @@ msgstr "ã??ã?¿ã?³(B):"
 msgid "_inertia:"
 msgstr "æ?°æ?§(_I):"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "ã?¿ã?¤ã? ã?¢ã?¦ã??(_T):"
 
@@ -144,74 +144,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>åº?ã??</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr "ä»?ã?®ã??ã??ã?¤ã?¹ã??æ?¥ç¶?ã??ã??ã?¦ã??ã??æ??ã?¯ã??ã?®ã??ã??ã?¤ã?¹ã??ç?¡å?¹ã?«ã??ã??(_O)"
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "å??è»¢ã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??(_R)"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "ã??ã?¡ã?¹ã??ã?¿ã??ã??ã?³ã?°ã??æ??å?¹ã?«ã??ã??(_F)"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "æ¨ªã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??(_H)"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "ã??ã?©ã??ã?°ã?ã??ã?¯ã??æ??å?¹ã?«ã??ã??(_L)"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "æ??ã?®ã?²ã??æ¤?ç?¥ã??æ??å?¹ã?«ã??ã??(_P)"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "ç¸¦ã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??(_V)"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "æ¨ªã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "äº?æ?¬æ??ã?§ã??ã?©ã??ã?°ã??ã??æ??ã?®æ¨ªã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "äº?æ?¬æ??ã?§ã??ã?©ã??ã?°ã??ã??æ??ã?®ç¸¦ã?¹ã?¯ã?ã?¼ã?«ã??æ??å?¹ã?«ã??ã??"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "ã?¹ã?¯ã?ã?¼ã?«"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "ã?²ã?¹ã??ã??ã?¦ã?¹ã??ã?ªã??ã?«ã??ã??(_G)"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "å??è»¢ã?¹ã?¯ã?ã?¼ã?«ã?®é??å§?ã??ã?¤ã?³ã??"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "ã?¿ã??ã??ã?³ã?°"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "ã?¿ã??ã??ã?³ã?°ç§»å??è·?é?¢"
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "ã?¿ã??ã??ã?³ã?°é??é??"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "ç¯?å?²:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "å¼·ã??:"
 
diff --git a/po/pa.po b/po/pa.po
index 1ac8072..e2f0088 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-06-15 06:58+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
@@ -49,12 +49,12 @@ msgstr "%s à¨?à©°à¨¤à¨° à¨?à©?à¨²à©?à¨¹à¨¿à¨? à¨¨à¨¹à©?à¨? à¨?à¨¾ à¨¸à¨?à¨¿à¨?
 msgid "No float atom in XServer"
 msgstr ""
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s à¨¨à¨¹à©?à¨? à¨²à©±à¨à¨¿à¨?"
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "à¨?à©?à¨? (%s)à¨µà¨¿à¨¦à¨?à©?à©±à¨? à¨¨à¨¹à©?à¨?à¥¤"
@@ -102,7 +102,7 @@ msgstr "à¨¬à¨?à¨¨(_b):"
 msgid "_inertia:"
 msgstr ""
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "à¨?à¨¾à¨?à¨®-à¨?à¨?à¨?(_t):"
 
@@ -151,74 +151,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>à¨?à©?à©?à¨¾</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "à¨?à©?à¨²à¨¾à¨?à¨¾à¨° à¨¸à¨?à¨°à©?à¨² à¨?à¨°à¨¨à¨¾ à¨¯à©?à¨?(_r)"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr ""
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr ""
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr ""
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "à¨?à¨®"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "à¨¸à¨?à¨°à©?à¨²à¨¿à©°à¨?"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "à¨?à©?à©±à¨¸à¨? à¨®à¨¾à¨?à¨?à¨¸ à¨¬à©°à¨¦ à¨¸à©?à©±à¨? à¨?à¨°à©?(_g)"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "à¨?à©?à¨²à¨¾à¨?à¨¾à¨° à¨¸à¨?à¨°à©?à¨²à¨¿à©°à¨? à¨¦à¨¾ à¨¸à¨¼à©?à¨°à©?à¨?à¨¤à©? à¨ªà©?à¨?à¨?à©°à¨?:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "à¨?à©?à¨ª à¨?à¨°à¨¨à¨¾"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "à¨?à©?à¨ªà¨¿à©°à¨? à¨®à©?à¨µ:"
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "à¨?à©?à¨ªà¨¿à©°à¨? à¨?à¨¾à¨?à¨®:"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "à¨°à©?à¨?à¨¼(_r):"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "à¨¦à¨¬à¨¾à¨?(_s):"
 
diff --git a/po/pt.po b/po/pt.po
index 6d21f76..eef25a6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-05-23 15:00+0000\n"
 "Last-Translator: AntÃ³nio Lima <amrlima gmail com>\n"
 "Language-Team: PortuguÃªs <gnome_pt yahoogroups com>\n"
@@ -49,12 +49,12 @@ msgstr "Incapaz de abrir o dispositivo %s."
 msgid "No float atom in XServer"
 msgstr "Nenhuma fracÃ§Ã£o de Ã¡tomo no XServer"
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s nÃ£o encontrou."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Nenhuma widget(%s)."
@@ -102,7 +102,7 @@ msgstr "_botÃ£o:"
 msgid "_inertia:"
 msgstr "_inÃ©rcia:"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "_tempo limite:"
 
@@ -151,74 +151,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Largo</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "Activar rolamento Ci_rcular"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "Activar batidas mais _rÃ¡pidas"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "Activar deslocamento _horizontal"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "Activar arrastamentos _trancados"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "Activar detecÃ§Ã£o _palm"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "Activar rolamento _vertical"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "Activar rolamento de margem contÃnuo"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Activar rolamento horizontal ao arrastar com dois dedos"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Activar rolamento vertical ao arrastar com dois dedos"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "Geral"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Rolamento"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "Desligar rato _convidado"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "Ponto inicial de rolamento circular:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Batidas"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "Movimento de batida:"
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Tempo de batida:"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "_alcance:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "pre_ssÃ£o:"
 
diff --git a/po/sl.po b/po/sl.po
index 15cc901..a3672f4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-29 15:06+0000\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-12-21 20:39+0100\n"
 "Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/gpds-xinput-ui.c:91
-#: ../src/gpds-xinput-utils.c:60
+#: ../src/gpds-xinput-ui.c:91 ../src/gpds-xinput-utils.c:60
 #, c-format
 msgid "No %s found."
 msgstr "%s ni mogoÄ?e najti."
@@ -30,15 +30,12 @@ msgstr "%s ni mogoÄ?e najti."
 msgid "An X error occurred. The error was %s."
 msgstr "PriÅ¡lo je do napake streÅ¾nika X. Napaka je bila %s."
 
-#: ../src/gpds-xinput.c:307
-#: ../src/gpds-xinput.c:325
-#: ../src/gpds-xinput.c:343
+#: ../src/gpds-xinput.c:307 ../src/gpds-xinput.c:325 ../src/gpds-xinput.c:343
 #, c-format
 msgid "There is no registered property for %d."
 msgstr "Ni vpisane lastnosti za %d."
 
-#: ../src/gpds-xinput.c:445
-#: ../src/gpds-xinput.c:612
+#: ../src/gpds-xinput.c:445 ../src/gpds-xinput.c:612
 #, c-format
 msgid ""
 "Format type is mismatched.\n"
@@ -57,14 +54,12 @@ msgstr "Naprave %s ni mogoÄ?e odpreti."
 msgid "No float atom in XServer"
 msgstr "Ni plavajoÄ?ega atoma v XServer"
 
-#: ../modules/gpds-touchpad-ui.c:770
-#: ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s ni mogoÄ?e najti."
 
-#: ../modules/gpds-touchpad-ui.c:819
-#: ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Ni gradnika (%s)."
@@ -80,13 +75,11 @@ msgstr "<b>Posnemanje srednjega gumba</b>"
 msgid "<b>Wheel Emulation</b>"
 msgstr "<b>Posnemanje koleÅ¡Ä?ka</b>"
 
-#: ../data/mouse.ui.h:3
-#: ../data/touchpad.ui.h:7
+#: ../data/mouse.ui.h:3 ../data/touchpad.ui.h:7
 msgid "<i>Long</i>"
 msgstr "<i>Dolgo</i>"
 
-#: ../data/mouse.ui.h:4
-#: ../data/touchpad.ui.h:10
+#: ../data/mouse.ui.h:4 ../data/touchpad.ui.h:10
 msgid "<i>Short</i>"
 msgstr "<i>Kratko</i>"
 
@@ -114,8 +107,7 @@ msgstr "_gumb:"
 msgid "_inertia:"
 msgstr "_vztrajnost:"
 
-#: ../data/mouse.ui.h:11
-#: ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "z_akasnitev:"
 
@@ -164,74 +156,78 @@ msgid "<i>Wide</i>"
 msgstr "<i>Å iroko</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 msgid "Enable Ci_rcular scrolling"
 msgstr "OmogoÄ?i k_roÅ¾no drsenje"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "OmogoÄ?i _hitrejÅ¡e udarjanje"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "OmogoÄ?i _vodoravno drsenje"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr "OmogoÄ?i _zaklenjen poteg"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr "OmogoÄ?i zaznavanje _dlani"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "OmogoÄ?i _navpiÄ?no drsenje"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr "OmogoÄ?i zvezno drsenje ob robovih"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "OmogoÄ?i vodoravno drsenje ob potegu z dvema prstoma"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "OmogoÄ?i navpiÄ?no drsenje ob potegu z dvema prstoma"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "SploÅ¡no"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Drsenje"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr "OnemogoÄ?i zunanjo _miÅ¡ko"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr "ZaÄ?etna toÄ?ka kroÅ¾nega drsenja:"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "Udarjanje"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr "Premik udarjanja: "
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "Ä?as udarjanja: "
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "_obmoÄ?je:"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "p_ritisk:"
 
@@ -244,6 +240,17 @@ msgid "Enable pointing-device plugin"
 msgstr "OmogoÄ?i vstavek kazalne naprave"
 
 #: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:2
-msgid "Set to True to enable the plugin to manage GPointingDeviceSettings settings."
-msgstr "Izbrana moÅ¾nost omogoÄ?i vstavek za upravljanje nastavitev GPointingDeviceSettings."
+msgid ""
+"Set to True to enable the plugin to manage GPointingDeviceSettings settings."
+msgstr ""
+"Izbrana moÅ¾nost omogoÄ?i vstavek za upravljanje nastavitev "
+"GPointingDeviceSettings."
 
+#: ../data/gpointing-device-settings.desktop.in.in.h:1
+#, fuzzy
+msgid "Pointing devices"
+msgstr "Nastavitve GPointing naprave"
+
+#: ../data/gpointing-device-settings.desktop.in.in.h:2
+msgid "Set your pointing devices preferences"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index f70ca45..a742117 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-03-03 18:18+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -47,12 +47,12 @@ msgstr "Kunde inte Ã¶ppna %s-enhet."
 msgid "No float atom in XServer"
 msgstr ""
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "%s hittades inte."
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "Det finns ingen widget(%s)."
@@ -106,7 +106,7 @@ msgstr ""
 msgid "_inertia:"
 msgstr ""
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr ""
 
@@ -159,75 +159,79 @@ msgid "<i>Wide</i>"
 msgstr "<i>Snabb</i>"
 
 #: ../data/touchpad.ui.h:13
-msgid "Enable Ci_rcular scrolling"
+msgid "Disable while _other device is connected"
 msgstr ""
 
 #: ../data/touchpad.ui.h:14
-msgid "Enable _faster tapping"
+msgid "Enable Ci_rcular scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:15
-msgid "Enable _horizontal scrolling"
+msgid "Enable _faster tapping"
 msgstr ""
 
 #: ../data/touchpad.ui.h:16
-msgid "Enable _locked drags"
+msgid "Enable _horizontal scrolling"
 msgstr ""
 
 #: ../data/touchpad.ui.h:17
-msgid "Enable _palm detection"
+msgid "Enable _locked drags"
 msgstr ""
 
 #: ../data/touchpad.ui.h:18
-msgid "Enable _vertical scrolling"
+msgid "Enable _palm detection"
 msgstr ""
 
 #: ../data/touchpad.ui.h:19
+msgid "Enable _vertical scrolling"
+msgstr ""
+
+#: ../data/touchpad.ui.h:20
 #, fuzzy
 msgid "Enable continuous edge scrolling"
 msgstr "Aktivera horisontell rullning"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr ""
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "AllmÃ¤nt"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "Rullning"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr ""
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr ""
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c0acc5e..1ba09ba 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-07 15:55+0900\n"
+"POT-Creation-Date: 2010-01-13 09:56+0900\n"
 "PO-Revision-Date: 2009-10-06 17:49+0800\n"
 "Last-Translator: è??è¿?å¼º <wzssyqa gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
@@ -49,12 +49,12 @@ msgstr "ä¸?è?½æ??å¼?è®¾å¤? %sã??"
 msgid "No float atom in XServer"
 msgstr ""
 
-#: ../modules/gpds-touchpad-ui.c:770 ../modules/gpds-mouse-ui.c:440
+#: ../modules/gpds-touchpad-ui.c:781 ../modules/gpds-mouse-ui.c:440
 #, c-format
 msgid "%s did not find."
 msgstr "æ²¡æ??å??ç?° %s ã??"
 
-#: ../modules/gpds-touchpad-ui.c:819 ../modules/gpds-mouse-ui.c:489
+#: ../modules/gpds-touchpad-ui.c:830 ../modules/gpds-mouse-ui.c:489
 #, c-format
 msgid "There is no widget(%s)."
 msgstr "æ²¡æ??é?¨ä»¶ (%s)"
@@ -102,7 +102,7 @@ msgstr "é?®(_B)"
 msgid "_inertia:"
 msgstr "æ?¯æ?§(_I)"
 
-#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:30
+#: ../data/mouse.ui.h:11 ../data/touchpad.ui.h:31
 msgid "_timeout:"
 msgstr "è®¡æ?¶(_T)"
 
@@ -152,75 +152,79 @@ msgid "<i>Wide</i>"
 msgstr "<i>å®½</i>"
 
 #: ../data/touchpad.ui.h:13
+msgid "Disable while _other device is connected"
+msgstr ""
+
+#: ../data/touchpad.ui.h:14
 #, fuzzy
 msgid "Enable Ci_rcular scrolling"
 msgstr "å?¯ç?¨å¾ªç?¯æ»?å?¨(_R)"
 
-#: ../data/touchpad.ui.h:14
+#: ../data/touchpad.ui.h:15
 msgid "Enable _faster tapping"
 msgstr "å?¯ç?¨å¿«é??ç?¹å?»(_F)"
 
-#: ../data/touchpad.ui.h:15
+#: ../data/touchpad.ui.h:16
 msgid "Enable _horizontal scrolling"
 msgstr "å?¯ç?¨æ°´å¹³æ»?å?¨(_H)"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:17
 msgid "Enable _locked drags"
 msgstr ""
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:18
 msgid "Enable _palm detection"
 msgstr ""
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:19
 msgid "Enable _vertical scrolling"
 msgstr "å?¯ç?¨ç«?ç?´æ»?å?¨(_V)"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:20
 msgid "Enable continuous edge scrolling"
 msgstr ""
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:21
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "å½?ä¸¤ä¸ªæ??æ??æ??å?¨æ?¶å?¯ç?¨æ°´å¹³æ»?å?¨"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:22
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "å½?ä¸¤ä¸ªæ??æ??æ??å?¨æ?¶å?¯ç?¨ç«?ç?´æ»?å?¨"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:23
 msgid "General"
 msgstr "é??ç?¨"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:24
 msgid "Scrolling"
 msgstr "æ»?å?¨"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:25
 msgid "Set _guest mouse off"
 msgstr ""
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:26
 msgid "Start point of circular scrolling:"
 msgstr ""
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:27
 msgid "Tapping"
 msgstr "ç?¹å?»"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:28
 msgid "Tapping move: "
 msgstr ""
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:29
 msgid "Tapping time: "
 msgstr "ç?¹å?»æ?¶é?´"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:30
 msgid "_range:"
 msgstr "å?ºå??(_R):"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:32
 msgid "pre_ssure:"
 msgstr "å??å??(_P)ï¼?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]