diff --git a/data/mouse.ui b/data/mouse.ui
index 0f177f1..65ac6f1 100644
--- a/data/mouse.ui
+++ b/data/mouse.ui
@@ -8,9 +8,11 @@
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child type="label">
           <object class="GtkLabel" id="middle_button_emulation_label">
-            <property name="label" translatable="yes">&lt;b&gt;Middle Button Emulation&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Middle Button Emulation</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+            <attributes>
+             <attribute name="weight" value="bold"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -72,9 +74,11 @@
               </child>
               <child>
                 <object class="GtkLabel" id="middle_button_timeout_left_label">
-                  <property name="label" translatable="yes" context="timeout">&lt;i&gt;Short&lt;/i&gt;</property>
+                  <property name="label" translatable="yes" context="timeout">Short</property>
                   <property name="use_underline">False</property>
-                  <property name="use_markup">True</property>
+                  <attributes>
+                   <attribute name="style" value="italic"/>
+                  </attributes>
                   <property name="justify">GTK_JUSTIFY_LEFT</property>
                   <property name="wrap">False</property>
                   <property name="selectable">False</property>
@@ -111,9 +115,11 @@
               </child>
               <child>
                 <object class="GtkLabel" id="middle_button_timeout_right_label">
-                  <property name="label" translatable="yes" context="timeout">&lt;i&gt;Long&lt;/i&gt;</property>
+                  <property name="label" translatable="yes" context="timeout">Long</property>
                   <property name="use_underline">False</property>
-                  <property name="use_markup">True</property>
+                  <attributes>
+                   <attribute name="style" value="italic"/>
+                  </attributes>
                   <property name="justify">GTK_JUSTIFY_LEFT</property>
                   <property name="wrap">False</property>
                   <property name="selectable">False</property>
@@ -150,9 +156,11 @@
         <property name="shadow_type">GTK_SHADOW_NONE</property>
         <child type="label">
           <object class="GtkLabel" id="wheel_emulation_label">
-            <property name="label" translatable="yes">&lt;b&gt;Wheel Emulation&lt;/b&gt;</property>
+            <property name="label" translatable="yes">Wheel Emulation</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+             <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -268,9 +276,11 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="wheel_emulation_timeout_left_label">
-                    <property name="label" translatable="yes" context="timeout">&lt;i&gt;Short&lt;/i&gt;</property>
+                    <property name="label" translatable="yes" context="timeout">Short</property>
                     <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
+                    <attributes>
+                     <attribute name="style" value="italic"/>
+                    </attributes>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="wrap">False</property>
                     <property name="selectable">False</property>
@@ -307,9 +317,11 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="wheel_emulation_timeout_right_label">
-                    <property name="label" translatable="yes" context="timeout">&lt;i&gt;Long&lt;/i&gt;</property>
+                    <property name="label" translatable="yes" context="timeout">Long</property>
                     <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
+                    <attributes>
+                     <attribute name="style" value="italic"/>
+                    </attributes>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="wrap">False</property>
                     <property name="selectable">False</property>
@@ -371,9 +383,11 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="wheel_emulation_inertia_left_label">
-                    <property name="label" translatable="yes" context="inertia">&lt;i&gt;Short&lt;/i&gt;</property>
+                    <property name="label" translatable="yes" context="inertia">Short</property>
                     <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
+                    <attributes>
+                     <attribute name="style" value="italic"/>
+                    </attributes>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="wrap">False</property>
                     <property name="selectable">False</property>
@@ -410,9 +424,11 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="wheel_emulation_inertia_right_label">
-                    <property name="label" translatable="yes" context="inertia">&lt;i&gt;Long&lt;/i&gt;</property>
+                    <property name="label" translatable="yes" context="inertia">Long</property>
                     <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
+                    <attributes>
+                     <attribute name="style" value="italic"/>
+                    </attributes>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="wrap">False</property>
                     <property name="selectable">False</property>
diff --git a/data/pointingstick.ui b/data/pointingstick.ui
index 6d3fd32..5265a24 100644
--- a/data/pointingstick.ui
+++ b/data/pointingstick.ui
@@ -5,9 +5,11 @@
     <property name="spacing">0</property>
     <child>
       <object class="GtkLabel" id="sensitivity_label">
-        <property name="label" translatable="yes">&lt;b&gt;Sensitivity&lt;/b&gt;</property>
+        <property name="label" translatable="yes">Sensitivity</property>
         <property name="use_underline">False</property>
-        <property name="use_markup">True</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
         <property name="justify">GTK_JUSTIFY_LEFT</property>
         <property name="wrap">False</property>
         <property name="selectable">False</property>
@@ -62,9 +64,11 @@
         </child>
         <child>
           <object class="GtkLabel" id="sensitivity_left_label">
-            <property name="label" translatable="yes" context="sensitivity">&lt;i&gt;Low&lt;/i&gt;</property>
+            <property name="label" translatable="yes" context="sensitivity">Low</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+            <attributes>
+             <attribute name="style" value="italic"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -101,9 +105,11 @@
         </child>
         <child>
           <object class="GtkLabel" id="sensitivity_right_label">
-            <property name="label" translatable="yes" context="sensitivity">&lt;i&gt;High&lt;/i&gt;</property>
+            <property name="label" translatable="yes" context="sensitivity">High</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+            <attributes>
+             <attribute name="style" value="italic"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -131,9 +137,11 @@
     </child>
     <child>
       <object class="GtkLabel" id="speed_label">
-        <property name="label" translatable="yes">&lt;b&gt;Speed&lt;/b&gt;</property>
+        <property name="label" translatable="yes">Speed</property>
         <property name="use_underline">False</property>
-        <property name="use_markup">True</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
         <property name="justify">GTK_JUSTIFY_LEFT</property>
         <property name="wrap">False</property>
         <property name="selectable">False</property>
@@ -188,9 +196,11 @@
         </child>
         <child>
           <object class="GtkLabel" id="speed_left_label">
-            <property name="label" translatable="yes" context="speed">&lt;i&gt;Slow&lt;/i&gt;</property>
+            <property name="label" translatable="yes" context="speed">Slow</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+            <attributes>
+             <attribute name="style" value="italic"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -227,9 +237,11 @@
         </child>
         <child>
           <object class="GtkLabel" id="speed_right_label">
-            <property name="label" translatable="yes" context="speed">&lt;i&gt;Fast&lt;/i&gt;</property>
+            <property name="label" translatable="yes" context="speed">Fast</property>
             <property name="use_underline">False</property>
-            <property name="use_markup">True</property>
+            <attributes>
+             <attribute name="style" value="italic"/>
+            </attributes>
             <property name="justify">GTK_JUSTIFY_LEFT</property>
             <property name="wrap">False</property>
             <property name="selectable">False</property>
@@ -257,9 +269,11 @@
     </child>
     <child>
       <object class="GtkLabel" id="scrolling_label">
-        <property name="label" translatable="yes">&lt;b&gt;Scrolling&lt;/b&gt;</property>
+        <property name="label" translatable="yes">Scrolling</property>
         <property name="use_underline">False</property>
-        <property name="use_markup">True</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
         <property name="justify">GTK_JUSTIFY_LEFT</property>
         <property name="wrap">False</property>
         <property name="selectable">False</property>
@@ -329,9 +343,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="middle_button_timeout_left_label">
-                <property name="label" translatable="yes" context="timeout">&lt;i&gt;Short&lt;/i&gt;</property>
+                <property name="label" translatable="yes" context="timeout">Short</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                 <attribute name="style" value="italic"/>
+                </attributes>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
@@ -368,9 +384,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="middle_button_timeout_right_label">
-                <property name="label" translatable="yes" context="timeout">&lt;i&gt;Long&lt;/i&gt;</property>
+                <property name="label" translatable="yes" context="timeout">Long</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                 <attribute name="style" value="italic"/>
+                </attributes>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
@@ -400,9 +418,11 @@
     </child>
     <child>
       <object class="GtkLabel" id="press_to_select_label">
-        <property name="label" translatable="yes">&lt;b&gt;Press to Select&lt;/b&gt;</property>
+        <property name="label" translatable="yes">Press to Select</property>
         <property name="use_underline">False</property>
-        <property name="use_markup">True</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
         <property name="justify">GTK_JUSTIFY_LEFT</property>
         <property name="wrap">False</property>
         <property name="selectable">False</property>
@@ -472,9 +492,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="press_to_select_threshold_left_label">
-                <property name="label" translatable="yes" context="threshold">&lt;i&gt;Low&lt;/i&gt;</property>
+                <property name="label" translatable="yes" context="threshold">Low</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                 <attribute name="style" value="italic"/>
+                </attributes>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
@@ -511,9 +533,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="press_to_select_threshold_right_label">
-                <property name="label" translatable="yes" context="threshold">&lt;i&gt;High&lt;/i&gt;</property>
+                <property name="label" translatable="yes" context="threshold">High</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                 <attribute name="style" value="italic"/>
+                </attributes>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
diff --git a/data/touchpad.ui b/data/touchpad.ui
index 872abbd..863b434 100644
--- a/data/touchpad.ui
+++ b/data/touchpad.ui
@@ -156,9 +156,11 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="guest_mouse_label">
-                            <property name="label" translatable="yes">&lt;b&gt;Guest Mouse&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">Guest Mouse</property>
                             <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -185,9 +187,11 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="palm_detection_label">
-                            <property name="label" translatable="yes">&lt;b&gt;Palm Detection&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">Palm Detection</property>
                             <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -244,9 +248,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="palm_detection_width_left_label">
-                                    <property name="label" translatable="yes">&lt;i&gt;Narrow&lt;/i&gt;</property>
+                                    <property name="label" translatable="yes">Narrow</property>
                                     <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
+                                    <attributes>
+                                     <attribute name="style" value="italic"/>
+                                    </attributes>
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="wrap">False</property>
                                     <property name="selectable">False</property>
@@ -283,9 +289,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="palm_detection_width_right_label">
-                                    <property name="label" translatable="yes">&lt;i&gt;Wide&lt;/i&gt;</property>
+                                    <property name="label" translatable="yes">Wide</property>
                                     <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
+                                    <attributes>
+                                     <attribute name="style" value="italic"/>
+                                    </attributes>
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="wrap">False</property>
                                     <property name="selectable">False</property>
