diff --git a/po/de.po b/po/de.po
index 543140d..5286622 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-10-25 15:13+0200\n"
+"POT-Creation-Date: 2011-12-05 06:02-0500\n"
 "PO-Revision-Date: 2010-04-07 22:05+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
@@ -16,236 +16,230 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/editor.c:91
+#: ../src/editor.c:94
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/editor.c:93
+#: ../src/editor.c:96
 msgid "_Open"
 msgstr "_Offnen"
 
-#: ../src/editor.c:96
+#: ../src/editor.c:99
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:98
+#: ../src/editor.c:101
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:101
+#: ../src/editor.c:104
 msgid "_Close"
 msgstr "_Schliessen"
 
-#: ../src/editor.c:108
+#: ../src/editor.c:111
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:110
+#: ../src/editor.c:113
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:112
+#: ../src/editor.c:115
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:117
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:116
+#: ../src/editor.c:119
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:119
+#: ../src/editor.c:122
 msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:126
+#: ../src/editor.c:129
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:128
+#: ../src/editor.c:131
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:131
+#: ../src/editor.c:134
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/editor.c:138
+#: ../src/editor.c:141
 msgid "_File..."
 msgstr "_Datei..."
 
-#: ../src/editor.c:144
+#: ../src/editor.c:147
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/editor.c:155
+#: ../src/editor.c:158
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/editor.c:156
+#: ../src/editor.c:159
 msgid "_Edit"
 msgstr "_Bearbeitung"
 
-#: ../src/editor.c:157
+#: ../src/editor.c:160
 msgid "_Insert"
 msgstr ""
 
-#: ../src/editor.c:158
+#: ../src/editor.c:161
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/editor.c:165
+#: ../src/editor.c:168
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:166
+#: ../src/editor.c:169
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:168
+#: ../src/editor.c:171
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:169
+#: ../src/editor.c:172
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:172
+#: ../src/editor.c:175
 msgid "Cut"
 msgstr ""
 
-#: ../src/editor.c:173
+#: ../src/editor.c:176
 msgid "Copy"
 msgstr ""
 
-#: ../src/editor.c:174
+#: ../src/editor.c:177
 msgid "Paste"
 msgstr ""
 
-#: ../src/editor.c:177
+#: ../src/editor.c:180
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/editor.c:189
+#: ../src/editor.c:192
 msgid "none"
 msgstr ""
 
-#: ../src/editor.c:190
+#: ../src/editor.c:193
 msgid "characters"
 msgstr ""
 
-#: ../src/editor.c:191
+#: ../src/editor.c:194
 msgid "words"
 msgstr ""
 
-#: ../src/editor.c:192
+#: ../src/editor.c:195
 msgid "words then characters"
 msgstr ""
 
-#: ../src/editor.c:275
+#: ../src/editor.c:278
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:276
+#: ../src/editor.c:279
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:389
+#: ../src/editor.c:392
 msgid "translator-credits"
 msgstr "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/editor.c:425
+#: ../src/editor.c:428
 msgid "Could not save configuration"
 msgstr ""
 
-#: ../src/editor.c:439 ../src/editor.c:444
+#: ../src/editor.c:445 ../src/editor.c:454 ../src/editor.c:884
+#: ../src/editor.c:889
+msgid "Question"
+msgstr ""
+
+#: ../src/editor.c:470 ../src/editor.c:475
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/editor.c:471 ../src/editor.c:481 ../src/editor.c:709
-#: ../src/editor.c:723 ../src/editor.c:876 ../src/editor.c:881
-msgid "Warning"
-msgstr "Achtung"
-
-#: ../src/editor.c:475
+#: ../src/editor.c:497 ../src/editor.c:721
 msgid ""
 "There are unsaved changes.\n"
 "Discard or save them?"
 msgstr ""
 
-#: ../src/editor.c:539
+#: ../src/editor.c:557
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:550
+#: ../src/editor.c:568
 msgid "Text:"
 msgstr "Text:"
 
-#: ../src/editor.c:557
+#: ../src/editor.c:575
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:559
+#: ../src/editor.c:577
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:582
+#: ../src/editor.c:600
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:661
+#: ../src/editor.c:679
 msgid "Insert file..."
 msgstr ""
 
