[gnome-control-center] all: fix up tooltips

[Piotr DrÄg <piotrdrag src gnome org>]

commit 5f124d600810b1a56484bb1957f441eb5f715b16
Author: Piotr DrÄg <piotrdrag gmail com>
Date:   Fri May 18 18:39:31 2012 +0200

    all: fix up tooltips
    
    Idea from commit d5088b2eb1bd5f1501e36ec878e60aa3f6e7241b.

 panels/bluetooth/bluetooth.ui          |    6 +++---
 panels/color/color.ui                  |    9 +++------
 panels/region/gnome-region-panel.ui    |    5 +----
 panels/screen/screen.ui                |    2 +-
 panels/universal-access/uap.ui         |    4 ++--
 panels/wacom/gnome-wacom-properties.ui |    4 ++--
 6 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/panels/bluetooth/bluetooth.ui b/panels/bluetooth/bluetooth.ui
index 63011b6..e398912 100644
--- a/panels/bluetooth/bluetooth.ui
+++ b/panels/bluetooth/bluetooth.ui
@@ -400,7 +400,7 @@
                                    <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="has_tooltip">False</property>
                                    <property name="use_action_appearance">False</property>
                                    <property name="relief">none</property>
                                   </object>
@@ -431,7 +431,7 @@
                                    <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="has_tooltip">False</property>
                                    <property name="use_action_appearance">False</property>
                                    <property name="relief">none</property>
                                   </object>
@@ -462,7 +462,7 @@
                                    <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="has_tooltip">False</property>
                                    <property name="use_action_appearance">False</property>
                                    <property name="relief">none</property>
                                   </object>
diff --git a/panels/color/color.ui b/panels/color/color.ui
index 92abce8..3e8cc8f 100644
--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -235,8 +235,7 @@
                             <property name="visible">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Add a virtual device</property>
-                            <property name="tooltip_text">Add a virtual device</property>
+                            <property name="tooltip_text" translatable="yes">Add a virtual device</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -252,8 +251,7 @@
                             <property name="visible">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove a device</property>
-                            <property name="tooltip_text">Remove a device</property>
+                            <property name="tooltip_text" translatable="yes">Remove a device</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -268,7 +266,7 @@
                             <property name="label" translatable="yes">Set for all users</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_text">Set this profile for all users on this computer</property>
+                            <property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                           </object>
@@ -313,7 +311,6 @@
                             <property name="label" translatable="yes">Calibrateâ</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Calibrate the device</property>
                             <property name="tooltip_text" translatable="yes">Calibrate the device</property>
                             <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
diff --git a/panels/region/gnome-region-panel.ui b/panels/region/gnome-region-panel.ui
index bbffcb7..c4b027d 100644
--- a/panels/region/gnome-region-panel.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -172,7 +172,7 @@
                                 <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="has_tooltip">False</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="relief">none</property>
                                 <property name="uri">http://glade.gnome.org</property>
@@ -898,7 +898,6 @@
                                     <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="has_tooltip">True</property>
-                                    <property name="tooltip_markup" translatable="yes">View and edit keyboard layout options</property>
                                     <property name="tooltip_text" translatable="yes">View and edit keyboard layout options</property>
                                     <property name="use_action_appearance">False</property>
                                     <property name="use_underline">True</property>
@@ -916,8 +915,6 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="has_tooltip">True</property>
-                                    <property name="tooltip_markup" translatable="yes">Replace the current keyboard layout settings with the
-default settings</property>
                                     <property name="tooltip_text" translatable="yes">Replace the current keyboard layout settings with the
 default settings</property>
                                     <property name="use_action_appearance">False</property>
diff --git a/panels/screen/screen.ui b/panels/screen/screen.ui
index 99b8a20..86c645e 100644
--- a/panels/screen/screen.ui
+++ b/panels/screen/screen.ui
@@ -320,7 +320,7 @@
                                 <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="has_tooltip">False</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="relief">none</property>
                                 <property name="image_position">right</property>
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index 1343d1a..8927aa9 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -1028,7 +1028,7 @@
                         <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="has_tooltip">False</property>
                         <property name="relief">none</property>
                       </object>
                       <packing>
@@ -2508,7 +2508,7 @@
                         <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="has_tooltip">False</property>
                         <property name="relief">none</property>
                       </object>
                       <packing>
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index ce0029e..d8fc413 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -133,7 +133,7 @@
                     <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="has_tooltip">False</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
                     <property name="use_action_appearance">False</property>
@@ -266,7 +266,7 @@
                    <property name="visible">False</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
-                   <property name="has_tooltip">True</property>
+                   <property name="has_tooltip">False</property>
                    <property name="use_action_appearance">False</property>
                    <property name="relief">none</property>
                    <property name="halign">end</property>