@@ -335,9 +343,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="palm_detection_depth_left_label">
-                                    <property name="label" translatable="yes">&lt;i&gt;Low&lt;/i&gt;</property>
+                                    <property name="label" translatable="yes">Low</property>
                                     <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
+                                    <attributes>
+                                     <attribute name="weight" value="bold"/>
+                                    </attributes>
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="wrap">False</property>
                                     <property name="selectable">False</property>
@@ -374,9 +384,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="palm_detection_depth_right_label">
-                                    <property name="label" translatable="yes">&lt;i&gt;High&lt;/i&gt;</property>
+                                    <property name="label" translatable="yes">High</property>
                                     <property name="use_underline">False</property>
-                                    <property name="use_markup">True</property>
+                                    <attributes>
+                                     <attribute name="style" value="italic"/>
+                                    </attributes>
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="wrap">False</property>
                                     <property name="selectable">False</property>
@@ -406,9 +418,11 @@
                         </child>
                         <child>
                           <object class="GtkLabel" id="locked_drags_label">
-                            <property name="label" translatable="yes">&lt;b&gt;Locked Drags&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">Locked Drags</property>
                             <property name="use_underline">False</property>
-                            <property name="use_markup">True</property>
+                            <attributes>
+                             <attribute name="weight" value="bold"/>
+                            </attributes>
                             <property name="justify">GTK_JUSTIFY_LEFT</property>
                             <property name="wrap">False</property>
                             <property name="selectable">False</property>
@@ -462,9 +476,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="locked_drags_timeout_left_label">
-                                <property name="label" translatable="yes" context="timeout">&lt;i&gt;Short&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="timeout">Short</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="weight" value="bold"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -501,9 +517,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="locked_drags_timeout_right_label">
-                                <property name="label" translatable="yes" context="timeout">&lt;i&gt;Long&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="timeout">Long</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -628,9 +646,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label25">
-                                <property name="label" translatable="yes" context="time">&lt;i&gt;Short&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="time">Short</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -667,9 +687,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label26">
-                                <property name="label" translatable="yes" context="time">&lt;i&gt;Long&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="time">Long</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -724,9 +746,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="tapping_move_scale_short_label">
-                                <property name="label" translatable="yes" context="distance">&lt;i&gt;Short&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="distance">Short</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -763,9 +787,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="tapping_move_scale_long_labe">
-                                <property name="label" translatable="yes" context="distance">&lt;i&gt;Long&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="distance">Long</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -890,9 +916,11 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="slow_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Slow</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -929,9 +957,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="fast_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Fast</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -980,9 +1010,11 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="low_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Slow</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1019,9 +1051,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="high_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Fast</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1387,9 +1421,11 @@
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label19">
-                    <property name="label" translatable="yes">&lt;b&gt;Scrolling&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Scrolling</property>
                     <property name="use_underline">False</property>
-                    <property name="use_markup">True</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="wrap">False</property>
                     <property name="selectable">False</property>
@@ -1487,9 +1523,11 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="minimum_speed_slow_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Slow</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1526,9 +1564,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="minimum_speed_fast_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Fast</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1583,9 +1623,11 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="maximum_speed_slow_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Slow&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Slow</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1622,9 +1664,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="maximum_speed_fast_label">
-                                <property name="label" translatable="yes">&lt;i&gt;Fast&lt;/i&gt;</property>
+                                <property name="label" translatable="yes">Fast</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1679,9 +1723,11 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="accelaration_factor_low_label">
-                                <property name="label" translatable="yes" context="yes">&lt;i&gt;Low&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="yes">Low</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
@@ -1718,9 +1764,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="accelaration_factor_high_label">
-                                <property name="label" translatable="yes" context="yes">&lt;i&gt;High&lt;/i&gt;</property>
+                                <property name="label" translatable="yes" context="yes">High</property>
                                 <property name="use_underline">False</property>
-                                <property name="use_markup">True</property>
+                                <attributes>
+                                 <attribute name="style" value="italic"/>
+                                </attributes>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                                 <property name="wrap">False</property>
                                 <property name="selectable">False</property>
diff --git a/po/LINGUAS b/po/LINGUAS
index 905c282..f83649b 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -10,6 +10,7 @@ gl
 hu
 id
 ja
+ko
 nb
 pa
 pt
diff --git a/po/et.po b/po/et.po
index d848dd7..62251ed 100644
--- a/po/et.po
+++ b/po/et.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-08 16:50+0000\n"
-"PO-Revision-Date: 2010-09-09 23:25+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
+"POT-Creation-Date: 2012-10-29 13:31+0000\n"
+"PO-Revision-Date: 2012-12-19 16:13+0300\n"
+"Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,12 @@ msgstr ""
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: ESTONIA\n"
 
+msgid "Dry _run"
+msgstr "_Kuivkäivitus"
+
+msgid "_Finish dry run"
+msgstr "_Lõpeta kuivkäivitus"
+
 #, c-format
 msgid "No %s found."
 msgstr "Ühtegi %s ei leitud."
@@ -65,20 +71,25 @@ msgstr "Sellist vidinat pole (%s)."
 #.
 #. vi:ts=4:nowrap:ai:expandtab:sw=4
 #.
-msgid "<b>Middle Button Emulation</b>"
-msgstr "<b>Keskmise klahvi emuleerimine</b>"
+msgid "Middle Button Emulation"
+msgstr "Keskmise nupu emuleerimine"
 
-msgid "<b>Wheel Emulation</b>"
-msgstr "<b>Kerimisratta emuleerimine</b>"
+msgid "Use _middle button emulation"
+msgstr "_Keskmise nupu emuleerimine"
 
-msgid "Enable _horizontal scroll"
-msgstr "_Horisontaalsuunaline kerimine"
+msgid "_timeout:"
+msgstr "_Ajapiirang:"
 
-msgid "Enable _vertical scroll"
-msgstr "_Vertikaalsuunaline kerimine"
+msgctxt "timeout"
+msgid "Short"
+msgstr "Lühike"
 
-msgid "Use _middle button emulation"
-msgstr "_Keskmise nupu emuleerimine"
+msgctxt "timeout"
+msgid "Long"
+msgstr "Pikk"
+
+msgid "Wheel Emulation"
+msgstr "Kerimisratta emuleerimine"
 
 msgid "Use _wheel emulation"
 msgstr "_Kerimisratta emuleerimine"
@@ -86,174 +97,179 @@ msgstr "_Kerimisratta emuleerimine"
 msgid "_button:"
 msgstr "_Nupp:"
 
+msgid "tim_eout:"
+msgstr "_Ajapiirang:"
+
 msgid "_inertia:"
 msgstr "_Inertsus:"
 
-msgid "_timeout:"
-msgstr "_Ajapiirang:"
-
 msgctxt "inertia"
-msgid "<i>Long</i>"
-msgstr "<i>Raske</i>"
+msgid "Short"
+msgstr "Kerge"
 
 msgctxt "inertia"
-msgid "<i>Short</i>"
-msgstr "<i>Kerge</i>"
+msgid "Long"
+msgstr "Raske"
 
-msgid "tim_eout:"
-msgstr "_Ajapiirang:"
+msgid "Enable _vertical scroll"
+msgstr "_Vertikaalsuunaline kerimine"
 
-msgctxt "timeout"
-msgid "<i>Long</i>"
-msgstr "<i>Pikk</i>"
+msgid "Enable _horizontal scroll"
+msgstr "_Horisontaalsuunaline kerimine"
 
-msgctxt "timeout"
-msgid "<i>Short</i>"
-msgstr "<i>Lühike</i>"
+msgid "_Disable touchpad"
+msgstr "_Puuteplaat on keelatud"
 
-msgid "<b>Guest Mouse</b>"
-msgstr "<b>Väline hiir</b>"
+msgid "Disable _tapping and scrolling"
+msgstr "_Koputamine ja kerimine keelatud"
 
-msgid "<b>Locked Drags</b>"
-msgstr "<b>Lohistamise lukk</b>"
+msgid "Disable while any _other devices are connected"
+msgstr "Keelatud, kui mõni _teine seade on ühendatud"
 
-msgid "<b>Palm Detection</b>"
-msgstr "<b>Peopesa tuvastus</b>"
+msgid "Guest Mouse"
+msgstr "Väline hiir"
 
-msgid "<b>Scrolling</b>"
-msgstr "<b>Kerimine</b>"
+msgid "Set _guest mouse off"
+msgstr "_Väline hiir on välja lülitatud"
 
-msgid "<i>Fast</i>"
-msgstr "<i>Kiire</i>"
+msgid "Palm Detection"
+msgstr "Peopesa tuvastus"
 
-msgid "<i>High</i>"
-msgstr "<i>Kõrge</i>"
+msgid "Enable _palm detection"
+msgstr "_Peopesa tuvastus lubatud"
 
-msgid "<i>Low</i>"
-msgstr "<i>Madal</i>"
+msgid "_range:"
+msgstr "_Ulatus:"
 
-msgid "<i>Narrow</i>"
-msgstr "<i>Kitsas</i>"
+msgid "Narrow"
+msgstr "Kitsas"
 
-msgid "<i>Slow</i>"
-msgstr "<i>Aeglane</i>"
+msgid "Wide"
+msgstr "Lai"
 
-msgid "<i>Wide</i>"
-msgstr "<i>Lai</i>"
+msgid "pre_ssure:"
+msgstr "_Surve:"
 
-msgid "Acceleration"
-msgstr "Kiirendus"
+msgid "Low"
+msgstr "Väike"
 
-msgid "Disable _tapping"
-msgstr "_Koputamine keelatud"
+msgid "High"
+msgstr "Suur"
 
-msgid "Disable _tapping and scrolling"
-msgstr "_Koputamine ja kerimine keelatud"
+msgid "Locked Drags"
+msgstr "Lohistamise lukk"
 
-msgid "Disable while any _other devices are connected"
-msgstr "Keelatud, kui mõni _teine seade on ühendatud"
+msgid "Enable _locked drags"
+msgstr "_Lohistamislukk lubatud"
 
-msgid "Enable Ci_rcular scrolling"
-msgstr "_Ringkerimine lubatud"
+msgid "General"
+msgstr "Üldine"
 
-msgid "Enable _faster tapping"
-msgstr "_Kiire koputamine lubatud"
+msgid "Disable _tapping"
+msgstr "_Koputamine keelatud"
 
-msgid "Enable _horizontal scrolling"
-msgstr "_Horisontaalne kerimine lubatud"
+msgid "Tapping time: "
+msgstr "Koputuse kestus: "
 
