gtk: Intern css names

This avoids a bunch of strdups at startup.

83 files changed, 92 insertions, 90 deletions

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 7d3b81e549..4188f8140d 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -253,7 +253,7 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
 
   g_object_class_install_properties (gobject_class, LAST_PROP, props);
 
-  gtk_widget_class_set_css_name (widget_class, "accellabel");
+  gtk_widget_class_set_css_name (widget_class, I_("accellabel"));
 }
 
 static void
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index 80b231a79c..1413dbe6c6 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -402,7 +402,7 @@ gtk_action_bar_class_init (GtkActionBarClass *klass)
   g_object_class_install_properties (object_class, LAST_PROP, props);
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
-  gtk_widget_class_set_css_name (widget_class, "actionbar");
+  gtk_widget_class_set_css_name (widget_class, I_("actionbar"));
 }
 
 static void
diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index 91ad228269..f28763f2f1 100644
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -1176,7 +1176,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, program_list_selection_activated);
   gtk_widget_class_bind_template_callback (widget_class, widget_button_press_event_cb);
 
-  gtk_widget_class_set_css_name (widget_class, "appchooser");
+  gtk_widget_class_set_css_name (widget_class, I_("appchooser"));
 }
 
 static void
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 733a1952cc..90ee047262 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -134,7 +134,7 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
-  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "frame");
+  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), I_("frame"));
 }
 
 static void
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index e835917c26..03462d9f62 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -593,7 +593,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_cancel);
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_last);
 
-  gtk_widget_class_set_css_name (widget_class, "assistant");
+  gtk_widget_class_set_css_name (widget_class, I_("assistant"));
 }
 
 static gint
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 2cd1a45da3..5a2203792e 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -172,7 +172,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
                                                                     FALSE,
                                                                     GTK_PARAM_READWRITE));
 
-  gtk_widget_class_set_css_name (widget_class, "buttonbox");
+  gtk_widget_class_set_css_name (widget_class, I_("buttonbox"));
 }
 
 static void
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 7361ce96ef..24b486eca3 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -259,7 +259,7 @@ gtk_box_class_init (GtkBoxClass *class)
   gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, child_props);
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
-  gtk_widget_class_set_css_name (widget_class, "box");
+  gtk_widget_class_set_css_name (widget_class, I_("box"));
 }
 
 static void
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 104e0216b9..99bca66ec5 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -284,7 +284,7 @@ gtk_button_class_init (GtkButtonClass *klass)
   widget_class->activate_signal = button_signals[ACTIVATE];
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index f0ef817840..b6cde75e79 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -640,7 +640,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                   G_TYPE_NONE, 0);
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CALENDAR);
-  gtk_widget_class_set_css_name (widget_class, "calendar");
+  gtk_widget_class_set_css_name (widget_class, I_("calendar"));
 }
 
 static void
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 582ac3f80d..1db7c20cdc 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -747,7 +747,7 @@ gtk_cell_editable_widget_class_init (GtkCellEditableWidgetClass *class)
       g_param_spec_string ("path", NULL, NULL,
                            NULL, GTK_PARAM_READWRITE));
 
-  gtk_widget_class_set_css_name (widget_class, "acceleditor");
+  gtk_widget_class_set_css_name (widget_class, I_("acceleditor"));
 }
 
 static void
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index c41e994e96..3ffffd50a4 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -266,7 +266,7 @@ gtk_cell_view_class_init (GtkCellViewClass *klass)
 							  FALSE,
 							  GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
-  gtk_widget_class_set_css_name (widget_class, "cellview");
+  gtk_widget_class_set_css_name (widget_class, I_("cellview"));
 }
 
 static void
diff --git a/gtk/gtkcenterbox.c b/gtk/gtkcenterbox.c
index 996e1ab305..bfa206141c 100644
--- a/gtk/gtkcenterbox.c
+++ b/gtk/gtkcenterbox.c
@@ -718,7 +718,7 @@ gtk_center_box_class_init (GtkCenterBoxClass *klass)
 
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
-  gtk_widget_class_set_css_name (widget_class, "box");
+  gtk_widget_class_set_css_name (widget_class, I_("box"));
 }
 
 static void
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 596e54d7bc..d67b686c94 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -328,7 +328,7 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
   g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CHECK_BOX);
