[gnumeric] GTK_STOCK: The war continues.

[Morten Welinder <mortenw src gnome org>]

commit 08a76b717243fe3aa9732ef1bbf2603fdc728258
Author: Morten Welinder <terra gnome org>
Date:   Sat Dec 27 20:56:23 2014 -0500

    GTK_STOCK: The war continues.

 po/da.po                |    6 ++----
 src/item-cursor.c       |    2 +-
 src/sheet-control-gui.c |   20 ++++++++++----------
 src/wbc-gtk-actions.c   |   10 +++++-----
 src/wbc-gtk.c           |    2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/po/da.po b/po/da.po
index 2cbfb75..fe741d9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6049,17 +6049,15 @@ msgstr "_Filtrér"
 #. Row specific (Note some labels duplicate col labels)
 #: ../src/dialogs/dialog-data-slicer.c:141 ../src/sheet-control-gui.c:2274
 #: ../src/tools/analysis-tools.c:224 ../src/tools/analysis-tools.c:2886
-#, fuzzy
 msgid "Row"
-msgstr "_Række"
+msgstr "Række"
 
 #. end sub menu
 #. Column specific (Note some labels duplicate row labels)
 #: ../src/dialogs/dialog-data-slicer.c:142 ../src/sheet-control-gui.c:2266
 #: ../src/tools/analysis-tools.c:224 ../src/tools/analysis-tools.c:2887
-#, fuzzy
 msgid "Column"
-msgstr "_Kolonne"
+msgstr "Kolonne"
 
 #: ../src/dialogs/dialog-data-slicer.c:143 ../src/dialogs/dialog-stf.ui.h:31
 #, fuzzy
diff --git a/src/item-cursor.c b/src/item-cursor.c
index b20fe63..7fccddb 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -814,7 +814,7 @@ item_cursor_popup_menu (GnmItemCursor *ic, GdkEvent *event)
                { N_("_Move"),          NULL,
                    0, 0, ACTION_MOVE_CELLS },
 