-#: ../src/editor.c:667 ../src/editor.c:790
+#: ../src/editor.c:685 ../src/editor.c:798
 msgid "Text files"
 msgstr ""
 
-#: ../src/editor.c:671 ../src/editor.c:794
+#: ../src/editor.c:689 ../src/editor.c:802
 msgid "All files"
 msgstr ""
 
-#: ../src/editor.c:713
-msgid ""
-"There are unsaved changes.\n"
-"Are you sure you want to discard them?"
-msgstr ""
-
-#: ../src/editor.c:720
+#: ../src/editor.c:727
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:784
+#: ../src/editor.c:792
 msgid "Open file..."
 msgstr "Offnen..."
 
-#: ../src/editor.c:852
+#: ../src/editor.c:860
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:880
+#: ../src/editor.c:888
 msgid "This file already exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:889
+#: ../src/editor.c:897
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:904
+#: ../src/editor.c:912
 msgid "Save as..."
 msgstr ""
 
-#: ../src/editor.c:961
+#: ../src/editor.c:969
 msgid "Text editor preferences"
 msgstr "Text Editor Einstellungen"
 
-#: ../src/editor.c:978
+#: ../src/editor.c:986
 msgid "Font:"
 msgstr ""
 
-#: ../src/editor.c:988
+#: ../src/editor.c:996
 msgid "Wrap mode:"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 7d4e872..9070f40 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-10-25 15:13+0200\n"
+"POT-Creation-Date: 2011-12-05 06:02-0500\n"
 "PO-Revision-Date: 2010-04-07 22:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -16,236 +16,230 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/editor.c:91
+#: ../src/editor.c:94
 msgid "_New"
 msgstr ""
 
-#: ../src/editor.c:93
+#: ../src/editor.c:96
 msgid "_Open"
 msgstr ""
 
-#: ../src/editor.c:96
+#: ../src/editor.c:99
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:98
+#: ../src/editor.c:101
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:101
+#: ../src/editor.c:104
 msgid "_Close"
 msgstr ""
 
-#: ../src/editor.c:108
+#: ../src/editor.c:111
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:110
+#: ../src/editor.c:113
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:112
+#: ../src/editor.c:115
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:117
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:116
+#: ../src/editor.c:119
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:119
+#: ../src/editor.c:122
 msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:126
+#: ../src/editor.c:129
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:128
+#: ../src/editor.c:131
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:131
+#: ../src/editor.c:134
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/editor.c:138
+#: ../src/editor.c:141
 msgid "_File..."
 msgstr ""
 
-#: ../src/editor.c:144
+#: ../src/editor.c:147
 msgid "_About"
 msgstr ""
 
-#: ../src/editor.c:155
+#: ../src/editor.c:158
 msgid "_File"
 msgstr ""
 
-#: ../src/editor.c:156
+#: ../src/editor.c:159
 msgid "_Edit"
 msgstr ""
 
-#: ../src/editor.c:157
+#: ../src/editor.c:160
 msgid "_Insert"
 msgstr ""
 
-#: ../src/editor.c:158
+#: ../src/editor.c:161
 msgid "_Help"
 msgstr ""
 
-#: ../src/editor.c:165
+#: ../src/editor.c:168
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:166
+#: ../src/editor.c:169
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:168
+#: ../src/editor.c:171
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:169
+#: ../src/editor.c:172
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:172
+#: ../src/editor.c:175
 msgid "Cut"
 msgstr ""
 
-#: ../src/editor.c:173
+#: ../src/editor.c:176
 msgid "Copy"
 msgstr ""
 
-#: ../src/editor.c:174
+#: ../src/editor.c:177
 msgid "Paste"
 msgstr ""
 
-#: ../src/editor.c:177
+#: ../src/editor.c:180
 msgid "Preferences"
 msgstr ""
 
-#: ../src/editor.c:189
+#: ../src/editor.c:192
 msgid "none"
 msgstr ""
 
-#: ../src/editor.c:190
+#: ../src/editor.c:193
 msgid "characters"
 msgstr ""
 
-#: ../src/editor.c:191
+#: ../src/editor.c:194
 msgid "words"
 msgstr ""
 
-#: ../src/editor.c:192
+#: ../src/editor.c:195
 msgid "words then characters"
 msgstr ""
 