-msgid "Enable _locked drags"
-msgstr "_Lohistamislukk lubatud"
+msgctxt "time"
+msgid "Short"
+msgstr "Lühike"
 
-msgid "Enable _palm detection"
-msgstr "_Peopesa tuvastus lubatud"
+msgctxt "time"
+msgid "Long"
+msgstr "Pikk"
 
-msgid "Enable _vertical scrolling"
-msgstr "_Vertikaalne kerimine lubatud"
+msgid "Tapping move: "
+msgstr "Koputuse nihe:"
 
-msgid "Enable continuous edge scrolling"
-msgstr "Serva jõudes kerimine ei peatu"
+msgctxt "distance"
+msgid "Short"
+msgstr "Lühike"
 
-msgid "Enable horizontal scrolling when dragging with two fingers"
-msgstr "Kahe sõrmega lohistamisel keritakse horisontaalsuunas"
+msgctxt "distance"
+msgid "Long"
+msgstr "Pikk"
 
-msgid "Enable vertical scrolling when dragging with two fingers"
-msgstr "Kahe sõrmega lohistamisel keritakse vertikaalsuunas"
+msgid "Enable _faster tapping"
+msgstr "_Kiire koputamine lubatud"
 
-msgid "General"
-msgstr "Üldine"
+msgid "Tapping"
+msgstr "Koputus"
 
-msgid "Maximum speed"
-msgstr "Suurim kiirus"
+msgid "Enable _vertical scrolling"
+msgstr "_Vertikaalne kerimine lubatud"
 
-msgid "Mimimum speed"
-msgstr "Väikseim kiirus"
+msgid "Slow"
+msgstr "Aeglane"
 
-msgid "Scrolling"
-msgstr "Kerimine"
+msgid "Fast"
+msgstr "Kiire"
 
-msgid "Set _guest mouse off"
-msgstr "_Külalishiir välja lülitatud"
+msgid "Enable _horizontal scrolling"
+msgstr "_Horisontaalne kerimine lubatud"
 
-msgid "Speed"
-msgstr "Kiirus"
+msgid "Enable continuous edge scrolling"
+msgstr "Serva jõudes kerimine ei peatu"
+
+msgid "Enable Ci_rcular scrolling"
+msgstr "_Ringkerimine lubatud"
 
 msgid "Start point of circular scrolling:"
 msgstr "Ringkerimise alguspunkt:"
 
-msgid "Tapping"
-msgstr "Koputus"
+msgid "Enable vertical scrolling when dragging with two fingers"
+msgstr "Kahe sõrmega lohistamisel keritakse vertikaalsuunas"
 
-msgid "Tapping move: "
-msgstr "Koputuse nihe:"
+msgid "Enable horizontal scrolling when dragging with two fingers"
+msgstr "Kahe sõrmega lohistamisel keritakse horisontaalsuunas"
 
-msgid "Tapping time: "
-msgstr "Koputuse kestus:"
+msgid "Scrolling"
+msgstr "Kerimine"
 
-msgid "_Disable touchpad"
-msgstr "_Puuteplaat on keelatud"
+msgid "Mimimum speed"
+msgstr "Väikseim kiirus"
 
-msgid "_range:"
-msgstr "_Ulatus:"
+msgid "Maximum speed"
+msgstr "Suurim kiirus"
 
-msgctxt "distance"
-msgid "<i>Long</i>"
-msgstr "<i>Kauge</i>"
+msgid "Acceleration"
+msgstr "Kiirendus"
 
-msgctxt "distance"
-msgid "<i>Short</i>"
-msgstr "<i>Lühike</i>"
+msgctxt "yes"
+msgid "Low"
+msgstr "Aeglane"
 
-msgid "pre_ssure:"
-msgstr "_Surve:"
+msgctxt "yes"
+msgid "High"
+msgstr "Kiire"
 
-msgctxt "time"
-msgid "<i>Long</i>"
-msgstr "<i>Pikk</i>"
+msgid "Speed"
+msgstr "Kiirus"
 
-msgctxt "time"
-msgid "<i>Short</i>"
-msgstr "<i>Lühike</i>"
+msgid "Sensitivity"
+msgstr "Tundlikkus"
 
-msgctxt "yes"
-msgid "<i>High</i>"
-msgstr "<i>Kõrge</i>"
+msgid "_Sensitivity:"
+msgstr "_Tundlikkus:"
 
-msgctxt "yes"
-msgid "<i>Low</i>"
-msgstr "<i>Madal</i>"
+msgctxt "sensitivity"
+msgid "Low"
+msgstr "Tundetu"
 
-msgid "<b>Press to Select</b>"
-msgstr "<b>Valimiseks klõpsa</b>"
+msgctxt "sensitivity"
+msgid "High"
+msgstr "Tundlik"
 
-msgid "<b>Sensitivity</b>"
-msgstr "<b>Tundlikkus</b>"
+msgid "_Speed:"
+msgstr "_Kiirus:"
 
-msgid "<b>Speed</b>"
-msgstr "<b>Kiirus</b>"
+msgctxt "speed"
+msgid "Slow"
+msgstr "Aeglane"
 
-msgid "Enable _Press to Select"
-msgstr "_Surumisel tehakse hiireklõps"
+msgctxt "speed"
+msgid "Fast"
+msgstr "Kiire"
 
 msgid "Enable sc_rolling"
 msgstr "_Kerimine lubatud"
@@ -261,38 +277,22 @@ msgstr "_Kerimine lubatud"
 msgid "Middle button _timeout:"
 msgstr "Kesknupu _ajapiir:"
 
-msgid "T_hreshold:"
-msgstr "_Lävi:"
-
-msgid "_Sensitivity:"
-msgstr "_Tundlikkus:"
-
-msgid "_Speed:"
-msgstr "_Kiirus:"
-
-msgctxt "sensitivity"
-msgid "<i>High</i>"
-msgstr "<i>Tundlik</i>"
-
-msgctxt "sensitivity"
-msgid "<i>Low</i>"
-msgstr "<i>Tuim</i>"
+msgid "Press to Select"
+msgstr "Valimiseks klõpsa"
 
-msgctxt "speed"
-msgid "<i>Fast</i>"
-msgstr "<i>Kiire</i>"
+msgid "Enable _Press to Select"
+msgstr "_Vajutusel tehakse hiireklõps"
 
-msgctxt "speed"
-msgid "<i>Slow</i>"
-msgstr "<i>Aeglane</i>"
+msgid "T_hreshold:"
+msgstr "_Lävi:"
 
 msgctxt "threshold"
-msgid "<i>High</i>"
-msgstr "<i>Kõrge</i>"
+msgid "Low"
+msgstr "Madal"
 
 msgctxt "threshold"
-msgid "<i>Low</i>"
-msgstr "<i>Madal</i>"
+msgid "High"
+msgstr "Kõrge"
 
 msgid "Enable pointing-device plugin"
 msgstr "Osutamisseadme plugina lubamine"
diff --git a/po/hu.po b/po/hu.po
index 04d9d04..a8e86a4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,20 +4,30 @@
 #
 # Németh Tamás <ntomasz at uhuklub dot hu>, 2010.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2010.
+# Balázs Úr <urbalazs at gmail dot com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-14 12:25+0200\n"
-"PO-Revision-Date: 2010-09-14 12:25+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
+"POT-Creation-Date: 2012-10-29 13:31+0000\n"
+"PO-Revision-Date: 2013-01-06 17:33+0100\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: ../src/gpds-main-window.c:322 ../src/gpds-main-window.c:458
+msgid "Dry _run"
+msgstr "_Próbaüzem"
+
+#: ../src/gpds-main-window.c:572
+msgid "_Finish dry run"
+msgstr "Próbaü_zem befejezése"
+
 #: ../src/gpds-xinput-ui.c:95 ../src/gpds-xinput-utils.c:60
 #, c-format
 msgid "No %s found."
@@ -73,306 +83,304 @@ msgstr "Nincs felületi elem (%s)."
 #. vi:ts=4:nowrap:ai:expandtab:sw=4
 #.
 #: ../data/mouse.ui.h:1
-msgid "<b>Middle Button Emulation</b>"
-msgstr "<b>Középső gomb emulálása</b>"
+#| msgid "<b>Middle Button Emulation</b>"
+msgid "Middle Button Emulation"
+msgstr "Középső gomb emulációja"
 
 #: ../data/mouse.ui.h:2
-msgid "<b>Wheel Emulation</b>"
-msgstr "<b>Görgő emulálása</b>"
+msgid "Use _middle button emulation"
+msgstr "_Középső gomb emulálásának engedélyezése"
 
-#: ../data/mouse.ui.h:3
-msgid "Enable _horizontal scroll"
-msgstr "_Vízszintes görgetés engedélyezése"
+#: ../data/mouse.ui.h:3 ../data/touchpad.ui.h:16
+msgid "_timeout:"
+msgstr "_időkorlát:"
 
-#: ../data/mouse.ui.h:4
-msgid "Enable _vertical scroll"
-msgstr "_Függőleges görgetés engedélyezése"
+#: ../data/mouse.ui.h:4 ../data/touchpad.ui.h:17 ../data/pointingstick.ui.h:12
+msgctxt "timeout"
+msgid "Short"
+msgstr "Rövid"
 
-#: ../data/mouse.ui.h:5
-msgid "Use _middle button emulation"
-msgstr "_Középső gomb emulálásának engedélyezése"
+#: ../data/mouse.ui.h:5 ../data/touchpad.ui.h:18 ../data/pointingstick.ui.h:13
+msgctxt "timeout"
+msgid "Long"
+msgstr "Hosszú"
 
 #: ../data/mouse.ui.h:6
+#| msgid "<b>Wheel Emulation</b>"
+msgid "Wheel Emulation"
+msgstr "Görgő emulációja"
+
+#: ../data/mouse.ui.h:7
 msgid "Use _wheel emulation"
 msgstr "_Görgő emulálásának engedélyezése"
 
-#: ../data/mouse.ui.h:7
+#: ../data/mouse.ui.h:8
 msgid "_button:"
 msgstr "g_omb:"
 