-  gtk_widget_class_set_css_name (widget_class, "checkbutton");
+  gtk_widget_class_set_css_name (widget_class, I_("checkbutton"));
 }
 
 static void
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index ac80ce3b58..e14687bb59 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -225,7 +225,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                   G_TYPE_NONE, 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "menuitem");
+  gtk_widget_class_set_css_name (widget_class, I_("menuitem"));
 }
 
 /**
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 57b93c77fb..d264b57e72 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -697,7 +697,7 @@ gtk_color_chooser_widget_class_init (GtkColorChooserWidgetClass *class)
       g_param_spec_boolean ("show-editor", P_("Show editor"), P_("Show editor"),
                             FALSE, GTK_PARAM_READWRITE));
 
-  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "colorchooser");
+  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), I_("colorchooser"));
 }
 
 /* GtkColorChooser implementation {{{1 */
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 86964957d2..725943f0b6 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -563,7 +563,7 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
                             TRUE, GTK_PARAM_READWRITE));
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_COLOR_SWATCH_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "colorswatch");
+  gtk_widget_class_set_css_name (widget_class, I_("colorswatch"));
 }
 
 static void
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index c9c1f4844d..304e33d851 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -894,7 +894,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, gtk_combo_box_menu_hide);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_COMBO_BOX_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "combobox");
+  gtk_widget_class_set_css_name (widget_class, I_("combobox"));
 }
 
 static void
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 78e4fe846f..babc37cd0d 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -597,7 +597,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkDialog, action_box);
   gtk_widget_class_bind_template_callback (widget_class, gtk_dialog_delete_event_handler);
 
-  gtk_widget_class_set_css_name (widget_class, "dialog");
+  gtk_widget_class_set_css_name (widget_class, I_("dialog"));
 }
 
 static void
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a7b53eba32..038106e27d 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1878,7 +1878,7 @@ gtk_entry_class_init (GtkEntryClass *class)
 				"toggle-overwrite", 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "entry");
+  gtk_widget_class_set_css_name (widget_class, I_("entry"));
 }
 
 static void
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 6090ef7942..e02ef8881a 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -341,7 +341,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                   G_TYPE_NONE, 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_EXPANDER_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "expander");
+  gtk_widget_class_set_css_name (widget_class, I_("expander"));
 }
 
 static void
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 6f18f6efff..ab7e041cae 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -468,7 +468,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
 
   _gtk_file_chooser_install_properties (gobject_class);
 
-  gtk_widget_class_set_css_name (widget_class, "filechooserbutton");
+  gtk_widget_class_set_css_name (widget_class, I_("filechooserbutton"));
 }
 
 static void
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index ead02131ea..db6b563d91 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -8519,7 +8519,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
   gtk_widget_class_bind_template_callback (widget_class, rename_file_rename_clicked);
   gtk_widget_class_bind_template_callback (widget_class, rename_file_end);
 
-  gtk_widget_class_set_css_name (widget_class, "filechooser");
+  gtk_widget_class_set_css_name (widget_class, I_("filechooser"));
 }
 
 static void
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 1fbdca0946..5043e03ae5 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -471,7 +471,7 @@ gtk_flow_box_child_class_init (GtkFlowBoxChildClass *class)
   widget_class->activate_signal = child_signals[CHILD_ACTIVATE];
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_LIST_ITEM);
-  gtk_widget_class_set_css_name (widget_class, "flowboxchild");
+  gtk_widget_class_set_css_name (widget_class, I_("flowboxchild"));
 }
 
 static void
@@ -3684,7 +3684,7 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
                                 "unselect-all", 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FLOW_BOX_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "flowbox");
+  gtk_widget_class_set_css_name (widget_class, I_("flowbox"));
 }
 
 static void
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 754615f234..04cca0ad75 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -611,7 +611,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                 g_cclosure_marshal_VOID__VOID,
                                                 G_TYPE_NONE, 0);
 
-  gtk_widget_class_set_css_name (widget_class, "fontbutton");
+  gtk_widget_class_set_css_name (widget_class, I_("fontbutton"));
 }
 
 static void
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 2b209b7f6d..824e8ad6f3 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -679,7 +679,7 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, size_change_cb);
   gtk_widget_class_bind_template_callback (widget_class, output_cb);
 