-#: ../src/editor.c:275
+#: ../src/editor.c:278
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:276
+#: ../src/editor.c:279
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:389
+#: ../src/editor.c:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/editor.c:425
+#: ../src/editor.c:428
 msgid "Could not save configuration"
 msgstr ""
 
-#: ../src/editor.c:439 ../src/editor.c:444
+#: ../src/editor.c:445 ../src/editor.c:454 ../src/editor.c:884
+#: ../src/editor.c:889
+msgid "Question"
+msgstr ""
+
+#: ../src/editor.c:470 ../src/editor.c:475
 msgid "Error"
 msgstr ""
 
-#: ../src/editor.c:471 ../src/editor.c:481 ../src/editor.c:709
-#: ../src/editor.c:723 ../src/editor.c:876 ../src/editor.c:881
-msgid "Warning"
-msgstr ""
-
-#: ../src/editor.c:475
+#: ../src/editor.c:497 ../src/editor.c:721
 msgid ""
 "There are unsaved changes.\n"
 "Discard or save them?"
 msgstr ""
 
-#: ../src/editor.c:539
+#: ../src/editor.c:557
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:550
+#: ../src/editor.c:568
 msgid "Text:"
 msgstr ""
 
-#: ../src/editor.c:557
+#: ../src/editor.c:575
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:559
+#: ../src/editor.c:577
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:582
+#: ../src/editor.c:600
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:661
+#: ../src/editor.c:679
 msgid "Insert file..."
 msgstr ""
 
-#: ../src/editor.c:667 ../src/editor.c:790
+#: ../src/editor.c:685 ../src/editor.c:798
 msgid "Text files"
 msgstr ""
 
-#: ../src/editor.c:671 ../src/editor.c:794
+#: ../src/editor.c:689 ../src/editor.c:802
 msgid "All files"
 msgstr ""
 
-#: ../src/editor.c:713
-msgid ""
-"There are unsaved changes.\n"
-"Are you sure you want to discard them?"
-msgstr ""
-
-#: ../src/editor.c:720
+#: ../src/editor.c:727
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:784
+#: ../src/editor.c:792
 msgid "Open file..."
 msgstr ""
 
-#: ../src/editor.c:852
+#: ../src/editor.c:860
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:880
+#: ../src/editor.c:888
 msgid "This file already exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:889
+#: ../src/editor.c:897
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:904
+#: ../src/editor.c:912
 msgid "Save as..."
 msgstr ""
 
-#: ../src/editor.c:961
+#: ../src/editor.c:969
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/editor.c:978
+#: ../src/editor.c:986
 msgid "Font:"
 msgstr ""
 
-#: ../src/editor.c:988
+#: ../src/editor.c:996
 msgid "Wrap mode:"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 7cfabbd..ba054d6 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-10-25 15:13+0200\n"
+"POT-Creation-Date: 2011-12-05 06:02-0500\n"
 "PO-Revision-Date: 2010-04-11 12:32+0200\n"
 "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
 "Language-Team: French\n"
@@ -16,162 +16,162 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/editor.c:91
+#: ../src/editor.c:94
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../src/editor.c:93
+#: ../src/editor.c:96
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/editor.c:96
+#: ../src/editor.c:99
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/editor.c:98
+#: ../src/editor.c:101
 msgid "_Save as..."
 msgstr "_Enregistrer sous..."
 
-#: ../src/editor.c:101
+#: ../src/editor.c:104
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/editor.c:108
+#: ../src/editor.c:111
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: ../src/editor.c:110
+#: ../src/editor.c:113
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: ../src/editor.c:112
+#: ../src/editor.c:115
 msgid "_Cut"
 msgstr "Co_uper"
 
-#: ../src/editor.c:114
+#: ../src/editor.c:117
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../src/editor.c:116
+#: ../src/editor.c:119
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../src/editor.c:119
+#: ../src/editor.c:122
 msgid "Select _all"
 msgstr "Sélectionner _tout"
 
-#: ../src/editor.c:126
+#: ../src/editor.c:129
 msgid "_Unselect all"
 msgstr "Tout _désélectionner"
 
-#: ../src/editor.c:128
+#: ../src/editor.c:131
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../src/editor.c:131
+#: ../src/editor.c:134
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/editor.c:138
+#: ../src/editor.c:141
 msgid "_File..."
 msgstr "_Fichier..."
 