-#: ../data/mouse.ui.h:8
-msgid "_inertia:"
-msgstr "_tehetetlenség:"
-
-#: ../data/mouse.ui.h:9 ../data/touchpad.ui.h:36
-msgid "_timeout:"
-msgstr "_időkorlát:"
+#: ../data/mouse.ui.h:9
+msgid "tim_eout:"
+msgstr "i_dőkorlát:"
 
 #: ../data/mouse.ui.h:10
-msgctxt "inertia"
-msgid "<i>Long</i>"
-msgstr "<i>Hosszú</i>"
+msgid "_inertia:"
+msgstr "_tehetetlenség:"
 
 #: ../data/mouse.ui.h:11
 msgctxt "inertia"
-msgid "<i>Short</i>"
-msgstr "<i>Rövid</i>"
+msgid "Short"
+msgstr "Rövid"
 
 #: ../data/mouse.ui.h:12
-msgid "tim_eout:"
-msgstr "i_dőkorlát:"
+msgctxt "inertia"
+msgid "Long"
+msgstr "Hosszú"
 
-#: ../data/mouse.ui.h:13 ../data/touchpad.ui.h:42
-#: ../data/pointingstick.ui.h:17
-msgctxt "timeout"
-msgid "<i>Long</i>"
-msgstr "<i>Hosszú</i>"
+#: ../data/mouse.ui.h:13
+msgid "Enable _vertical scroll"
+msgstr "_Függőleges görgetés engedélyezése"
 
-#: ../data/mouse.ui.h:14 ../data/touchpad.ui.h:43
-#: ../data/pointingstick.ui.h:18
-msgctxt "timeout"
-msgid "<i>Short</i>"
-msgstr "<i>Rövid</i>"
+#: ../data/mouse.ui.h:14
+msgid "Enable _horizontal scroll"
+msgstr "_Vízszintes görgetés engedélyezése"
 
 #: ../data/touchpad.ui.h:1
-msgid "<b>Guest Mouse</b>"
-msgstr "<b>Vendégegér</b>"
+msgid "_Disable touchpad"
+msgstr "É_rintőtábla kikapcsolása"
 
 #: ../data/touchpad.ui.h:2
-msgid "<b>Locked Drags</b>"
-msgstr "<b>Zárolt húzások</b>"
+msgid "Disable _tapping and scrolling"
+msgstr "K_oppintás és görgetés tiltása"
 
 #: ../data/touchpad.ui.h:3
-msgid "<b>Palm Detection</b>"
-msgstr "<b>Tenyérfelismerés</b>"
+msgid "Disable while any _other devices are connected"
+msgstr "Kikapcsolás, ha _más eszköz is csatlakoztatva van"
 
-#: ../data/touchpad.ui.h:4 ../data/pointingstick.ui.h:2
-msgid "<b>Scrolling</b>"
-msgstr "<b>Görgetés</b>"
+#: ../data/touchpad.ui.h:4
+#| msgid "<b>Guest Mouse</b>"
+msgid "Guest Mouse"
+msgstr "Vendégegér"
 
 #: ../data/touchpad.ui.h:5
-msgid "<i>Fast</i>"
-msgstr "<i>Gyors</i>"
+msgid "Set _guest mouse off"
+msgstr "_Vendégegér kikapcsolása"
 
 #: ../data/touchpad.ui.h:6
-msgid "<i>High</i>"
-msgstr "<i>Magas</i>"
+#| msgid "<b>Palm Detection</b>"
+msgid "Palm Detection"
+msgstr "Tenyérfelismerés"
 
 #: ../data/touchpad.ui.h:7
-msgid "<i>Low</i>"
-msgstr "<i>Alacsony</i>"
+msgid "Enable _palm detection"
+msgstr "_Tenyérfelismerés engedélyezése"
 
 #: ../data/touchpad.ui.h:8
-msgid "<i>Narrow</i>"
-msgstr "<i>Keskeny</i>"
+msgid "_range:"
+msgstr "te_rület:"
 
 #: ../data/touchpad.ui.h:9
-msgid "<i>Slow</i>"
-msgstr "<i>Lassú</i>"
+#| msgid "<i>Narrow</i>"
+msgid "Narrow"
+msgstr "Keskeny"
 
 #: ../data/touchpad.ui.h:10
-msgid "<i>Wide</i>"
-msgstr "<i>Széles</i>"
+msgid "Wide"
+msgstr "Széles"
 
 #: ../data/touchpad.ui.h:11
-msgid "Acceleration"
-msgstr "Gyorsítás"
+msgid "pre_ssure:"
+msgstr "nyo_más:"
 
 #: ../data/touchpad.ui.h:12
-msgid "Disable _tapping"
-msgstr "Koppi_ntás tiltása"
+msgid "Low"
+msgstr "Alacsony"
 
 #: ../data/touchpad.ui.h:13
-msgid "Disable _tapping and scrolling"
-msgstr "K_oppintás és görgetés tiltása"
+msgid "High"
+msgstr "Magas"
 
 #: ../data/touchpad.ui.h:14
-msgid "Disable while any _other devices are connected"
-msgstr "Kikapcsolás, ha _más eszköz is csatlakoztatva van"
+#| msgid "<b>Locked Drags</b>"
+msgid "Locked Drags"
+msgstr "Zárolt húzások"
 
 #: ../data/touchpad.ui.h:15
-msgid "Enable Ci_rcular scrolling"
-msgstr "_Körkörös görgetés engedélyezése"
-
-#: ../data/touchpad.ui.h:16
-msgid "Enable _faster tapping"
-msgstr "Gyo_rsabb koppintás engedélyezése"
-
-#: ../data/touchpad.ui.h:17
-msgid "Enable _horizontal scrolling"
-msgstr "_Vízszintes görgetés engedélyezése"
-
-#: ../data/touchpad.ui.h:18
 msgid "Enable _locked drags"
 msgstr "_Zárolt húzások engedélyezése"
 
 #: ../data/touchpad.ui.h:19
-msgid "Enable _palm detection"
-msgstr "_Tenyérfelismerés engedélyezése"
+msgid "General"
+msgstr "Általános"
 
 #: ../data/touchpad.ui.h:20
-msgid "Enable _vertical scrolling"
-msgstr "_Függőleges görgetés engedélyezése"
+msgid "Disable _tapping"
+msgstr "Koppi_ntás tiltása"
 
 #: ../data/touchpad.ui.h:21
-msgid "Enable continuous edge scrolling"
-msgstr "Folyamatos szélen görgetés engedélyezése"
+msgid "Tapping time: "
+msgstr "Koppintás ideje: "
 
 #: ../data/touchpad.ui.h:22
-msgid "Enable horizontal scrolling when dragging with two fingers"
-msgstr "Vízszintes görgetés engedélyezése kétujjas húzáskor"
+msgctxt "time"
+msgid "Short"
+msgstr "Rövid"
 
 #: ../data/touchpad.ui.h:23
-msgid "Enable vertical scrolling when dragging with two fingers"
-msgstr "Függőleges görgetés engedélyezése kétujjas húzáskor"
+msgctxt "time"
+msgid "Long"
+msgstr "Hosszú"
 
 #: ../data/touchpad.ui.h:24
-msgid "General"
-msgstr "Általános"
+msgid "Tapping move: "
+msgstr "Koppintás mozgása: "
 
 #: ../data/touchpad.ui.h:25
-msgid "Maximum speed"
-msgstr "Maximum sebesség"
+msgctxt "distance"
+msgid "Short"
+msgstr "Rövid"
 
 #: ../data/touchpad.ui.h:26
-msgid "Mimimum speed"
-msgstr "Minimum sebesség"
+msgctxt "distance"
+msgid "Long"
+msgstr "Hosszú"
 
 #: ../data/touchpad.ui.h:27
-msgid "Scrolling"
-msgstr "Görgetés"
+msgid "Enable _faster tapping"
+msgstr "Gyo_rsabb koppintás engedélyezése"
 
 #: ../data/touchpad.ui.h:28
-msgid "Set _guest mouse off"
-msgstr "_Vendégegér kikapcsolása"
+msgid "Tapping"
+msgstr "Koppintás"
 
 #: ../data/touchpad.ui.h:29
-msgid "Speed"
-msgstr "Sebesség"
+msgid "Enable _vertical scrolling"
+msgstr "_Függőleges görgetés engedélyezése"
 
 #: ../data/touchpad.ui.h:30
-msgid "Start point of circular scrolling:"
-msgstr "A körkörös görgetés kezdőpontja:"
+msgid "Slow"
+msgstr "Lassú"
 
 #: ../data/touchpad.ui.h:31
-msgid "Tapping"
-msgstr "Koppintás"
+msgid "Fast"
+msgstr "Gyors"
 
 #: ../data/touchpad.ui.h:32
-msgid "Tapping move: "
-msgstr "Koppintás mozgása: "
+msgid "Enable _horizontal scrolling"
+msgstr "_Vízszintes görgetés engedélyezése"
 
 #: ../data/touchpad.ui.h:33
-msgid "Tapping time: "
-msgstr "Koppintás ideje: "
+msgid "Enable continuous edge scrolling"
+msgstr "Folyamatos szélen görgetés engedélyezése"
 
 #: ../data/touchpad.ui.h:34
-msgid "_Disable touchpad"
-msgstr "É_rintőtábla kikapcsolása"
+msgid "Enable Ci_rcular scrolling"
+msgstr "_Körkörös görgetés engedélyezése"
 
 #: ../data/touchpad.ui.h:35
-msgid "_range:"
-msgstr "te_rület:"
+msgid "Start point of circular scrolling:"
+msgstr "A körkörös görgetés kezdőpontja:"
+
+#: ../data/touchpad.ui.h:36
+msgid "Enable vertical scrolling when dragging with two fingers"
+msgstr "Függőleges görgetés engedélyezése kétujjas húzáskor"
 
 #: ../data/touchpad.ui.h:37
-msgctxt "distance"
-msgid "<i>Long</i>"
-msgstr "<i>Hosszú</i>"
+msgid "Enable horizontal scrolling when dragging with two fingers"
+msgstr "Vízszintes görgetés engedélyezése kétujjas húzáskor"
 
-#: ../data/touchpad.ui.h:38
-msgctxt "distance"
-msgid "<i>Short</i>"
-msgstr "<i>Rövid</i>"
+#: ../data/touchpad.ui.h:38 ../data/pointingstick.ui.h:9
+msgid "Scrolling"
+msgstr "Görgetés"
 
 #: ../data/touchpad.ui.h:39