-               { N_("_Copy"),          GTK_STOCK_COPY,
+               { N_("_Copy"), "edit-copy",
                    0, 0, ACTION_COPY_CELLS },
 
                { N_("Copy _Formats"),          NULL,
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index a4fcdac..fd5aa68 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -2164,13 +2164,13 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
        };
 
        static GnumericPopupMenuElement popup_elements[] = {
-               { N_("Cu_t"),           GTK_STOCK_CUT,
+               { N_("Cu_t"),           "edit-cut",
                    0, 0, CONTEXT_CUT, NULL },
-               { N_("_Copy"),          GTK_STOCK_COPY,
+               { N_("_Copy"),          "edit-copy",
                    0, 0, CONTEXT_COPY, NULL },
-               { N_("_Paste"),         GTK_STOCK_PASTE,
+               { N_("_Paste"),         "edit-paste",
                    0, 0, CONTEXT_PASTE, NULL },
-               { N_("Paste _Special"), NULL,
+               { N_("Paste _Special"), "edit-paste",
                    0, CONTEXT_DISABLE_PASTE_SPECIAL, CONTEXT_PASTE_SPECIAL, NULL },
 
                { "", NULL, 0, 0, 0, NULL },
@@ -2178,7 +2178,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
                { N_("_Insert Cells..."),       NULL,
                    CONTEXT_DISPLAY_FOR_CELLS,
                  CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION, CONTEXT_INSERT, NULL },
-               { N_("_Delete Cells..."),       GTK_STOCK_DELETE,
+               { N_("_Delete Cells..."), "edit-delete",
                    CONTEXT_DISPLAY_FOR_CELLS,
                  CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION, CONTEXT_DELETE, NULL },
                { N_("_Insert Column(s)"), "gnumeric-column-add",
@@ -2198,7 +2198,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
                  CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
                  CONTEXT_DELETE, NULL },
 
-               { N_("Clear Co_ntents"), GTK_STOCK_CLEAR,
+               { N_("Clear Co_ntents"), "edit-clear",
                    0, 0, CONTEXT_CLEAR_CONTENT, NULL },
 
                { "", NULL, CONTEXT_DISPLAY_FOR_CELLS, 0, 0, NULL },
@@ -2232,16 +2232,16 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
                { N_("DataSlicer Field _Order "), NULL,
                     CONTEXT_DISPLAY_WITH_DATA_SLICER_ROW | CONTEXT_DISPLAY_WITH_DATA_SLICER_COL, 0,
                     -1, NULL },        /* start sub menu */
-               { N_("Left"), GTK_STOCK_GO_BACK,
+               { N_("Left"), "go-previous",
                     CONTEXT_DISPLAY_WITH_DATA_SLICER_ROW, 0,
                     CONTEXT_DATA_SLICER_REFRESH, NULL },
-               { N_("Right"), GTK_STOCK_GO_FORWARD,
+               { N_("Right"), "go-next",
                     CONTEXT_DISPLAY_WITH_DATA_SLICER_ROW, 0,
                     CONTEXT_DATA_SLICER_REFRESH, NULL },
-               { N_("Up"), GTK_STOCK_GO_UP,
+               { N_("Up"), "go-up",
                     CONTEXT_DISPLAY_WITH_DATA_SLICER_COL, 0,
                     CONTEXT_DATA_SLICER_REFRESH, NULL },
-               { N_("Down"), GTK_STOCK_GO_DOWN,
+               { N_("Down"), "go-down",
                     CONTEXT_DISPLAY_WITH_DATA_SLICER_COL, 0,
                     CONTEXT_DATA_SLICER_REFRESH, NULL },
                { "",   NULL,
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 4be6256..fd87f13 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -2910,11 +2910,11 @@ static GtkToggleActionEntry const font_toggle_actions[] = {
 /****************************************************************************/
 
 static GOActionComboPixmapsElement const halignment_combo_info[] = {
-       { N_("Align left"),             GTK_STOCK_JUSTIFY_LEFT,         GNM_HALIGN_LEFT },
-       { N_("Center horizontally"),    GTK_STOCK_JUSTIFY_CENTER,       GNM_HALIGN_CENTER },
-       { N_("Align right"),            GTK_STOCK_JUSTIFY_RIGHT,        GNM_HALIGN_RIGHT },
-       { N_("Fill Horizontally"),      "gnumeric-format-halign-fill",          GNM_HALIGN_FILL },
-       { N_("Justify Horizontally"),   GTK_STOCK_JUSTIFY_FILL,         GNM_HALIGN_JUSTIFY },
+       { N_("Align left"),             "format-justify-left",          GNM_HALIGN_LEFT },
+       { N_("Center horizontally"),    "format-justify-center",        GNM_HALIGN_CENTER },
+       { N_("Align right"),            "format-justify-right",         GNM_HALIGN_RIGHT },
+       { N_("Fill Horizontally"),      "gnumeric-format-halign-fill",  GNM_HALIGN_FILL },
+       { N_("Justify Horizontally"),   "format-justify-fill",          GNM_HALIGN_JUSTIFY },
        { N_("Center horizontally across the selection"),
                                        "gnumeric-center-across-selection", 
GNM_HALIGN_CENTER_ACROSS_SELECTION },
        { N_("Align numbers right, and text left"),
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6e08bf1..da9099c 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3704,7 +3704,7 @@ wbc_gtk_init_font_name (WBCGtk *gtk, gboolean horiz)
                 "visible-horizontal", horiz,
                 "name", (horiz ? "FontName" : "VFontName"),
                 "tooltip", _("Change font"),
-                "stock-id", GTK_STOCK_SELECT_FONT,
+                "icon-name", "gnumeric-font",
                 NULL);
 
        g_object_set_data (G_OBJECT (act), "wbcg", gtk);