diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index ebd08e2..096ec17 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -91,7 +91,7 @@ gtk_cell_renderer_spin_class_init (GtkCellRendererSpinClass *klass)
 				   PROP_ADJUSTMENT,
 				   g_param_spec_object ("adjustment",
 							P_("Adjustment"),
-							P_("The adjustment that holds the value of the spinbutton."),
+							P_("The adjustment that holds the value of the spin button"),
 							GTK_TYPE_ADJUSTMENT,
 							GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 3e47c91..11b4eca 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -217,7 +217,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                    PROP_SINGLE_PARAGRAPH_MODE,
                                    g_param_spec_boolean ("single-paragraph-mode",
                                                          P_("Single Paragraph Mode"),
-                                                         P_("Whether or not to keep all text in a single paragraph"),
+                                                         P_("Whether to keep all text in a single paragraph"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 081e687..891f376 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -169,7 +169,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
   g_object_class_install_property (gobject_class,
                                    PROP_USE_ALPHA,
                                    g_param_spec_boolean ("use-alpha", P_("Use alpha"), 
-                                                         P_("Whether or not to give the color an alpha value"),
+                                                         P_("Whether to give the color an alpha value"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8145905..deebea7 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -825,8 +825,8 @@ gtk_entry_class_init (GtkEntryClass *class)
   g_object_class_install_property (gobject_class,
                                    PROP_INVISIBLE_CHAR_SET,
                                    g_param_spec_boolean ("invisible-char-set",
-                                                         P_("Invisible char set"),
-                                                         P_("Whether the invisible char has been set"),
+                                                         P_("Invisible character set"),
+                                                         P_("Whether the invisible character has been set"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 6c7de57..9a20507 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -280,7 +280,7 @@ gtk_file_chooser_class_init (gpointer g_iface)
    */
   g_object_interface_install_property (g_iface,
 				       g_param_spec_boolean ("create-folders",
-							     P_("Allow folders creation"),
+							     P_("Allow folder creation"),
 							     P_("Whether a file chooser not in open mode "
 								"will offer the user to create new folders."),
 							     TRUE,
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 2c6a507..1c8f15d 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -619,14 +619,14 @@ gtk_notebook_class_init (GtkNotebookClass *class)
 				   PROP_SHOW_TABS,
 				   g_param_spec_boolean ("show-tabs",
  							 P_("Show Tabs"),
- 							 P_("Whether tabs should be shown or not"),
+ 							 P_("Whether tabs should be shown"),
  							 TRUE,
  							 GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
 				   PROP_SHOW_BORDER,
 				   g_param_spec_boolean ("show-border",
  							 P_("Show Border"),
- 							 P_("Whether the border should be shown or not"),
+ 							 P_("Whether the border should be shown"),
  							 TRUE,
  							 GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
@@ -699,14 +699,14 @@ gtk_notebook_class_init (GtkNotebookClass *class)
 					      CHILD_PROP_TAB_EXPAND,
 					      g_param_spec_boolean ("tab-expand", 
 								    P_("Tab expand"), 
-								    P_("Whether to expand the child's tab or not"),
+								    P_("Whether to expand the child's tab"),
 								    FALSE,
 								    GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
 					      CHILD_PROP_TAB_FILL,
 					      g_param_spec_boolean ("tab-fill", 
 								    P_("Tab fill"), 
-								    P_("Whether the child's tab should fill the allocated area or not"),
+								    P_("Whether the child's tab should fill the allocated area"),
 								    TRUE,
 								    GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
@@ -720,7 +720,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
 					      CHILD_PROP_REORDERABLE,
 					      g_param_spec_boolean ("reorderable",
 								    P_("Tab reorderable"),
-								    P_("Whether the tab is reorderable by user action or not"),
+								    P_("Whether the tab is reorderable by user action"),
 								    FALSE,
 								    GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 4c31ea7..09783d5 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -148,7 +148,7 @@ gtk_plug_class_init (GtkPlugClass *class)
 				   PROP_EMBEDDED,
 				   g_param_spec_boolean ("embedded",
 							 P_("Embedded"),
-							 P_("Whether or not the plug is embedded"),
+							 P_("Whether the plug is embedded"),
 							 FALSE,
 							 GTK_PARAM_READABLE));
 
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 5f9d8d2..6a16c59 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -333,7 +333,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
   g_object_class_install_property (object_class,
                                    PROP_MANUAL_CAPABILITIES,
                                    g_param_spec_flags ("manual-capabilities",
-                                                       P_("Manual Capabilites"),
+                                                       P_("Manual Capabilities"),
                                                        P_("Capabilities the application can handle"),
                                                        GTK_TYPE_PRINT_CAPABILITIES,
                                                        0,
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 96b3167..1a517a3 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -211,13 +211,13 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                       GTK_PARAM_READWRITE));
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("xspacing",
-                                                             P_("XSpacing"),
+                                                             P_("X spacing"),
                                                              P_("Extra spacing applied to the width of a progress bar."),
                                                              0, G_MAXINT, 7,
                                                              G_PARAM_READWRITE));
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("yspacing",
-                                                             P_("YSpacing"),
+                                                             P_("Y spacing"),
                                                              P_("Extra spacing applied to the height of a progress bar."),
                                                              0, G_MAXINT, 7,
                                                              G_PARAM_READWRITE));
@@ -231,7 +231,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
    */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("min-horizontal-bar-width",
-                                                             P_("Min horizontal bar width"),
+                                                             P_("Minimum horizontal bar width"),
                                                              P_("The minimum horizontal width of the progress bar"),
                                                              1, G_MAXINT, MIN_HORIZONTAL_BAR_WIDTH,
                                                              G_PARAM_READWRITE));
@@ -244,7 +244,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
    */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("min-horizontal-bar-height",
-                                                             P_("Min horizontal bar height"),
+                                                             P_("Minimum horizontal bar height"),
                                                              P_("Minimum horizontal height of the progress bar"),
                                                              1, G_MAXINT, MIN_HORIZONTAL_BAR_HEIGHT,
                                                              G_PARAM_READWRITE));
@@ -257,7 +257,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
    */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("min-vertical-bar-width",
-                                                             P_("Min vertical bar width"),
+                                                             P_("Minimum vertical bar width"),
                                                              P_("The minimum vertical width of the progress bar"),
                                                              1, G_MAXINT, MIN_VERTICAL_BAR_WIDTH,
                                                              G_PARAM_READWRITE));
@@ -270,7 +270,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
    */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("min-vertical-bar-height",
-                                                             P_("Min vertical bar height"),
+                                                             P_("Minimum vertical bar height"),
                                                              P_("The minimum vertical height of the progress bar"),
                                                              1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
                                                              G_PARAM_READWRITE));
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index a61ea84..b9e7aa4 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -206,7 +206,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                    PROP_ADJUSTMENT,
                                    g_param_spec_object ("adjustment",
                                                         P_("Adjustment"),
-                                                        P_("The adjustment that holds the value of the spinbutton"),
+                                                        P_("The adjustment that holds the value of the spin button"),
                                                         GTK_TYPE_ADJUSTMENT,
                                                         GTK_PARAM_READWRITE));
   
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 1cdb0c1..adacde3 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -286,7 +286,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
 				   PROP_BLINKING,
 				   g_param_spec_boolean ("blinking",
 							 P_("Blinking"),
-							 P_("Whether or not the status icon is blinking"),
+							 P_("Whether the status icon is blinking"),
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
@@ -294,7 +294,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
 				   PROP_VISIBLE,
 				   g_param_spec_boolean ("visible",
 							 P_("Visible"),
-							 P_("Whether or not the status icon is visible"),
+							 P_("Whether the status icon is visible"),
 							 TRUE,
 							 GTK_PARAM_READWRITE));
 
@@ -310,7 +310,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
 				   PROP_EMBEDDED,
 				   g_param_spec_boolean ("embedded",
 							 P_("Embedded"),
-							 P_("Whether or not the status icon is embedded"),
+							 P_("Whether the status icon is embedded"),
 							 FALSE,
 							 GTK_PARAM_READABLE));
 
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 42217fc..007e781 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -109,7 +109,7 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass)
   /**
    * GtkToggleAction:active:
    *
-   * If the toggle action should be active in or not.
+   * Whether the toggle action should be active.
    *
    * Since: 2.10
    */
@@ -117,7 +117,7 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass)
                                    PROP_ACTIVE,
                                    g_param_spec_boolean ("active",
                                                          P_("Active"),
-                                                         P_("If the toggle action should be active in or not"),
+                                                         P_("Whether the toggle action should be active"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index ddc6678..d88f37e 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -113,7 +113,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                                    PROP_ACTIVE,
                                    g_param_spec_boolean ("active",
 							 P_("Active"),
-							 P_("If the toggle button should be pressed in or not"),
+							 P_("If the toggle button should be pressed in"),
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index bb26802..b8cb0c2 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -104,7 +104,7 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass)
   /**
    * GtkToggleToolButton:active:
    *
-   * If the toggle tool button should be pressed in or not.
+   * If the toggle tool button should be pressed in.
    *
    * Since: 2.8
    */
@@ -112,7 +112,7 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass)
                                    PROP_ACTIVE,
                                    g_param_spec_boolean ("active",
 							 P_("Active"),
-							 P_("If the toggle button should be pressed in or not"),
+							 P_("If the toggle button should be pressed in"),
 							 FALSE,
 							 GTK_PARAM_READWRITE));
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 6b1f053..16190b1 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -508,7 +508,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   /**
    * GtkToolbar:tooltips:
    * 
-   * If the tooltips of the toolbar should be active or not.
+   * If the tooltips of the toolbar should be active.
    * 
    * Since: 2.8
    */
@@ -516,7 +516,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
 				   PROP_TOOLTIPS,
 				   g_param_spec_boolean ("tooltips",
 							 P_("Tooltips"),
-							 P_("If the tooltips of the toolbar should be active or not"),
+							 P_("If the tooltips of the toolbar should be active"),
 							 TRUE,
 							 GTK_PARAM_READWRITE));
   
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 450ab17..c1a14a4 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -696,7 +696,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   /**
    * GtkWidget:double-buffered
    *
-   * Whether or not the widget is double buffered.
+   * Whether the widget is double buffered.
    *
    * Since: 2.18
    */
@@ -704,7 +704,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                    PROP_DOUBLE_BUFFERED,
                                    g_param_spec_boolean ("double-buffered",
                                                          P_("Double Buffered"),
-                                                         P_("Whether or not the widget is double buffered"),
+                                                         P_("Whether the widget is double buffered"),
                                                          TRUE,
                                                          GTK_PARAM_READWRITE));
 