-msgid "pre_ssure:"
-msgstr "nyo_más:"
+msgid "Mimimum speed"
+msgstr "Minimum sebesség"
 
 #: ../data/touchpad.ui.h:40
-msgctxt "time"
-msgid "<i>Long</i>"
-msgstr "<i>Hosszú</i>"
+msgid "Maximum speed"
+msgstr "Maximum sebesség"
 
 #: ../data/touchpad.ui.h:41
-msgctxt "time"
-msgid "<i>Short</i>"
-msgstr "<i>Rövid</i>"
+msgid "Acceleration"
+msgstr "Gyorsítás"
 
-#: ../data/touchpad.ui.h:44
+#: ../data/touchpad.ui.h:42
 msgctxt "yes"
-msgid "<i>High</i>"
-msgstr "<i>Magas</i>"
+msgid "Low"
+msgstr "Alacsony"
 
-#: ../data/touchpad.ui.h:45
+#: ../data/touchpad.ui.h:43
 msgctxt "yes"
-msgid "<i>Low</i>"
-msgstr "<i>Alacsony</i>"
+msgid "High"
+msgstr "Magas"
+
+#: ../data/touchpad.ui.h:44 ../data/pointingstick.ui.h:5
+msgid "Speed"
+msgstr "Sebesség"
 
 #: ../data/pointingstick.ui.h:1
-msgid "<b>Press to Select</b>"
-msgstr "<b>Lenyomás kijelöléshez</b>"
+#| msgid "_Sensitivity:"
+msgid "Sensitivity"
+msgstr "Érzékenység"
+
+#: ../data/pointingstick.ui.h:2
+msgid "_Sensitivity:"
+msgstr "É_rzékenység:"
 
 #: ../data/pointingstick.ui.h:3
-msgid "<b>Sensitivity</b>"
-msgstr "<b>Érzékenység</b>"
+msgctxt "sensitivity"
+msgid "Low"
+msgstr "Alacsony"
 
 #: ../data/pointingstick.ui.h:4
-msgid "<b>Speed</b>"
-msgstr "<b>Sebesség</b>"
-
-#: ../data/pointingstick.ui.h:5
-msgid "Enable _Press to Select"
-msgstr "_Lenyomás kijelöléshez engedélyezése"
+msgctxt "sensitivity"
+msgid "High"
+msgstr "Magas"
 
 #: ../data/pointingstick.ui.h:6
-msgid "Enable sc_rolling"
-msgstr "_Görgetés engedélyezése"
+msgid "_Speed:"
+msgstr "S_ebesség:"
 
 #: ../data/pointingstick.ui.h:7
-msgid "Middle button _timeout:"
-msgstr "Középső gomb i_dőkorlátja:"
+msgctxt "speed"
+msgid "Slow"
+msgstr "Lassú"
 
 #: ../data/pointingstick.ui.h:8
-msgid "T_hreshold:"
-msgstr "_Küszöb:"
-
-#: ../data/pointingstick.ui.h:9
-msgid "_Sensitivity:"
-msgstr "É_rzékenység:"
+msgctxt "speed"
+msgid "Fast"
+msgstr "Gyors"
 
 #: ../data/pointingstick.ui.h:10
-msgid "_Speed:"
-msgstr "S_ebesség:"
+msgid "Enable sc_rolling"
+msgstr "_Görgetés engedélyezése"
 
 #: ../data/pointingstick.ui.h:11
-msgctxt "sensitivity"
-msgid "<i>High</i>"
-msgstr "<i>Magas</i>"
-
-#: ../data/pointingstick.ui.h:12
-msgctxt "sensitivity"
-msgid "<i>Low</i>"
-msgstr "<i>Alacsony</i>"
-
-#: ../data/pointingstick.ui.h:13
-msgctxt "speed"
-msgid "<i>Fast</i>"
-msgstr "<i>Gyors</i>"
+msgid "Middle button _timeout:"
+msgstr "Középső gomb i_dőkorlátja:"
 
 #: ../data/pointingstick.ui.h:14
-msgctxt "speed"
-msgid "<i>Slow</i>"
-msgstr "<i>Lassú</i>"
+#| msgid "<b>Press to Select</b>"
+msgid "Press to Select"
+msgstr "Lenyomás kijelöléshez"
 
 #: ../data/pointingstick.ui.h:15
-msgctxt "threshold"
-msgid "<i>High</i>"
-msgstr "<i>Magas</i>"
+msgid "Enable _Press to Select"
+msgstr "_Lenyomás kijelöléshez engedélyezése"
 
 #: ../data/pointingstick.ui.h:16
+msgid "T_hreshold:"
+msgstr "_Küszöb:"
+
+#: ../data/pointingstick.ui.h:17
+msgctxt "threshold"
+msgid "Low"
+msgstr "Alacsony"
+
+#: ../data/pointingstick.ui.h:18
 msgctxt "threshold"
-msgid "<i>Low</i>"
-msgstr "<i>Alacsony</i>"
+msgid "High"
+msgstr "Magas"
 
 #: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:1
 msgid "Enable pointing-device plugin"
@@ -391,10 +399,90 @@ msgstr "Mutatóeszközök"
 msgid "Set your pointing devices preferences"
 msgstr "A mutatóeszközök tulajdonságainak beállítása"
 
-#: ../src/gpds-main-window.c:322 ../src/gpds-main-window.c:458
-msgid "Dry _run"
-msgstr "_Próbaüzem"
+#~ msgctxt "inertia"
+#~ msgid "<i>Long</i>"
+#~ msgstr "<i>Hosszú</i>"
 
-#: ../src/gpds-main-window.c:572
-msgid "_Finish dry run"
-msgstr "Próbaü_zem befejezése"
+#~ msgctxt "inertia"
+#~ msgid "<i>Short</i>"
+#~ msgstr "<i>Rövid</i>"
+
+#~ msgctxt "timeout"
+#~ msgid "<i>Long</i>"
+#~ msgstr "<i>Hosszú</i>"
+
+#~ msgctxt "timeout"
+#~ msgid "<i>Short</i>"
+#~ msgstr "<i>Rövid</i>"
+
+#~ msgid "<b>Scrolling</b>"
+#~ msgstr "<b>Görgetés</b>"
+
+#~ msgid "<i>Fast</i>"
+#~ msgstr "<i>Gyors</i>"
+
+#~ msgid "<i>High</i>"
+#~ msgstr "<i>Magas</i>"
+
+#~ msgid "<i>Low</i>"
+#~ msgstr "<i>Alacsony</i>"
+
+#~ msgid "<i>Slow</i>"
+#~ msgstr "<i>Lassú</i>"
+
+#~ msgid "<i>Wide</i>"
+#~ msgstr "<i>Széles</i>"
+
+#~ msgctxt "distance"
+#~ msgid "<i>Long</i>"
+#~ msgstr "<i>Hosszú</i>"
+
+#~ msgctxt "distance"
+#~ msgid "<i>Short</i>"
+#~ msgstr "<i>Rövid</i>"
+
+#~ msgctxt "time"
+#~ msgid "<i>Long</i>"
+#~ msgstr "<i>Hosszú</i>"
+
+#~ msgctxt "time"
+#~ msgid "<i>Short</i>"
+#~ msgstr "<i>Rövid</i>"
+
+#~ msgctxt "yes"
+#~ msgid "<i>High</i>"
+#~ msgstr "<i>Magas</i>"
+
+#~ msgctxt "yes"
+#~ msgid "<i>Low</i>"
+#~ msgstr "<i>Alacsony</i>"
+
+#~ msgid "<b>Sensitivity</b>"
+#~ msgstr "<b>Érzékenység</b>"
+
+#~ msgid "<b>Speed</b>"
+#~ msgstr "<b>Sebesség</b>"
+
+#~ msgctxt "sensitivity"
+#~ msgid "<i>High</i>"
+#~ msgstr "<i>Magas</i>"
+
+#~ msgctxt "sensitivity"
+#~ msgid "<i>Low</i>"
+#~ msgstr "<i>Alacsony</i>"
+
+#~ msgctxt "speed"
+#~ msgid "<i>Fast</i>"
+#~ msgstr "<i>Gyors</i>"
+
+#~ msgctxt "speed"
+#~ msgid "<i>Slow</i>"
+#~ msgstr "<i>Lassú</i>"
+
+#~ msgctxt "threshold"
+#~ msgid "<i>High</i>"
+#~ msgstr "<i>Magas</i>"
+
+#~ msgctxt "threshold"
+#~ msgid "<i>Low</i>"
+#~ msgstr "<i>Alacsony</i>"
diff --git a/po/id.po b/po/id.po
index 2f300c7..ce0c628 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,24 +1,33 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Indonesian translation of gpointing-device-settings
+# Copyright (C) YEAR THE gpointing-device-settings' COPYRIGHT HOLDER
+# This file is distributed under the same license as the gpointing-device-settings package.
 # Imam Musthaqim <userindesign@gmail.com>, 2009.
+# Andika Triwidada <andika@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gpointing-device-settings master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-21 07:23+0000\n"
-"PO-Revision-Date: 2010-04-14 11:15+0700\n"
+"POT-Creation-Date: 2011-01-03 22:20+0000\n"
+"PO-Revision-Date: 2012-09-17 11:33+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: INDONESIA <userindsign@gmail.com>\n"
+"Language-Team: INDONESIA <gnome@i15n.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: INDONESIA\n"
+"Language: id_ID\n"
+"X-Generator: Poedit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/gpds-xinput-ui.c:95
-#: ../src/gpds-xinput-utils.c:60
+#: ../src/gpds-main-window.c:322 ../src/gpds-main-window.c:458
+msgid "Dry _run"
+msgstr "Uji _coba"
+
+#: ../src/gpds-main-window.c:572
+msgid "_Finish dry run"
+msgstr "_Akhiri uji coba"
+
+#: ../src/gpds-xinput-ui.c:95 ../src/gpds-xinput-utils.c:60
 #, c-format
 msgid "No %s found."
 msgstr "Tidak ada %s yang ditemukan."
@@ -28,15 +37,12 @@ msgstr "Tidak ada %s yang ditemukan."
 msgid "An X error occurred. The error was %s."
 msgstr "Terjadi kesalahan X. Kesalahannya adalah %s."
 