-  gtk_widget_class_set_css_name (widget_class, "fontchooser");
+  gtk_widget_class_set_css_name (widget_class, I_("fontchooser"));
 }
 
 static void
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index cb8225d8ba..455654b623 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -218,7 +218,7 @@ gtk_frame_class_init (GtkFrameClass *class)
   class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "frame");
+  gtk_widget_class_set_css_name (widget_class, I_("frame"));
 }
 
 static void
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 1150dfb7e6..fc9b0e85bc 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1721,7 +1721,7 @@ gtk_grid_class_init (GtkGridClass *class)
                       GTK_PARAM_READWRITE);
 
   gtk_container_class_install_child_properties (container_class, N_CHILD_PROPERTIES, child_properties);
-  gtk_widget_class_set_css_name (widget_class, "grid");
+  gtk_widget_class_set_css_name (widget_class, I_("grid"));
 }
 
 static void
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 0a24db4a40..88bc51318d 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -1977,7 +1977,7 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class)
   g_object_class_install_properties (object_class, LAST_PROP, header_bar_props);
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
-  gtk_widget_class_set_css_name (widget_class, "headerbar");
+  gtk_widget_class_set_css_name (widget_class, I_("headerbar"));
 }
 
 static void
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 751855fbf6..3a3c42a482 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -915,7 +915,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
 				  GTK_MOVEMENT_VISUAL_POSITIONS, -1);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ICON_VIEW_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "iconview");
+  gtk_widget_class_set_css_name (widget_class, I_("iconview"));
 }
 
 static void
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index f9af644ff6..1ff842cfc4 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -271,7 +271,7 @@ gtk_image_class_init (GtkImageClass *class)
   g_object_class_install_properties (gobject_class, NUM_PROPERTIES, image_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_IMAGE_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "image");
+  gtk_widget_class_set_css_name (widget_class, I_("image"));
 }
 
 static void
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 47062a44c3..b5ea64354e 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -408,7 +408,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkInfoBar, close_button);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInfoBar, revealer);
 
-  gtk_widget_class_set_css_name (widget_class, "infobar");
+  gtk_widget_class_set_css_name (widget_class, I_("infobar"));
 }
 
 static void
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f1ed1b3347..ea73ded7f2 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1127,7 +1127,7 @@ gtk_label_class_init (GtkLabelClass *class)
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LABEL_ACCESSIBLE);
 
-  gtk_widget_class_set_css_name (widget_class, "label");
+  gtk_widget_class_set_css_name (widget_class, I_("label"));
 
   quark_shortcuts_connected = g_quark_from_static_string ("gtk-label-shortcuts-connected");
   quark_mnemonic_menu = g_quark_from_static_string ("gtk-mnemonic-menu");
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index d9d60975e0..0d8c304727 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -1059,7 +1059,7 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
   g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
 
   gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE);
-  gtk_widget_class_set_css_name (wclass, "levelbar");
+  gtk_widget_class_set_css_name (wclass, I_("levelbar"));
 }
 
 static void
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index f742169703..41e4bbfa6a 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -209,7 +209,7 @@ gtk_link_button_class_init (GtkLinkButtonClass *klass)
                   G_TYPE_BOOLEAN, 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LINK_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index 9acc954254..103371c31c 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -572,7 +572,7 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
   gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
                                 "unselect-all", 0);
 
-  gtk_widget_class_set_css_name (widget_class, "list");
+  gtk_widget_class_set_css_name (widget_class, I_("list"));
 }
 
 static void
@@ -3362,7 +3362,7 @@ gtk_list_box_row_class_init (GtkListBoxRowClass *klass)
 
   g_object_class_install_properties (object_class, LAST_ROW_PROPERTY, row_properties);
 
-  gtk_widget_class_set_css_name (widget_class, "row");
+  gtk_widget_class_set_css_name (widget_class, I_("row"));
 }
 
 static void
diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
index 39e897479a..7259042e02 100644
--- a/gtk/gtklockbutton.c
+++ b/gtk/gtklockbutton.c
@@ -323,7 +323,7 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, stack);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LOCK_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index d4307ea398..351d227403 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -933,7 +933,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                 GTK_SCROLL_PAGE_DOWN);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "menu");
+  gtk_widget_class_set_css_name (widget_class, I_("menu"));
 }
 
 
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 53127b6b75..2b20bc4fac 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -200,7 +200,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
-  gtk_widget_class_set_css_name (widget_class, "menubar");
+  gtk_widget_class_set_css_name (widget_class, I_("menubar"));
 }
 
 static void
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 74916069b0..84f10d8829 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -576,7 +576,7 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
   g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index d9ef5bb7c5..0d7453ee63 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -665,7 +665,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target");
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "menuitem");
+  gtk_widget_class_set_css_name (widget_class, I_("menuitem"));
 }
 
 static void
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index f74dab0bd6..fa9f03caa1 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -272,7 +272,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_label);
   gtk_widget_class_bind_template_child_internal_private (widget_class, GtkMessageDialog, message_area);
 
-  gtk_widget_class_set_css_name (widget_class, "messagedialog");
+  gtk_widget_class_set_css_name (widget_class, I_("messagedialog"));
 }
 
 static void
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 59f957ceff..7d95e40528 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -307,25 +307,25 @@ update_node_name (GtkModelButton *button)
       a11y_role = ATK_ROLE_PUSH_BUTTON;
       if (button->menu_name)
         {
-          indicator_name = "arrow";
+          indicator_name = I_("arrow");
           indicator_visible = TRUE;
         }
       else
         {
-          indicator_name = "check";
+          indicator_name = I_("check");
           indicator_visible = FALSE;
         }
       break;
 
     case GTK_BUTTON_ROLE_CHECK:
       a11y_role = ATK_ROLE_CHECK_BOX;
-      indicator_name = "check";
+      indicator_name = I_("check");
       indicator_visible = TRUE;
       break;
 
     case GTK_BUTTON_ROLE_RADIO:
       a11y_role = ATK_ROLE_RADIO_BUTTON;
-      indicator_name = "radio";
+      indicator_name = I_("radio");
       indicator_visible = TRUE;
       break;
 
@@ -1040,7 +1040,7 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
   g_object_class_install_properties (object_class, LAST_PROPERTY, properties);
 
   gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_PUSH_BUTTON);
-  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "modelbutton");
+  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), I_("modelbutton"));
 }
 
 static void
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 4113482461..1828f97f42 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1041,7 +1041,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_NOTEBOOK_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "notebook");
+  gtk_widget_class_set_css_name (widget_class, I_("notebook"));
 }
 
 static void
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 6ae29649a5..e7b969c1d7 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -805,7 +805,7 @@ gtk_overlay_class_init (GtkOverlayClass *klass)
                   GTK_TYPE_WIDGET,
                   GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
 
-  gtk_widget_class_set_css_name (widget_class, "overlay");
+  gtk_widget_class_set_css_name (widget_class, I_("overlay"));
 }
 
 static void
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index bf26a461bf..f1029290f1 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -692,7 +692,7 @@ gtk_paned_class_init (GtkPanedClass *class)
   add_move_binding (binding_set, GDK_KEY_KP_End, 0, GTK_SCROLL_END);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_PANED_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "paned");
+  gtk_widget_class_set_css_name (widget_class, I_("paned"));
 }
 
 static GType
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index bfb39da5bd..3b16694a98 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -4752,7 +4752,7 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
 
   g_object_class_install_properties (gobject_class, NUM_PROPERTIES, properties);
 
