← easystroke

Big translation update

32fa7d2d55cd4a133f1b5eac8c42264a0f89e1fd · Thomas Jaeger · Mar 9, 2011 14:07

Adds Catalan, Finnish, Korean and Traditional Chinese. Thanks to everyone
involved.

+6290 −3005 · 18 files changed

  • .gitignore +1 −0
  • gui.glade +1568 −1368
  • po/ca.po +615 −0
  • po/cs.po +141 −142
  • po/de.po +143 −143
  • po/el.po +152 −142
  • po/es.po +170 −166
  • po/fi.po +614 −0
  • po/fr.po +223 −213
  • po/he.po +134 −135
  • po/it.po +141 −137
  • po/ja.po +146 −140
  • po/ko.po +600 −0
  • po/pl.po +134 −135
  • po/ru.po +19 −5
  • po/vi.po +609 −0
  • po/{zh.po => zh_CN.po} +282 −279
  • po/zh_TW.po +598 −0
diff --git a/.gitignore b/.gitignore
index 6359059..fc9e9c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ dbus-server.h
 debug.mk
 *.gz
 po/??
+po/??_??
 po/POTFILES.in
 po/*.pot
 easystroke.desktop
diff --git a/gui.glade b/gui.glade
index 039532d..a98a3e1 100644
--- a/gui.glade
+++ b/gui.glade
@@ -1,783 +1,751 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="main">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+  <object class="GtkAboutDialog" id="aboutdialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
     <property name="window_position">center</property>
-    <property name="default_width">800</property>
-    <property name="default_height">600</property>
-    <child>
-      <object class="GtkNotebook" id="notebook1">
+    <property name="type_hint">normal</property>
+    <property name="copyright">Copyright © 2008-2009 Thomas Jaeger.</property>
+    <property name="website">http://easystroke.sourceforge.net</property>
+    <property name="website_label">http://easystroke.sourceforge.net</property>
+    <property name="authors">Thomas Jaeger &lt;ThJaeger@gmail.com&gt;</property>
+    <property name="translator_credits">El Libre (Catalan)
+Jordis (Catalan)
+John Luk (Chinese - Simplified)
+Kenny Wang (Chinese - Simplified)
+于 (Chinese - Traditional)
+Jakub Žáček (Czech)
+Sauli Pelkonen (Finnish)
+Loïc Guégant (French)
+Antoine Del Piccolo (French)
+Γουργιώτης Γιώργος (Greek)
+Yaron (Hebrew)
+Massimiliano La Gala (Italian)
+Jiro Kawada (Japanese)
+Jincreator (Korean)
+Tomasz Kołodziejski (Polish)
+Claque (Russian)
+Marcos (Spanish)
+Paco Molinero (Spanish)
+Sweettuxy (Spanish)
+Jesus Vera (Spanish)
+Martín V. (Spanish)
+Van Diep Duong (Vietnamese)</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="border_width">6</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_final_timeout">
+    <property name="upper">2500</property>
+    <property name="step_increment">5</property>
+    <property name="page_increment">20</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_init_timeout">
+    <property name="upper">2500</property>
+    <property name="step_increment">5</property>
+    <property name="page_increment">20</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_pressure_threshold">
+    <property name="upper">255</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_scroll_speed">
+    <property name="upper">10</property>
+    <property name="step_increment">0.20000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment_trace_width">
+    <property name="upper">20</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkMessageDialog" id="dialog_delete">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="transient_for">main</property>
+    <property name="message_type">warning</property>
+    <property name="buttons">cancel</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox8">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area8">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkVPaned" id="vpaned1">
+              <object class="GtkButton" id="button_delete_delete">
+                <property name="label">gtk-delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkExpander" id="expander_apps">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkTable" id="table1">
-                        <property name="visible">True</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <child>
-                              <object class="GtkTreeView" id="treeview_apps">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="check_show_deleted">
-                            <property name="label" translatable="yes">Show deleted rows</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox1">
-                            <property name="height_request">130</property>
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="button_add_app">
-                                <property name="label" translatable="yes">Add Application</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="image">image8</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="button_remove_app">
-                                <property name="label" translatable="yes">Remove Application/Group</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="image">image9</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="button_add_group">
-                                <property name="label" translatable="yes">Add Group</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="image">image10</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">2</property>
-                                <property name="secondary">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="button_reset_actions">
-                            <property name="label" translatable="yes">Reset Action(s)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="image">image11</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label20">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Applications</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="resize">False</property>
-                    <property name="shrink">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow_actions">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">12</property>
-                <property name="layout_style">start</property>
-                <child>
-                  <object class="GtkButton" id="button_record">
-                    <property name="label" translatable="yes">_Record Stroke</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="image">image1</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_add_action">
-                    <property name="label" translatable="yes">_Add Action</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="image">image2</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_delete_action">
-                    <property name="label" translatable="yes">_Delete Action(s)</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="image">image3</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_hide1">
-                    <property name="label" translatable="yes">_Hide</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                    <property name="secondary">True</property>
-                  </packing>
-                </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="1">button_delete_delete</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkMessageDialog" id="dialog_icon">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="transient_for">main</property>
+    <property name="buttons">ok</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox6">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMessageDialog" id="dialog_record">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="transient_for">main</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox10">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_record_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_record_delete">
+                <property name="label" translatable="yes">_Delete Current</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="image">image6</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
         </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-1">button_record_cancel</action-widget>
+      <action-widget response="1">button_record_delete</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkMessageDialog" id="dialog_select">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="transient_for">main</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox9">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area9">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Actions</property>
-            <property name="use_underline">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="select_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="select_ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="select_default">
+                <property name="label" translatable="yes">_Default</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="image">image5</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="tab_fill">False</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkHBox" id="hbox_button_timeout">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
             <child>
-              <object class="GtkFrame" id="frame_button">
+              <object class="GtkRadioButton" id="radio_timeout_default">
+                <property name="label" translatable="yes">Timeout</property>
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="top_padding">4</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox4">
-                        <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox2">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkButton" id="button_button">
-                                <property name="label" translatable="yes">_Gesture Button</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label_button">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkExpander" id="expander1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox5">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkVButtonBox" id="vbuttonbox2">
-                                    <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkButton" id="button_add_extra">
-                                        <property name="label">gtk-add</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_stock">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_edit_extra">
-                                        <property name="label">gtk-edit</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_stock">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="button_remove_extra">
-                                        <property name="label">gtk-remove</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_stock">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview_extra">
-                                        <property name="height_request">120</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">5</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label11">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Additional Buttons</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox_timeout_profile">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label19">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Timeout profile</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEventBox" id="box_timeout">
-                                <property name="visible">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox_timeout">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label15">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Initial Timeout (ms)</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="spin_init_timeout">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment_init_timeout</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label17">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">     Timeout (ms)</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="spin_final_timeout">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment_final_timeout</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame_trace">
+              <object class="GtkRadioButton" id="radio_instant">
+                <property name="label" translatable="yes">Instant Gestures</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radio_timeout_default</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="radio_click_hold">
+                <property name="label" translatable="yes">Click &amp; Hold</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">radio_timeout_default</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="table2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">3</property>
+            <property name="column_spacing">6</property>
+            <property name="row_spacing">6</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkToggleButton" id="toggle_control">
+                <property name="label" translatable="yes">_Control</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="toggle_shift">
+                <property name="label" translatable="yes">_Shift</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="toggle_alt">
+                <property name="label" translatable="yes">_Alt</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="toggle_super">
+                <property name="label" translatable="yes">S_uper</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="toggle_any">
+                <property name="label" translatable="yes">An_y Modifier</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="box_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label18">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Alternatively, you may select button and modifiers below.</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEventBox" id="eventbox">
+            <property name="height_request">200</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_BUTTON_PRESS_MASK</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-1">select_cancel</action-widget>
+      <action-widget response="1">select_ok</action-widget>
+      <action-widget response="2">select_default</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-record</property>
+  </object>
+  <object class="GtkImage" id="image10">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-clear</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-clear</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-delete</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkWindow" id="main">
+    <property name="can_focus">False</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="window_position">center</property>
+    <property name="default_width">800</property>
+    <property name="default_height">600</property>
+    <child>
+      <object class="GtkNotebook" id="notebook1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="border_width">6</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkVPaned" id="vpaned1">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment3">
+                  <object class="GtkExpander" id="expander_apps">
                     <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="xscale">0</property>
-                    <property name="top_padding">4</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">12</property>
+                    <property name="can_focus">True</property>
                     <child>
-                      <object class="GtkVBox" id="vbox6">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">6</property>
+                        <property name="row_spacing">6</property>
                         <child>
-                          <object class="GtkHBox" id="hbox_trace">
+                          <object class="GtkScrolledWindow" id="scrolledwindow5">
                             <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label13">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Method to show gestures</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkEventBox" id="box_trace">
-                                <property name="visible">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label10">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Color</property>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkColorButton" id="button_color">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="color">#000000000000</property>
-                              </object>
-                              <packing>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label23">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Width</property>
-                              </object>
-                              <packing>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
-                              <object class="GtkSpinButton" id="spin_trace_width">
+                              <object class="GtkTreeView" id="treeview_apps">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment_trace_width</property>
                               </object>
-                              <packing>
-                                <property name="position">5</property>
-                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox4">
+                          <object class="GtkCheckButton" id="check_show_deleted">
+                            <property name="label" translatable="yes">Show deleted rows</property>
                             <property name="visible">True</property>
-                            <child>
-                              <object class="GtkCheckButton" id="check_feedback">
-                                <property name="label" translatable="yes">Show popups (</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="check_left_handed">
-                                <property name="label" translatable="yes">optimize for left-handed operation )</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox3">
+                          <object class="GtkVButtonBox" id="vbuttonbox1">
+                            <property name="height_request">130</property>
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
+                            <property name="layout_style">start</property>
                             <child>
-                              <object class="GtkCheckButton" id="check_tray_icon">
-                                <property name="label" translatable="yes">Show tray icon</property>
+                              <object class="GtkButton" id="button_add_app">
+                                <property name="label" translatable="yes">Add Application</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="image">image8</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="check_tray_feedback">
-                                <property name="label" translatable="yes">Show last gesture in tray</property>
+                              <object class="GtkButton" id="button_remove_app">
+                                <property name="label" translatable="yes">Remove Application/Group</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="image">image9</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="check_autostart">
-                                <property name="label" translatable="yes">Autostart easystroke</property>
+                              <object class="GtkButton" id="button_add_group">
+                                <property name="label" translatable="yes">Add Group</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="image">image10</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">end</property>
                                 <property name="position">2</property>
+                                <property name="secondary">True</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="x_options"></property>
                           </packing>
                         </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Appearance&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <child>
-                          <object class="GtkTreeView" id="treeview_exceptions">
+                          <object class="GtkButton" id="button_reset_actions">
+                            <property name="label" translatable="yes">Reset Action(s)</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="image">image11</property>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
                         </child>
                       </object>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label20">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Applications</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="resize">False</property>
+                    <property name="shrink">False</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label4">
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow_actions">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Exceptions&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox3">
+              <object class="GtkHButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">12</property>
                 <property name="layout_style">start</property>
                 <child>
-                  <object class="GtkButton" id="button_add_exception">
-                    <property name="label" translatable="yes">_Add Exception</property>
+                  <object class="GtkButton" id="button_record">
+                    <property name="label" translatable="yes">_Record Stroke</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="image">image4</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">image1</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -787,13 +755,14 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button_remove_exception">
-                    <property name="label" translatable="yes">_Remove Exception</property>
+                  <object class="GtkButton" id="button_add_action">
+                    <property name="label" translatable="yes">_Add Action</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="image">image7</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">image2</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -803,221 +772,335 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button_hide2">
-                    <property name="label" translatable="yes">_Hide</property>
+                  <object class="GtkButton" id="button_delete_action">
+                    <property name="label" translatable="yes">_Delete Action(s)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">image3</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button_hide1">
+                    <property name="label" translatable="yes">_Hide</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
                     <property name="secondary">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">3</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child type="tab">
-          <object class="GtkLabel" id="label2">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Preferences</property>
+            <property name="label" translatable="yes">Actions</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
-            <property name="position">1</property>
             <property name="tab_fill">False</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox7">
+          <object class="GtkVBox" id="vbox3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkFrame" id="frame_advanced1">
+              <object class="GtkFrame" id="frame_button">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment4">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="xscale">0</property>
                     <property name="top_padding">4</property>
                     <property name="bottom_padding">4</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox8">
+                      <object class="GtkVBox" id="vbox4">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="check_timeout_gestures">
-                            <property name="label" translatable="yes">Timeout Gestures</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkCheckButton" id="check_advanced_ignore">
-                                <property name="label" translatable="yes">Ignore strokes leading up to advanced gestures</property>
+                              <object class="GtkButton" id="button_button">
+                                <property name="label" translatable="yes">_Gesture Button</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLinkButton" id="linkbutton1">
-                                <property name="label" translatable="yes">(See Documentation)</property>
+                              <object class="GtkLabel" id="label_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="relief">none</property>
-                                <property name="uri">http://easystroke.wiki.sourceforge.net/FeatureAdvancedGestures#content</property>
+                                <property name="can_focus">False</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkExpander" id="expander1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkVButtonBox" id="vbuttonbox2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkButton" id="button_add_extra">
+                                        <property name="label">gtk-add</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="button_edit_extra">
+                                        <property name="label">gtk-edit</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="button_remove_extra">
+                                        <property name="label">gtk-remove</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="use_action_appearance">False</property>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow7">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="treeview_extra">
+                                        <property name="height_request">120</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">5</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                            <child type="label">
+                              <object class="GtkLabel" id="label11">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Additional Buttons</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox7">
+                          <object class="GtkHBox" id="hbox_timeout_profile">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkCheckButton" id="check_advanced_popups">
-                                <property name="label" translatable="yes">Show popups on advanced gestures</property>
+                              <object class="GtkLabel" id="label19">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Timeout profile</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="check_osd">
-                                <property name="label" translatable="yes">Show OSD</property>
+                              <object class="GtkEventBox" id="box_timeout">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox6">
+                          <object class="GtkHBox" id="hbox_timeout">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkCheckButton" id="check_scroll_invert">
-                                <property name="label" translatable="yes">Invert Scroll Direction</property>
+                              <object class="GtkLabel" id="label15">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Initial Timeout (ms)</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="spin_init_timeout">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="adjustment">adjustment_init_timeout</property>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label8">
+                              <object class="GtkLabel" id="label17">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Scroll Speed</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">     Timeout (ms)</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHScale" id="hscale1">
+                              <object class="GtkSpinButton" id="spin_final_timeout">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment_scroll_speed</property>
-                                <property name="value_pos">right</property>
+                                <property name="adjustment">adjustment_final_timeout</property>
                               </object>
                               <packing>
-                                <property name="position">2</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">6</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="check_move_back">
-                            <property name="label" translatable="yes">Move the cursor back to the original position after each gesture</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
                       </object>
                     </child>
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="label29">
+                  <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -1031,75 +1114,147 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame_advanced2">
+              <object class="GtkFrame" id="frame_trace">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="xalign">0</property>
+                    <property name="xscale">0</property>
                     <property name="top_padding">4</property>
+                    <property name="bottom_padding">4</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox5">
+                      <object class="GtkVBox" id="vbox6">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkCheckButton" id="check_proximity">
-                            <property name="label" translatable="yes">Stay in 'scroll' and 'ignore' mode as long as the pen is within range</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox_pressure">
+                          <object class="GtkHBox" id="hbox_trace">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkSpinButton" id="spin_pressure_threshold">
+                              <object class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="adjustment">adjustment_pressure_threshold</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Method to show gestures</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEventBox" id="box_trace">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">0</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="button_default_pressure_threshold">
+                              <object class="GtkLabel" id="label10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Color</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkColorButton" id="button_color">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="relief">none</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="color">#000000000000</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label23">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Width</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="spin_trace_width">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment_trace_width</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_feedback">
+                                <property name="label" translatable="yes">Show popups (</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="check_pressure_abort">
-                                <property name="label" translatable="yes">Abort stroke if pressure exceeds the number on the left (out of 255)</property>
+                              <object class="GtkCheckButton" id="check_left_handed">
+                                <property name="label" translatable="yes">optimize for left-handed operation )</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="position">2</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
@@ -1109,385 +1264,423 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label27">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Tablet Options&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame_advanced3">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <child>
-                          <object class="GtkTreeView" id="treeview_devices">
+                          <object class="GtkHBox" id="hbox3">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label22">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Devices&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHButtonBox" id="hbuttonbox5">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">12</property>
-                <property name="layout_style">start</property>
-                <child>
-                  <object class="GtkButton" id="button_hide4">
-                    <property name="label" translatable="yes">_Hide</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_tray_icon">
+                                <property name="label" translatable="yes">Show tray icon</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="check_tray_feedback">
+                                <property name="label" translatable="yes">Show last gesture in tray</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="check_autostart">
+                                <property name="label" translatable="yes">Autostart easystroke</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Appearance&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                    <property name="secondary">True</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">4</property>
+                <property name="position">1</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
             <child>
-              <object class="GtkHPaned" id="hpaned1">
+              <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTreeView" id="treeview_recent">
+                      <object class="GtkScrolledWindow" id="scrolledwindow4">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" id="treeview_exceptions">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow3">
+                <child type="label">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="GtkTreeView" id="treeview_ranking">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </object>
-                    </child>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Exceptions&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox2">
+              <object class="GtkHButtonBox" id="hbuttonbox3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="spacing">12</property>
                 <property name="layout_style">start</property>
                 <child>
-                  <object class="GtkButton" id="button_hide3">
-                    <property name="label" translatable="yes">_Hide</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                    <property name="secondary">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_matrix">
-                    <property name="label" translatable="yes">_Matrix</property>
+                  <object class="GtkButton" id="button_add_exception">
+                    <property name="label" translatable="yes">_Add Exception</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">_History</property>
-            <property name="use_underline">True</property>
-          </object>
-          <packing>
-            <property name="position">3</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkAboutDialog" id="aboutdialog">
-    <property name="border_width">5</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <property name="copyright">Copyright &#xA9; 2008-2009 Thomas Jaeger.</property>
-    <property name="website">http://easystroke.sourceforge.net</property>
-    <property name="website_label">http://easystroke.sourceforge.net</property>
-    <property name="authors">Thomas Jaeger &lt;ThJaeger@gmail.com&gt;</property>
-    <property name="translator_credits">John Luk (Chinese)
-Kenny Wang (Chinese)
-Jakub &#x17D;&#xE1;&#x10D;ek (Czech)
-Antoine Del Piccolo (French)
-&#x393;&#x3BF;&#x3C5;&#x3C1;&#x3B3;&#x3B9;&#x3CE;&#x3C4;&#x3B7;&#x3C2; &#x393;&#x3B9;&#x3CE;&#x3C1;&#x3B3;&#x3BF;&#x3C2; (Greek)
-Yaron (Hebrew)
-Massimiliano La Gala (Italian)
-Jiro Kawada (Japanese)
-Tomasz Ko&#x142;odziejski (Polish)
-Claque (Russian)
-Paco Molinero (Spanish)
-Jesus Vera (Spanish)
-Marcos (Spanish)</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_pressure_threshold">
-    <property name="upper">255</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_trace_width">
-    <property name="upper">20</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_final_timeout">
-    <property name="upper">2500</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">20</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_init_timeout">
-    <property name="upper">2500</property>
-    <property name="step_increment">5</property>
-    <property name="page_increment">20</property>
-  </object>
-  <object class="GtkMessageDialog" id="dialog_icon">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="transient_for">main</property>
-    <property name="buttons">ok</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area6">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMessageDialog" id="dialog_delete">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="transient_for">main</property>
-    <property name="message_type">warning</property>
-    <property name="buttons">cancel</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox8">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area8">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_delete_delete">
-                <property name="label">gtk-delete</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="use_stock">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">image4</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button_remove_exception">
+                    <property name="label" translatable="yes">_Remove Exception</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="image">image7</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button_hide2">
+                    <property name="label" translatable="yes">_Hide</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                    <property name="secondary">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="pack_type">end</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="1">button_delete_delete</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkMessageDialog" id="dialog_record">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="transient_for">main</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox10">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area10">
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="label" translatable="yes">Preferences</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkButton" id="button_record_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkFrame" id="frame_advanced1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="use_stock">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="xalign">0</property>
+                    <property name="xscale">0</property>
+                    <property name="top_padding">4</property>
+                    <property name="bottom_padding">4</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="check_timeout_gestures">
+                            <property name="label" translatable="yes">Timeout Gestures</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_advanced_ignore">
+                                <property name="label" translatable="yes">Ignore strokes leading up to advanced gestures</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLinkButton" id="linkbutton1">
+                                <property name="label" translatable="yes">(See Documentation)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="relief">none</property>
+                                <property name="uri">http://easystroke.wiki.sourceforge.net/FeatureAdvancedGestures#content</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox7">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_advanced_popups">
+                                <property name="label" translatable="yes">Show popups on advanced gestures</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="check_osd">
+                                <property name="label" translatable="yes">Show OSD</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox6">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_scroll_invert">
+                                <property name="label" translatable="yes">Invert Scroll Direction</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label8">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Scroll Speed</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHScale" id="hscale1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment_scroll_speed</property>
+                                <property name="value_pos">right</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="padding">6</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_move_back">
+                            <property name="label" translatable="yes">Move the cursor back to the original position after each gesture</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label29">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1496,13 +1689,105 @@ Marcos (Spanish)</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button_record_delete">
-                <property name="label" translatable="yes">_Delete Current</property>
+              <object class="GtkFrame" id="frame_advanced2">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image6</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="top_padding">4</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="check_proximity">
+                            <property name="label" translatable="yes">Stay in 'scroll' and 'ignore' mode as long as the pen is within range</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox_pressure">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkSpinButton" id="spin_pressure_threshold">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment_pressure_threshold</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button_default_pressure_threshold">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="relief">none</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="check_pressure_abort">
+                                <property name="label" translatable="yes">Abort stroke if pressure exceeds the number on the left (out of 255)</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label27">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Tablet Options&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1510,309 +1795,224 @@ Marcos (Spanish)</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-1">button_record_cancel</action-widget>
-      <action-widget response="1">button_record_delete</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkMessageDialog" id="dialog_select">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="transient_for">main</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox9">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkEventBox" id="eventbox">
-            <property name="height_request">200</property>
-            <property name="visible">True</property>
-            <property name="events">GDK_BUTTON_PRESS_MASK</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label18">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Alternatively, you may select button and modifiers below.</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkTable" id="table2">
-            <property name="visible">True</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">3</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkToggleButton" id="toggle_control">
-                <property name="label" translatable="yes">_Control</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="toggle_shift">
-                <property name="label" translatable="yes">_Shift</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="toggle_alt">
-                <property name="label" translatable="yes">_Alt</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="toggle_super">
-                <property name="label" translatable="yes">S_uper</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
             <child>
-              <object class="GtkToggleButton" id="toggle_any">
-                <property name="label" translatable="yes">An_y Modifier</property>
+              <object class="GtkFrame" id="frame_advanced3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <child>
+                          <object class="GtkTreeView" id="treeview_devices">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label22">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Devices&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEventBox" id="box_button">
+              <object class="GtkHButtonBox" id="hbuttonbox5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="spacing">12</property>
+                <property name="layout_style">start</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkButton" id="button_hide4">
+                    <property name="label" translatable="yes">_Hide</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                    <property name="secondary">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="right_attach">3</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkHBox" id="hbox_button_timeout">
+        <child type="tab">
+          <object class="GtkLabel" id="label21">
             <property name="visible">True</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkRadioButton" id="radio_timeout_default">
-                <property name="label" translatable="yes">Timeout</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="radio_instant">
-                <property name="label" translatable="yes">Instant Gestures</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">radio_timeout_default</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="radio_click_hold">
-                <property name="label" translatable="yes">Click &amp; Hold</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">radio_timeout_default</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Advanced</property>
           </object>
           <packing>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
+            <property name="tab_fill">False</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area9">
+        <child>
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="layout_style">end</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkButton" id="select_cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkHPaned" id="hpaned1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeview_recent">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeview_ranking">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="select_ok">
-                <property name="label">gtk-ok</property>
+              <object class="GtkHButtonBox" id="hbuttonbox2">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="spacing">12</property>
+                <property name="layout_style">start</property>
+                <child>
+                  <object class="GtkButton" id="button_hide3">
+                    <property name="label" translatable="yes">_Hide</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                    <property name="secondary">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button_matrix">
+                    <property name="label" translatable="yes">_Matrix</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButton" id="select_default">
-                <property name="label" translatable="yes">_Default</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image5</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="label" translatable="yes">_History</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+            <property name="tab_fill">False</property>
           </packing>
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-1">select_cancel</action-widget>
-      <action-widget response="1">select_ok</action-widget>
-      <action-widget response="2">select_default</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="stock">gtk-media-record</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="image5">
-    <property name="visible">True</property>
-    <property name="stock">gtk-clear</property>
-  </object>
-  <object class="GtkImage" id="image6">
-    <property name="visible">True</property>
-    <property name="stock">gtk-delete</property>
-  </object>
-  <object class="GtkImage" id="image4">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image7">
-    <property name="visible">True</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="image8">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image9">
-    <property name="visible">True</property>
-    <property name="stock">gtk-remove</property>
-  </object>
-  <object class="GtkImage" id="image10">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image11">
-    <property name="visible">True</property>
-    <property name="stock">gtk-clear</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment_scroll_speed">
-    <property name="upper">10</property>
-    <property name="step_increment">0.20000000000000001</property>
-    <property name="page_increment">1</property>
   </object>
 </interface>
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..42a7b23
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,615 @@
+# Catalan translation for easystroke
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the easystroke package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: easystroke\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-11-23 03:22+0000\n"
+"Last-Translator: jordis <Unknown>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
+
+#: ../actiondb.cc:127
+#, c-format
+msgid "Error: can't execute command \"%s\": fork() failed\n"
+msgstr "Error: no es pot executar l'ordre «%s»: fork() ha fallat\n"
+
+#: ../actiondb.cc:145 ../prefs.cc:154
+msgid "None"
+msgstr "Cap"
+
+#: ../actiondb.cc:145
+msgid "Unminimize"
+msgstr "Restaura"
+
+#: ../actiondb.cc:145
+msgid "Show/Hide"
+msgstr "Mostra/amaga"
+
+#: ../actiondb.cc:145
+msgid "Disable (Enable)"
+msgstr "Inhabilita (Habilita)"
+
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
+msgid "Default"
+msgstr "Per defecte"
+
+#: ../actiondb.cc:210
+#, c-format
+msgid "Error: Couldn't read action database: %s.\n"
+msgstr "Error: No s'ha pogut llegir la base de dades d'accions: %s.\n"
+
+#: ../actiondb.cc:226
+msgid "rename() failed"
+msgstr "rename() ha fallat"
+
+#: ../actiondb.cc:230
+#, c-format
+msgid "Error: Couldn't save action database: %s.\n"
+msgstr "Error: No s'ha pogut desar la base de dades d'acciones: %s.\n"
+
+#: ../actiondb.cc:234 ../prefdb.cc:154
+msgid ""
+"Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
+"directory and that you have write access to it.  You can change the "
+"configuration directory using the -c or --config-dir command line options."
+msgstr ""
+"No s'ha pogut desar %1. Els canvis que heu fet es perdran. Assegureu-vos que "
+"«%2» sigui un directori i que hi tingueu accés d'escriptura. Podeu canviar "
+"el directori de la configuració mitjançant les opcions -c o --config-dir de "
+"la línia d'ordres."
+
+#: ../actiondb.cc:237
+msgid "actions"
+msgstr "accions"
+
+#: ../actions.cc:66
+msgid "Key combination..."
+msgstr "Combinació de tecles..."
+
+#: ../actions.cc:164
+msgid "Command"
+msgstr "Ordre"
+
+#: ../actions.cc:165
+msgid "Key"
+msgstr "Tecla"
+
+#: ../actions.cc:166
+msgid "Text"
+msgstr "Text"
+
+#: ../actions.cc:167 ../actions.cc:1024
+msgid "Scroll"
+msgstr "Desplaçament"
+
+#: ../actions.cc:168 ../actions.cc:1031
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
+msgid "Button"
+msgstr "Botó"
+
+#: ../actions.cc:170
+msgid "Misc"
+msgstr "Altres"
+
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
+msgid "Stroke"
+msgstr "Traç"
+
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
+msgid "Name"
+msgstr "Nom"
+
+#: ../actions.cc:256
+msgid "Type"
+msgstr "Tipus"
+
+#: ../actions.cc:262
+msgid "Details"
+msgstr "Detalls"
+
+#: ../actions.cc:287
+msgid "Application"
+msgstr "Aplicació"
+
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Accions"
+
+#: ../actions.cc:552
+msgid "Action \"%1\" is about to be deleted."
+msgstr "Esteu a punt de suprimir l'acció «%1»."
+
+#: ../actions.cc:554
+msgid "One action is about to be deleted."
+msgid_plural "%1 actions are about to be deleted"
+msgstr[0] "Se suprimirà una acció"
+msgstr[1] "Se suprimiran %1 accions"
+
+#: ../actions.cc:559
+msgid "Delete an Action"
+msgid_plural "Delete Actions"
+msgstr[0] "Suprimeix una acció"
+msgstr[1] "Suprimeix les accions"
+
+#: ../actions.cc:625
+msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
+msgstr "%1 «%2» (que conté %3 %4) se suprimirà."
+
+#: ../actions.cc:626
+msgid "The application"
+msgstr "L'aplicació"
+
+#: ../actions.cc:626
+msgid "The group"
+msgstr "El grup"
+
+#: ../actions.cc:629
+msgid "action"
+msgid_plural "actions"
+msgstr[0] "acció"
+msgstr[1] "accions"
+
+#: ../actions.cc:630
+msgid "Delete an Application"
+msgstr "Suprimeix una aplicació"
+
+#: ../actions.cc:630
+msgid "Delete an Application Group"
+msgstr "Suprimeix un grup d'aplicacions"
+
+#: ../actions.cc:660
+msgid "Group"
+msgstr "Grup"
+
+#: ../actions.cc:760
+msgid ""
+"You are about to bind an action to a single click.  This might make it "
+"difficult to use Button %1 in the future.  Are you sure you want to continue?"
+msgstr ""
+"Esteu a punt de vincular una acció a un sol clic. Això pot fer que sigui "
+"difícil utilitzar el botó %1 en el futur. Segur que voleu continuar?"
+
+#: ../actions.cc:793
+msgid "Record a New Stroke"
+msgstr "Enregistra un traç nou"
+
+#: ../actions.cc:794
+msgid ""
+"The next stroke will be associated with the action \"%1\".  You can draw it "
+"anywhere on the screen (except for the two buttons below)."
+msgstr ""
+"El proper traç s'associarà amb l'acció «%1». Podeu dibuixar-lo on vulgueu de "
+"la pantalla (excepte als dos botons de sota)."
+
+#: ../actions.cc:886
+msgid "Gesture %1"
+msgstr "Gest %1"
+
+#: ../actions.cc:1002
+msgid "No Modifiers"
+msgstr "Cap modificador"
+
+#: ../actions.cc:1010
+msgid "(Instantly) "
+msgstr "(Instantàniament) "
+
+#: ../actions.cc:1012
+msgid "(Click & Hold) "
+msgstr "(Manté el botó clicat) "
+
+#: ../actions.cc:1014
+msgid "Any Modifier"
+msgstr "Qualsevol modificador"
+
+#: ../actions.cc:1017 ../prefs.cc:446
+msgid "Button %1"
+msgstr "Botó %1"
+
+#: ../actions.cc:1022
+msgid " + Scroll"
+msgstr " + Desplaçament"
+
+#: ../composite.cc:26
+msgid "'composite' not available"
+msgstr "«composite» no està disponible"
+
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
+#, c-format
+msgid "Error: %s\n"
+msgstr "Error: %s\n"
+
+#: ../main.cc:265
+#, c-format
+msgid "Error: A grab failed.  Resetting...\n"
+msgstr "Error: Ha fallat una captura. Es reiniciarà...\n"
+
+#: ../main.cc:286
+#, c-format
+msgid "Fatal Error: Connection to X server lost, restarting...\n"
+msgstr ""
+"Error molt greu: S'ha perdut la connexió al servidor X. Es reiniciarà...\n"
+
+#: ../main.cc:935
+#, c-format
+msgid "Warning: No action \"%s\" defined\n"
+msgstr "Avís: No s'ha definit cap acció «%s»\n"
+
+#: ../main.cc:950
+msgid "Tray icon disabled"
+msgstr "S'ha inhabilitat la icona de la safata"
+
+#: ../main.cc:951
+msgid ""
+"To bring the configuration dialog up again, you should define an action of "
+"type Misc...Show/Hide."
+msgstr ""
+"Per tornar a obrir el diàleg de configuració, definiu una acció de tipus "
+"Altres - Mostra/Amaga"
+
+#: ../main.cc:1012
+#, c-format
+msgid "Error initializing D-BUS\n"
+msgstr "Error en inicialitzar D-BUS\n"
+
+#: ../main.cc:1050
+#, c-format
+msgid "Couldn't open display.\n"
+msgstr "No s'ha pogut obrir la pantalla.\n"
+
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr ""
+"L'Easystroke ja s'està executant. A continuació, s'obrirà la finestra de "
+"configuració.\n"
+
+#: ../main.cc:1203
+#, c-format
+msgid "Error: Couldn't create configuration directory \"%s\"\n"
+msgstr "Error: No s'ha pogut crear el directori de configuració «%s»\n"
+
+#: ../main.cc:1208
+#, c-format
+msgid "Error: \"%s\" is not a directory\n"
+msgstr "Error: «%s» no és un directori\n"
+
+#: ../prefdb.cc:150
+#, c-format
+msgid "Error: Couldn't save preferences: %s.\n"
+msgstr "Error: No s'han pogut desar les preferències: %s.\n"
+
+#: ../prefdb.cc:157
+msgid "preferences"
+msgstr "preferències"
+
+#: ../prefdb.cc:223
+#, c-format
+msgid "Error: Couldn't read preferences.\n"
+msgstr "Error: No s'han pogut llegir les preferències.\n"
+
+#: ../prefs.cc:156
+msgid "XShape"
+msgstr ""
+
+#: ../prefs.cc:157
+msgid "Annotate (compiz)"
+msgstr ""
+
+#: ../prefs.cc:158
+msgid "Fire (compiz)"
+msgstr "Foc (compiz)"
+
+#: ../prefs.cc:159
+msgid "Water (compiz)"
+msgstr "Aigua (compiz)"
+
+#: ../prefs.cc:164 ../prefs.cc:174
+msgid "Timeout Off"
+msgstr "Temps d'espera desactivat"
+
+#: ../prefs.cc:165 ../prefs.cc:175
+msgid "Conservative"
+msgstr "Conservador"
+
+#: ../prefs.cc:167 ../prefs.cc:177
+msgid "Medium"
+msgstr "Mitjà"
+
+#: ../prefs.cc:168 ../prefs.cc:178
+msgid "Aggressive"
+msgstr "Agressiu"
+
+#: ../prefs.cc:169 ../prefs.cc:179
+msgid "Flick"
+msgstr "Parpelleig"
+
+#: ../prefs.cc:180
+msgid "Custom"
+msgstr "Personalitzat"
+
+#: ../prefs.cc:298
+msgid "Application (WM__CLASS)"
+msgstr "Aplicació (WM__CLASS)"
+
+#: ../prefs.cc:316
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../prefs.cc:317
+msgid "Device"
+msgstr "Dispositiu"
+
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
+msgid "<App disabled>"
+msgstr "<Aplicació inhabilitada>"
+
+#: ../prefs.cc:426
+msgid "Select a Mouse or Pen Button"
+msgstr "Seleccioneu un botó del ratolí o del llapis"
+
+#: ../prefs.cc:427
+msgid ""
+"Please place your mouse or pen in the box below and press the button that "
+"you want to select.  You can also hold down additional modifiers."
+msgstr ""
+"Situeu el ratolí o el llapis al quadre següent i premeu el botó que voleu "
+"seleccionar. També podeu prémer modificadors addicionals."
+
+#: ../stats.cc:35 ../stats.cc:43
+msgid "Score"
+msgstr "Puntuació"
+
+#: ../win.cc:161
+msgid "D_isabled"
+msgstr "_Inhabilitat"
+
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(marc del gestor de finestres)"
+
+#: ../trace.h:23
+msgid "Connection to DBus failed"
+msgstr "Ha fallat la connexió al DBus"
+
+#: ../gui.glade.h:1
+msgid "     Timeout (ms)"
+msgstr "     Temps d'espera (ms)"
+
+#: ../gui.glade.h:2
+msgid "(See Documentation)"
+msgstr "(Vegeu la documentació)"
+
+#: ../gui.glade.h:3
+msgid "<b>Appearance</b>"
+msgstr "<b>Aspecte</b>"
+
+#: ../gui.glade.h:4
+msgid "<b>Behavior</b>"
+msgstr "<b>Comportament</b>"
+
+#: ../gui.glade.h:5
+msgid "<b>Devices</b>"
+msgstr "<b>Dispositius</b>"
+
+#: ../gui.glade.h:6
+msgid "<b>Exceptions</b>"
+msgstr "<b>Excepcions</b>"
+
+#: ../gui.glade.h:7
+msgid "<b>Tablet Options</b>"
+msgstr ""
+
+#: ../gui.glade.h:8
+msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
+msgstr ""
+
+#: ../gui.glade.h:10
+msgid "Add Application"
+msgstr "Afegeix una aplicació"
+
+#: ../gui.glade.h:11
+msgid "Add Group"
+msgstr "Afegeix un grup"
+
+#: ../gui.glade.h:12
+msgid "Additional Buttons"
+msgstr "Botons addicionals"
+
+#: ../gui.glade.h:13
+msgid "Advanced"
+msgstr "Avançat"
+
+#: ../gui.glade.h:14
+msgid "Alternatively, you may select button and modifiers below."
+msgstr ""
+
+#: ../gui.glade.h:15
+msgid "An_y Modifier"
+msgstr "_Qualsevol modificador"
+
+#: ../gui.glade.h:16
+msgid "Applications"
+msgstr "Aplicacions"
+
+#: ../gui.glade.h:17
+msgid "Autostart easystroke"
+msgstr "Inicia l'Easystroke automàticament"
+
+#: ../gui.glade.h:18
+msgid "Click & Hold"
+msgstr ""
+
+#: ../gui.glade.h:19
+msgid "Color"
+msgstr "Color"
+
+#: ../gui.glade.h:20
+msgid "Ignore strokes leading up to advanced gestures"
+msgstr ""
+
+#: ../gui.glade.h:21
+msgid "Initial Timeout (ms)"
+msgstr ""
+
+#: ../gui.glade.h:22
+msgid "Instant Gestures"
+msgstr ""
+
+#: ../gui.glade.h:23
+msgid "Invert Scroll Direction"
+msgstr ""
+
+#: ../gui.glade.h:24
+msgid "Method to show gestures"
+msgstr ""
+
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+
+#: ../gui.glade.h:26
+msgid "Preferences"
+msgstr "Preferències"
+
+#: ../gui.glade.h:27
+msgid "Remove Application/Group"
+msgstr ""
+
+#: ../gui.glade.h:28
+msgid "Reset Action(s)"
+msgstr ""
+
+#: ../gui.glade.h:29
+msgid "S_uper"
+msgstr "Sú_per"
+
+#: ../gui.glade.h:30
+msgid "Scroll Speed"
+msgstr "Velocitat de desplaçament"
+
+#: ../gui.glade.h:31
+msgid "Show OSD"
+msgstr "Mostra l'OSD"
+
+#: ../gui.glade.h:32
+msgid "Show deleted rows"
+msgstr ""
+
+#: ../gui.glade.h:33
+msgid "Show last gesture in tray"
+msgstr ""
+
+#: ../gui.glade.h:34
+msgid "Show popups ("
+msgstr ""
+
+#: ../gui.glade.h:35
+msgid "Show popups on advanced gestures"
+msgstr ""
+
+#: ../gui.glade.h:36
+msgid "Show tray icon"
+msgstr "Mostra la icona a la barra de sistema"
+
+#: ../gui.glade.h:37
+msgid "Stay in 'scroll' and 'ignore' mode as long as the pen is within range"
+msgstr ""
+
+#: ../gui.glade.h:38
+msgid "Timeout"
+msgstr "Temps d'espera"
+
+#: ../gui.glade.h:39
+msgid "Timeout Gestures"
+msgstr ""
+
+#: ../gui.glade.h:40
+msgid "Timeout profile"
+msgstr ""
+
+#: ../gui.glade.h:41
+msgid "Width"
+msgstr "Amplada"
+
+#: ../gui.glade.h:42
+msgid "_Add Action"
+msgstr ""
+
+#: ../gui.glade.h:43
+msgid "_Add Exception"
+msgstr ""
+
+#: ../gui.glade.h:44
+msgid "_Alt"
+msgstr "_Alt"
+
+#: ../gui.glade.h:45
+msgid "_Control"
+msgstr "_Control"
+
+#: ../gui.glade.h:46
+msgid "_Default"
+msgstr "Per _defecte"
+
+#: ../gui.glade.h:47
+msgid "_Delete Action(s)"
+msgstr ""
+
+#: ../gui.glade.h:48
+msgid "_Delete Current"
+msgstr ""
+
+#: ../gui.glade.h:49
+msgid "_Gesture Button"
+msgstr ""
+
+#: ../gui.glade.h:50
+msgid "_Hide"
+msgstr "A_maga"
+
+#: ../gui.glade.h:51
+msgid "_History"
+msgstr "_Historial"
+
+#: ../gui.glade.h:52
+msgid "_Matrix"
+msgstr ""
+
+#: ../gui.glade.h:53
+msgid "_Record Stroke"
+msgstr ""
+
+#: ../gui.glade.h:54
+msgid "_Remove Exception"
+msgstr ""
+
+#: ../gui.glade.h:55
+msgid "_Shift"
+msgstr "Tecla de majú_scules"
+
+#: ../gui.glade.h:56
+msgid "optimize for left-handed operation )"
+msgstr ""
+
+#: ../easystroke.desktop.in.h:1
+msgid "Control your desktop using mouse gestures"
+msgstr "Controla el teu escriptori a través de gestos amb el ratolí"
+
+#: ../easystroke.desktop.in.h:2
+msgid "Easystroke Gesture Recognition"
+msgstr "Reconeixement de gestos Easystroke"
diff --git a/po/cs.po b/po/cs.po
index 6f671e5..a54192b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,58 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
-"PO-Revision-Date: 2009-05-11 15:05+0000\n"
-"Last-Translator: Jakub Žáček <dawon.cz@gmail.com>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-03-31 16:20+0000\n"
+"Last-Translator: Roman Horník <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-05-12 07:24+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "Chyba: nelze spustit příkaz \"%s\": fork() selhalo\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Žádný"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "Odminimalizovat"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Zakázat (Povolit)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Chyba: Nelze přečíst databázi akcí: %s.\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() selhalo"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Chyba: Nelze zapsat databázi akcí: %s.\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -68,112 +68,116 @@ msgstr ""
 "složka a že do ní máte právo zápisu. Můžete změnit konfigurační složku "
 "parametrem -c nebo --config-dir v terminálu."
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "akce"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Kombinace kláves..."
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Klávesa"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Text"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Posun"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Tlačítko"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Ostatní"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Gesto"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Název"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Typ"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Detaily"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Aplikace"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Akce"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "Akce \"%1\" bude smazána."
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Jedna akce bude smazána."
 msgstr[1] "%1 akce budou smazány."
 msgstr[2] "%1 akcí bude smazáno."
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Smazat akci"
 msgstr[1] "Smazat akce"
 msgstr[2] "Smazat akce"
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (obsahující %3 %4) bude smazána."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "Aplikace"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "Skupina"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "akce"
 msgstr[1] "akce"
 msgstr[2] "akcí"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Smazat aplikaci"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Smazat skupinu aplikací"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Skupina"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -181,11 +185,11 @@ msgstr ""
 "Chcete nastavit pro akci jedno kliknutí. Toto může v budouctnosti způsobovat "
 "problémy při používání tlačítka %1. Opravdu chcete pokračovat?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Zaznamenat nové gesto"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -193,31 +197,31 @@ msgstr ""
 "Následující gesto bude asociováno s akcí \"%1\". Můžete malovat kdekoliv na "
 "obrazovce (s výjimkou dvou tlačítek níže)."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Gesto %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Žádné modifikátory"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(Instantně) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(Kliknout & držet) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Jakékoliv modifikátory"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Tlačítko %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + Rolovat"
 
@@ -225,42 +229,31 @@ msgstr " + Rolovat"
 msgid "'composite' not available"
 msgstr "'composite' není k dispozici"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "Otevírání zařízení %s selhalo.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "Chyba: Grab selhal, restartování...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Fatální chyba: Spojení s X servere zraceno, resetuji...\n"
 
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "Chyba: Potřebujete XImput k používání pokročilých gest\n"
-
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Varování: Nebyla nadefinována akce \"%s\"\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Ikona v oznam. oblasti zakázána"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
@@ -268,105 +261,108 @@ msgstr ""
 "K zobrazení dialogu nastavení byste měli nadefinovat akci "
 "Ostatní....Zobrazit/Skrýt"
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Chyba při spouštění D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Nelze otevřít display.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr ""
+"Easystroke již běží, proto bude zobrazeno konfigurační okno Easystroku.\n"
+
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "Chyba: Nelze vytvořit konfigurační složku \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Chyba: \"%s\" není složka\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "Chyba: Nelze uložit nastavení: %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "nastavení"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Chyba: Nelze načíst nastavení.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Annotate (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Oheň (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Voda (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Timeout vypnutý"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Konzervativní"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Střední"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Agresivní"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Trhnutí"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Aplikace (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Zařízení"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(window manager frame)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Apl zakázána>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Zvolte tlačítko myši nebo pera"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -374,7 +370,7 @@ msgstr ""
 "Prosím umístěte myš do náslodujícího okna a stiskněte požadované tlačítko. "
 "Můžete také držet libovolné pomocné klávesy (Ctrl, Alt, Shift)."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Skóre"
 
@@ -382,6 +378,10 @@ msgstr "Skóre"
 msgid "D_isabled"
 msgstr "Zakázán_o"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(window manager frame)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Spojení s DBus selhalo"
@@ -418,74 +418,70 @@ msgstr "<b>Nastavení Tabletu</b>"
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr "Přerušit gesto, když tlak přesáhne číslo nalevo (max 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Povolit gesta, když je otevřeno menu (experimentální)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Akce"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Přidat aplikaci"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Přidat skupinu"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Další tlačítka"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr "Alternativně můžete zvolit tlačítko a modifikátory níže."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "J_akýkoliv modifikátor"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Aplikace"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Automaticky spouštět EasyStroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Kliknout & držet"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Barva"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "Ignorovat čáry, které začínají být složitějšími gesty"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "Počáteční timeout (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Rychlá gesta"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Obrátit směr posuvu"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Metoda zobrazování gest"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr "Po každém gestu přesunout kurzor zpět na původní pozici."
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Nastavení"
@@ -551,66 +547,62 @@ msgid "Width"
 msgstr "Šířka"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "Obejít problémy s časováním u Wacom tabletů a u Tablet PC"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "Přid_at akci"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "Přid_at výjimku"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "_Výchozí"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "S_mazat akce"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "S_mazat aktuální"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "Tlačítko _Gest"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "_Skrýt"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "_Historie"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Matrix"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "_Zaznamenat gesto"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "Odeb_rat výjimku"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "optimalizovat pro leváky )"
 
@@ -623,12 +615,19 @@ msgid "Easystroke Gesture Recognition"
 msgstr "Easystroke rozeznávání gest"
 
 #, c-format
-#~ msgid "Is easystroke already running?\n"
-#~ msgstr "Neběží již EasyStroke?\n"
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "Otevírání zařízení %s selhalo.\n"
 
-#: ../main.cc:1398
 #, c-format
-msgid ""
-"Easystroke is already running, showing configuration window instead.\n"
-msgstr ""
-"Easystroke již běží, proto bude zobrazeno konfigurační okno Easystroku.\n"
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "Chyba: Potřebujete XImput k používání pokročilých gest\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Povolit gesta, když je otevřeno menu (experimentální)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "Obejít problémy s časováním u Wacom tabletů a u Tablet PC"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "Neběží již EasyStroke?\n"
diff --git a/po/de.po b/po/de.po
index 4ee030c..562773b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,59 +8,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke 0.3.97\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
-"PO-Revision-Date: 2009-05-11 18:46+0000\n"
-"Last-Translator: Tom Jaeger <Unknown>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-03-24 19:58+0000\n"
+"Last-Translator: Jens Bning <jensboening@gmx.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-05-12 07:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr ""
 "Fehler: Konnte Befehl \"%s\" nicht ausfhren: fork() fehlgeschlagen.\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Keine"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "Unminimieren"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Anzeigen/Verstecken"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Deaktivieren (Aktivieren)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Standard"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Fehler: Konnte Aktionendatenbank nicht laden: %s.\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() fehlgeschlagen"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Fehler: Konnte Aktionendatenbank nicht speichern: %s.\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -71,109 +71,113 @@ msgstr ""
 "Konfigurationsverzeichnis mit den Kommandozeilenoptionen -c oder --config-"
 "dir verndern."
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "Aktionen"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Tastenkombination..."
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Befehl"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Taste"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Text"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Scrollen"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Maustaste"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Sonstige"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Geste"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Name"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Typ"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Details"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Anwendung"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Aktionen"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "Wenn Sie fortfahren, wird die Aktion \"%1\" gelscht."
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Wenn Sie fortfahren, wird eine Aktion gelscht."
 msgstr[1] "Wenn Sie fortfahren, werden %1 Aktionen gelscht."
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Eine Aktion lschen"
 msgstr[1] "Aktionen lschen"
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "Wenn Sie fortfahren, wird %1 \"%2\" (mitsamt %3 %4) gelscht."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "die Anwendung"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "die Gruppe"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "Aktion"
 msgstr[1] "Aktionen"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Eine Anwendung lschen"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Eine Anwendungsgruppe lschen"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -182,11 +186,11 @@ msgstr ""
 "Schwierigkeiten bereiten, Maustaste %1 zu benutzen.  Sind Sie sich sicher, "
 "dass Sie fortfahren mchten?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Eine neue Geste aufnehmen"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -195,31 +199,31 @@ msgstr ""
 "beliebiger Position auf dem Bildschirm (mit Ausnahme der beiden "
 "Schaltflchen) erstellen."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Geste %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Keine Modifier"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(Sofort) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(Click & Hold) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Beliebiger Modfier"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Maustaste %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + Scrollen"
 
@@ -227,42 +231,31 @@ msgstr " + Scrollen"
 msgid "'composite' not available"
 msgstr "'composite' nicht verfgbar"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "ffnen des Gertes %s fehlgeschlagen.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "Fehler: Ein Grab ist fehlgeschlagen.  Breche Geste ab...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Fataler Fehler: Verbindung zum X-Server verloren, starte neu...\n"
 
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "Fehler: Sie bentigen XInput for Advanced Gestures\n"
-
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Warnung: Aktion \"%s\" nicht definiert\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Tray-Symbol deaktiviert"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
@@ -270,105 +263,109 @@ msgstr ""
 "Um den Konfigurationsdialog wieder anzuzeigen, knnen Sie eine Aktion vom "
 "Typ Verschiedene..Anzeigen/Verstecken erstellen."
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Fehler bei der Initialisierung von D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Konnte Verbindung zum Server nicht herstellen.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr ""
+"Easystroke ist bereits gestartet, zeige stattdessen das "
+"Konfigurationsfenster.\n"
+
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "Fehler: Konnte Konfigurationsverzeichnis nicht erstellen: \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Fehler: \"%s\" ist kein Verzeichnis\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "Fehler: Konnte Einstellungen nicht speichern: %s\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "Einstellungen"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Fehler: Konnte Einstellungen nicht laden.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Annotate (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Feuer (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Wasser (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Timeout Aus"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Konservativ"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Mittel"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Aggressiv"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Flick"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Anwendung (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Gert"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(Rahmen des Window-Managers)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Anwendung deaktiviert>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Eine Maus- oder Stifttaste auswhlen"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -376,7 +373,7 @@ msgstr ""
 "Drcken Sie auf die entsprechende Taste, whrend sich der Mauszeiger in der "
 "Box befindet.  Sie knnen auch zustzlich Modifier drcken."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Ergebnis"
 
@@ -384,6 +381,10 @@ msgstr "Ergebnis"
 msgid "D_isabled"
 msgstr "Deaktiviert"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(Rahmen des Window-Managers)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Verbindung zum DBus fehlgeschlagen"
@@ -420,75 +421,72 @@ msgstr "<b>Tablet-Optionen</b>"
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr "Breche Gesten ab folgendem Druck ab (von 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Akzeptiere Gesten whrend Mens angezeigt werden (experimentell)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Aktionen"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Anwendung hinzufgen"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Gruppe hinzufgen"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Zustzliche Maustasten"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr ""
 "Alternativ knnen sie Maustaste und Modifiers weiter unten auswhlen."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "Beliebiger Modifier"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Automatisch starten"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Click & Hold"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Farbe"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "Ignoriere die Mausbewegung bei Advanced Gestures"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "Anfngliches Timeout (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Sofortige Gesten"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Scroll-Richtung invertieren"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Methode zum Anzeigen der Gesten"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+"Bewegen Sie den Mauszeiger nach einer Geste zurck in die Ausgangsposition"
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -556,66 +554,62 @@ msgid "Width"
 msgstr "Breite"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "Workaround fr Timing-Problem auf Wacom Tablets und Tablet PCs"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "Aktion hinzufgen"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "Ausnahme hinzufgen"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "Strg"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "Standard"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "Aktion(en) lschen"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "Geste lschen"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "Gesten-Maustaste"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "Verstecken"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "Verlauf"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "Matrix"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "Geste aufnehmen"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "Ausnahme Entfernen"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "Umschalt"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "fr linkshndige Bedienung optimieren )"
 
@@ -628,13 +622,19 @@ msgid "Easystroke Gesture Recognition"
 msgstr "Easystroke Gestenerkennung"
 
 #, c-format
-#~ msgid "Is easystroke already running?\n"
-#~ msgstr "Ist easystroke bereits gestartet?\n"
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "ffnen des Gertes %s fehlgeschlagen.\n"
 
-#: ../main.cc:1398
 #, c-format
-msgid ""
-"Easystroke is already running, showing configuration window instead.\n"
-msgstr ""
-"Easystroke ist bereits gestartet, zeige stattdessen das "
-"Konfigurationsfenster.\n"
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "Fehler: Sie bentigen XInput for Advanced Gestures\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Akzeptiere Gesten whrend Mens angezeigt werden (experimentell)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "Workaround fr Timing-Problem auf Wacom Tablets und Tablet PCs"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "Ist easystroke bereits gestartet?\n"
diff --git a/po/el.po b/po/el.po
index 7b1b21d..42f2446 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,57 +7,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-12 20:23-0400\n"
-"PO-Revision-Date: 2009-03-11 17:20+0000\n"
-"Last-Translator: Γουργιώτης Γιώργος <Unknown>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-07-23 10:00+0000\n"
+"Last-Translator: Μανώλης Σκόνδρας <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-13 00:20+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
-msgstr "Σφάλμα: δεν μπόρεσε να εκτελεστεί η εντολή \"%s\": η fork() απέτυχε\n"
+msgstr ""
+"Σφάλμα: δεν μπόρεσε να εκτελεστεί η εντολή \"%s\": η fork() απέτυχε\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Κανένα"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "Αποελαχιστοποίησε"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Εμφάνιση/Απόκρυψη"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Απενεργοποίηση (Ενεργοποίηση)"
 
-#: ../actiondb.cc:178 ../prefs.cc:160 ../prefs.cc:171 ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../actiondb.cc:205
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Σφάλμα: Δεν ήταν δυνατή η ανάγνωση της βάσης δράσεων: %s.\n"
 
-#: ../actiondb.cc:221
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "Η μετονομασία() απέτυχε"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Σφάλμα: Δεν ήταν δυνατή η αποθήκευση της βάσης δράσεων: %s.\n"
 
-#: ../actiondb.cc:229 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -68,109 +70,113 @@ msgstr ""
 "αλλάξετε τον κατάλογο διαμόρφωσης χρησιμοποιώντας τις επιλογές κελύφους -c ή "
 "--config-dir."
 
-#: ../actiondb.cc:232
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "ενέργειες"
 
-#: ../actions.cc:34
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Συνδυασμός πλήκτρων..."
 
-#: ../actions.cc:130
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Εντολή"
 
-#: ../actions.cc:131
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Πλήκτρο"
 
-#: ../actions.cc:132
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../actions.cc:133 ../actions.cc:943
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: ../actions.cc:134 ../actions.cc:950
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Παράβλεψη"
 
-#: ../actions.cc:135 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Κουμπί"
 
-#: ../actions.cc:136
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: ../actions.cc:191 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Κτύπημα"
 
-#: ../actions.cc:197 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../actions.cc:221
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Τύπος"
 
-#: ../actions.cc:227
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: ../actions.cc:250
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Εφαρμογή"
 
-#: ../actions.cc:480
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "Η δράση \"%1\" πρόκειται να διαγραφεί"
 
-#: ../actions.cc:482
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Μία δράση πρόκειται να διαγραφεί"
 msgstr[1] "%1 δράσεις πρόκειται να διαγραφούν"
 
-#: ../actions.cc:487
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Διαγραφή μιας Δράσης"
 msgstr[1] "Διαγραφή Δράσεων"
 
-#: ../actions.cc:552
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (που περιέχει %3 %4) πρόκειται να διαγραφεί."
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The application"
 msgstr "Η εφαρμογή"
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The group"
 msgstr "Η ομάδα"
 
-#: ../actions.cc:556
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "δράση"
 msgstr[1] "δράσεις"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Διαγραφή μιας Εφαρμογής"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Διαγραφή μιας Ομάδας Εφαρμογών"
 
-#: ../actions.cc:587
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../actions.cc:677
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -179,11 +185,11 @@ msgstr ""
 "την χρήση του Κουμπιού %1 στο μέλλον. Είστε σίγουρος ότι θέλετε να "
 "συνεχίσετε;"
 
-#: ../actions.cc:709
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Καταχωρήστε ένα Νέο Κτύπημα"
 
-#: ../actions.cc:710
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -191,31 +197,31 @@ msgstr ""
 "Το επόμενο κτύπημα θα συσχετισθεί με την δράση \"%1\". Μπορείτε να "
 "σχεδιάσετε οπουδήποτε στην οθόνη (εκτός από τα δύο κουμπιά παρακάτω)."
 
-#: ../actions.cc:800
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Χειρονομία %1"
 
-#: ../actions.cc:921
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Όχι Τροποποιητές"
 
-#: ../actions.cc:929
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(Άμεσα) "
 
-#: ../actions.cc:931
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(Κλικ & Κράτημα) Ε "
 
-#: ../actions.cc:933
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Κάθε Τροποποιητή"
 
-#: ../actions.cc:936 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Κουμπί %1"
 
-#: ../actions.cc:941
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + Κύλιση"
 
@@ -223,48 +229,31 @@ msgstr " + Κύλιση"
 msgid "'composite' not available"
 msgstr "Δεν είναι διαθέσιμο το 'composite'"
 
-#: ../grabber.cc:357
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "Το άνοιγμα της Συσκευής %s απέτυχε.\n"
-
-#: ../main.cc:107 ../main.cc:276 ../main.cc:1865
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Σφάλμα: %s\n"
 
-#: ../main.cc:277
-#, c-format
-msgid "Is easystroke already running?\n"
-msgstr "Το easystroke τρέχει ήδη;\n"
-
-#: ../main.cc:279
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "Σφάλμα: Η σύλληψη απέτυχε. Επαναφορά...\n"
 
-#: ../main.cc:300
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Μοιραίο Σφάλμα: Η σύνδεση στον X server χάθηκε, επανεκκίνηση...\n"
 
-#: ../main.cc:748
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr ""
-"Σφάλμα: Χρειάζεστε το XInput για να χρησιμοποιήσετε προχωρημένες "
-"χειρονομίες\n"
-
-#: ../main.cc:1275
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Προειδοποίηση: Καμία δράση \"%s\" δεν έχει ορισθεί\n"
 
-#: ../main.cc:1294
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Το εικονίδιο συστήματος απενργοποιήθηκε"
 
-#: ../main.cc:1295
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
@@ -272,105 +261,108 @@ msgstr ""
 "Για να επαναφέρετε το παράθυρο διαμόρφωσης, θα πρέπει να ορίσετε μία δράση "
 "τύπου Διάφορα...Εμφάνιση/Απόκρυψη."
 
-#: ../main.cc:1354
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Σφάλμα αρχικοποίησης D-BUS\n"
 
-#: ../main.cc:1392
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Δεν μπόρεσε να ανοιχθεί display.\n"
 
-#: ../main.cc:1557
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr ""
+"Το easystroke τρέχει ήδη, προβολή παραθύρου παραμετροποίησης αντ'αυτού\n"
+
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "Σφάλμα: Δεν μπόρεσε να δημιουργηθεί ο κατάλογος διαμόρφωσης \"%s\"\n"
 
-#: ../main.cc:1562
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Σφάλμα: \"%s\" δεν είναι κατάλογος\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "Σφάλμα: Δεν σώθηκαν οι προτιμήσεις:%s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "προτιμήσεις"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Σφάλμα: Δεν διαβάστηκαν οι προτιμήσεις.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Σχολιασμός (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Φλόγα (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Νερό (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Απενεργοποίηση Timeout"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Συντηρητικό"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Επιθετικό"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Flick"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Προσαρμοσμένo"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Εφαρμογή (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Ενεργοποιήθηκε"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Συσκευή"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(πλαίσιο διαχειρηστή παραθύρων)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Απενεργοποίηση Εφαρμογής>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Επιλέξτε ένα κουμπί Ποντικιού ή Πένας"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -379,7 +371,7 @@ msgstr ""
 "το πλήκτρο που θέλετε να επιλέξετε. Μπορείτε επίσης να κρατήσετε πατημένους "
 "επιπλέον τροποποιητές."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Σκορ"
 
@@ -387,6 +379,10 @@ msgstr "Σκορ"
 msgid "D_isabled"
 msgstr "_Απενεργοποίηση"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(πλαίσιο διαχειρηστή παραθύρων)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Η σύνδεση στο DBus απέτυχε"
@@ -424,74 +420,72 @@ msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr ""
 "Διακοπή κτυπήματος αν η πίεση υπερβεί τον αριθμό στα αριστερά (μέχρι το 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Αποδοχή χειρονομίας κατά την εμφάνιση των μενού (πειραματικό)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Ενέργειες"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Προσθήκη Εφαρμογής"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Προσθήκη Ομάδας"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Πρόσθετα Κουμπιά"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
-msgstr "Εναλλακτικά, μπορείτε  να επιλέξετε κουμπί και τροποποιητές παρακάτω."
+msgstr ""
+"Εναλλακτικά, μπορείτε  να επιλέξετε κουμπί και τροποποιητές παρακάτω."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "Κάθ_ε Τροποποιητής"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Εφαρμογές"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Αυτόματη έναρξη easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Κλικ & Κράτημα"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "Αγνοήστε κτυπήματε που οδηγούν σε προχωρημένες χειρονομίες"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "Αρχικό Όριο Χρόνου (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Στιγμιαίες Χειρονομίες"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Αντιστροφή Διεύθυνσης Κύλισης"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Μέθοδος εμφάνισης χειρονομιών"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+"Μετακινήστε τον κέρσορα πίσω στην αρχική του θέση ύστερα από κάθε χειρονομία"
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Προτιμήσεις"
@@ -559,66 +553,62 @@ msgid "Width"
 msgstr "Πλάτος"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "Εργασία γύρω από τα χρονικά θέματα σε Wacom tablets και Tablet PCs"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "_Προσθήκη Δράσης"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "_Προσθήκη Εξαίρεσης"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "_Προεπιλογή"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "_Διαγραφή Δράσεων"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "_Διαγραφή Τρέχοντος"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "Κουμπί _Χειρονομίας"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "_Απόκρυψη"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Μήτρα"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "_Καταχώρηση Κτυπήματος"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "_Αφαίρεση Εξαίρεσης"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "βελτιστοποίηση για χειρισμούς από αριστερόχειρες"
 
@@ -629,3 +619,23 @@ msgstr "Ελέγξτε την επιφάνεια εργασίας χρησιμο
 #: ../easystroke.desktop.in.h:2
 msgid "Easystroke Gesture Recognition"
 msgstr "Easystroke Αναγνώρηση Χειρονομιών"
+
+#, c-format
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "Το άνοιγμα της Συσκευής %s απέτυχε.\n"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "Το easystroke τρέχει ήδη;\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Αποδοχή χειρονομίας κατά την εμφάνιση των μενού (πειραματικό)"
+
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr ""
+#~ "Σφάλμα: Χρειάζεστε το XInput για να χρησιμοποιήσετε προχωρημένες "
+#~ "χειρονομίες\n"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "Εργασία γύρω από τα χρονικά θέματα σε Wacom tablets και Tablet PCs"
diff --git a/po/es.po b/po/es.po
index e752db0..a86f8b9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,58 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
-"PO-Revision-Date: 2009-10-02 22:13+0000\n"
-"Last-Translator: Sweettuxy <Unknown>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-12-10 16:51+0000\n"
+"Last-Translator: Martín V. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-19 07:40+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "Error: no se puede ejecutar la orden «%s»: fork() falló\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Ninguno"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "Desminimizar"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Mostrar/ocultar"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Desactivar (activar)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Error: No se puede leer la base de datos de acciones: %s.\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "falló rename()"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Error: No se puede guardar la base de datos de acciones: %s.\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -68,109 +68,113 @@ msgstr ""
 "directorio y que tiene permisos de escritura. Puede cambiar el directorio de "
 "configuración usando las órdenes -c o -config."
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "acciones"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Combinación de tec las..."
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Orden"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Tecla"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Texto"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Desplazador"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Botón"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Varios"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Trazo"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Nombre"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Tipo"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Detalles"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Aplicación"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Acciones"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "La acción «%1» está a punto de ser eliminada"
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Una acción está a punto de ser eliminada."
 msgstr[1] "%1 acciones están a punto de ser eliminadas."
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Borrar una acción"
 msgstr[1] "Borrar acciones"
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 «%2» (que contienen %3 %4) están a punto de ser eliminadas."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "La aplicación"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "El grupo"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "acción"
 msgstr[1] "acciones"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Borrar una aplicación"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Borrar un grupo de aplicación"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Grupo"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -178,43 +182,43 @@ msgstr ""
 "Está a punto de unir una acción a una simple pulsación. Esto puede hacer "
 "difícil usar el boton %1 en el futuro. ¿Está seguro/a de continuar?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Grabar un nuevo trazo"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
 msgstr ""
 "El siguiente trazo será asociado con la acción \"%1\". Usted puede dibujarlo "
-"en todas partes sobre la pantalla (excepto los dos botones debajo)."
+"en cualquier parte de la pantalla (excepto los dos botones de abajo)."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Gesto %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Sin modificadores"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
-msgstr "(Instante) "
+msgstr "(Instantaneamente) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(Pulsar y mantener) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Cualquier modificador"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Botón %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + Desplazar"
 
@@ -222,165 +226,150 @@ msgstr " + Desplazar"
 msgid "'composite' not available"
 msgstr "«composición» no disponible"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "Falló la apertura del dispositivo %s.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
-msgstr "Error: Un agarrón falló. Restablecimiento...\n"
+msgstr "Error: Una sujeción falló. Restableciendo...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
-msgstr "Error fatal: La conexión al servidor X se perdió, reiniciando...\n"
-
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "Error: Necesita Xinput para usar gestos avanzados\n"
+msgstr ""
+"Error fatal: La conexión con el servidor X se perdió, reiniciando...\n"
 
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Aviso: No se ha definido la acción «%s»\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Bandeja de iconos desactivada"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
 msgstr ""
-"Para mostrar  el diálogo de configuración otra vez, usted debería definir "
-"una acción de tipo Misc... Mostrar/Ocultar."
+"Para mostrar  el diálogo de configuración otra vez, debería definir una "
+"acción de tipo Varios... Mostrar/Ocultar."
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Error al inicializar D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
-msgstr "No se puede abrir la pantalla.\n"
+msgstr "No se pudo abrir el display\n"
 
-#: ../main.cc:1398
+#: ../main.cc:1054
 #, c-format
 msgid ""
 "Easystroke is already running, showing configuration window instead.\n"
 msgstr ""
-"Easystroke se esta ejecutando, mostrando a la ventana de configuración en "
-"cambio.\n"
+"Easystroke ya está en ejecución, se mostrará la ventana de configuración.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
-msgstr "Error: No se puede crear el directorio de configuración «%s»\n"
+msgstr "Error: No se pudo crear el directorio de configuración \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Error: «%s» no es un directorio\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
-msgstr "Error: No se pueden guardar las preferencias: %s.\n"
+msgstr "Error: No se pudieron guardar las preferencias: %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "preferencias"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
-msgstr "Error: No se pueden leer las preferencias.\n"
+msgstr "Error: No se pudieron leer las preferencias.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Anotar (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Fuego (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Agua (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Tiempo de apagado"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Conservador"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Medio"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Agresivo"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Movimiento rápido"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Aplicación (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(marco de gestión de ventana)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Aplicación desactivada>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Seleccione un ratón o puntero"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
 msgstr ""
-"Por favor coloque el puntero del ratón o un bolígrafo en la casilla inferior "
-"y pulse el botón que desea seleccionar. También puede mantener pulsados "
+"Por favor coloque el puntero del ratón o puntero en la casilla inferior y "
+"pulse el botón que desea seleccionar. También puede mantener pulsados "
 "modificadores adicionales."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Puntuación"
 
@@ -388,13 +377,17 @@ msgstr "Puntuación"
 msgid "D_isabled"
 msgstr "Desact_ivado"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(marco de gestor de ventana)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Falló la conexión DBus"
 
 #: ../gui.glade.h:1
 msgid "     Timeout (ms)"
-msgstr "     Tiempo (ms)"
+msgstr "     Tiempo de espera (ms)"
 
 #: ../gui.glade.h:2
 msgid "(See Documentation)"
@@ -423,76 +416,73 @@ msgstr "<b>Opciones de tableta</b>"
 #: ../gui.glade.h:8
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr ""
-"abortar trazo si la presión excede el número sobre el izquierdo (de 255)"
-
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Acepta gestos cuando se muestran los menús (experimental)"
+"Abortar el trazo si la presión excede el número especificado a la izquierda "
+"(de 255)"
 
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Acciones"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Añadir aplicación"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Botones adicionales"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr "Alternativamente, puede seleccionar botón y modificadores debajo."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "Cual_quier modificador"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Iniciar automáticamente easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Pulsar y mantener"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Color"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
-msgstr "No haga caso de golpes que conducen hasta gestos avanzados"
+msgstr "Ignorar trazos que lleven a gestos avanzados"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
-msgstr "Pausa inicial (ms)"
+msgstr "Tiempo de espera inicial (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Gestos instantáneos"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Invertir dirección de scroll"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Método para mostrar los gestos"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr "Mover el cursor a la posición inicial después de cada gesto"
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Preferencias"
@@ -511,7 +501,7 @@ msgstr "S_uper"
 
 #: ../gui.glade.h:30
 msgid "Scroll Speed"
-msgstr "desplazamiento veloz"
+msgstr "Velocidad de desplazamiento"
 
 #: ../gui.glade.h:31
 msgid "Show OSD"
@@ -535,95 +525,89 @@ msgstr "Mostrar menús emergentes en gestos avanzados"
 
 #: ../gui.glade.h:36
 msgid "Show tray icon"
-msgstr "Mostrar bandeja de entrada"
+msgstr "Mostrar icono en el área de notificación"
 
 #: ../gui.glade.h:37
 msgid "Stay in 'scroll' and 'ignore' mode as long as the pen is within range"
 msgstr ""
-"permanezca en 'desplazar' e 'ignore' el modo mientras la pluma esté en el "
+"Permanecer en modo 'scroll' e 'ignorar' mientras el puntero esté dentro del "
 "rango"
 
 #: ../gui.glade.h:38
 msgid "Timeout"
-msgstr "Tiempo"
+msgstr "Tiempo de espera"
 
 #: ../gui.glade.h:39
 msgid "Timeout Gestures"
-msgstr "Tiempo de los gestos"
+msgstr ""
 
 #: ../gui.glade.h:40
 msgid "Timeout profile"
-msgstr "Perfil de tiempo"
+msgstr "Perfil de tiempo de espera"
 
 #: ../gui.glade.h:41
 msgid "Width"
 msgstr "Ancho"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr ""
-"El trabajo alrededor del engranaje de distribución publica(emite) sobre "
-"tablas Wacom y ordenadores personales"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "_Añadir acción"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "_Añadir excepción"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "Pre_determinado"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "_Borrar acción(es)"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "_Borrar actual"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "Botón de _gesto"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
-msgstr "_Historia"
+msgstr "_Historial"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Matriz"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "_Grabar Trazo"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "Elimina_r excepción"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
-msgstr "_shift"
+msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
-msgstr "Optimizado para zurdos"
+msgstr "optimizar para zurdos )"
 
 #: ../easystroke.desktop.in.h:1
 msgid "Control your desktop using mouse gestures"
@@ -631,4 +615,24 @@ msgstr "Controlar su escriotrio usando gestos de ratón"
 
 #: ../easystroke.desktop.in.h:2
 msgid "Easystroke Gesture Recognition"
-msgstr "Reconocimiento de gestos Easyestroke"
+msgstr "Reconocedor de gestos Easystroke"
+
+#, c-format
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "Falló la apertura del dispositivo %s.\n"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "¿Está easystroke funcionando?\n"
+
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "Error: Necesita Xinput para usar gestos avanzados\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Acepta gestos cuando se muestran los menús (experimental)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr ""
+#~ "El trabajo alrededor del engranaje de distribución publica(emite) sobre "
+#~ "tablas Wacom y ordenadores personales"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..0d6149c
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,614 @@
+# Finnish translation for easystroke
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the easystroke package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: easystroke\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2011-01-07 03:33+0000\n"
+"Last-Translator: Sauli Pelkonen <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
+
+#: ../actiondb.cc:127
+#, c-format
+msgid "Error: can't execute command \"%s\": fork() failed\n"
+msgstr "Virhe: komennon \"%s\": fork() suorittaminen epäonnistui\n"
+
+#: ../actiondb.cc:145 ../prefs.cc:154
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../actiondb.cc:145
+msgid "Unminimize"
+msgstr "Palauta"
+
+#: ../actiondb.cc:145
+msgid "Show/Hide"
+msgstr "Näytä/Piilota"
+
+#: ../actiondb.cc:145
+msgid "Disable (Enable)"
+msgstr "Poista käytöstä (Ota käyttöön)"
+
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
+msgid "Default"
+msgstr "Oletus"
+
+#: ../actiondb.cc:210
+#, c-format
+msgid "Error: Couldn't read action database: %s.\n"
+msgstr "Virhe: Ei voi lukea eletietokantaa: %s.\n"
+
+#: ../actiondb.cc:226
+msgid "rename() failed"
+msgstr "rename() epäonnistui"
+
+#: ../actiondb.cc:230
+#, c-format
+msgid "Error: Couldn't save action database: %s.\n"
+msgstr "Virhe: Ei voi tallentaa eletietokantaa: %s.\n"
+
+#: ../actiondb.cc:234 ../prefdb.cc:154
+msgid ""
+"Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
+"directory and that you have write access to it.  You can change the "
+"configuration directory using the -c or --config-dir command line options."
+msgstr ""
+"Ei voi tallentaa sovellusta/ryhmää %1. Tehdyt muutokset häviävät. Varmista, "
+"että \"%2\" on hakemisto, johon sinulla on kirjoitusoikeus. Voit vaihtaa "
+"asetushakemiston käyttämällä komentoriviparametreja -c tai --config-dir."
+
+#: ../actiondb.cc:237
+msgid "actions"
+msgstr "toiminnot"
+
+#: ../actions.cc:66
+msgid "Key combination..."
+msgstr "Näppäinyhdistelmä"
+
+#: ../actions.cc:164
+msgid "Command"
+msgstr "Komento"
+
+#: ../actions.cc:165
+msgid "Key"
+msgstr "Näppäin"
+
+#: ../actions.cc:166
+msgid "Text"
+msgstr "Teksti"
+
+#: ../actions.cc:167 ../actions.cc:1024
+msgid "Scroll"
+msgstr "Vieritys"
+
+#: ../actions.cc:168 ../actions.cc:1031
+msgid "Ignore"
+msgstr "Ohita"
+
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
+msgid "Button"
+msgstr "Hiirinäppäin"
+
+#: ../actions.cc:170
+msgid "Misc"
+msgstr "Muut"
+
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
+msgid "Stroke"
+msgstr "Ele"
+
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
+msgid "Name"
+msgstr "Nimi"
+
+#: ../actions.cc:256
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../actions.cc:262
+msgid "Details"
+msgstr "Tiedot"
+
+#: ../actions.cc:287
+msgid "Application"
+msgstr "Sovellus"
+
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Toiminnot"
+
+#: ../actions.cc:552
+msgid "Action \"%1\" is about to be deleted."
+msgstr "Toiminto \"%1\" poistetaan."
+
+#: ../actions.cc:554
+msgid "One action is about to be deleted."
+msgid_plural "%1 actions are about to be deleted"
+msgstr[0] "Yksi toiminto poistetaan."
+msgstr[1] "%1 toimintoa poistetaan."
+
+#: ../actions.cc:559
+msgid "Delete an Action"
+msgid_plural "Delete Actions"
+msgstr[0] "Poista toiminto"
+msgstr[1] "Poista toiminnot"
+
+#: ../actions.cc:625
+msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
+msgstr "%1 \"%2\" (sisältää %3 %4) poistetaan."
+
+#: ../actions.cc:626
+msgid "The application"
+msgstr "Sovellus"
+
+#: ../actions.cc:626
+msgid "The group"
+msgstr "Ryhmä"
+
+#: ../actions.cc:629
+msgid "action"
+msgid_plural "actions"
+msgstr[0] "toiminto"
+msgstr[1] "toimintoa"
+
+#: ../actions.cc:630
+msgid "Delete an Application"
+msgstr "Poista sovellus"
+
+#: ../actions.cc:630
+msgid "Delete an Application Group"
+msgstr "Poista sovellusryhmä"
+
+#: ../actions.cc:660
+msgid "Group"
+msgstr "Ryhmä"
+
+#: ../actions.cc:760
+msgid ""
+"You are about to bind an action to a single click.  This might make it "
+"difficult to use Button %1 in the future.  Are you sure you want to continue?"
+msgstr ""
+"Olet sitomassa toimintoa pelkkään hiiren napsautukseen. Hiirinapin %1 "
+"käyttäminen voi olla vaikeaa jatkossa. Haluatko varmasti jatkaa?"
+
+#: ../actions.cc:793
+msgid "Record a New Stroke"
+msgstr "Sieppaa uusi ele"
+
+#: ../actions.cc:794
+msgid ""
+"The next stroke will be associated with the action \"%1\".  You can draw it "
+"anywhere on the screen (except for the two buttons below)."
+msgstr ""
+"Seuraava ele sidotaan toimintoon \"%1\". Voit piirtää sen minne tahansa "
+"ruudulla (lukuunottamatta kahta nappia alapuolella)."
+
+#: ../actions.cc:886
+msgid "Gesture %1"
+msgstr "Ele %1"
+
+#: ../actions.cc:1002
+msgid "No Modifiers"
+msgstr "Ei muunnosnäppäimiä"
+
+#: ../actions.cc:1010
+msgid "(Instantly) "
+msgstr "(Välittömästi) "
+
+#: ../actions.cc:1012
+msgid "(Click & Hold) "
+msgstr "(Pidä pohjassa) "
+
+#: ../actions.cc:1014
+msgid "Any Modifier"
+msgstr "Mikä tahansa"
+
+#: ../actions.cc:1017 ../prefs.cc:446
+msgid "Button %1"
+msgstr "Hiirinäppäin %1"
+
+#: ../actions.cc:1022
+msgid " + Scroll"
+msgstr " + Vieritä"
+
+#: ../composite.cc:26
+msgid "'composite' not available"
+msgstr "'composite' ei saatavilla"
+
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
+#, c-format
+msgid "Error: %s\n"
+msgstr "Virhe: %s\n"
+
+#: ../main.cc:265
+#, c-format
+msgid "Error: A grab failed.  Resetting...\n"
+msgstr "Virhe: Sieppaus epäonnistui. Nollataan...\n"
+
+#: ../main.cc:286
+#, c-format
+msgid "Fatal Error: Connection to X server lost, restarting...\n"
+msgstr ""
+"Vakava virhe: Yhteys X -palvelimeen katkesi, käynnistetään uudelleen...\n"
+
+#: ../main.cc:935
+#, c-format
+msgid "Warning: No action \"%s\" defined\n"
+msgstr "Varoitus: Toimintoa \"%s\" ei määritelty\n"
+
+#: ../main.cc:950
+msgid "Tray icon disabled"
+msgstr "Ilmoitusalueen kuvake ei käytössä"
+
+#: ../main.cc:951
+msgid ""
+"To bring the configuration dialog up again, you should define an action of "
+"type Misc...Show/Hide."
+msgstr ""
+"Tuodaksesi asetusvalikon uudelleen esille määrittele toiminto Muut > "
+"Näytä/Piilota."
+
+#: ../main.cc:1012
+#, c-format
+msgid "Error initializing D-BUS\n"
+msgstr "Virhe alustettaessa D-Busia.\n"
+
+#: ../main.cc:1050
+#, c-format
+msgid "Couldn't open display.\n"
+msgstr "Näyttöä ei voitu avata.\n"
+
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr "Easystroke on jo käynnissä, näytetään vain asetusikkuna.\n"
+
+#: ../main.cc:1203
+#, c-format
+msgid "Error: Couldn't create configuration directory \"%s\"\n"
+msgstr "Virhe: Ei voi luoda asetushakemistoa \"%s\"\n"
+
+#: ../main.cc:1208
+#, c-format
+msgid "Error: \"%s\" is not a directory\n"
+msgstr "Virhe: \"%s\" ei ole hakemisto\n"
+
+#: ../prefdb.cc:150
+#, c-format
+msgid "Error: Couldn't save preferences: %s.\n"
+msgstr "Virhe: Ei voitu tallentaa asetuksia: %s.\n"
+
+#: ../prefdb.cc:157
+msgid "preferences"
+msgstr "asetukset"
+
+#: ../prefdb.cc:223
+#, c-format
+msgid "Error: Couldn't read preferences.\n"
+msgstr "Virhe: Ei voitu lukea asetuksia.\n"
+
+#: ../prefs.cc:156
+msgid "XShape"
+msgstr "XShape"
+
+#: ../prefs.cc:157
+msgid "Annotate (compiz)"
+msgstr "Piirros (compiz)"
+
+#: ../prefs.cc:158
+msgid "Fire (compiz)"
+msgstr "Tuli (compiz)"
+
+#: ../prefs.cc:159
+msgid "Water (compiz)"
+msgstr "Vesitehoste (compiz)"
+
+#: ../prefs.cc:164 ../prefs.cc:174
+msgid "Timeout Off"
+msgstr "Ei aikakatkaisua"
+
+#: ../prefs.cc:165 ../prefs.cc:175
+msgid "Conservative"
+msgstr "Konservatiivinen"
+
+#: ../prefs.cc:167 ../prefs.cc:177
+msgid "Medium"
+msgstr "Medium"
+
+#: ../prefs.cc:168 ../prefs.cc:178
+msgid "Aggressive"
+msgstr "Aggressiivinen"
+
+#: ../prefs.cc:169 ../prefs.cc:179
+msgid "Flick"
+msgstr "Näpäytys"
+
+#: ../prefs.cc:180
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: ../prefs.cc:298
+msgid "Application (WM__CLASS)"
+msgstr "Sovellus (WM__CLASS)"
+
+#: ../prefs.cc:316
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../prefs.cc:317
+msgid "Device"
+msgstr "Laite"
+
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
+msgid "<App disabled>"
+msgstr "<Sovellus ei käytössä>"
+
+#: ../prefs.cc:426
+msgid "Select a Mouse or Pen Button"
+msgstr "Valitse hiiri- tai kynänäppäin"
+
+#: ../prefs.cc:427
+msgid ""
+"Please place your mouse or pen in the box below and press the button that "
+"you want to select.  You can also hold down additional modifiers."
+msgstr ""
+"Vie hiiri tai kynä alla olevaan laatikkoon ja paina näppäintä jonka haluat "
+"valita. Voit myös samalla halutessasi pitää pohjassa muunnosnäppäimiä."
+
+#: ../stats.cc:35 ../stats.cc:43
+msgid "Score"
+msgstr "Pisteet"
+
+#: ../win.cc:161
+msgid "D_isabled"
+msgstr "E_i käytössä"
+
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(ikkunointiohjelman kehys)"
+
+#: ../trace.h:23
+msgid "Connection to DBus failed"
+msgstr "Yhteys D-Busiin epäonnistui"
+
+#: ../gui.glade.h:1
+msgid "     Timeout (ms)"
+msgstr "     Aikakatkaisu (ms)"
+
+#: ../gui.glade.h:2
+msgid "(See Documentation)"
+msgstr "(Katso Dokumentointi [englanniksi] )"
+
+#: ../gui.glade.h:3
+msgid "<b>Appearance</b>"
+msgstr "<b>Ulkoasu</b>"
+
+#: ../gui.glade.h:4
+msgid "<b>Behavior</b>"
+msgstr "<b>Toiminta</b>"
+
+#: ../gui.glade.h:5
+msgid "<b>Devices</b>"
+msgstr "<b>Laitteet</b>"
+
+#: ../gui.glade.h:6
+msgid "<b>Exceptions</b>"
+msgstr "<b>Poikkeukset</b>"
+
+#: ../gui.glade.h:7
+msgid "<b>Tablet Options</b>"
+msgstr "<b>Tablet-valinnat</b>"
+
+#: ../gui.glade.h:8
+msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
+msgstr "Keskeytä ele, jos paine ylittää vasemmalla olevan luvun (255:stä)"
+
+#: ../gui.glade.h:10
+msgid "Add Application"
+msgstr "Lisää sovellus"
+
+#: ../gui.glade.h:11
+msgid "Add Group"
+msgstr "Lisää ryhmä"
+
+#: ../gui.glade.h:12
+msgid "Additional Buttons"
+msgstr "Muut hiirinäppäimet"
+
+#: ../gui.glade.h:13
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: ../gui.glade.h:14
+msgid "Alternatively, you may select button and modifiers below."
+msgstr "Vaihtoehtoisesti voit valita näppäimen muunnoksineen alapuolelta."
+
+#: ../gui.glade.h:15
+msgid "An_y Modifier"
+msgstr "Mi_kä tahansa"
+
+#: ../gui.glade.h:16
+msgid "Applications"
+msgstr "Sovellukset"
+
+#: ../gui.glade.h:17
+msgid "Autostart easystroke"
+msgstr "Käynnistä easystroke automaattisesti"
+
+#: ../gui.glade.h:18
+msgid "Click & Hold"
+msgstr "Pidä pohjassa"
+
+#: ../gui.glade.h:19
+msgid "Color"
+msgstr "Väri"
+
+#: ../gui.glade.h:20
+msgid "Ignore strokes leading up to advanced gestures"
+msgstr "Jätä huomiotta edistyneisiin toimintoihin johtavat eleet"
+
+#: ../gui.glade.h:21
+msgid "Initial Timeout (ms)"
+msgstr "Alustava aikakatkaisu (ms)"
+
+#: ../gui.glade.h:22
+msgid "Instant Gestures"
+msgstr "Välitön ele"
+
+#: ../gui.glade.h:23
+msgid "Invert Scroll Direction"
+msgstr "Käänteinen vierityssuunta"
+
+#: ../gui.glade.h:24
+msgid "Method to show gestures"
+msgstr "Eleiden näyttämismenetelmä"
+
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+"Palauta osoitin takaisin alkuperäiseen sijaintiin jokaisen liikkeen jälkeen"
+
+#: ../gui.glade.h:26
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../gui.glade.h:27
+msgid "Remove Application/Group"
+msgstr "Poista sovellus/ryhmä"
+
+#: ../gui.glade.h:28
+msgid "Reset Action(s)"
+msgstr "Nollaa toiminto/toiminnot"
+
+#: ../gui.glade.h:29
+msgid "S_uper"
+msgstr "S_uper"
+
+#: ../gui.glade.h:30
+msgid "Scroll Speed"
+msgstr "Vieritysnopeus"
+
+#: ../gui.glade.h:31
+msgid "Show OSD"
+msgstr "Näytä viestit ruudulla"
+
+#: ../gui.glade.h:32
+msgid "Show deleted rows"
+msgstr "Näytä poistetut rivit"
+
+#: ../gui.glade.h:33
+msgid "Show last gesture in tray"
+msgstr "Näytä viimeisin ele ilmaisinalueella"
+
+#: ../gui.glade.h:34
+msgid "Show popups ("
+msgstr "Näytä ponnahdusikkunat ("
+
+#: ../gui.glade.h:35
+msgid "Show popups on advanced gestures"
+msgstr "Näytä ponnahdusikkunat edistyneille eleille"
+
+#: ../gui.glade.h:36
+msgid "Show tray icon"
+msgstr "Näytä ilmoitusalueen kuvake"
+
+#: ../gui.glade.h:37
+msgid "Stay in 'scroll' and 'ignore' mode as long as the pen is within range"
+msgstr ""
+"Pysy 'Vieritys' tai 'Ohita' -tilassa niin kauan kuin kynä on alueella"
+
+#: ../gui.glade.h:38
+msgid "Timeout"
+msgstr "Aikakatkaisu"
+
+#: ../gui.glade.h:39
+msgid "Timeout Gestures"
+msgstr "Eleiden aikakatkaisu"
+
+#: ../gui.glade.h:40
+msgid "Timeout profile"
+msgstr "Aikakatkaisun profiili"
+
+#: ../gui.glade.h:41
+msgid "Width"
+msgstr "Leveys"
+
+#: ../gui.glade.h:42
+msgid "_Add Action"
+msgstr "_Lisää toiminto"
+
+#: ../gui.glade.h:43
+msgid "_Add Exception"
+msgstr "_Lisää poikkeus"
+
+#: ../gui.glade.h:44
+msgid "_Alt"
+msgstr "_Alt"
+
+#: ../gui.glade.h:45
+msgid "_Control"
+msgstr "_Control"
+
+#: ../gui.glade.h:46
+msgid "_Default"
+msgstr "_Oletus"
+
+#: ../gui.glade.h:47
+msgid "_Delete Action(s)"
+msgstr "_Poista toiminto/toiminnot"
+
+#: ../gui.glade.h:48
+msgid "_Delete Current"
+msgstr "_Poista nykyinen"
+
+#: ../gui.glade.h:49
+msgid "_Gesture Button"
+msgstr "_Eleen liipaisinnäppäin"
+
+#: ../gui.glade.h:50
+msgid "_Hide"
+msgstr "P_iilota"
+
+#: ../gui.glade.h:51
+msgid "_History"
+msgstr "_Historia"
+
+#: ../gui.glade.h:52
+msgid "_Matrix"
+msgstr "_Matriisi"
+
+#: ../gui.glade.h:53
+msgid "_Record Stroke"
+msgstr "_Sieppaa ele"
+
+#: ../gui.glade.h:54
+msgid "_Remove Exception"
+msgstr "_Poista poikkeus"
+
+#: ../gui.glade.h:55
+msgid "_Shift"
+msgstr "_Shift"
+
+#: ../gui.glade.h:56
+msgid "optimize for left-handed operation )"
+msgstr "optimoi vasenkätisen tablet-käytölle )"
+
+#: ../easystroke.desktop.in.h:1
+msgid "Control your desktop using mouse gestures"
+msgstr "Hallitse työpöytää hiirieleillä"
+
+#: ../easystroke.desktop.in.h:2
+msgid "Easystroke Gesture Recognition"
+msgstr "Easystroke hiirieleet"
diff --git a/po/fr.po b/po/fr.po
index 16a3880..f8729c2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,379 +7,372 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-09 15:55-0400\n"
-"PO-Revision-Date: 2009-03-24 09:28+0000\n"
-"Last-Translator: Antoine DEL PICCOLO <toniodp@gmail.com>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-11-16 16:18+0000\n"
+"Last-Translator: Loïc Guégant <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-03-24 23:20+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
-msgstr ""
-"Erreur : impossible d'exécuter la commande \"%s\" : échec de fork()\n"
+msgstr "Erreur : impossible d'exécuter la commande « %s », échec de fork()\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Aucun"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
-msgstr "Agrandir"
+msgstr "Déminimiser"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
-msgstr "Montrer/cacher"
+msgstr "Afficher / masquer"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Désactiver (Activer)"
 
-#: ../actiondb.cc:178 ../prefs.cc:160 ../prefs.cc:171 ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../actiondb.cc:205
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
-msgstr "Erreur : Impossible de lire la base de données d'action : %s\n"
+msgstr "Erreur : impossible de lire la base de données des actions %s\n"
 
-#: ../actiondb.cc:221
+#: ../actiondb.cc:226
 msgid "rename() failed"
-msgstr "rename() a echoué"
+msgstr "rename() a échoué"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
-msgstr "Erreur : Impossible d'écrire la base de données d'action : %s\n"
+msgstr ""
+"Erreur : impossible d'enregistrer la base de données des actions %s.\n"
 
-#: ../actiondb.cc:229 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
 "configuration directory using the -c or --config-dir command line options."
 msgstr ""
-"Impossible de sauver %1. Vos modifications vont être perdues. Assurez vous "
-"que \"%2\" est un répertoire et que vous y avez les droits d'écriture. Vous "
-"pouvez changer le répertoire de configuration en utilisant les options de "
-"ligne de commande -c ou --config-dir"
+"Impossible d'enregistrer %1. Vos modifications seront perdues. Assurez vous "
+"que « %2 » est un répertoire et que vous y avez accès en écriture. Vous "
+"pouvez changer le répertoire de configuration à l'aide des options de ligne "
+"de commande -c ou --config-dir."
 
-#: ../actiondb.cc:232
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "actions"
 
-#: ../actions.cc:34
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Combinaison de touches..."
 
-#: ../actions.cc:130
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Commande"
 
-#: ../actions.cc:131
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Touche"
 
-#: ../actions.cc:132
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Texte"
 
-#: ../actions.cc:133 ../actions.cc:943
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Défilement"
 
-#: ../actions.cc:134 ../actions.cc:950
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../actions.cc:135 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Bouton"
 
-#: ../actions.cc:136
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Divers"
 
-#: ../actions.cc:191 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Mouvement"
 
-#: ../actions.cc:197 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Nom"
 
-#: ../actions.cc:221
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Type"
 
-#: ../actions.cc:227
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Détails"
 
-#: ../actions.cc:250
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Application"
 
-#: ../actions.cc:480
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Actions"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
-msgstr "L'action \"%1\" va être supprimée."
+msgstr "L'action « %1 » va être supprimée."
 
-#: ../actions.cc:482
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Une action va être supprimée."
 msgstr[1] "%1 actions vont être supprimées."
 
-#: ../actions.cc:487
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
-msgstr[0] "Supprimer un action."
-msgstr[1] "Supprimer des actions."
+msgstr[0] "Supprimer une action"
+msgstr[1] "Supprimer des actions"
 
-#: ../actions.cc:552
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
-msgstr "%1 \"%2\" (qui contient %3 %4) va être supprimé."
+msgstr "%1 « %2 » (qui contient %3 %4) va être supprimé."
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The application"
 msgstr "L'application"
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The group"
 msgstr "Le groupe"
 
-#: ../actions.cc:556
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "action"
 msgstr[1] "actions"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Supprimer une application"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Supprimer un groupe d'application"
 
-#: ../actions.cc:587
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Groupe"
 
-#: ../actions.cc:677
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
 msgstr ""
-"Vous allez assigner une action à un simple clic. Cela peut perturber "
-"l'utilisation du bouton %1 à l'avenir. Êtes-vous sur de vouloir continuer?"
+"Vous allez assigner une action à un simple clic, ce qui peut rendre "
+"difficile l'utilisation du bouton %1 à l'avenir. Êtes-vous sûr(e) de vouloir "
+"continuer?"
 
-#: ../actions.cc:709
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Enregister un nouveau mouvement"
 
-#: ../actions.cc:710
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
 msgstr ""
-"Le prochain mouvement va être associé à l'action \"%1\". Vous pouvez le "
-"dessiner n'importe où sur l'écran (à l'exception des deux boutons ci-"
-"dessous)."
+"Le prochain mouvement va être associé à l'action « %1 ». Vous pouvez le "
+"tracer n'importe où sur l'écran (à l'exception des deux boutons ci-dessous)."
 
-#: ../actions.cc:800
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Geste %1"
 
-#: ../actions.cc:921
+#: ../actions.cc:1002
 msgid "No Modifiers"
-msgstr "Pas de modificateurs"
+msgstr "Aucun modificateur"
 
-#: ../actions.cc:929
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(Instantané) "
 
-#: ../actions.cc:931
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
-msgstr "(Clic & maintenir) "
+msgstr "(Cliquer & maintenir) "
 
-#: ../actions.cc:933
+#: ../actions.cc:1014
 msgid "Any Modifier"
-msgstr "N'importe quel modificateur"
+msgstr "Tout modificateur"
 
-#: ../actions.cc:936 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Bouton %1"
 
-#: ../actions.cc:941
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + Défilement"
 
 #: ../composite.cc:26
 msgid "'composite' not available"
-msgstr "'composite' non disponible"
+msgstr "« composite » non disponible"
 
-#: ../grabber.cc:357
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "L'ouverture de l'équipement %s échouée.\n"
-
-#: ../main.cc:107 ../main.cc:276 ../main.cc:1865
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: ../main.cc:277
-#, c-format
-msgid "Is easystroke already running?\n"
-msgstr "Est-ce que easystroke tourne déjà?\n"
-
-#: ../main.cc:279
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
-msgstr "Erreur: Un grab a échoué.  Redémarrage...\n"
+msgstr "Erreur : une saisie a échoué. Redémarrage...\n"
 
-#: ../main.cc:300
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Erreur fatale : connexion au serveur X perdue, redémarrage...\n"
 
-#: ../main.cc:748
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr ""
-"Erreur : Vous avez besoin de XInput pour utiliser les gestes avancés.\n"
-
-#: ../main.cc:1275
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
-msgstr "Attention : Aucune action \"%s\" n'est définie.\n"
+msgstr "Attention : aucune action « %s » définie\n"
 
-#: ../main.cc:1294
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Icone de la barre des tâches désactivée"
 
-#: ../main.cc:1295
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
 msgstr ""
-"Pour voir la fenêtre de configuration à nouveau, vous devriez définir une "
-"action de type Divers...Montrer/Cacher"
+"Pour afficher à nouveau la fenêtre de configuration, vous devriez définir "
+"une action de type Divers... Afficher / masquer"
 
-#: ../main.cc:1354
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Erreur d'initialisation de D-BUS\n"
 
-#: ../main.cc:1392
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Impossible d'ouvrir l'affichage.\n"
 
-#: ../main.cc:1557
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr ""
+"Easystroke est déjà en cours d'exécution, affichage de la fenêtre de "
+"configuration à la place.\n"
+
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
-msgstr "Erreur : Impossible de créer le répertoire de configuration \"%s\"\n"
+msgstr "Erreur : impossible de créer le répertoire de configuration « %s »\n"
 
-#: ../main.cc:1562
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
-msgstr "Erreur : \"%s\" n'est pas un répertoire\n"
+msgstr "Erreur : « %s » n'est pas un répertoire\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
-msgstr "Erreur : impossible de sauver les préférences : %s.\n"
+msgstr "Erreur : impossible d'enregistrer les préférences %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "préférences"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Erreur : impossible de lire les préférences.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Annoter (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Feu (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Gouttes d'eau (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
-msgstr "Arrêt du timeout"
+msgstr "Arrêt du temps mort"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Conservatif"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Moyen"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Agressif"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Pichenette"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Application (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
-msgstr "Équipement"
-
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(cadre du gestionnaire de fenêtres)"
+msgstr "Périphérique"
 
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Application désactivée>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
-msgstr "Choisir un bouton de souris ou stylet"
+msgstr "Sélectionnez un bouton de souris ou de stylet"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
 msgstr ""
-"Veuillez placer votre souris ou stylet dans le cadre ci-dessous et cliquer "
+"Veuillez placer votre souris ou stylet dans le cadre ci-dessous et appuyer "
 "sur le bouton que vous voulez sélectionner. Vous pouvez également maintenir "
-"d'autres modificateurs appuyés."
+"enfoncés des modificateurs supplémentaires."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Score"
 
@@ -387,17 +380,21 @@ msgstr "Score"
 msgid "D_isabled"
 msgstr "D_ésactivé"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(cadre du gestionnaire de fenêtres)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
-msgstr "Connexion à DBus échouée"
+msgstr "La connexion à DBus a échoué"
 
 #: ../gui.glade.h:1
 msgid "     Timeout (ms)"
-msgstr "     Timeout (ms)"
+msgstr "     Temps mort (ms)"
 
 #: ../gui.glade.h:2
 msgid "(See Documentation)"
-msgstr "(Voir la documentation)"
+msgstr "(voir la documentation)"
 
 #: ../gui.glade.h:3
 msgid "<b>Appearance</b>"
@@ -409,7 +406,7 @@ msgstr "<b>Comportement</b>"
 
 #: ../gui.glade.h:5
 msgid "<b>Devices</b>"
-msgstr "<b>Équipements</b>"
+msgstr "Périphériques"
 
 #: ../gui.glade.h:6
 msgid "<b>Exceptions</b>"
@@ -422,76 +419,74 @@ msgstr "<b>Options de tablette</b>"
 #: ../gui.glade.h:8
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr ""
-"Annuler le mouvement si la pression excède le nombre à gauche (en dehors de "
-"255)"
-
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Accepter les gestes quand les menus sont affichés (expérimental)"
+"Interrompre le mouvement si la pression excède le nombre à gauche (au-delà "
+"de 255)"
 
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Actions"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
-msgstr "Ajouter application"
+msgstr "Ajouter une application"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
-msgstr "Ajouter groupe"
+msgstr "Ajouter un groupe"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Boutons supplémentaires"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
-msgstr "Sinon, vous pouvez choisir boutons et modificateurs ci-dessous."
+msgstr ""
+"Autrement, vous pouvez sélectionner un bouton et des modificateurs ci-"
+"dessous."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
-msgstr "N_'importe quel modificateur"
+msgstr "_Tout modificateur"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Applications"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Démarrer automatiquement easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Cliquer & maintenir"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Couleur"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
-msgstr "Ignorer les mouvements qui amènent à des gestes avancés"
+msgstr "Ignorer les mouvements menant à des gestes avancés"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
-msgstr "Timeout initial (ms)"
+msgstr "Temps mort initial (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Gestes instantanés"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
-msgstr "Inverser la direction de défilement"
+msgstr "Inverser le sens de défilement"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
-msgstr "Méthodes pour montrer les gestes"
+msgstr "Méthode pour indiquer les gestes"
+
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr "Ramener le curseur à sa position originale après chaque geste."
 
 #: ../gui.glade.h:26
 msgid "Preferences"
@@ -499,11 +494,11 @@ msgstr "Préférences"
 
 #: ../gui.glade.h:27
 msgid "Remove Application/Group"
-msgstr "Supprimer Application/Groupe"
+msgstr "Supprimer l'application ou le groupe"
 
 #: ../gui.glade.h:28
 msgid "Reset Action(s)"
-msgstr "Remettre à zéro l'action"
+msgstr "Réinitialiser les actions"
 
 #: ../gui.glade.h:29
 msgid "S_uper"
@@ -515,117 +510,132 @@ msgstr "Vitesse de défilement"
 
 #: ../gui.glade.h:31
 msgid "Show OSD"
-msgstr "Montrer OSD"
+msgstr "Afficher à l'écran"
 
 #: ../gui.glade.h:32
 msgid "Show deleted rows"
-msgstr "Montrer les rangées supprimées"
+msgstr "Afficher les rangées supprimées"
 
 #: ../gui.glade.h:33
 msgid "Show last gesture in tray"
-msgstr "Montrer le dernier geste dans la barre des tâches"
+msgstr "Afficher le dernier geste dans la barre des tâches"
 
 #: ../gui.glade.h:34
 msgid "Show popups ("
-msgstr "Montrer les popups ("
+msgstr "Afficher les popups ("
 
 #: ../gui.glade.h:35
 msgid "Show popups on advanced gestures"
-msgstr "Montrer les popups sur les gestes avancés"
+msgstr "Afficher les popups sur les gestes avancés"
 
 #: ../gui.glade.h:36
 msgid "Show tray icon"
-msgstr "Montrer l'icône dans la barre des tâches"
+msgstr "Afficher l'icône dans la barre des tâches"
 
 #: ../gui.glade.h:37
 msgid "Stay in 'scroll' and 'ignore' mode as long as the pen is within range"
 msgstr ""
-"Rester en mode 'défilement' et 'ignorer' tant que le stylet est à portée"
+"Rester en mode « défilement » et « ignorer »tant que le stylet est à portée"
 
 #: ../gui.glade.h:38
 msgid "Timeout"
-msgstr "Timeout"
+msgstr "Temps mort"
 
 #: ../gui.glade.h:39
 msgid "Timeout Gestures"
-msgstr "Gestes de timeout"
+msgstr "Gestes de temps mort"
 
 #: ../gui.glade.h:40
 msgid "Timeout profile"
-msgstr "Profil du timeout"
+msgstr "Profil du temps mort"
 
 #: ../gui.glade.h:41
 msgid "Width"
 msgstr "Largeur"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "Régler les problèmes de timing sur les tablettes Wacom et Tablet PCs"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
-msgstr "_Ajouter action"
+msgstr "_Ajouter une action"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
-msgstr "_Ajouter exception"
+msgstr "_Ajouter une exception"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
-msgstr "_Control"
+msgstr "_Contrôle"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
-msgstr "_Défaut"
+msgstr "Par _défaut"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
-msgstr "_Supprimer action(s)"
+msgstr "_Supprimer les actions"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
-msgstr "_Supprimer courant"
+msgstr "_Supprimer l'actuel"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "_Bouton de geste"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
-msgstr "_Cacher"
+msgstr "_Masquer"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "_Historique"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Matrice"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
-msgstr "_Enregistrer mouvement"
+msgstr "_Enregistrer un mouvement"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
-msgstr "_Supprimer exception"
+msgstr "_Supprimer l'exception"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
-msgstr "_Shift"
+msgstr "Ma_j"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "optimiser pour une opération de gaucher)"
 
 #: ../easystroke.desktop.in.h:1
 msgid "Control your desktop using mouse gestures"
-msgstr "Contrôler votre bureau en utilisant des gestes de souris"
+msgstr "Contrôler votre bureau à l'aide de gestes de souris"
 
 #: ../easystroke.desktop.in.h:2
 msgid "Easystroke Gesture Recognition"
-msgstr "Reconnaissance de gestes Easystroke"
+msgstr "Reconnaissance gestuelle Easystroke"
+
+#, c-format
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "L'ouverture de l'équipement %s échouée.\n"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "Est-ce que easystroke tourne déjà?\n"
+
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr ""
+#~ "Erreur : Vous avez besoin de XInput pour utiliser les gestes avancés.\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Accepter les gestes quand les menus sont affichés (expérimental)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "Régler les problèmes de timing sur les tablettes Wacom et Tablet PCs"
diff --git a/po/he.po b/po/he.po
index 1ad428d..8481b23 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,167 +7,171 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
-"PO-Revision-Date: 2009-10-18 05:38+0000\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2009-11-19 08:54+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-19 07:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "שגיאה: לא ניתן להפעיל את הפקודה \"%s\": fork() כשל\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "ללא"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "ביטול המזעור"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "הצגה/הסתרה"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "נטרול (הפעלה)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "שגיאה: לא ניתן לקרוא את מסד נתוני הפעילות: %s.\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() כשל"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "שגיאה: לא ניתן לשמור את מסד נתוני הפעילות: %s.\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
 "configuration directory using the -c or --config-dir command line options."
 msgstr ""
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "פעולות"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "צירוף מקשים"
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "פקודה"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "מקש"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "טקסט"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "גלילה"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "התעלמות"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "לחצן"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "שונות"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "לחיצה"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "שם"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "סוג"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "פרטים"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "יישום"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "פעולות"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "הפעולה \"%1\" עומדת להמחק."
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "פעולה אחת עומדת להמחק."
 msgstr[1] "%1 פעולות עומדות להמחק."
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "מחיקת פעולה"
 msgstr[1] "מחיקת פעולות"
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (המכיל %3 %4) עומד להמחק."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "היישום"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "הקבוצה"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "פעולה"
 msgstr[1] "פעולות"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "מחיקת יישום"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "מחיקת קבוצת יישומים"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -175,11 +179,11 @@ msgstr ""
 "אתה עומד לאגד פעולה ללחיצה בודדת. פעולה זו תקשה על שימוש בלחצן %1 בעתיד. האם "
 "אתה בטוח שברצונך להמשיך?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "הקלדת לחיצה חדשה"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -187,31 +191,31 @@ msgstr ""
 "הלחיצה הבאה תהיה משוייכת עם הפעולה \"%1\". ניתן לצייר אותה בכל מקום במסך "
 "(מלבד שני הלחצנים שלהלן)."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "מחווה %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "אין מקשי החלפה"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(באופן מיידי) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(לחיצה והחזקה) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "כל מקש החלפה שהוא"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "לחצן %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + גלילה"
 
@@ -219,153 +223,138 @@ msgstr " + גלילה"
 msgid "'composite' not available"
 msgstr "'חיבור' אינו זמין"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "פתיחת ההתקן %s נכשלה.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "שגיאה: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "שגיאה: הלכידה נכשלה. מתבצע איפוס...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "שגיאה קריטית: החיבור לשרת ה־X נכשל, מתבצעת הפעלה מחדש...\n"
 
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "שגיאה: יש צורך ב־ XInput כדי להשתמש במחוות המתקדמות\n"
-
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "אזהרה: לא הוגדרה פעולה \"%s\"\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "סמל הדיווח מנוטרל"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
 msgstr ""
 "כדי להעלות את דו־שיח התצורה שוב, עליך להגדיר פעולה מסוג שונות...הצגה/הסתרה."
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "ארעה שגיאה בהפעלת D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "לא ניתן לפתוח את התצוגה.\n"
 
-#: ../main.cc:1398
+#: ../main.cc:1054
 #, c-format
 msgid ""
 "Easystroke is already running, showing configuration window instead.\n"
 msgstr "Easystroke כבר פעיל, חלון התצורה יופיע במקום.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "שגיאה: לא ניתן ליצור את תיקיית התצורה \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "שגיאה: \"%s\" איננה תיקייה\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "שגיאה: לא ניתן לשמור את ההעדפות: %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "העדפות"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "שגיאה: לא ניתן לקרוא את ההעדפות.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "ציור הערות (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "אש (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "מים (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "פסק זמן כבוי"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "שמרני"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "בינוני"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "תוקפני"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "הצלפה"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "יישום (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "פעיל"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "התקן"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(מסגרת מנהל החלונות)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<היישום מנוטרל>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "בחירה בעכבר או בלחצן עט"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -373,7 +362,7 @@ msgstr ""
 "נא לשים את העכבר או את העט שלך להלן וללחוץ על הלחצן שברצונך לבחור. ניתן "
 "להחזיק מקשי החלפה נוספים."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "ניקוד"
 
@@ -381,6 +370,10 @@ msgstr "ניקוד"
 msgid "D_isabled"
 msgstr "מ_נוטרל"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(מסגרת מנהל החלונות)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "החיבור אל DBus נכשל"
@@ -417,74 +410,70 @@ msgstr "<b>אפשרויות מחשב הלוח</b>"
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr "ביטול התנועה אם הלחץ חורג מהמספר שמשמאל (מתוך 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "קבלת מחוות כאשר התפריטים מופיעים (נסיוני)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "פעולות"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "הוספת יישום"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "הוספת קבוצה"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "לחצנים נוספים"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr "לחילופין, ניתן לבחור לחצנים ומקשי החלפה להלן."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "מקש ה_חלפה כלשהו"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "יישומים"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "הפעלה אוטומטית של easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "לחיצה והחזקה"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "צבע"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "התעלמות מתנועות המובילות למחוות מתקדמות"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "תום זמן התחלתי (מילישניות)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "מחווה מיידית"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "הפיכת כיוון הגלילה"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "השיטה להצגת המחוות"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "העדפות"
@@ -550,66 +539,62 @@ msgid "Width"
 msgstr "רוחב"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "פתרון עקיפי לבעיות התזמון ללוחות Wacom ומחשבי לוח"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "הוספת _פעולה"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "הוספת _חריגה"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "_ברירת מחדל"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "מחיקת _פעולה"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "מחיקת ה_נוכחית"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "לחצן ה_מחווה"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "ה_סתרה"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "היס_טוריה"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_מטריצה"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "ה_קלטת התנועה"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "הסרת ה_חריגה"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "התאמה לתפעול על ידי שמאליים ("
 
@@ -620,3 +605,17 @@ msgstr "ניתן לשלוט בשולחן העבודה באמצעות תנועו
 #: ../easystroke.desktop.in.h:2
 msgid "Easystroke Gesture Recognition"
 msgstr "זיהוי תנועות עכבר של Easystroke"
+
+#, c-format
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "פתיחת ההתקן %s נכשלה.\n"
+
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "שגיאה: יש צורך ב־ XInput כדי להשתמש במחוות המתקדמות\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "קבלת מחוות כאשר התפריטים מופיעים (נסיוני)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "פתרון עקיפי לבעיות התזמון ללוחות Wacom ומחשבי לוח"
diff --git a/po/it.po b/po/it.po
index c820e95..0febdea 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,58 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
-"PO-Revision-Date: 2009-08-21 06:11+0000\n"
-"Last-Translator: Massimiliano La Gala <Unknown>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-05-16 03:08+0000\n"
+"Last-Translator: Modernday <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-21 22:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "Errore: impossibile eseguire il comando \"%s\" fork() fallita\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Nessuno"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "ripristina"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Mostra/nascondi"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Disabilita (abilita)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Errore: impossibile leggere il database delle azioni: %s\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() fallita"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Errore: impossibile salvare il database delle azioni: %s\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -69,109 +69,113 @@ msgstr ""
 "possibile cambiare la cartella della configurazione utilizzando i parametri -"
 "c o --config-dir nella riga di comando."
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "azioni"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Combinazione di tasti..."
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Comando"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Tasto"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Testo"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Scorri"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Tasto"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Varie"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Tratto"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Nome"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Tipo"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Applicazione"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Azioni"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "l'azione \"%1\" sta per essere cancellata."
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Un azione sta per essere cancellata."
 msgstr[1] "%1 azoni stanno per essere cancellate"
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Cancella un Azione"
 msgstr[1] "Cancella Azioni"
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (contententi %3 %4) sta per essere cancellata."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "L'applicazione"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "Il gruppo"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "azione"
 msgstr[1] "azioni"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Cancella un applicazione"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Cancella un gruppo di applicazioni"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -179,11 +183,11 @@ msgstr ""
 "Si sta assegnando un azione ad un singolo click. Ciò può rendere difficile "
 "in futuro l'utilizzo del pulsante %1. Si è sicuri di voler continuare?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Registra un nuovo Gesto"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -191,31 +195,31 @@ msgstr ""
 "Il prossimo gesto sarà associato con l'azione \"%1\". È possibile disegnarlo "
 "ovunque nello schermo (eccetto nei due pulsanti sottostanti)."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Gesto %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Nessun modificatore"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(instantaneamente) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(clicca e tieni premuto) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Qualsiasi modificatore"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Pulsante %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + scorrimento"
 
@@ -223,42 +227,31 @@ msgstr " + scorrimento"
 msgid "'composite' not available"
 msgstr "'composite' non disponibile"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "Apertura del dispositivo %s fallita.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Errore: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "Errore: acquisizione fallita. Resetto...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Errore Fatale: Connessione con X server perdura, riavvio...\n"
 
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "Errore: è necessario XInput per utilizzare i gesti avanzati\n"
-
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Attenzione: Nessuna azione \"%s\" definita\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "icona nel vassoio disabilitata"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
@@ -266,17 +259,17 @@ msgstr ""
 "Per mostrare nuovamente la finestra di configurazione, si dovrebbe definire "
 "un azione del tipo \"Varie->Mostra/nascondi\"."
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Errore inizializzando D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Impossibile aprire il display.\n"
 
-#: ../main.cc:1398
+#: ../main.cc:1054
 #, c-format
 msgid ""
 "Easystroke is already running, showing configuration window instead.\n"
@@ -284,95 +277,91 @@ msgstr ""
 "Easystroke è già in esecuzione, sarà mostrata la finestra di "
 "configurazione.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "Errore: Impossibile creare la cartella di configurazione \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Errore: \"%s\" non è una cartella\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "Errore: Impossibile salvare le preferenze: %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "preferenze"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Errore: impossibile leggere le preferenze.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Annotazione (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Fuoco (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Acqua (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Fine timeout"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Conservativo"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Dispositivo"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Aggressivo"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Flick"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Applicazione (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Attivo"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "cornice del gestore finestre"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<App disabilitato>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Selezionare un pulsante del mouse o della penna"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -381,7 +370,7 @@ msgstr ""
 "pulsante che si vuole selezionare. È anche possibile premere modificatori "
 "addizionali."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Punteggio"
 
@@ -389,6 +378,10 @@ msgstr "Punteggio"
 msgid "D_isabled"
 msgstr "D_isabilitato"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "cornice del gestore finestre"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Connessione a DBus fallita"
@@ -426,76 +419,73 @@ msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr ""
 "Annulla gesto se la pressione eccede il numero sulla sinistra (fuori di 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Accetta i gesti con menu aperti (sperimentale)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Azioni"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Aggiungi applicazione"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Aggiungi gruppo"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Pulsanti aggiuntivi"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr ""
 "Alternativamente, è possibile selezionare i pulsanti e modificatori "
 "sottostanti."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "Qualsiasi Modificatore (_y)"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "esegui automaticamente easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "clicca e tieni premuto"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Colore"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "Ignora i gesti che portano ai \"gesti avanzati\""
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "Timeout iniziale (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Gesti istantanei"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Invertire direzione di scorrimento"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Metodi per mostrari i gesti"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+"Rimetti il cursore nella posizione di partenza al termine di ogni gesture"
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Preferenze"
@@ -563,67 +553,62 @@ msgid "Width"
 msgstr "Larghezza"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr ""
-"Raggira i problemi di temporizzazione sulla Wacom tablets e sui Tablet PC"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "_Aggiungi Azione"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "_Aggiungi Eccezione"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Controllo"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "Pre_definito"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "Cancella Azione/i (_d)"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "Cancella Corrente"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "Pulsante _Gesto"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "Cronologia (_H)"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Matrice"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "_Registra Gesto"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "_Rimuovi Eccezione"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "ottimizza operazioni per mancini )"
 
@@ -634,3 +619,22 @@ msgstr "Controlla la scrivania utilizzando i gesti del muse"
 #: ../easystroke.desktop.in.h:2
 msgid "Easystroke Gesture Recognition"
 msgstr "Easystroke riconoscimento gesti"
+
+#, c-format
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "Apertura del dispositivo %s fallita.\n"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr ""
+#~ "Raggira i problemi di temporizzazione sulla Wacom tablets e sui Tablet PC"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "Easystroke è già in esecuzione?\n"
+
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "Errore: è necessario XInput per utilizzare i gesti avanzati\n"
+
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "Accetta i gesti con menu aperti (sperimentale)"
diff --git a/po/ja.po b/po/ja.po
index 831a406..2cae2b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,57 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-03-09 15:55-0400\n"
-"PO-Revision-Date: 2009-05-07 08:33+0000\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2010-05-04 06:50+0000\n"
 "Last-Translator: kawaji <jiro.kawada@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-05-10 02:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "エラー: コマンド \"%s\" 実行不可: fork() 失敗\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "何もしない"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "最小化解除"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "表示/隠す"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "無効化 (有効化)"
 
-#: ../actiondb.cc:178 ../prefs.cc:160 ../prefs.cc:171 ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../actiondb.cc:205
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "エラー: アクションのデータベースが読めませんでした: %s.\n"
 
-#: ../actiondb.cc:221
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() 失敗"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "エラー: アクションのデータベースが保存できませんでした: %s.\n"
 
-#: ../actiondb.cc:229 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -66,149 +67,153 @@ msgstr ""
 "%1 の保存ができませんでした。変更内容は失われます。\"%2\" が書き込み権限を有するディレクトリであるか確かめてください。-c または --"
 "config-dir コマンドラインオプションを使用して、設定ファイル用のディレクトリを変更することが可能です。"
 
-#: ../actiondb.cc:232
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "アクション"
 
-#: ../actions.cc:34
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "キーの組み合わせ..."
 
-#: ../actions.cc:130
+#: ../actions.cc:164
 msgid "Command"
 msgstr "コマンド"
 
-#: ../actions.cc:131
+#: ../actions.cc:165
 msgid "Key"
 msgstr "キー"
 
-#: ../actions.cc:132
+#: ../actions.cc:166
 msgid "Text"
 msgstr "テキスト"
 
-#: ../actions.cc:133 ../actions.cc:943
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "スクロール"
 
-#: ../actions.cc:134 ../actions.cc:950
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "無視"
 
-#: ../actions.cc:135 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "ボタン"
 
-#: ../actions.cc:136
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "その他"
 
-#: ../actions.cc:191 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "ストローク"
 
-#: ../actions.cc:197 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "名前"
 
-#: ../actions.cc:221
+#: ../actions.cc:256
 msgid "Type"
 msgstr "種類"
 
-#: ../actions.cc:227
+#: ../actions.cc:262
 msgid "Details"
 msgstr "詳細"
 
-#: ../actions.cc:250
+#: ../actions.cc:287
 msgid "Application"
 msgstr "アプリケーション"
 
-#: ../actions.cc:480
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "アクション"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "アクション \"%1\" が削除されます。"
 
-#: ../actions.cc:482
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../actions.cc:487
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "アクションを削除"
 
-#: ../actions.cc:552
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (含有数 %3 %4 ) が削除されます"
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The application"
 msgstr "アプリケーション"
 
-#: ../actions.cc:553
+#: ../actions.cc:626
 msgid "The group"
 msgstr "グループ"
 
-#: ../actions.cc:556
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "アクション"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "アプリケーションを削除"
 
-#: ../actions.cc:557
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "アプリケーション・グループを削除"
 
-#: ../actions.cc:587
+#: ../actions.cc:660
 msgid "Group"
 msgstr "グループ"
 
-#: ../actions.cc:677
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
 msgstr ""
 "シングル・クリックにアクションを割り当てようとしています。これにより、ボタン %1 の使用が今後難しくなる可能性があります。本当に設定を続けますか?"
 
-#: ../actions.cc:709
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "新しいストロークを記録"
 
-#: ../actions.cc:710
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
 msgstr ""
 "これから行うストロークが、アクション \"%1\" と関連付けられます。画面のどの場所でもストロークの描画ができます(下の2つのボタンを除く)"
 
-#: ../actions.cc:800
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "ジェスチャ %1"
 
-#: ../actions.cc:921
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "修飾キーなし"
 
-#: ../actions.cc:929
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(インスタント) "
 
-#: ../actions.cc:931
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(クリック & ホールド) "
 
-#: ../actions.cc:933
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "任意の修飾キー"
 
-#: ../actions.cc:936 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "ボタン %1"
 
-#: ../actions.cc:941
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + スクロール"
 
@@ -216,141 +221,143 @@ msgstr " + スクロール"
 msgid "'composite' not available"
 msgstr "”コンポジット”が利用できません"
 
-#: ../grabber.cc:357
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "デバイス %s を開けませんでした。\n"
-
-#: ../main.cc:107 ../main.cc:276 ../main.cc:1865
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "エラー: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
-msgid "Is easystroke already running?\n"
-msgstr "easystroke がすでに実行されていませんか?\n"
+msgid "Error: A grab failed.  Resetting...\n"
+msgstr ""
 
-#: ../main.cc:300
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "致命的なエラー: X サーバへの接続を喪失、再スタート中...\n"
 
-#: ../main.cc:748
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "エラー: 高度ジェスチャを使用するには XInput が必要です\n"
-
-#: ../main.cc:1275
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "警告: アクション \"%s\" は定義されていません\n"
 
-#: ../main.cc:1294
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "トレイアイコン無効"
 
-#: ../main.cc:1354
+#: ../main.cc:951
+msgid ""
+"To bring the configuration dialog up again, you should define an action of "
+"type Misc...Show/Hide."
+msgstr ""
+
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "D-BUS 初期化エラー\n"
 
-#: ../main.cc:1392
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "ディスプレイを開けませんでした。\n"
 
-#: ../main.cc:1557
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr "Easystroke はすでに実行されているので、代わりに設定ウィンドウを表示します。\n"
+
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "エラー: 設定ファイル用ディレクトリ \"%s\" の作成ができませんでした\n"
 
-#: ../main.cc:1562
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "エラー: \"%s\" はディレクトリではありません\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "エラー: 設定を保存できませんでした: %s.\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "設定"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "エラー: 設定を読めませんでした。\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "注釈線 (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "炎の描画 (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "水効果 (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "タイムアウトなし"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "長め"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "中程度"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "短め"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "フリック"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "アプリケーション(WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "有効"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "デバイス"
 
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<アプリ無効>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "マウスまたはペンのボタンを選択"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
 msgstr "マウスやペンを下のボックスに置いてから、選択したいボタンを押してください。追加の修飾キーをホールドすることも可能です。"
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "スコア"
 
@@ -358,6 +365,10 @@ msgstr "スコア"
 msgid "D_isabled"
 msgstr "無効(_I)"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr ""
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "DBus への接続に失敗"
@@ -394,74 +405,70 @@ msgstr "<b>タブレット・オプション</b>"
 msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr "圧力が左の数値(255以内)を超えた場合はストロークを中止"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "メニューが表示されている時もジェスチャを認識(実験的な実装)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "アクション"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "アプリケーションを追加"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "グループを追加"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "さらに追加するボタン"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "高度設定"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr "代わりに、ボタンや修飾キーを下から選択することもできます。"
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "任意の修飾キー(_Y)"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Easystroke を自動起動"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "クリック & ホールド"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "色"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "高度ジェスチャに至ったストロークを無視"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "初期タイムアウト(ミリ秒)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "インスタント・ジェスチャ"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "スクロール方向を反転"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "ジェスチャを表示する方法"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr "ジェスチャー毎後にカーソルを元の位置に戻す"
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "設定"
@@ -527,66 +534,62 @@ msgid "Width"
 msgstr "幅"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr "Wacom タブレットやタブレット PC でのタイミング問題について回避策を取る"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "アクションを追加(_A)"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "例外を追加(_A)"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "デフォルト(_D)"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "アクションを削除(_D)"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "現在の設定を削除(_D)"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "ジェスチャ・ボタン(_G)"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "履歴(_H)"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "マトリクス(_M)"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "ストロークを記録(_R)"
 
-#: ../gui.glade.h:55
+#: ../gui.glade.h:54
 msgid "_Remove Exception"
 msgstr "例外を削除(_R)"
 
-#: ../gui.glade.h:56
+#: ../gui.glade.h:55
 msgid "_Shift"
 msgstr "_Shift"
 
-#: ../gui.glade.h:57
+#: ../gui.glade.h:56
 msgid "optimize for left-handed operation )"
 msgstr "左手操作のために最適化 )"
 
@@ -598,17 +601,20 @@ msgstr "マウス・ジェスチャを使用してデスクトップを制御し
 msgid "Easystroke Gesture Recognition"
 msgstr "Easystroke ジェスチャ認識"
 
-#: ../main.cc:279
 #, c-format
-msgid "Error: A grab failed.  Resetting...\n"
-msgstr ""
+#~ msgid "Opening Device %s failed.\n"
+#~ msgstr "デバイス %s を開けませんでした。\n"
 
-#: ../main.cc:1295
-msgid ""
-"To bring the configuration dialog up again, you should define an action of "
-"type Misc...Show/Hide."
-msgstr ""
+#, c-format
+#~ msgid "Error: You need XInput to use advanced gestures\n"
+#~ msgstr "エラー: 高度ジェスチャを使用するには XInput が必要です\n"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr ""
+#~ msgid "Accept gestures when menus are shown (experimental)"
+#~ msgstr "メニューが表示されている時もジェスチャを認識(実験的な実装)"
+
+#~ msgid "Work around timing issues on Wacom tablets and Tablet PCs"
+#~ msgstr "Wacom タブレットやタブレット PC でのタイミング問題について回避策を取る"
+
+#, c-format
+#~ msgid "Is easystroke already running?\n"
+#~ msgstr "easystroke がすでに実行されていませんか?\n"
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..cf61cfc
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,600 @@
+# Korean translation for easystroke
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the easystroke package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# jincreator <Unknown>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: easystroke\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
+"PO-Revision-Date: 2011-01-15 01:54+0000\n"
+"Last-Translator: jincreator <Unknown>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
+
+#: ../actiondb.cc:127
+#, c-format
+msgid "Error: can't execute command \"%s\": fork() failed\n"
+msgstr "오류: 명령 \"%s\"를 실행할 수 없습니다: fork() 실패\n"
+
+#: ../actiondb.cc:145 ../prefs.cc:154
+msgid "None"
+msgstr "없음"
+
+#: ../actiondb.cc:145
+msgid "Unminimize"
+msgstr "최소화 안함"
+
+#: ../actiondb.cc:145
+msgid "Show/Hide"
+msgstr "보이기/숨기기"
+
+#: ../actiondb.cc:145
+msgid "Disable (Enable)"
+msgstr "비활성화(활성화)"
+
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
+msgid "Default"
+msgstr "기본값"
+
+#: ../actiondb.cc:210
+#, c-format
+msgid "Error: Couldn't read action database: %s.\n"
+msgstr "오류: %s 움직임 데이터베이스를 읽을 수 없습니다.\n"
+
+#: ../actiondb.cc:226
+msgid "rename() failed"
+msgstr "rename() 실패"
+
+#: ../actiondb.cc:230
+#, c-format
+msgid "Error: Couldn't save action database: %s.\n"
+msgstr "오류: %s 움직임 데이터베이스를 저장할 수 없습니다.\n"
+
+#: ../actiondb.cc:234 ../prefdb.cc:154
+msgid ""
+"Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
+"directory and that you have write access to it.  You can change the "
+"configuration directory using the -c or --config-dir command line options."
+msgstr ""
+"%1을(를) 저장하지 못했습니다. 바뀐 점은 없어집니다. \"%2\"이(가) 쓰기 가능한 경로인지 확인하십시오. 명령행에서 -c 또는 --"
+"config-dir 옵션을 통해 설정 경로를 바꿀 수 있습니다."
+
+#: ../actiondb.cc:237
+msgid "actions"
+msgstr "활동"
+
+#: ../actions.cc:66
+msgid "Key combination..."
+msgstr "키 조합..."
+
+#: ../actions.cc:164
+msgid "Command"
+msgstr "명령어"
+
+#: ../actions.cc:165
+msgid "Key"
+msgstr "키"
+
+#: ../actions.cc:166
+msgid "Text"
+msgstr "글자"
+
+#: ../actions.cc:167 ../actions.cc:1024
+msgid "Scroll"
+msgstr "스크롤"
+
+#: ../actions.cc:168 ../actions.cc:1031
+msgid "Ignore"
+msgstr "무시"
+
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
+msgid "Button"
+msgstr "단추"
+
+#: ../actions.cc:170
+msgid "Misc"
+msgstr "기타"
+
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
+msgid "Stroke"
+msgstr "선 그리기"
+
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
+msgid "Name"
+msgstr "이름"
+
+#: ../actions.cc:256
+msgid "Type"
+msgstr "종류"
+
+#: ../actions.cc:262
+msgid "Details"
+msgstr "자세히"
+
+#: ../actions.cc:287
+msgid "Application"
+msgstr "프로그램"
+
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "활동"
+
+#: ../actions.cc:552
+msgid "Action \"%1\" is about to be deleted."
+msgstr "활동 \"%1\"을(를) 삭제할 것입니다."
+
+#: ../actions.cc:554
+msgid "One action is about to be deleted."
+msgid_plural "%1 actions are about to be deleted"
+msgstr[0] "활동이 삭제됩니다."
+
+#: ../actions.cc:559
+msgid "Delete an Action"
+msgid_plural "Delete Actions"
+msgstr[0] "활동 삭제"
+
+#: ../actions.cc:625
+msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
+msgstr "%1 \"%2\" (%3 %4를 포함하는)을(를) 삭제할 것입니다."
+
+#: ../actions.cc:626
+msgid "The application"
+msgstr "프로그램"
+
+#: ../actions.cc:626
+msgid "The group"
+msgstr "모음"
+
+#: ../actions.cc:629
+msgid "action"
+msgid_plural "actions"
+msgstr[0] "동작"
+
+#: ../actions.cc:630
+msgid "Delete an Application"
+msgstr "프로그램 삭제"
+
+#: ../actions.cc:630
+msgid "Delete an Application Group"
+msgstr "프로그램 모음 삭제"
+
+#: ../actions.cc:660
+msgid "Group"
+msgstr ""
+
+#: ../actions.cc:760
+msgid ""
+"You are about to bind an action to a single click.  This might make it "
+"difficult to use Button %1 in the future.  Are you sure you want to continue?"
+msgstr "활동을 한번 클릭과 연결하려 합니다. 이는 나중에 %1 버튼을 사용하기 힘들게 합니다. 계속하시겠습니까?"
+
+#: ../actions.cc:793
+msgid "Record a New Stroke"
+msgstr "새 선 그리기를 녹음합니다."
+
+#: ../actions.cc:794
+msgid ""
+"The next stroke will be associated with the action \"%1\".  You can draw it "
+"anywhere on the screen (except for the two buttons below)."
+msgstr "다음 선 그리기는 \"%1\" 활동에 연결됩니다. 화면 아무곳에 그리세요(두 버튼 아래 제외)."
+
+#: ../actions.cc:886
+msgid "Gesture %1"
+msgstr "동작 %1"
+
+#: ../actions.cc:1002
+msgid "No Modifiers"
+msgstr "고치기 없음"
+
+#: ../actions.cc:1010
+msgid "(Instantly) "
+msgstr "(즉시) "
+
+#: ../actions.cc:1012
+msgid "(Click & Hold) "
+msgstr "(클릭 유지) "
+
+#: ../actions.cc:1014
+msgid "Any Modifier"
+msgstr "다른 수정"
+
+#: ../actions.cc:1017 ../prefs.cc:446
+msgid "Button %1"
+msgstr "버튼 %1"
+
+#: ../actions.cc:1022
+msgid " + Scroll"
+msgstr " +스크롤"
+
+#: ../composite.cc:26
+msgid "'composite' not available"
+msgstr "'컴퍼지트' 사용 불가"
+
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
+#, c-format
+msgid "Error: %s\n"
+msgstr "오류: %s\n"
+
+#: ../main.cc:265
+#, c-format
+msgid "Error: A grab failed.  Resetting...\n"
+msgstr "오류: 잡기 실패. 다시 설정중...\n"
+
+#: ../main.cc:286
+#, c-format
+msgid "Fatal Error: Connection to X server lost, restarting...\n"
+msgstr "치명적인 오류: X 서버와의 연결이 끊어짐, 재시작중...\n"
+
+#: ../main.cc:935
+#, c-format
+msgid "Warning: No action \"%s\" defined\n"
+msgstr "경고: 활동 \"%s\"가 정의되지 않음\n"
+
+#: ../main.cc:950
+msgid "Tray icon disabled"
+msgstr "트레이 아이콘이 비활성화됨"
+
+#: ../main.cc:951
+msgid ""
+"To bring the configuration dialog up again, you should define an action of "
+"type Misc...Show/Hide."
+msgstr "설정 창을 다시 보려면 활동의 없음...보이기/숨기기 형식을 지정해야 합니다."
+
+#: ../main.cc:1012
+#, c-format
+msgid "Error initializing D-BUS\n"
+msgstr "D-BUS 초기화 오류\n"
+
+#: ../main.cc:1050
+#, c-format
+msgid "Couldn't open display.\n"
+msgstr "디스플레이를 열 수 없습니다.\n"
+
+#: ../main.cc:1054
+#, c-format
+msgid ""
+"Easystroke is already running, showing configuration window instead.\n"
+msgstr "이지스트로크가 이미 실행중이므로 설정 창을 대신 보여드립니다.\n"
+
+#: ../main.cc:1203
+#, c-format
+msgid "Error: Couldn't create configuration directory \"%s\"\n"
+msgstr "오류: \"%s\" 설정 경로를 열 수 없습니다.\n"
+
+#: ../main.cc:1208
+#, c-format
+msgid "Error: \"%s\" is not a directory\n"
+msgstr "오류: \"%s\"은(는) 경로가 아닙니다.\n"
+
+#: ../prefdb.cc:150
+#, c-format
+msgid "Error: Couldn't save preferences: %s.\n"
+msgstr "오류: 환경설정:%s을 저장할 수 없습니다.\n"
+
+#: ../prefdb.cc:157
+msgid "preferences"
+msgstr "환경설정"
+
+#: ../prefdb.cc:223
+#, c-format
+msgid "Error: Couldn't read preferences.\n"
+msgstr "오류: 환경설정을 읽을 수 없습니다.\n"
+
+#: ../prefs.cc:156
+msgid "XShape"
+msgstr "XShape"
+
+#: ../prefs.cc:157
+msgid "Annotate (compiz)"
+msgstr "주석 (컴피즈)"
+
+#: ../prefs.cc:158
+msgid "Fire (compiz)"
+msgstr "화면에 불꽃으로 그림을 그림 (컴피즈)"
+
+#: ../prefs.cc:159
+msgid "Water (compiz)"
+msgstr "물결 효과 (컴피즈)"
+
+#: ../prefs.cc:164 ../prefs.cc:174
+msgid "Timeout Off"
+msgstr "시간제한 끔"
+
+#: ../prefs.cc:165 ../prefs.cc:175
+msgid "Conservative"
+msgstr "조심스러움"
+
+#: ../prefs.cc:167 ../prefs.cc:177
+msgid "Medium"
+msgstr "중간"
+
+#: ../prefs.cc:168 ../prefs.cc:178
+msgid "Aggressive"
+msgstr "적극적"
+
+#: ../prefs.cc:169 ../prefs.cc:179
+msgid "Flick"
+msgstr "경쾌함"
+
+#: ../prefs.cc:180
+msgid "Custom"
+msgstr "사용자 지정"
+
+#: ../prefs.cc:298
+msgid "Application (WM__CLASS)"
+msgstr "프로그램 (WM_CLASS)"
+
+#: ../prefs.cc:316
+msgid "Enabled"
+msgstr "활성화"
+
+#: ../prefs.cc:317
+msgid "Device"
+msgstr "기기"
+
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
+msgid "<App disabled>"
+msgstr "<프로그램 비활성화>"
+
+#: ../prefs.cc:426
+msgid "Select a Mouse or Pen Button"
+msgstr "마우스나 펜 버튼을 선택하세요"
+
+#: ../prefs.cc:427
+msgid ""
+"Please place your mouse or pen in the box below and press the button that "
+"you want to select.  You can also hold down additional modifiers."
+msgstr "박스 안으로 마우스나 펜을 가져가서 선택할 버튼을 누르십시오. 추가 변경자를 억제할 수도 있습니다."
+
+#: ../stats.cc:35 ../stats.cc:43
+msgid "Score"
+msgstr "점수"
+
+#: ../win.cc:161
+msgid "D_isabled"
+msgstr "사용 안함(_I)"
+
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(창 관리자 프레임)"
+
+#: ../trace.h:23
+msgid "Connection to DBus failed"
+msgstr "DBus 연결 실패"
+
+#: ../gui.glade.h:1
+msgid "     Timeout (ms)"
+msgstr "     시간제한 (ms)"
+
+#: ../gui.glade.h:2
+msgid "(See Documentation)"
+msgstr "(문서 참조)"
+
+#: ../gui.glade.h:3
+msgid "<b>Appearance</b>"
+msgstr "<b>모양새</b>"
+
+#: ../gui.glade.h:4
+msgid "<b>Behavior</b>"
+msgstr "<b>동작</b>"
+
+#: ../gui.glade.h:5
+msgid "<b>Devices</b>"
+msgstr "<b>기기</b>"
+
+#: ../gui.glade.h:6
+msgid "<b>Exceptions</b>"
+msgstr "<b>예외</b>"
+
+#: ../gui.glade.h:7
+msgid "<b>Tablet Options</b>"
+msgstr "<b>태블릿 선택</b>"
+
+#: ../gui.glade.h:8
+msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
+msgstr "압력이 왼쪽 숫자(255 이하)를 넘어서면 선 그리기 취소"
+
+#: ../gui.glade.h:10
+msgid "Add Application"
+msgstr "프로그램 추가"
+
+#: ../gui.glade.h:11
+msgid "Add Group"
+msgstr "모음 추가"
+
+#: ../gui.glade.h:12
+msgid "Additional Buttons"
+msgstr "보조 버튼"
+
+#: ../gui.glade.h:13
+msgid "Advanced"
+msgstr "고급"
+
+#: ../gui.glade.h:14
+msgid "Alternatively, you may select button and modifiers below."
+msgstr "대신, 아래의 버튼과 변경자를 선택할 수 있습니다."
+
+#: ../gui.glade.h:15
+msgid "An_y Modifier"
+msgstr "다른 변경자(_Y)"
+
+#: ../gui.glade.h:16
+msgid "Applications"
+msgstr "프로그램"
+
+#: ../gui.glade.h:17
+msgid "Autostart easystroke"
+msgstr "이지스트로크 자동 실행"
+
+#: ../gui.glade.h:18
+msgid "Click & Hold"
+msgstr "누른채로 잡고있기"
+
+#: ../gui.glade.h:19
+msgid "Color"
+msgstr "색"
+
+#: ../gui.glade.h:20
+msgid "Ignore strokes leading up to advanced gestures"
+msgstr "고급 동작에 따라 무시"
+
+#: ../gui.glade.h:21
+msgid "Initial Timeout (ms)"
+msgstr "초기 시간제한 (ms)"
+
+#: ../gui.glade.h:22
+msgid "Instant Gestures"
+msgstr "순간 동작"
+
+#: ../gui.glade.h:23
+msgid "Invert Scroll Direction"
+msgstr "스크롤 방향 뒤집기"
+
+#: ../gui.glade.h:24
+msgid "Method to show gestures"
+msgstr "동작을 보여줄 방법"
+
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr "동작 후 커서를 원래 위치로 돌려놓음"
+
+#: ../gui.glade.h:26
+msgid "Preferences"
+msgstr "환경설정"
+
+#: ../gui.glade.h:27
+msgid "Remove Application/Group"
+msgstr "프로그램/모음 지우기"
+
+#: ../gui.glade.h:28
+msgid "Reset Action(s)"
+msgstr "활동 초기화"
+
+#: ../gui.glade.h:29
+msgid "S_uper"
+msgstr "S_uper"
+
+#: ../gui.glade.h:30
+msgid "Scroll Speed"
+msgstr "스크롤 빠르기"
+
+#: ../gui.glade.h:31
+msgid "Show OSD"
+msgstr "OSD 보임"
+
+#: ../gui.glade.h:32
+msgid "Show deleted rows"
+msgstr "삭제된 줄 보이기"
+
+#: ../gui.glade.h:33
+msgid "Show last gesture in tray"
+msgstr "트레이에 마지막 동작 보이기"
+
+#: ../gui.glade.h:34
+msgid "Show popups ("
+msgstr "팝업 보이기 ("
+
+#: ../gui.glade.h:35
+msgid "Show popups on advanced gestures"
+msgstr "고급 동작 시 팝업 보이기"
+
+#: ../gui.glade.h:36
+msgid "Show tray icon"
+msgstr "트레이 아이콘 보이기"
+
+#: ../gui.glade.h:37
+msgid "Stay in 'scroll' and 'ignore' mode as long as the pen is within range"
+msgstr "펜이 범위 안에 있는 동안 '스크롤'과 '무시' 상태 유지하기"
+
+#: ../gui.glade.h:38
+msgid "Timeout"
+msgstr "시간제한"
+
+#: ../gui.glade.h:39
+msgid "Timeout Gestures"
+msgstr "활동 시간제한"
+
+#: ../gui.glade.h:40
+msgid "Timeout profile"
+msgstr "시간제한 정책"
+
+#: ../gui.glade.h:41
+msgid "Width"
+msgstr "너비"
+
+#: ../gui.glade.h:42
+msgid "_Add Action"
+msgstr "활동 추가(_A)"
+
+#: ../gui.glade.h:43
+msgid "_Add Exception"
+msgstr "예외 추가(_A)"
+
+#: ../gui.glade.h:44
+msgid "_Alt"
+msgstr "_Alt"
+
+#: ../gui.glade.h:45
+msgid "_Control"
+msgstr "_Control"
+
+#: ../gui.glade.h:46
+msgid "_Default"
+msgstr "기본값(_D)"
+
+#: ../gui.glade.h:47
+msgid "_Delete Action(s)"
+msgstr "활동 삭제(_D)"
+
+#: ../gui.glade.h:48
+msgid "_Delete Current"
+msgstr "현재 것 삭제(_D)"
+
+#: ../gui.glade.h:49
+msgid "_Gesture Button"
+msgstr "동작 버튼(_G)"
+
+#: ../gui.glade.h:50
+msgid "_Hide"
+msgstr "숨기기(_H)"
+
+#: ../gui.glade.h:51
+msgid "_History"
+msgstr "기록(_H)"
+
+#: ../gui.glade.h:52
+msgid "_Matrix"
+msgstr "표(_M)"
+
+#: ../gui.glade.h:53
+msgid "_Record Stroke"
+msgstr "선 그리기 기록(_R)"
+
+#: ../gui.glade.h:54
+msgid "_Remove Exception"
+msgstr "예외 삭제(_R)"
+
+#: ../gui.glade.h:55
+msgid "_Shift"
+msgstr "_Shift"
+
+#: ../gui.glade.h:56
+msgid "optimize for left-handed operation )"
+msgstr "왼손잡이에 맞게 최적화 )"
+
+#: ../easystroke.desktop.in.h:1
+msgid "Control your desktop using mouse gestures"
+msgstr "마우스 동작을 통해 데스크탑 제어"
+
+#: ../easystroke.desktop.in.h:2
+msgid "Easystroke Gesture Recognition"
+msgstr "이지스트로크 동작 인식"
diff --git a/po/pl.po b/po/pl.po
index 2d03873..6a50bd8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easystroke\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-05-11 02:55-0400\n"
+"POT-Creation-Date: 2010-02-13 18:30-0500\n"
 "PO-Revision-Date: 2010-01-30 22:32+0000\n"
 "Last-Translator: neo <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -16,50 +16,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-02-13 23:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-09 17:56+0000\n"
+"X-Generator: Launchpad (build 12532)\n"
 
-#: ../actiondb.cc:126
+#: ../actiondb.cc:127
 #, c-format
 msgid "Error: can't execute command \"%s\": fork() failed\n"
 msgstr "Błąd: nie potrafię wykonać komendy \"%s\": fork() failed\n"
 
-#: ../actiondb.cc:144 ../prefs.cc:159
+#: ../actiondb.cc:145 ../prefs.cc:154
 msgid "None"
 msgstr "Żaden"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Unminimize"
 msgstr "Cofnij minimalizację"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Show/Hide"
 msgstr "Pokaż/ukryj"
 
-#: ../actiondb.cc:144
+#: ../actiondb.cc:145
 msgid "Disable (Enable)"
 msgstr "Wyłącz (włącz)"
 
-#: ../actiondb.cc:158 ../actiondb.cc:182 ../prefs.cc:160 ../prefs.cc:171
-#: ../prefs.cc:181
+#: ../actiondb.cc:159 ../actiondb.cc:183 ../prefs.cc:155 ../prefs.cc:166
+#: ../prefs.cc:176
 msgid "Default"
 msgstr "Domyślnie"
 
-#: ../actiondb.cc:209
+#: ../actiondb.cc:210
 #, c-format
 msgid "Error: Couldn't read action database: %s.\n"
 msgstr "Nie potrafię odczytać bazy danych: %s.\n"
 
-#: ../actiondb.cc:225
+#: ../actiondb.cc:226
 msgid "rename() failed"
 msgstr "rename() zwróciło błąd"
 
-#: ../actiondb.cc:229
+#: ../actiondb.cc:230
 #, c-format
 msgid "Error: Couldn't save action database: %s.\n"
 msgstr "Nie potrafię zapisać do bazy danych: %s.\n"
 
-#: ../actiondb.cc:233 ../prefdb.cc:151
+#: ../actiondb.cc:234 ../prefdb.cc:154
 msgid ""
 "Couldn't save %1.  Your changes will be lost.  Make sure that \"%2\" is a "
 "directory and that you have write access to it.  You can change the "
@@ -69,112 +69,116 @@ msgstr ""
 "jest folderem i ma ustawione prawa dostępu. Możesz zmienić folder "
 "konfiguracyjny używając opcji -c lub --config-dir z linii komend."
 
-#: ../actiondb.cc:236
+#: ../actiondb.cc:237
 msgid "actions"
 msgstr "akcje"
 
-#: ../actions.cc:64
+#: ../actions.cc:66
 msgid "Key combination..."
 msgstr "Kombinacja klawiszy..."
 
-#: ../actions.cc:160
+#: ../actions.cc:164
 msgid "Command"
 msgstr "Komenda"
 
-#: ../actions.cc:161
+#: ../actions.cc:165
 msgid "Key"
 msgstr "Kombinacja klawiszy"
 
-#: ../actions.cc:162
+#: ../actions.cc:166
 msgid "Text"
 msgstr "Tekst"
 
-#: ../actions.cc:163 ../actions.cc:1016
+#: ../actions.cc:167 ../actions.cc:1024
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: ../actions.cc:164 ../actions.cc:1023
+#: ../actions.cc:168 ../actions.cc:1031
 msgid "Ignore"
 msgstr "Pomiń"
 
-#: ../actions.cc:165 ../prefs.cc:310 ../prefs.cc:334
+#: ../actions.cc:169 ../prefs.cc:303 ../prefs.cc:327
 msgid "Button"
 msgstr "Przycisk"
 
-#: ../actions.cc:166
+#: ../actions.cc:170
 msgid "Misc"
 msgstr "Różne"
 
-#: ../actions.cc:223 ../stats.cc:32 ../stats.cc:38
+#: ../actions.cc:226 ../stats.cc:33 ../stats.cc:39
 msgid "Stroke"
 msgstr "Gest"
 
-#: ../actions.cc:229 ../stats.cc:33 ../stats.cc:41
+#: ../actions.cc:232 ../stats.cc:34 ../stats.cc:42
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../actions.cc:253
+#: ../actions.cc:256
 msgid "Type"
 msgstr "Typ"
 
-#: ../actions.cc:259
+#: ../actions.cc:262
 msgid "Details"
 msgstr "Szczegóły"
 
-#: ../actions.cc:282
+#: ../actions.cc:287
 msgid "Application"
 msgstr "Program"
 
-#: ../actions.cc:549
+#: ../actions.cc:294 ../gui.glade.h:9
+msgid "Actions"
+msgstr "Akcje"
+
+#: ../actions.cc:552
 msgid "Action \"%1\" is about to be deleted."
 msgstr "Gest \"%1\" zostanie usunięty. Kontynuować?"
 
-#: ../actions.cc:551
+#: ../actions.cc:554
 msgid "One action is about to be deleted."
 msgid_plural "%1 actions are about to be deleted"
 msgstr[0] "Na pewno chcesz usunąć %1 gest?"
 msgstr[1] "Na pewno chcesz usunąć %1 gesty?"
 msgstr[2] "Na pewno chcesz usunąć %1 gestów?"
 
-#: ../actions.cc:556
+#: ../actions.cc:559
 msgid "Delete an Action"
 msgid_plural "Delete Actions"
 msgstr[0] "Usuń gest."
 msgstr[1] "Usuń gesty."
 msgstr[2] "Usuń gesty."
 
-#: ../actions.cc:621
+#: ../actions.cc:625
 msgid "%1 \"%2\" (containing %3 %4) is about to be deleted."
 msgstr "%1 \"%2\" (zawierający %3 %4) zostanie usunięty."
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The application"
 msgstr "Program"
 
-#: ../actions.cc:622
+#: ../actions.cc:626
 msgid "The group"
 msgstr "Grupa"
 
-#: ../actions.cc:625
+#: ../actions.cc:629
 msgid "action"
 msgid_plural "actions"
 msgstr[0] "gest"
 msgstr[1] "gesty"
 msgstr[2] "gestów"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application"
 msgstr "Usuń program"
 
-#: ../actions.cc:626
+#: ../actions.cc:630
 msgid "Delete an Application Group"
 msgstr "Usuń grupę programów"
 
-#: ../actions.cc:656
+#: ../actions.cc:660
 msgid "Group"
 msgstr "Grupa"
 
-#: ../actions.cc:747
+#: ../actions.cc:760
 msgid ""
 "You are about to bind an action to a single click.  This might make it "
 "difficult to use Button %1 in the future.  Are you sure you want to continue?"
@@ -182,11 +186,11 @@ msgstr ""
 "Akcja zostanie przypisana do pojedynczego przycisku myszy, co może sprawić "
 "problemy z jego użyciem w przyszłości. Kontynuować?"
 
-#: ../actions.cc:780
+#: ../actions.cc:793
 msgid "Record a New Stroke"
 msgstr "Zapisz nowy gest"
 
-#: ../actions.cc:781
+#: ../actions.cc:794
 msgid ""
 "The next stroke will be associated with the action \"%1\".  You can draw it "
 "anywhere on the screen (except for the two buttons below)."
@@ -194,31 +198,31 @@ msgstr ""
 "Nowy gest zostanie przypisany akcji \"%1\". Możesz go narysować gdziekolwiek "
 "na ekranie (poza dwoma przyciskami poniżej)."
 
-#: ../actions.cc:873
+#: ../actions.cc:886
 msgid "Gesture %1"
 msgstr "Gest %1"
 
-#: ../actions.cc:994
+#: ../actions.cc:1002
 msgid "No Modifiers"
 msgstr "Brak dodatkowych klawiszy"
 
-#: ../actions.cc:1002
+#: ../actions.cc:1010
 msgid "(Instantly) "
 msgstr "(Natychmiast) "
 
-#: ../actions.cc:1004
+#: ../actions.cc:1012
 msgid "(Click & Hold) "
 msgstr "(Kliknij i przytrzymaj) "
 
-#: ../actions.cc:1006
+#: ../actions.cc:1014
 msgid "Any Modifier"
 msgstr "Jakikolwiek dodatkowy klawisz"
 
-#: ../actions.cc:1009 ../prefs.cc:451
+#: ../actions.cc:1017 ../prefs.cc:446
 msgid "Button %1"
 msgstr "Przycisk %1"
 
-#: ../actions.cc:1014
+#: ../actions.cc:1022
 msgid " + Scroll"
 msgstr " + przewijanie"
 
@@ -226,42 +230,31 @@ msgstr " + przewijanie"
 msgid "'composite' not available"
 msgstr "'composite' niedostępny"
 
-#. TODO
-#: ../grabber.cc:376
-#, c-format
-msgid "Opening Device %s failed.\n"
-msgstr "Nie udało się skomunikować z urządzeniem %s.\n"
-
-#: ../main.cc:106 ../main.cc:275 ../main.cc:1861
+#: ../main.cc:102 ../main.cc:263 ../main.cc:1366
 #, c-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: ../main.cc:277
+#: ../main.cc:265
 #, c-format
 msgid "Error: A grab failed.  Resetting...\n"
 msgstr "Błąd: Pobranie zawiodło. Resetuję...\n"
 
-#: ../main.cc:298
+#: ../main.cc:286
 #, c-format
 msgid "Fatal Error: Connection to X server lost, restarting...\n"
 msgstr "Błąd krytyczny: Połączenie z serwerem X utracone, resetuję...\n"
 
-#: ../main.cc:746
-#, c-format
-msgid "Error: You need XInput to use advanced gestures\n"
-msgstr "Błąd: Potrzebujesz XInput żeby używać zaawansowanych gestów\n"
-
-#: ../main.cc:1277
+#: ../main.cc:935
 #, c-format
 msgid "Warning: No action \"%s\" defined\n"
 msgstr "Ostrzeżenie: Akcja \"%s\" niezdefiniowana\n"
 
-#: ../main.cc:1296
+#: ../main.cc:950
 msgid "Tray icon disabled"
 msgstr "Ikonka systemowa wyłączona"
 
-#: ../main.cc:1297
+#: ../main.cc:951
 msgid ""
 "To bring the configuration dialog up again, you should define an action of "
 "type Misc...Show/Hide."
@@ -269,111 +262,107 @@ msgstr ""
 "Żeby wyświetlić z powrotem okienko konfiguracji powinieneś zdefiniować akcję "
 "typu różne...pokaż/ukryj."
 
-#: ../main.cc:1356
+#: ../main.cc:1012
 #, c-format
 msgid "Error initializing D-BUS\n"
 msgstr "Błąd przy uruchamianiu D-BUS\n"
 
-#: ../main.cc:1394
+#: ../main.cc:1050
 #, c-format
 msgid "Couldn't open display.\n"
 msgstr "Nie potrafię otrzymać dostępu do ekranu.\n"
 
-#: ../main.cc:1398
+#: ../main.cc:1054
 #, c-format
 msgid ""
 "Easystroke is already running, showing configuration window instead.\n"
 msgstr "Easystroke już działa. Pokażę więc tylko okienko konfiguracji.\n"
 
-#: ../main.cc:1563
+#: ../main.cc:1203
 #, c-format
 msgid "Error: Couldn't create configuration directory \"%s\"\n"
 msgstr "Błąd: nie potrafię stworzyć folderu konfiguracji \"%s\"\n"
 
-#: ../main.cc:1568
+#: ../main.cc:1208
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Błąd: \"%s\" nie jest folderem\n"
 
-#: ../prefdb.cc:147
+#: ../prefdb.cc:150
 #, c-format
 msgid "Error: Couldn't save preferences: %s.\n"
 msgstr "Błąd: nie potrafię zapisać ustawień: %s\n"
 
-#: ../prefdb.cc:154
+#: ../prefdb.cc:157
 msgid "preferences"
 msgstr "Właściwości"
 
-#: ../prefdb.cc:220
+#: ../prefdb.cc:223
 #, c-format
 msgid "Error: Couldn't read preferences.\n"
 msgstr "Błąd: Nie potrafię odczytać ustawień.\n"
 
-#: ../prefs.cc:161
+#: ../prefs.cc:156
 msgid "XShape"
 msgstr "XShape"
 
-#: ../prefs.cc:162
+#: ../prefs.cc:157
 msgid "Annotate (compiz)"
 msgstr "Rysowanie (compiz)"
 
-#: ../prefs.cc:163
+#: ../prefs.cc:158
 msgid "Fire (compiz)"
 msgstr "Ogień  (compiz)"
 
-#: ../prefs.cc:164
+#: ../prefs.cc:159
 msgid "Water (compiz)"
 msgstr "Woda (compiz)"
 
-#: ../prefs.cc:169 ../prefs.cc:179
+#: ../prefs.cc:164 ../prefs.cc:174
 msgid "Timeout Off"
 msgstr "Przeyrwanie wyłączone"
 
-#: ../prefs.cc:170 ../prefs.cc:180
+#: ../prefs.cc:165 ../prefs.cc:175
 msgid "Conservative"
 msgstr "Konserwatywne"
 
-#: ../prefs.cc:172 ../prefs.cc:182
+#: ../prefs.cc:167 ../prefs.cc:177
 msgid "Medium"
 msgstr "Średnie"
 
-#: ../prefs.cc:173 ../prefs.cc:183
+#: ../prefs.cc:168 ../prefs.cc:178
 msgid "Aggressive"
 msgstr "Agresywne"
 
-#: ../prefs.cc:174 ../prefs.cc:184
+#: ../prefs.cc:169 ../prefs.cc:179
 msgid "Flick"
 msgstr "Natychmiastowo"
 
-#: ../prefs.cc:185
+#: ../prefs.cc:180
 msgid "Custom"
 msgstr "Użytkownika"
 
-#: ../prefs.cc:305
+#: ../prefs.cc:298
 msgid "Application (WM__CLASS)"
 msgstr "Aplikacja (WM__CLASS)"
 
-#: ../prefs.cc:323
+#: ../prefs.cc:316
 msgid "Enabled"
 msgstr "Włączony"
 
-#: ../prefs.cc:324
+#: ../prefs.cc:317
 msgid "Device"
 msgstr "Urządzenie"
 
-#: ../prefs.cc:348 ../prefs.cc:596
-msgid "(window manager frame)"
-msgstr "(menedżer ramki okienka)"
-
-#: ../prefs.cc:349 ../prefs.cc:601 ../prefs.cc:624
+#: ../prefs.cc:342 ../prefs.cc:595 ../prefs.cc:618
 msgid "<App disabled>"
 msgstr "<Program wyłączony>"
 
-#: ../prefs.cc:431
+#: ../prefs.cc:426
 msgid "Select a Mouse or Pen Button"
 msgstr "Wybierz mysz lub Przycisk Rysika"
 
-#: ../prefs.cc:432
+#: ../prefs.cc:427
 msgid ""
 "Please place your mouse or pen in the box below and press the button that "
 "you want to select.  You can also hold down additional modifiers."
@@ -381,7 +370,7 @@ msgstr ""
 "Najedź myszą lub rysikiem na pole poniżej i naciśnij wybrany przycisk. Może "
 "również wcisnąć dodatkowe klawisze."
 
-#: ../stats.cc:34 ../stats.cc:42
+#: ../stats.cc:35 ../stats.cc:43
 msgid "Score"
 msgstr "Wynik"
 
@@ -389,6 +378,10 @@ msgstr "Wynik"
 msgid "D_isabled"
 msgstr "W_yłącz"
 
+#: ../win.cc:272
+msgid "(window manager frame)"
+msgstr "(menedżer ramki okienka)"
+
 #: ../trace.h:23
 msgid "Connection to DBus failed"
 msgstr "Połączenie z DBus nie udało się"
@@ -426,74 +419,70 @@ msgid "Abort stroke if pressure exceeds the number on the left (out of 255)"
 msgstr ""
 "Anuluj gest jeśli nacisk będzie większy niż liczba po lewej (mniej niż 255)"
 
-#: ../gui.glade.h:9
-msgid "Accept gestures when menus are shown (experimental)"
-msgstr "Akceptuje gest gdy menu jest wyświetlone (eksperymentalne)"
-
 #: ../gui.glade.h:10
-msgid "Actions"
-msgstr "Akcje"
-
-#: ../gui.glade.h:11
 msgid "Add Application"
 msgstr "Dodaj program"
 
-#: ../gui.glade.h:12
+#: ../gui.glade.h:11
 msgid "Add Group"
 msgstr "Dodaj grupę"
 
-#: ../gui.glade.h:13
+#: ../gui.glade.h:12
 msgid "Additional Buttons"
 msgstr "Dodatkowe guziki"
 
-#: ../gui.glade.h:14
+#: ../gui.glade.h:13
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../gui.glade.h:15
+#: ../gui.glade.h:14
 msgid "Alternatively, you may select button and modifiers below."
 msgstr "Możesz też wybrać przycisk i inne klawisze poniżej."
 
-#: ../gui.glade.h:16
+#: ../gui.glade.h:15
 msgid "An_y Modifier"
 msgstr "Do_wolny Klawisz Dodatkowy"
 
-#: ../gui.glade.h:17
+#: ../gui.glade.h:16
 msgid "Applications"
 msgstr "Programy"
 
-#: ../gui.glade.h:18
+#: ../gui.glade.h:17
 msgid "Autostart easystroke"
 msgstr "Automatycznie uruchamiaj easystroke"
 
-#: ../gui.glade.h:19
+#: ../gui.glade.h:18
 msgid "Click & Hold"
 msgstr "Kliknij i przytrzymaj"
 
-#: ../gui.glade.h:20
+#: ../gui.glade.h:19
 msgid "Color"
 msgstr "Kolor"
 
-#: ../gui.glade.h:21
+#: ../gui.glade.h:20
 msgid "Ignore strokes leading up to advanced gestures"
 msgstr "Pomijaj gesty, które uruchamiają gesty zaawansowane"
 
-#: ../gui.glade.h:22
+#: ../gui.glade.h:21
 msgid "Initial Timeout (ms)"
 msgstr "Anulowanie gestów po czasie (ms)"
 
-#: ../gui.glade.h:23
+#: ../gui.glade.h:22
 msgid "Instant Gestures"
 msgstr "Natychmiastowe gesty"
 
-#: ../gui.glade.h:24
+#: ../gui.glade.h:23
 msgid "Invert Scroll Direction"
 msgstr "Odwróć kierunek przewijania"
 
-#: ../gui.glade.h:25
+#: ../gui.glade.h:24
 msgid "Method to show gestures"
 msgstr "Metoda rysowania gestów"
 
+#: ../gui.glade.h:25
+msgid "Move the cursor back to the original position after each gesture"
+msgstr ""
+
 #: ../gui.glade.h:26
 msgid "Preferences"
 msgstr "Ustawienia"
@@ -561,67 +550,62 @@ msgid "Width"
 msgstr "Szerokość"
 
 #: ../gui.glade.h:42
-msgid "Work around timing issues on Wacom tablets and Tablet PCs"
-msgstr ""
-"Rozwiąż tymczasowo problemy z czasem z tabletami Wacom i Tabletami PC"
-
-#: ../gui.glade.h:43
 msgid "_Add Action"
 msgstr "_Dodaj gest"
 
-#: ../gui.glade.h:44
+#: ../gui.glade.h:43
 msgid "_Add Exception"
 msgstr "_Dodaj wyjątek"
 
-#: ../gui.glade.h:45
+#: ../gui.glade.h:44
 msgid "_Alt"
 msgstr "_Alt"
 
-#: ../gui.glade.h:46
+#: ../gui.glade.h:45
 msgid "_Control"
 msgstr "_Control"
 
-#: ../gui.glade.h:47
+#: ../gui.glade.h:46
 msgid "_Default"
 msgstr "_Domyślne"
 
-#: ../gui.glade.h:48
+#: ../gui.glade.h:47
 msgid "_Delete Action(s)"
 msgstr "_Usuń gest"
 
-#: ../gui.glade.h:49
+#: ../gui.glade.h:48
 msgid "_Delete Current"
 msgstr "_Usuń bieżący"
 
-#: ../gui.glade.h:50
+#: ../gui.glade.h:49
 msgid "_Gesture Button"
 msgstr "_Klawisz gestów"
 
-#: ../gui.glade.h:51
+#: ../gui.glade.h:50
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: ../gui.glade.h:52
+#: ../gui.glade.h:51
 msgid "_History"
 msgstr "_Historia"
 
-#: ../gui.glade.h:53
+#: ../gui.glade.h:52
 msgid "_Matrix"
 msgstr "_Tablica"
 
-#: ../gui.glade.h:54
+#: ../gui.glade.h:53
 msgid "_Record Stroke"
 msgstr "_

Diff truncated because it is very large.