-#: ../src/gpds-xinput.c:306
-#: ../src/gpds-xinput.c:324
-#: ../src/gpds-xinput.c:342
+#: ../src/gpds-xinput.c:306 ../src/gpds-xinput.c:324 ../src/gpds-xinput.c:342
 #, c-format
 msgid "There is no registered property for %d."
 msgstr "Tidak ada properti terdaftar untuk %d."
 
-#: ../src/gpds-xinput.c:444
-#: ../src/gpds-xinput.c:611
+#: ../src/gpds-xinput.c:444 ../src/gpds-xinput.c:611
 #, c-format
 msgid ""
 "Format type is mismatched.\n"
@@ -45,25 +51,28 @@ msgstr ""
 "Jenis format tidak cocok.\n"
 "%s ditentukan tapi %s kembali."
 
-#: ../src/gpds-xinput-utils.c:107
+#: ../src/gpds-xinput-utils.c:87
+#, c-format
+msgid "No device found for %d."
+msgstr "Tak ditemukan perangkat bagi %d."
+
+#: ../src/gpds-xinput-utils.c:134
 #, c-format
 msgid "Could not open %s device."
 msgstr "Tidak dapat membuka perangkat %s."
 
-#: ../src/gpds-xinput-utils.c:124
+#: ../src/gpds-xinput-utils.c:151
 #, c-format
 msgid "No float atom in XServer"
 msgstr "Tidak ada atom mengambang dalam XServer"
 
-#: ../modules/gpds-touchpad-ui.c:1155
-#: ../modules/gpds-mouse-ui.c:513
+#: ../modules/gpds-touchpad-ui.c:1155 ../modules/gpds-mouse-ui.c:513
 #: ../modules/gpds-pointingstick-ui.c:242
 #, c-format
 msgid "%s did not find."
 msgstr "%s tidak menemukan."
 
-#: ../modules/gpds-touchpad-ui.c:1329
-#: ../modules/gpds-mouse-ui.c:656
+#: ../modules/gpds-touchpad-ui.c:1329 ../modules/gpds-mouse-ui.c:656
 #: ../modules/gpds-pointingstick-ui.c:405
 #, c-format
 msgid "There is no widget(%s)."
@@ -81,50 +90,63 @@ msgid "<b>Wheel Emulation</b>"
 msgstr "<b>Emulasi Roda</b>"
 
 #: ../data/mouse.ui.h:3
-#: ../data/touchpad.ui.h:7
-#: ../data/pointingstick.ui.h:7
-msgid "<i>Long</i>"
-msgstr "<i>Panjang</i>"
-
-#: ../data/mouse.ui.h:4
-#: ../data/touchpad.ui.h:10
-#: ../data/pointingstick.ui.h:9
-msgid "<i>Short</i>"
-msgstr "<i>Pendek</i>"
-
-#: ../data/mouse.ui.h:5
 msgid "Enable _horizontal scroll"
 msgstr "Aktifkan gulir _horizontal"
 
-#: ../data/mouse.ui.h:6
+#: ../data/mouse.ui.h:4
 msgid "Enable _vertical scroll"
 msgstr "Aktifkan gulir _vertikal"
 
-#: ../data/mouse.ui.h:7
+#: ../data/mouse.ui.h:5
 msgid "Use _middle button emulation"
 msgstr "Gunakan emulasi tombol _tengah"
 
-#: ../data/mouse.ui.h:8
+#: ../data/mouse.ui.h:6
 msgid "Use _wheel emulation"
 msgstr "Gunakan emulasi _roda"
 
-#: ../data/mouse.ui.h:9
+#: ../data/mouse.ui.h:7
 msgid "_button:"
 msgstr "_tombol:"
 
-#: ../data/mouse.ui.h:10
+#: ../data/mouse.ui.h:8
 msgid "_inertia:"
 msgstr "_inersia:"
 
-#: ../data/mouse.ui.h:11
-#: ../data/touchpad.ui.h:38
+#: ../data/mouse.ui.h:9 ../data/touchpad.ui.h:36
 msgid "_timeout:"
 msgstr "batas _waktu:"
 
+#: ../data/mouse.ui.h:10
+#| msgid "<i>Long</i>"
+msgctxt "inertia"
+msgid "<i>Long</i>"
+msgstr "<i>Panjang</i>"
+
+#: ../data/mouse.ui.h:11
+#| msgid "<i>Short</i>"
+msgctxt "inertia"
+msgid "<i>Short</i>"
+msgstr "<i>Pendek</i>"
+
 #: ../data/mouse.ui.h:12
 msgid "tim_eout:"
 msgstr "batas _waktu:"
 
+#: ../data/mouse.ui.h:13 ../data/touchpad.ui.h:42
+#: ../data/pointingstick.ui.h:17
+#| msgid "<i>Long</i>"
+msgctxt "timeout"
+msgid "<i>Long</i>"
+msgstr "<i>Lama</i>"
+
+#: ../data/mouse.ui.h:14 ../data/touchpad.ui.h:43
+#: ../data/pointingstick.ui.h:18
+#| msgid "<i>Short</i>"
+msgctxt "timeout"
+msgid "<i>Short</i>"
+msgstr "<i>Sebentar</i>"
+
 #: ../data/touchpad.ui.h:1
 msgid "<b>Guest Mouse</b>"
 msgstr "<b>Mouse Tamu</b>"
@@ -137,147 +159,175 @@ msgstr "<b>Seret Terkunci</b>"
 msgid "<b>Palm Detection</b>"
 msgstr "<b>Deteksi Telapak Tangan</b>"
 
-#: ../data/touchpad.ui.h:4
-#: ../data/pointingstick.ui.h:2
+#: ../data/touchpad.ui.h:4 ../data/pointingstick.ui.h:2
 msgid "<b>Scrolling</b>"
 msgstr "<b>Menggulir</b>"
 
 #: ../data/touchpad.ui.h:5
-#: ../data/pointingstick.ui.h:5
 msgid "<i>Fast</i>"
 msgstr "<i>Cepat</i>"
 
 #: ../data/touchpad.ui.h:6
-#: ../data/pointingstick.ui.h:6
 msgid "<i>High</i>"
 msgstr "<i>Tinggi</i>"
 
-#: ../data/touchpad.ui.h:8
-#: ../data/pointingstick.ui.h:8
+#: ../data/touchpad.ui.h:7
 msgid "<i>Low</i>"
 msgstr "<i>Rendah</i>"
 
-#: ../data/touchpad.ui.h:9
+#: ../data/touchpad.ui.h:8
 msgid "<i>Narrow</i>"
 msgstr "<i>Sempit</i>"
 
-#: ../data/touchpad.ui.h:11
-#: ../data/pointingstick.ui.h:10
+#: ../data/touchpad.ui.h:9
 msgid "<i>Slow</i>"
 msgstr "<i>Lambat</i>"
 
-#: ../data/touchpad.ui.h:12
+#: ../data/touchpad.ui.h:10
 msgid "<i>Wide</i>"
 msgstr "<i>Lebar</i>"
 
-#: ../data/touchpad.ui.h:13
+#: ../data/touchpad.ui.h:11
 msgid "Acceleration"
 msgstr "Akselerasi"
 
-#: ../data/touchpad.ui.h:14
-#| msgid "Enable _faster tapping"
+#: ../data/touchpad.ui.h:12
 msgid "Disable _tapping"
 msgstr "Matikan ke_tukan"
 
-#: ../data/touchpad.ui.h:15
-#| msgid "Enable _vertical scrolling"
+#: ../data/touchpad.ui.h:13
 msgid "Disable _tapping and scrolling"
 msgstr "Matikan ke_tukan dan gulir"
 
-#: ../data/touchpad.ui.h:16
+#: ../data/touchpad.ui.h:14
 msgid "Disable while any _other devices are connected"
 msgstr "Matikan ketika perangkat la_in sedang tersambung"
 
-#: ../data/touchpad.ui.h:17
+#: ../data/touchpad.ui.h:15
 msgid "Enable Ci_rcular scrolling"
 msgstr "Aktifkan gulir Melingka_r"
 
-#: ../data/touchpad.ui.h:18
+#: ../data/touchpad.ui.h:16
 msgid "Enable _faster tapping"
 msgstr "Aktifkan ketukan yang _lebih cepat"
 
-#: ../data/touchpad.ui.h:19
+#: ../data/touchpad.ui.h:17
 msgid "Enable _horizontal scrolling"
 msgstr "Aktifkan gulir _horizontal"
 
-#: ../data/touchpad.ui.h:20
+#: ../data/touchpad.ui.h:18
 msgid "Enable _locked drags"
 msgstr "Aktifkan seret _terkunci"
 
-#: ../data/touchpad.ui.h:21
+#: ../data/touchpad.ui.h:19
 msgid "Enable _palm detection"
 msgstr "Aktifkan deteksi _telapak tangan"
 
-#: ../data/touchpad.ui.h:22
+#: ../data/touchpad.ui.h:20
 msgid "Enable _vertical scrolling"
 msgstr "Aktifkan gulir _vertikal"
 
-#: ../data/touchpad.ui.h:23
+#: ../data/touchpad.ui.h:21
 msgid "Enable continuous edge scrolling"
 msgstr "Aktifkan gulir pinggir kontinu"
 
-#: ../data/touchpad.ui.h:24
+#: ../data/touchpad.ui.h:22
 msgid "Enable horizontal scrolling when dragging with two fingers"
 msgstr "Aktifkan gulir horizontal saat menyeret dengan dua jari"
 
-#: ../data/touchpad.ui.h:25
+#: ../data/touchpad.ui.h:23
 msgid "Enable vertical scrolling when dragging with two fingers"
 msgstr "Aktifkan gulir vertikal saat menyeret dengan dua jari"
 
-#: ../data/touchpad.ui.h:26
+#: ../data/touchpad.ui.h:24
 msgid "General"
 msgstr "Umum"
 
-#: ../data/touchpad.ui.h:27
+#: ../data/touchpad.ui.h:25
 msgid "Maximum speed"
 msgstr "Kecepatan maksimum"
 
-#: ../data/touchpad.ui.h:28
+#: ../data/touchpad.ui.h:26
 msgid "Mimimum speed"
 msgstr "Kecepatan minimum"
 
-#: ../data/touchpad.ui.h:29
+#: ../data/touchpad.ui.h:27
 msgid "Scrolling"
 msgstr "Menggulir"
 
-#: ../data/touchpad.ui.h:30
+#: ../data/touchpad.ui.h:28
 msgid "Set _guest mouse off"
 msgstr "Matikan _mouse tamu"
 