-#: ../src/editor.c:144
+#: ../src/editor.c:147
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/editor.c:155
+#: ../src/editor.c:158
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/editor.c:156
+#: ../src/editor.c:159
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../src/editor.c:157
+#: ../src/editor.c:160
 msgid "_Insert"
 msgstr "_Insertion"
 
-#: ../src/editor.c:158
+#: ../src/editor.c:161
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/editor.c:165
+#: ../src/editor.c:168
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/editor.c:166
+#: ../src/editor.c:169
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/editor.c:168
+#: ../src/editor.c:171
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/editor.c:169
+#: ../src/editor.c:172
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: ../src/editor.c:172
+#: ../src/editor.c:175
 msgid "Cut"
 msgstr "Couper"
 
-#: ../src/editor.c:173
+#: ../src/editor.c:176
 msgid "Copy"
 msgstr "Copier"
 
-#: ../src/editor.c:174
+#: ../src/editor.c:177
 msgid "Paste"
 msgstr "Coller"
 
-#: ../src/editor.c:177
+#: ../src/editor.c:180
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/editor.c:189
+#: ../src/editor.c:192
 msgid "none"
 msgstr "aucun"
 
-#: ../src/editor.c:190
+#: ../src/editor.c:193
 msgid "characters"
 msgstr "caractères"
 
-#: ../src/editor.c:191
+#: ../src/editor.c:194
 msgid "words"
 msgstr "mots"
 
-#: ../src/editor.c:192
+#: ../src/editor.c:195
 msgid "words then characters"
 msgstr "mots puis caractères"
 
-#: ../src/editor.c:275
+#: ../src/editor.c:278
 msgid "Text editor - "
 msgstr "Éditeur de texte - "
 
-#: ../src/editor.c:276
+#: ../src/editor.c:279
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: ../src/editor.c:389
+#: ../src/editor.c:392
 msgid "translator-credits"
 msgstr ""
 "Calimero <calimeroteknik@free.fr>\n"
 "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/editor.c:425
+#: ../src/editor.c:428
 msgid "Could not save configuration"
 msgstr "Erreur lors de la sauvegarde de la configuration"
 
-#: ../src/editor.c:439 ../src/editor.c:444
+#: ../src/editor.c:445 ../src/editor.c:454 ../src/editor.c:884
+#: ../src/editor.c:889
+msgid "Question"
+msgstr ""
+
+#: ../src/editor.c:470 ../src/editor.c:475
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/editor.c:471 ../src/editor.c:481 ../src/editor.c:709
-#: ../src/editor.c:723 ../src/editor.c:876 ../src/editor.c:881
-msgid "Warning"
-msgstr "Avertissement"
-
-#: ../src/editor.c:475
+#: ../src/editor.c:497 ../src/editor.c:721
 msgid ""
 "There are unsaved changes.\n"
 "Discard or save them?"
@@ -179,79 +179,71 @@ msgstr ""
 "Il y a des changements non enregistrés.\n"
 "Abandonner ou enregistrer ?"
 
-#: ../src/editor.c:539
+#: ../src/editor.c:557
 msgid "Find text"
 msgstr "Rechercher"
 
-#: ../src/editor.c:550
+#: ../src/editor.c:568
 msgid "Text:"
 msgstr "Texte :"
 
-#: ../src/editor.c:557
+#: ../src/editor.c:575
 msgid "Case-sensitive"
 msgstr "Sensible à la casse"
 
-#: ../src/editor.c:559
+#: ../src/editor.c:577
 msgid "Wrap"
 msgstr "Boucler"
 
-#: ../src/editor.c:582
+#: ../src/editor.c:600
 msgid "Text not found"
 msgstr "Texte non trouvé"
 
-#: ../src/editor.c:661
+#: ../src/editor.c:679
 msgid "Insert file..."
 msgstr "Insérer un fichier..."
 
-#: ../src/editor.c:667 ../src/editor.c:790
+#: ../src/editor.c:685 ../src/editor.c:798
 msgid "Text files"
 msgstr "Fichiers texte"
 