-  gtk_widget_class_set_css_name (widget_class, "placessidebar");
+  gtk_widget_class_set_css_name (widget_class, I_("placessidebar"));
 }
 
 /**
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 2f3fa86e3e..e559b0045f 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -2241,7 +2241,7 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_listbox_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_recent_servers_listbox_row_activated);
 
-  gtk_widget_class_set_css_name (widget_class, "placesview");
+  gtk_widget_class_set_css_name (widget_class, I_("placesview"));
 }
 
 static void
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index a49114ceb1..e9fe0929e6 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1689,7 +1689,7 @@ gtk_popover_class_init (GtkPopoverClass *klass)
 
   quark_widget_popovers = g_quark_from_static_string ("gtk-quark-widget-popovers");
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_POPOVER_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "popover");
+  gtk_widget_class_set_css_name (widget_class, I_("popover"));
 }
 
 static void
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 25b9e646e5..9ad36111e5 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -557,7 +557,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
   gtk_widget_class_bind_template_callback (widget_class, update_number_up_layout);
   gtk_widget_class_bind_template_callback (widget_class, redraw_page_layout_preview);
 
-  gtk_widget_class_set_css_name (widget_class, "printdialog");
+  gtk_widget_class_set_css_name (widget_class, I_("printdialog"));
 }
 
 /* Returns a toplevel GtkWindow, or NULL if none */
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 3022032029..5383cdbc31 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -265,7 +265,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
   g_object_class_install_properties (gobject_class, NUM_PROPERTIES, progress_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_PROGRESS_BAR_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "progressbar");
+  gtk_widget_class_set_css_name (widget_class, I_("progressbar"));
 }
 
 static void
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index a86cd37599..652d878ece 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -217,7 +217,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
 				       G_TYPE_NONE, 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "radiobutton");
+  gtk_widget_class_set_css_name (widget_class, I_("radiobutton"));
 }
 
 static void
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 5b0cf9121c..3bea191712 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -460,7 +460,7 @@ gtk_range_class_init (GtkRangeClass *class)
   g_object_class_install_properties (gobject_class, LAST_PROP, properties);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RANGE_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "range");
+  gtk_widget_class_set_css_name (widget_class, I_("range"));
 }
 
 static void
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index 790221311e..8564147e5f 100644
--- a/gtk/gtkrevealer.c
+++ b/gtk/gtkrevealer.c
@@ -262,7 +262,7 @@ gtk_revealer_class_init (GtkRevealerClass *klass)
 
   g_object_class_install_properties (object_class, LAST_PROP, props);
 
