[gtkhtml/gnome-3-12] Bug 729958 - Tooltips for emoticons and colors are not translated

[Milan Crha <mcrha src gnome org>]

commit 4a796558855a843bb0d57d1cb996bf6bd4868a86
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 29 17:13:22 2014 +0200

    Bug 729958 - Tooltips for emoticons and colors are not translated

 components/editor/gtkhtml-color-combo.c      |    2 +-
 components/editor/gtkhtml-face-tool-button.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/components/editor/gtkhtml-color-combo.c b/components/editor/gtkhtml-color-combo.c
index cd4d664..a699eb0 100644
--- a/components/editor/gtkhtml-color-combo.c
+++ b/components/editor/gtkhtml-color-combo.c
@@ -1008,7 +1008,7 @@ color_combo_build_popup_window (GtkhtmlColorCombo *combo)
                GdkColor color;
                const gchar *tooltip;
 
-               tooltip = gettext (default_colors[ii].tooltip);
+               tooltip = _(default_colors[ii].tooltip);
                gdk_color_parse (default_colors[ii].color, &color);
                widget = color_combo_new_swatch_button (
                        combo, tooltip, &color);
diff --git a/components/editor/gtkhtml-face-tool-button.c b/components/editor/gtkhtml-face-tool-button.c
index 0ba31e3..946c47c 100644
--- a/components/editor/gtkhtml-face-tool-button.c
+++ b/components/editor/gtkhtml-face-tool-button.c
@@ -624,7 +624,7 @@ face_tool_button_build_popup_window (GtkhtmlFaceToolButton *button)
                gchar *tooltip;
 
                tooltip = face_tool_button_elide_underscores (
-                       gettext (face->label));
+                       _(face->label));
 
                widget = gtk_button_new ();
                gtk_button_set_image (