-#: ../src/editor.c:671 ../src/editor.c:794
+#: ../src/editor.c:689 ../src/editor.c:802
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/editor.c:713
-msgid ""
-"There are unsaved changes.\n"
-"Are you sure you want to discard them?"
-msgstr ""
-"Il y a des changements non enregistrés.\n"
-"Êtes-vous sûr de vouloir les annuler ?"
-
-#: ../src/editor.c:720
+#: ../src/editor.c:727
 msgid "Discard"
 msgstr "Annuler"
 
-#: ../src/editor.c:784
+#: ../src/editor.c:792
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: ../src/editor.c:852
+#: ../src/editor.c:860
 msgid "Partial write"
 msgstr "Écriture partielle"
 
-#: ../src/editor.c:880
+#: ../src/editor.c:888
 msgid "This file already exists. Overwrite?"
 msgstr "Le fichier existe déjà. L'écraser ?"
 
-#: ../src/editor.c:889
+#: ../src/editor.c:897
 msgid "Allocation error"
 msgstr "Erreur d'allocation"
 
-#: ../src/editor.c:904
+#: ../src/editor.c:912
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../src/editor.c:961
+#: ../src/editor.c:969
 msgid "Text editor preferences"
 msgstr "Préférences de l'éditeur de texte"
 
-#: ../src/editor.c:978
+#: ../src/editor.c:986
 msgid "Font:"
 msgstr "Police :"
 
-#: ../src/editor.c:988
+#: ../src/editor.c:996
 msgid "Wrap mode:"
 msgstr "Retour à la ligne :"
 
diff --git a/po/it.po b/po/it.po
index f96e01b..38fd78c 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-10-25 15:13+0200\n"
+"POT-Creation-Date: 2011-12-05 06:02-0500\n"
 "PO-Revision-Date: 2010-04-09 16:43+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
@@ -17,236 +17,230 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/editor.c:91
+#: ../src/editor.c:94
 msgid "_New"
 msgstr ""
 
-#: ../src/editor.c:93
+#: ../src/editor.c:96
 msgid "_Open"
 msgstr ""
 
-#: ../src/editor.c:96
+#: ../src/editor.c:99
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:98
+#: ../src/editor.c:101
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:101
+#: ../src/editor.c:104
 msgid "_Close"
 msgstr ""
 
-#: ../src/editor.c:108
+#: ../src/editor.c:111
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:110
+#: ../src/editor.c:113
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:112
+#: ../src/editor.c:115
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:117
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:116
+#: ../src/editor.c:119
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:119
+#: ../src/editor.c:122
 msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:126
+#: ../src/editor.c:129
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:128
+#: ../src/editor.c:131
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:131
+#: ../src/editor.c:134
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/editor.c:138
+#: ../src/editor.c:141
 msgid "_File..."
 msgstr ""
 
-#: ../src/editor.c:144
+#: ../src/editor.c:147
 msgid "_About"
 msgstr ""
 
-#: ../src/editor.c:155
+#: ../src/editor.c:158
 msgid "_File"
 msgstr ""
 
-#: ../src/editor.c:156
+#: ../src/editor.c:159
 msgid "_Edit"
 msgstr ""
 
-#: ../src/editor.c:157
+#: ../src/editor.c:160
 msgid "_Insert"
 msgstr ""
 
-#: ../src/editor.c:158
+#: ../src/editor.c:161
 msgid "_Help"
 msgstr ""
 
-#: ../src/editor.c:165
+#: ../src/editor.c:168
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:166
+#: ../src/editor.c:169
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:168
+#: ../src/editor.c:171
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:169
+#: ../src/editor.c:172
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:172
+#: ../src/editor.c:175
 msgid "Cut"
 msgstr ""
 
-#: ../src/editor.c:173
+#: ../src/editor.c:176
 msgid "Copy"
 msgstr ""
 
-#: ../src/editor.c:174
+#: ../src/editor.c:177
 msgid "Paste"
 msgstr ""
 
-#: ../src/editor.c:177
+#: ../src/editor.c:180
 msgid "Preferences"
 msgstr ""
 
-#: ../src/editor.c:189
+#: ../src/editor.c:192
 msgid "none"
 msgstr ""
 
-#: ../src/editor.c:190
+#: ../src/editor.c:193
 msgid "characters"
 msgstr ""
 
-#: ../src/editor.c:191
+#: ../src/editor.c:194
 msgid "words"
 msgstr ""
 