-  gtk_widget_class_set_css_name (widget_class, "revealer");
+  gtk_widget_class_set_css_name (widget_class, I_("revealer"));
 }
 
 /**
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index fa09f95d4b..01e54fe29f 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -855,7 +855,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                       GTK_SCROLL_END);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCALE_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "scale");
+  gtk_widget_class_set_css_name (widget_class, I_("scale"));
 }
 
 static void
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index c6ab5942f1..9e3c640c50 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -335,7 +335,7 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, cb_popup_mapped);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCALE_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 87f2120fee..8ddb412ad5 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -230,7 +230,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
   g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SCROLL_BAR);
-  gtk_widget_class_set_css_name (widget_class, "scrollbar");
+  gtk_widget_class_set_css_name (widget_class, I_("scrollbar"));
 }
 
 static gboolean
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 583e0227cb..bff8c4100c 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -815,7 +815,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "scrolledwindow");
+  gtk_widget_class_set_css_name (widget_class, I_("scrolledwindow"));
 }
 
 static gboolean
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 89ea23b9bf..28aa69b79e 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -414,7 +414,7 @@ gtk_search_bar_class_init (GtkSearchBarClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkSearchBar, box_center);
   gtk_widget_class_bind_template_child_private (widget_class, GtkSearchBar, close_button);
 
-  gtk_widget_class_set_css_name (widget_class, "searchbar");
+  gtk_widget_class_set_css_name (widget_class, I_("searchbar"));
 }
 
 static void
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index cbff1c54f9..13d0b6b526 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -134,7 +134,7 @@ gtk_separator_class_init (GtkSeparatorClass *class)
   g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
 
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SEPARATOR);
-  gtk_widget_class_set_css_name (widget_class, "separator");
+  gtk_widget_class_set_css_name (widget_class, I_("separator"));
 }
 
 /**
diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index 80941a1aa2..96a1faae72 100644
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include "gtkseparatormenuitem.h"
+#include "gtkintl.h"
 
 #include "gtkstylecontext.h"
 
@@ -50,7 +51,7 @@ gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class)
   GTK_CONTAINER_CLASS (class)->child_type = NULL;
 
   gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_SEPARATOR);
-  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "separator");
+  gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), I_("separator"));
 }
 
 static void
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 3cd9f2c1c2..c0cc141bcd 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -101,7 +101,7 @@ gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
-  gtk_widget_class_set_css_name (widget_class, "separator");
+  gtk_widget_class_set_css_name (widget_class, I_("separator"));
 }
 
 static void
diff --git a/gtk/gtkshortcutsgroup.c b/gtk/gtkshortcutsgroup.c
index 5eda2d1538..8e37665637 100644
--- a/gtk/gtkshortcutsgroup.c
+++ b/gtk/gtkshortcutsgroup.c
@@ -362,7 +362,7 @@ gtk_shortcuts_group_class_init (GtkShortcutsGroupClass *klass)
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 
-  gtk_widget_class_set_css_name (widget_class, "shortcuts-group");
+  gtk_widget_class_set_css_name (widget_class, I_("shortcuts-group"));
 }
 
 static void
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 527e35da04..be60ba3799 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -411,7 +411,7 @@ gtk_shortcuts_section_class_init (GtkShortcutsSectionClass *klass)
                                 GDK_KEY_Page_Down, GDK_CONTROL_MASK,
                                 "change-current-page", 1,
                                 G_TYPE_INT, 1);
-  gtk_widget_class_set_css_name (widget_class, "shortcuts-section");
+  gtk_widget_class_set_css_name (widget_class, I_("shortcuts-section"));
 }
 
 static void
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index 7ad524117f..2477dd4aa8 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -712,7 +712,7 @@ gtk_shortcuts_shortcut_class_init (GtkShortcutsShortcutClass *klass)
                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
-  gtk_widget_class_set_css_name (widget_class, "shortcut");
+  gtk_widget_class_set_css_name (widget_class, I_("shortcut"));
 }
 
 static void
diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index 0634e5012a..d3a58bd30d 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -28,6 +28,7 @@
 #include "gtkstylecontext.h"
 #include "gtkrevealer.h"
 #include "gtkselection.h"
+#include "gtkintl.h"
 
 #ifdef HAVE_CLOUDPROVIDERS
 #include <cloudproviders/cloudprovidersaccount.h>
@@ -615,7 +616,7 @@ gtk_sidebar_row_class_init (GtkSidebarRowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, revealer);
 
   gtk_widget_class_bind_template_callback (widget_class, on_child_revealed);
-  gtk_widget_class_set_css_name (widget_class, "row");
+  gtk_widget_class_set_css_name (widget_class, I_("row"));
 }
 
 GtkSidebarRow*
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 7210916bf3..7db7f544d1 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -559,7 +559,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
   add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPIN_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "spinbutton");
+  gtk_widget_class_set_css_name (widget_class, I_("spinbutton"));
 }
 
 static void
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index f8660319bf..7244edd566 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -206,7 +206,7 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPINNER_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "spinner");
+  gtk_widget_class_set_css_name (widget_class, I_("spinner"));
 }
 
 static void
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index 2bfa5c54a8..59d427e3aa 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -427,7 +427,7 @@ gtk_stack_class_init (GtkStackClass *klass)
   gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, stack_child_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STACK_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "stack");
+  gtk_widget_class_set_css_name (widget_class, I_("stack"));
 }
 
 /**
diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index 5a4a3014a2..134999327f 100644
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -450,7 +450,7 @@ gtk_stack_sidebar_class_init (GtkStackSidebarClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPERTIES, obj_properties);
 
-  gtk_widget_class_set_css_name (widget_class, "stacksidebar");
+  gtk_widget_class_set_css_name (widget_class, I_("stacksidebar"));
 }
 
 /**
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index b686998c44..36c2f2ea27 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -694,7 +694,7 @@ gtk_stack_switcher_class_init (GtkStackSwitcherClass *class)
                                                         GTK_PARAM_READWRITE |
                                                         G_PARAM_CONSTRUCT));
 
-  gtk_widget_class_set_css_name (widget_class, "stackswitcher");
+  gtk_widget_class_set_css_name (widget_class, I_("stackswitcher"));
 }
 
 /**
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 56bf58ff39..3edb920424 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -218,7 +218,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, label);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "statusbar");
+  gtk_widget_class_set_css_name (widget_class, I_("statusbar"));
 }
 
 static void
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index d6755a5500..e3a4dabbb5 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -615,7 +615,7 @@ gtk_switch_class_init (GtkSwitchClass *klass)
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SWITCH_ACCESSIBLE);
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOGGLE_BUTTON);
 
-  gtk_widget_class_set_css_name (widget_class, "switch");
+  gtk_widget_class_set_css_name (widget_class, I_("switch"));
 }
 
 static void
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 2d07d9cbc9..6e625b63d0 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1619,7 +1619,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
 				GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TEXT_VIEW_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "textview");
+  gtk_widget_class_set_css_name (widget_class, I_("textview"));
 
   quark_text_selection_data = g_quark_from_static_string ("gtk-text-view-text-selection-data");
   quark_gtk_signal = g_quark_from_static_string ("gtk-signal");
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 18912644ed..cb61488028 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -180,7 +180,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
 		  G_TYPE_NONE, 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "button");
+  gtk_widget_class_set_css_name (widget_class, I_("button"));
 }
 
 static void
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 681ef30504..bc60117ab2 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -541,7 +541,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   add_ctrl_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
   add_ctrl_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
-  gtk_widget_class_set_css_name (widget_class, "toolbar");
+  gtk_widget_class_set_css_name (widget_class, I_("toolbar"));
 }
 
 static void
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index d8685e7b0e..75558bd8a2 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -275,7 +275,7 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
   
   g_type_class_add_private (object_class, sizeof (GtkToolButtonPrivate));
 
-  gtk_widget_class_set_css_name (widget_class, "toolbutton");
+  gtk_widget_class_set_css_name (widget_class, I_("toolbutton"));
 }
 
 static void
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index e25e7a6882..ad132a0513 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -201,7 +201,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
 		  NULL,
 		  G_TYPE_NONE, 0);
 
-  gtk_widget_class_set_css_name (widget_class, "toolitem");
+  gtk_widget_class_set_css_name (widget_class, I_("toolitem"));
 }
 
 static void
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 36e525f4fb..f2c9c51051 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1611,7 +1611,7 @@ gtk_tool_item_group_class_init (GtkToolItemGroupClass *cls)
                                                                 0,
                                                                 GTK_PARAM_READWRITE));
 
-  gtk_widget_class_set_css_name (wclass, "toolitemgroup");
+  gtk_widget_class_set_css_name (wclass, I_("toolitemgroup"));
 }
 
 /**
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 50fa7101a8..be8d5b0caf 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -910,7 +910,7 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls)
                                                                     DEFAULT_CHILD_EXPAND,
                                                                     GTK_PARAM_READWRITE));
 
-  gtk_widget_class_set_css_name (wclass, "toolpalette");
+  gtk_widget_class_set_css_name (wclass, I_("toolpalette"));
 }
 
 /**
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 00514591d0..4ba520ecca 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1657,7 +1657,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TREE_VIEW_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "treeview");
+  gtk_widget_class_set_css_name (widget_class, I_("treeview"));
 }
 
 static void
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index d5ccf27868..03447593a6 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -274,7 +274,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
 						      GTK_SHADOW_IN,
 						      GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
-  gtk_widget_class_set_css_name (widget_class, "viewport");
+  gtk_widget_class_set_css_name (widget_class, I_("viewport"));
 }
 
 static void
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 667b0748c8..6fd9ae40ed 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -819,7 +819,7 @@ gtk_widget_get_type (void)
 	NULL /* interface data */
       };
 
-      widget_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, "GtkWidget",
+      widget_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, g_intern_static_string ("GtkWidget"),
                                             &widget_info, G_TYPE_FLAG_ABSTRACT);
 
       g_type_add_class_private (widget_type, sizeof (GtkWidgetClassPrivate));
@@ -3144,7 +3144,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                 "popup-menu", 0);
 
   gtk_widget_class_set_accessible_type (klass, GTK_TYPE_WIDGET_ACCESSIBLE);
-  gtk_widget_class_set_css_name (klass, "widget");
+  gtk_widget_class_set_css_name (klass, I_("widget"));
 }
 
 static void
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index eb856d0758..13a28e2802 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1280,7 +1280,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_WINDOW_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "window");
+  gtk_widget_class_set_css_name (widget_class, I_("window"));
 }
 
 /**