-#: ../data/touchpad.ui.h:31
+#: ../data/touchpad.ui.h:29
 msgid "Speed"
 msgstr "Kecepatan"
 
-#: ../data/touchpad.ui.h:32
+#: ../data/touchpad.ui.h:30
 msgid "Start point of circular scrolling:"
 msgstr "Titik awal gulir melingkar:"
 
-#: ../data/touchpad.ui.h:33
+#: ../data/touchpad.ui.h:31
 msgid "Tapping"
 msgstr "Mengetuk"
 
-#: ../data/touchpad.ui.h:34
+#: ../data/touchpad.ui.h:32
 msgid "Tapping move: "
 msgstr "Gerakan mengetuk:"
 
-#: ../data/touchpad.ui.h:35
+#: ../data/touchpad.ui.h:33
 msgid "Tapping time: "
 msgstr "Waktu mengetuk:"
 
-#: ../data/touchpad.ui.h:36
+#: ../data/touchpad.ui.h:34
 msgid "_Disable touchpad"
 msgstr "Matikan bi_dang sentuh"
 
-#: ../data/touchpad.ui.h:37
+#: ../data/touchpad.ui.h:35
 msgid "_range:"
 msgstr "_jangkauan:"
 
+#: ../data/touchpad.ui.h:37
+#| msgid "<i>Long</i>"
+msgctxt "distance"
+msgid "<i>Long</i>"
+msgstr "<i>Jauh</i>"
+
+#: ../data/touchpad.ui.h:38
+#| msgid "<i>Short</i>"
+msgctxt "distance"
+msgid "<i>Short</i>"
+msgstr "<i>Dekat</i>"
+
 #: ../data/touchpad.ui.h:39
 msgid "pre_ssure:"
 msgstr "te_kanan:"
 
+#: ../data/touchpad.ui.h:40
+#| msgid "<i>Long</i>"
+msgctxt "time"
+msgid "<i>Long</i>"
+msgstr "<i>Lama</i>"
+
+#: ../data/touchpad.ui.h:41
+#| msgid "<i>Short</i>"
+msgctxt "time"
+msgid "<i>Short</i>"
+msgstr "<i>Sebentar</i>"
+
+#: ../data/touchpad.ui.h:44
+#| msgid "<i>High</i>"
+msgctxt "yes"
+msgid "<i>High</i>"
+msgstr "<i>Tinggi</i>"
+
+#: ../data/touchpad.ui.h:45
+#| msgid "<i>Low</i>"
+msgctxt "yes"
+msgid "<i>Low</i>"
+msgstr "<i>Rendah</i>"
+
 #: ../data/pointingstick.ui.h:1
-#| msgid "<b>Palm Detection</b>"
 msgid "<b>Press to Select</b>"
 msgstr "<b>Tekan untuk Memilih</b>"
 
@@ -286,50 +336,84 @@ msgid "<b>Sensitivity</b>"
 msgstr "<b>Kepekaan</b>"
 
 #: ../data/pointingstick.ui.h:4
-#| msgid "<b>Guest Mouse</b>"
 msgid "<b>Speed</b>"
 msgstr "<b>Kecepatan</b>"
 
-#: ../data/pointingstick.ui.h:11
+#: ../data/pointingstick.ui.h:5
 msgid "Enable _Press to Select"
 msgstr "Aktifkan _Tekan untuk Memilih"
 
-#: ../data/pointingstick.ui.h:12
-#| msgid "Enable Ci_rcular scrolling"
+#: ../data/pointingstick.ui.h:6
 msgid "Enable sc_rolling"
 msgstr "Aktifkan guli_r"
 
-#: ../data/pointingstick.ui.h:13
-#| msgid "Use _middle button emulation"
+#: ../data/pointingstick.ui.h:7
 msgid "Middle button _timeout:"
 msgstr "Timeout tombol _tengah:"
 
-#: ../data/pointingstick.ui.h:14
+#: ../data/pointingstick.ui.h:8
 msgid "T_hreshold:"
 msgstr "A_mbang:"
 
-#: ../data/pointingstick.ui.h:15
+#: ../data/pointingstick.ui.h:9
 msgid "_Sensitivity:"
 msgstr "_Kepekaan:"
 
-#: ../data/pointingstick.ui.h:16
+#: ../data/pointingstick.ui.h:10
 msgid "_Speed:"
 msgstr "_Kecepatan:"
 
+#: ../data/pointingstick.ui.h:11
+#| msgid "<i>High</i>"
+msgctxt "sensitivity"
+msgid "<i>High</i>"
+msgstr "<i>Tinggi</i>"
+
+#: ../data/pointingstick.ui.h:12
+#| msgid "<i>Low</i>"
+msgctxt "sensitivity"
+msgid "<i>Low</i>"
+msgstr "<i>Rendah</i>"
+
+#: ../data/pointingstick.ui.h:13
+#| msgid "<i>Fast</i>"
+msgctxt "speed"
+msgid "<i>Fast</i>"
+msgstr "<i>Cepat</i>"
+
+#: ../data/pointingstick.ui.h:14
+#| msgid "<i>Slow</i>"
+msgctxt "speed"
+msgid "<i>Slow</i>"
+msgstr "<i>Lambat</i>"
+
+#: ../data/pointingstick.ui.h:15
+#| msgid "<i>High</i>"
+msgctxt "threshold"
+msgid "<i>High</i>"
+msgstr "<i>Tinggi</i>"
+
+#: ../data/pointingstick.ui.h:16
+#| msgid "<i>Low</i>"
+msgctxt "threshold"
+msgid "<i>Low</i>"
+msgstr "<i>Rendah</i>"
+
 #: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:1
 msgid "Enable pointing-device plugin"
 msgstr "Aktifkan plugin perangkat-penunjuk"
 
 #: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:2
-msgid "Set to True to enable the plugin to manage GPointingDeviceSettings settings."
-msgstr "Setel ke Benar untuk memungkinkan plugin mengelola setelan GPointingDeviceSettings."
+msgid ""
+"Set to True to enable the plugin to manage GPointingDeviceSettings settings."
+msgstr ""
+"Setel ke Benar untuk memungkinkan plugin mengelola setelan "
+"GPointingDeviceSettings."
 
 #: ../data/gpointing-device-settings.desktop.in.in.h:1
-#| msgid "GPointing Device Settings"
 msgid "Pointing devices"
 msgstr "Perangkat penunjuk"
 
 #: ../data/gpointing-device-settings.desktop.in.in.h:2
 msgid "Set your pointing devices preferences"
 msgstr "Atur preferensi perangkat penunjuk Anda"