-#: ../src/editor.c:192
+#: ../src/editor.c:195
 msgid "words then characters"
 msgstr ""
 
-#: ../src/editor.c:275
+#: ../src/editor.c:278
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:276
+#: ../src/editor.c:279
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:389
+#: ../src/editor.c:392
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/editor.c:425
+#: ../src/editor.c:428
 msgid "Could not save configuration"
 msgstr ""
 
-#: ../src/editor.c:439 ../src/editor.c:444
+#: ../src/editor.c:445 ../src/editor.c:454 ../src/editor.c:884
+#: ../src/editor.c:889
+msgid "Question"
+msgstr ""
+
+#: ../src/editor.c:470 ../src/editor.c:475
 msgid "Error"
 msgstr ""
 
-#: ../src/editor.c:471 ../src/editor.c:481 ../src/editor.c:709
-#: ../src/editor.c:723 ../src/editor.c:876 ../src/editor.c:881
-msgid "Warning"
-msgstr ""
-
-#: ../src/editor.c:475
+#: ../src/editor.c:497 ../src/editor.c:721
 msgid ""
 "There are unsaved changes.\n"
 "Discard or save them?"
 msgstr ""
 
-#: ../src/editor.c:539
+#: ../src/editor.c:557
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:550
+#: ../src/editor.c:568
 msgid "Text:"
 msgstr ""
 
-#: ../src/editor.c:557
+#: ../src/editor.c:575
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:559
+#: ../src/editor.c:577
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:582
+#: ../src/editor.c:600
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:661
+#: ../src/editor.c:679
 msgid "Insert file..."
 msgstr ""
 
-#: ../src/editor.c:667 ../src/editor.c:790
+#: ../src/editor.c:685 ../src/editor.c:798
 msgid "Text files"
 msgstr ""
 
-#: ../src/editor.c:671 ../src/editor.c:794
+#: ../src/editor.c:689 ../src/editor.c:802
 msgid "All files"
 msgstr ""
 
-#: ../src/editor.c:713
-msgid ""
-"There are unsaved changes.\n"
-"Are you sure you want to discard them?"
-msgstr ""
-
-#: ../src/editor.c:720
+#: ../src/editor.c:727
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:784
+#: ../src/editor.c:792
 msgid "Open file..."
 msgstr ""
 
-#: ../src/editor.c:852
+#: ../src/editor.c:860
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:880
+#: ../src/editor.c:888
 msgid "This file already exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:889
+#: ../src/editor.c:897
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:904
+#: ../src/editor.c:912
 msgid "Save as..."
 msgstr ""
 
-#: ../src/editor.c:961
+#: ../src/editor.c:969
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/editor.c:978
+#: ../src/editor.c:986
 msgid "Font:"
 msgstr ""
 
-#: ../src/editor.c:988
+#: ../src/editor.c:996
 msgid "Wrap mode:"
 msgstr ""
 
diff --git a/src/editor.c b/src/editor.c
index 6f75505..346cb62 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -14,6 +14,9 @@ static char const _license[] =
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n";
+/* TODO:
+ * - move the "find" dialog over the status bar (and in Surfer too, and use a
+ *   GtkCombo box with the history of what was searched for already) */
 
 
 
@@ -427,6 +430,34 @@ void editor_config_save(Editor * editor)
 }
 
 
