diff --git a/po/de.po b/po/de.po
index 932600d..cf07324 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-16 01:54+0200\n"
+"POT-Creation-Date: 2011-04-16 23:43+0200\n"
 "PO-Revision-Date: 2010-04-07 22:05+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
diff --git a/po/es.po b/po/es.po
index 1f75754..01cb5ec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-16 01:54+0200\n"
+"POT-Creation-Date: 2011-04-16 23:43+0200\n"
 "PO-Revision-Date: 2010-04-07 22:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
diff --git a/po/fr.po b/po/fr.po
index 5d67480..c3079e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-16 01:54+0200\n"
+"POT-Creation-Date: 2011-04-16 23:43+0200\n"
 "PO-Revision-Date: 2010-04-11 12:32+0200\n"
 "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
 "Language-Team: French\n"
diff --git a/po/it.po b/po/it.po
index 6bfeac3..be0ca61 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Editor 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-16 01:54+0200\n"
+"POT-Creation-Date: 2011-04-16 23:43+0200\n"
 "PO-Revision-Date: 2010-04-09 16:43+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
diff --git a/src/editor.c b/src/editor.c
index 98a3a0e..45ae8ad 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -89,12 +89,12 @@ static DesktopAccel _editor_accel[] =
 static DesktopMenu _editor_menu_file[] =
 {
 	{ N_("_New"), G_CALLBACK(on_file_new), GTK_STOCK_NEW, GDK_CONTROL_MASK,
-		GDK_KEY_n },
+		GDK_KEY_N },
 	{ N_("_Open"), G_CALLBACK(on_file_open), GTK_STOCK_OPEN,
-		GDK_CONTROL_MASK, GDK_KEY_o },
+		GDK_CONTROL_MASK, GDK_KEY_O },
 	{ "", NULL, NULL, 0, 0 },
 	{ N_("_Save"), G_CALLBACK(on_file_save), GTK_STOCK_SAVE,
-		GDK_CONTROL_MASK, GDK_KEY_s },
+		GDK_CONTROL_MASK, GDK_KEY_S },
 	{ N_("_Save as..."), G_CALLBACK(on_file_save_as), GTK_STOCK_SAVE_AS,
 		GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_S },
 	{ "", NULL, NULL, 0, 0 },
@@ -106,15 +106,15 @@ static DesktopMenu _editor_menu_edit[] =
 {
 	/* FIXME implement undo and redo */
 	{ N_("_Undo"), NULL, GTK_STOCK_UNDO, GDK_CONTROL_MASK,
-		GDK_KEY_z },
-	{ N_("_Redo"), NULL, GTK_STOCK_REDO, GDK_CONTROL_MASK, GDK_KEY_r },
+		GDK_KEY_Z },
+	{ N_("_Redo"), NULL, GTK_STOCK_REDO, GDK_CONTROL_MASK, GDK_KEY_R },
 	{ "", NULL, NULL, 0, 0 },
 	{ N_("_Cut"), G_CALLBACK(on_edit_cut), GTK_STOCK_CUT, GDK_CONTROL_MASK,
-		GDK_KEY_x },
+		GDK_KEY_X },
 	{ N_("_Copy"), G_CALLBACK(on_edit_copy), GTK_STOCK_COPY,
-		GDK_CONTROL_MASK, GDK_KEY_c },
+		GDK_CONTROL_MASK, GDK_KEY_C },
 	{ N_("_Paste"), G_CALLBACK(on_edit_paste), GTK_STOCK_PASTE,
-		GDK_CONTROL_MASK, GDK_KEY_v },
+		GDK_CONTROL_MASK, GDK_KEY_V },
 	{ "", NULL, NULL, 0, 0 },
 	{ N_("Select _all"), G_CALLBACK(on_edit_select_all),
 #if GTK_CHECK_VERSION(2, 10, 0)
@@ -129,7 +129,7 @@ static DesktopMenu _editor_menu_edit[] =
 		GDK_CONTROL_MASK, GDK_KEY_F },
 	{ "", NULL, NULL, 0, 0 },
 	{ N_("_Preferences"), G_CALLBACK(on_edit_preferences),
-		GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_p },
+		GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_P },
 	{ NULL, NULL, NULL, 0, 0 }
 };
 
@@ -884,13 +884,13 @@ void editor_show_preferences(Editor * editor, gboolean show)
 	gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
 	gtk_size_group_add_widget(group, widget);
 	gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
-#if GTK_CHECK_VERSION(2, 24, 0)
+#if GTK_CHECK_VERSION(3, 0, 0)
 	editor->pr_wrap = gtk_combo_box_text_new();
 #else
 	editor->pr_wrap = gtk_combo_box_new_text();
 #endif
 	for(i = 0; i < sizeof(_editor_wrap) / sizeof(*_editor_wrap); i++)
-#if GTK_CHECK_VERSION(2, 24, 0)
+#if GTK_CHECK_VERSION(3, 0, 0)
 		gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(editor->pr_wrap),
 				NULL, _(_editor_wrap[i].name));
 #else