-
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..997ebfd
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,399 @@
+# Korean translation for gpointing-device-settings.
+# Copyright (C) 2012 gpointing-device-settings's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gpointing-device-settings package.
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gpointing-device-settings master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-20 11:31+0000\n"
+"PO-Revision-Date: 2012-09-03 04:58+0900\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"Language-Team: Korean <gnome-kr@googlegroups.com>\n"
+"Language: ko\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"
+
+#: ../src/gpds-main-window.c:322 ../src/gpds-main-window.c:458
+msgid "Dry _run"
+msgstr "시험 실행(_R)"
+
+#: ../src/gpds-main-window.c:572
+msgid "_Finish dry run"
+msgstr "시험 실행 끝내기(_F)"
+
+#: ../src/gpds-xinput-ui.c:95 ../src/gpds-xinput-utils.c:60
+#, c-format
+msgid "No %s found."
+msgstr "%s을(를) 찾을 수 없습니다."
+
+#: ../src/gpds-xinput.c:220
+#, c-format
+msgid "An X error occurred. The error was %s."
+msgstr "X에 오류가 발생했습니다. 오류는 %s 입니다."
+
+#: ../src/gpds-xinput.c:306 ../src/gpds-xinput.c:324 ../src/gpds-xinput.c:342
+#, c-format
+msgid "There is no registered property for %d."
+msgstr "%d에 대한 등록 속성이 없습니다."
+
+#: ../src/gpds-xinput.c:444 ../src/gpds-xinput.c:611
+#, c-format
+msgid ""
+"Format type is mismatched.\n"
+"%s is specified but %s returns."
+msgstr ""
+"형식이 일치하지 않습니다.\n"
+"%s(으)로 정했지만 %s을(를) 반환했습니다."
+
+#: ../src/gpds-xinput-utils.c:87
+#, c-format
+msgid "No device found for %d."
+msgstr "%d에 대한 장치가 없습니다."
+
+#: ../src/gpds-xinput-utils.c:134
+#, c-format
+msgid "Could not open %s device."
+msgstr "%s 장치를 열 수 없습니다."
+
+#: ../src/gpds-xinput-utils.c:151
+#, c-format
+msgid "No float atom in XServer"
+msgstr "X 서버에 플로트 요소가 없습니다"
+
+#: ../modules/gpds-touchpad-ui.c:1155 ../modules/gpds-mouse-ui.c:513
+#: ../modules/gpds-pointingstick-ui.c:242
+#, c-format
+msgid "%s did not find."
+msgstr "%s을(를) 찾지 못했습니다."
+
+#: ../modules/gpds-touchpad-ui.c:1329 ../modules/gpds-mouse-ui.c:656
+#: ../modules/gpds-pointingstick-ui.c:405
+#, c-format
+msgid "There is no widget(%s)."
+msgstr "위젯(%s)이 없습니다."
+
+#.
+#. vi:ts=4:nowrap:ai:expandtab:sw=4
+#.
+#: ../data/mouse.ui.h:1
+msgid "<b>Middle Button Emulation</b>"
+msgstr "<b>가운데 단추 흉내내기</b>"
+
+#: ../data/mouse.ui.h:2
+msgid "Use _middle button emulation"
+msgstr "가운데 단추 흉내내기 사용(_M)"
+
+#: ../data/mouse.ui.h:3 ../data/touchpad.ui.h:16
+msgid "_timeout:"
+msgstr "제한 시간(_T):"
+
+#: ../data/mouse.ui.h:4 ../data/touchpad.ui.h:17 ../data/pointingstick.ui.h:12
+msgctxt "timeout"
+msgid "<i>Short</i>"
+msgstr "<i>짧게</i>"
+
+#: ../data/mouse.ui.h:5 ../data/touchpad.ui.h:18 ../data/pointingstick.ui.h:13
+msgctxt "timeout"
+msgid "<i>Long</i>"
+msgstr "<i>길게</i>"
+
+#: ../data/mouse.ui.h:6
+msgid "<b>Wheel Emulation</b>"
+msgstr "<b>휠 흉내내기</b>"
+
+#: ../data/mouse.ui.h:7
+msgid "Use _wheel emulation"
+msgstr "휠 흉내내기 사용(_W)"
+
+#: ../data/mouse.ui.h:8
+msgid "_button:"
+msgstr "단추(_B):"
+
+#: ../data/mouse.ui.h:9
+msgid "tim_eout:"
+msgstr "제한 시간(_E):"
+
+#: ../data/mouse.ui.h:10
+msgid "_inertia:"
+msgstr "관성(_I):"
+
+#: ../data/mouse.ui.h:11
+msgctxt "inertia"
+msgid "<i>Short</i>"
+msgstr "<i>짧게</i>"
+
+#: ../data/mouse.ui.h:12
+msgctxt "inertia"
+msgid "<i>Long</i>"
+msgstr "<i>길게</i>"
+
+#: ../data/mouse.ui.h:13
+msgid "Enable _vertical scroll"
+msgstr "수직 스크롤 활성화(_V)"
+
+#: ../data/mouse.ui.h:14
+msgid "Enable _horizontal scroll"
+msgstr "수평 스크롤 활성화(_H)"
+
+#: ../data/touchpad.ui.h:1
+msgid "_Disable touchpad"
+msgstr "터치패드 비활성화(_D)"
+
+#: ../data/touchpad.ui.h:2
+msgid "Disable _tapping and scrolling"
+msgstr "탭 동작, 스크롤 비활성화(_T)"
+
+#: ../data/touchpad.ui.h:3
+msgid "Disable while any _other devices are connected"
+msgstr "다른 장치 연결하는 동안 비활성화(_O)"
+
+#: ../data/touchpad.ui.h:4
+msgid "<b>Guest Mouse</b>"
+msgstr "<b>게스트 마우스</b>"
+
+#: ../data/touchpad.ui.h:5
+msgid "Set _guest mouse off"
+msgstr "게스트 마우스 비활성화 설정(_G)"
+
+#: ../data/touchpad.ui.h:6
+msgid "<b>Palm Detection</b>"
+msgstr "<b>손바닥 감지</b>"
+
+#: ../data/touchpad.ui.h:7
+msgid "Enable _palm detection"
+msgstr "손바닥 감지 활성화(_P)"
+
+#: ../data/touchpad.ui.h:8
+msgid "_range:"
+msgstr "범위(_R):"
+
+#: ../data/touchpad.ui.h:9
+msgid "<i>Narrow</i>"
+msgstr "<i>좁게</i>"
+
+#: ../data/touchpad.ui.h:10
+msgid "<i>Wide</i>"
+msgstr "<i>넓게</i>"
+
+#: ../data/touchpad.ui.h:11
+msgid "pre_ssure:"
+msgstr "압력(_S):"
+
+#: ../data/touchpad.ui.h:12
+msgid "<i>Low</i>"
+msgstr "<i>낮게</i>"
+
+#: ../data/touchpad.ui.h:13
+msgid "<i>High</i>"
+msgstr "<i>높게</i>"
+
+#: ../data/touchpad.ui.h:14
+msgid "<b>Locked Drags</b>"
+msgstr "<b>드래그 잠금</b>"
+
+#: ../data/touchpad.ui.h:15
+msgid "Enable _locked drags"
+msgstr "드래그 잠금 활성화(_L)"
+
+#: ../data/touchpad.ui.h:19
+msgid "General"
+msgstr "일반"
+
+#: ../data/touchpad.ui.h:20
+msgid "Disable _tapping"
+msgstr "탭 동작 비활성화(_T)"
+
+#: ../data/touchpad.ui.h:21
+msgid "Tapping time: "
+msgstr "탭 동작 시간:"
+
+#: ../data/touchpad.ui.h:22
+msgctxt "time"
+msgid "<i>Short</i>"
+msgstr "<i>짧게</i>"
+
+#: ../data/touchpad.ui.h:23
+msgctxt "time"
+msgid "<i>Long</i>"
+msgstr "<i>길게</i>"
+
+#: ../data/touchpad.ui.h:24
+msgid "Tapping move: "
+msgstr "탭 동작 이동:"
+
+#: ../data/touchpad.ui.h:25
+msgctxt "distance"
+msgid "<i>Short</i>"
+msgstr "<i>짧게</i>"
+
+#: ../data/touchpad.ui.h:26
+msgctxt "distance"
+msgid "<i>Long</i>"
+msgstr "<i>길게</i>"
+
+#: ../data/touchpad.ui.h:27
+msgid "Enable _faster tapping"
+msgstr "빠른 탭 동작 활성화(_F)"
+
+#: ../data/touchpad.ui.h:28
+msgid "Tapping"
+msgstr "탭 동작"
+
+#: ../data/touchpad.ui.h:29
+msgid "Enable _vertical scrolling"
+msgstr "수직 스크롤 활성화(_V)"
+
+#: ../data/touchpad.ui.h:30
+msgid "<i>Slow</i>"
+msgstr "<i>느리게</i>"
+
+#: ../data/touchpad.ui.h:31
+msgid "<i>Fast</i>"
+msgstr "<i>빠르게</i>"
+
+#: ../data/touchpad.ui.h:32
+msgid "Enable _horizontal scrolling"
+msgstr "수평 스크롤 활성화(_H)"
+
+#: ../data/touchpad.ui.h:33
+msgid "Enable continuous edge scrolling"
+msgstr "연속 모서리 스크롤 활성화"
+
+#: ../data/touchpad.ui.h:34
+msgid "Enable Ci_rcular scrolling"
+msgstr "회전 스크롤 활성화(_R)"
+
+#: ../data/touchpad.ui.h:35
+msgid "Start point of circular scrolling:"
+msgstr "회전 스크롤 시작점:"
+
+#: ../data/touchpad.ui.h:36
+msgid "Enable vertical scrolling when dragging with two fingers"
+msgstr "두 손가락으로 끌어 움직일 때 수직 스크롤 활성화"
+
+#: ../data/touchpad.ui.h:37
+msgid "Enable horizontal scrolling when dragging with two fingers"
+msgstr "두 손가락으로 끌어 움직일 때 수평 스크롤 활성화"
+
+#: ../data/touchpad.ui.h:38 ../data/pointingstick.ui.h:9
+msgid "<b>Scrolling</b>"
+msgstr "<b>스크롤</b>"
+
+#: ../data/touchpad.ui.h:39
+msgid "Scrolling"
+msgstr "스크롤"
+
+#: ../data/touchpad.ui.h:40
+msgid "Mimimum speed"
+msgstr "최소 속도"
+
+#: ../data/touchpad.ui.h:41
+msgid "Maximum speed"
+msgstr "최대 속도"
+
+#: ../data/touchpad.ui.h:42
+msgid "Acceleration"
+msgstr "가속도"
+
+#: ../data/touchpad.ui.h:43
+msgctxt "yes"
+msgid "<i>Low</i>"
+msgstr "<i>낮게</i>"
+
+#: ../data/touchpad.ui.h:44
+msgctxt "yes"
+msgid "<i>High</i>"
+msgstr "<i>높게</i>"
+
+#: ../data/touchpad.ui.h:45
+msgid "Speed"
+msgstr "속도"
+
+#: ../data/pointingstick.ui.h:1
+msgid "<b>Sensitivity</b>"
+msgstr "<b>민감도</b>"
+
+#: ../data/pointingstick.ui.h:2
+msgid "_Sensitivity:"
+msgstr "민감도(_S):"
+
+#: ../data/pointingstick.ui.h:3
+msgctxt "sensitivity"
+msgid "<i>Low</i>"
+msgstr "<i>낮게</i>"
+
+#: ../data/pointingstick.ui.h:4
+msgctxt "sensitivity"
+msgid "<i>High</i>"
+msgstr "<i>높게</i>"
+
+#: ../data/pointingstick.ui.h:5
+msgid "<b>Speed</b>"
+msgstr "<b>속도</b>"
+
+#: ../data/pointingstick.ui.h:6
+msgid "_Speed:"
+msgstr "속도(_S):"
+
+#: ../data/pointingstick.ui.h:7
+msgctxt "speed"
+msgid "<i>Slow</i>"
+msgstr "<i>느리게</i>"
+
+#: ../data/pointingstick.ui.h:8
+msgctxt "speed"
+msgid "<i>Fast</i>"
+msgstr "<i>빠르게</i>"
+
+#: ../data/pointingstick.ui.h:10
+msgid "Enable sc_rolling"
+msgstr "스크롤 활성화(_R)"
+
+#: ../data/pointingstick.ui.h:11
+msgid "Middle button _timeout:"
+msgstr "가운데 단추 제한 시간(_T):"
+
+#: ../data/pointingstick.ui.h:14
+msgid "<b>Press to Select</b>"
+msgstr "<b>눌러서 선택</b>"
+
+#: ../data/pointingstick.ui.h:15
+msgid "Enable _Press to Select"
+msgstr "눌러서 선택 활성화(_P)"
+
+#: ../data/pointingstick.ui.h:16
+msgid "T_hreshold:"
+msgstr "임계값(_H):"
+
+#: ../data/pointingstick.ui.h:17
+msgctxt "threshold"
+msgid "<i>Low</i>"
+msgstr "<i>낮게</i>"
+
+#: ../data/pointingstick.ui.h:18
+msgctxt "threshold"
+msgid "<i>High</i>"
+msgstr "<i>높게</i>"
+
+#: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:1
+msgid "Enable pointing-device plugin"
+msgstr "포인팅 장치 플러그인 활성화"
+
+#: ../data/gpointing-device-settings_gnome_settings_daemon.schemas.in.h:2
+msgid ""
+"Set to True to enable the plugin to manage GPointingDeviceSettings settings."
+msgstr ""
+"GPointingDeviceSettings 설정을 관리하기 위한 플러그인을 활성화 하려면 표시하"
+"십시오."
+
+#: ../data/gpointing-device-settings.desktop.in.in.h:1
+msgid "Pointing devices"
+msgstr "포인팅 장치"
+
+#: ../data/gpointing-device-settings.desktop.in.in.h:2
+msgid "Set your pointing devices preferences"
+msgstr "포인팅 장치 기본 설정을 설정합니다"