+/* editor_confirm */
+int editor_confirm(Editor * editor, char const * message, ...)
+{
+	GtkWidget * dialog;
+	va_list ap;
+	char const * action;
+	int res;
+
+	dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
+			GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
+			GTK_BUTTONS_NONE,
+# if GTK_CHECK_VERSION(2, 6, 0)
+			"%s", _("Question"));
+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+# endif
+			"%s", message);
+	va_start(ap, message);
+	while((action = va_arg(ap, char const *)) != NULL)
+		gtk_dialog_add_button(GTK_DIALOG(dialog),
+				action, va_arg(ap, int));
+	va_end(ap);
+	gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
+	res = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy(dialog);
+	return res;
+}
+
+
 /* editor_error */
 int editor_error(Editor * editor, char const * message, int ret)
 {
@@ -452,7 +483,6 @@ int editor_error(Editor * editor, char const * message, int ret)
 /* editor_close */
 gboolean editor_close(Editor * editor)
 {
-	GtkWidget * dialog;
 	int res;
 
 #ifdef DEBUG
@@ -464,23 +494,11 @@ gboolean editor_close(Editor * editor)
 		gtk_main_quit();
 		return FALSE;
 	}
-	dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
-			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-			GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s",
-#if GTK_CHECK_VERSION(2, 6, 0)
-			_("Warning"));
-	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-			"%s",
-#endif
-			_("There are unsaved changes.\n"
-				"Discard or save them?"));
-	gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
-			GTK_RESPONSE_CANCEL, GTK_STOCK_DISCARD,
-			GTK_RESPONSE_REJECT, GTK_STOCK_SAVE,
-			GTK_RESPONSE_ACCEPT, NULL);
-	gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
-	res = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy(dialog);
+	res = editor_confirm(editor, _("There are unsaved changes.\n"
+				"Discard or save them?"),
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_DISCARD, GTK_RESPONSE_REJECT,
+			GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
 	if(res == GTK_RESPONSE_CANCEL)
 		return TRUE;
 	else if(res == GTK_RESPONSE_ACCEPT && editor_save(editor) != TRUE)
@@ -686,7 +704,6 @@ int editor_insert_file_dialog(Editor * editor)
 /* editor_open */
 void editor_open(Editor * editor, char const * filename)
 {
-	GtkWidget * dialog;
 	int res;
 	FILE * fp;
 	GtkTextBuffer * tbuf;
@@ -701,29 +718,19 @@ void editor_open(Editor * editor, char const * filename)
 	if(gtk_text_buffer_get_modified(gtk_text_view_get_buffer(GTK_TEXT_VIEW(
 						editor->view))) == TRUE)
 	{
-		dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
-				GTK_DIALOG_MODAL
-				| GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s",
-#if GTK_CHECK_VERSION(2, 6, 0)
-				_("Warning"));
-		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(
-					dialog), "%s",
-#endif
-				_("There are unsaved changes.\n"
-				"Are you sure you want to discard them?"));
-		gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
+		res = editor_confirm(editor, _("There are unsaved changes.\n"
+					"Discard or save them?"),
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 #if GTK_CHECK_VERSION(2, 12, 0)
-				GTK_STOCK_DISCARD,
+				GTK_STOCK_DISCARD, GTK_RESPONSE_REJECT,
 #else
-				_("Discard"),
+				_("Discard"), GTK_RESPONSE_REJECT,
 #endif
-				GTK_RESPONSE_CLOSE, NULL);
-		gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
-		res = gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_destroy(dialog);
-		if(res != GTK_RESPONSE_CLOSE)
+				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+				NULL);
+		if(res == GTK_RESPONSE_ACCEPT && editor_save(editor) != TRUE)
+			return;
+		else if(res != GTK_RESPONSE_CLOSE)
 			return;
 	}
 	tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));
@@ -734,6 +741,7 @@ void editor_open(Editor * editor, char const * filename)
 		gtk_text_buffer_set_modified(tbuf, FALSE);
 		return;
 	}
+	/* FIXME use a GIOChannel instead (with a modal GtkDialog) */
 	if((fp = fopen(filename, "r")) == NULL)
 	{
 		snprintf(buf, sizeof(buf), "%s: %s", filename, strerror(errno));
@@ -871,14 +879,14 @@ gboolean editor_save_as(Editor * editor, char const * filename)
 		dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
 				GTK_DIALOG_MODAL
 				| GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
+				GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s",
 #if GTK_CHECK_VERSION(2, 6, 0)
-				_("Warning"));
+				_("Question"));
 		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(
 					dialog), "%s",
 #endif
 				_("This file already exists. Overwrite?"));
-		gtk_window_set_title(GTK_WINDOW(dialog), _("Warning"));
+		gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
 		ret = gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 		if(ret == GTK_RESPONSE_NO)
diff --git a/src/editor.h b/src/editor.h
index 721a9ca..bccabb1 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -43,6 +43,7 @@ void editor_about(Editor * editor);
 void editor_config_load(Editor * editor);
 void editor_config_save(Editor * editor);
 
+int editor_confirm(Editor * editor, char const * message, ...);
 int editor_error(Editor * editor, char const * message, int ret);
 
 gboolean editor_close(Editor * editor);