diff --git a/po/de.po b/po/de.po
index b2989b9..e1539cb 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: 2010-10-26 01:10+0200\n"
+"POT-Creation-Date: 2010-10-26 01:45+0200\n"
 "PO-Revision-Date: 2010-04-07 22:05+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
@@ -16,200 +16,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/callbacks.c:81
+#: ../src/callbacks.c:70
 msgid "Text editor preferences"
 msgstr "Text Editor Einstellungen"
 
-#: ../src/callbacks.c:98
+#: ../src/callbacks.c:87
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:276
-msgid "About Editor"
-msgstr "Info zu Editor"
-
-#: ../src/callbacks.c:287
-msgid "C_redits"
-msgstr "_Mitwirkende"
-
-#: ../src/callbacks.c:291
-msgid "_License"
-msgstr "_Lizenz"
-
-#: ../src/callbacks.c:341
-msgid "Credits"
-msgstr "Mitwirkende"
-
-#: ../src/callbacks.c:364
-msgid "Written by"
-msgstr "Programm von"
-
-#: ../src/callbacks.c:393
-msgid "License"
-msgstr "Lizenz"
-
-#: ../src/editor.c:51
+#: ../src/editor.c:59
 msgid "_New"
 msgstr "_Neu"
 
-#: ../src/editor.c:53
+#: ../src/editor.c:61
 msgid "_Open"
 msgstr "_Offnen"
 
-#: ../src/editor.c:56
+#: ../src/editor.c:64
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:58
+#: ../src/editor.c:66
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:61
+#: ../src/editor.c:69
 msgid "_Close"
 msgstr "_Schliessen"
 
-#: ../src/editor.c:68
+#: ../src/editor.c:76
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:70
+#: ../src/editor.c:78
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:72
+#: ../src/editor.c:80
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:73
+#: ../src/editor.c:81
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:74
+#: ../src/editor.c:82
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:76
-msgid "_Select all"
+#: ../src/editor.c:84
+msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:83
+#: ../src/editor.c:91
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:85
+#: ../src/editor.c:93
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:88
+#: ../src/editor.c:96
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/editor.c:96 ../src/editor.c:98
+#: ../src/editor.c:104 ../src/editor.c:106
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/editor.c:105
+#: ../src/editor.c:113
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/editor.c:106
+#: ../src/editor.c:114
 msgid "_Edit"
 msgstr ""
 
-#: ../src/editor.c:107
+#: ../src/editor.c:115
 msgid "_Help"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:122
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:115
+#: ../src/editor.c:123
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:117
+#: ../src/editor.c:125
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:118
+#: ../src/editor.c:126
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:122
+#: ../src/editor.c:130
 msgid "Preferences"
 msgstr ""
 
-#: ../src/editor.c:210
+#: ../src/editor.c:220
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:211
+#: ../src/editor.c:221
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:248 ../src/editor.c:253
+#: ../src/editor.c:292 ../src/editor.c:297
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/editor.c:280 ../src/editor.c:289 ../src/editor.c:399
-#: ../src/editor.c:413 ../src/editor.c:543 ../src/editor.c:548
+#: ../src/editor.c:324 ../src/editor.c:333 ../src/editor.c:443
+#: ../src/editor.c:457 ../src/editor.c:587 ../src/editor.c:592
 msgid "Warning"
 msgstr "Achtung"
 
-#: ../src/editor.c:284
+#: ../src/editor.c:328
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to close?"
 msgstr ""
 
-#: ../src/editor.c:319
+#: ../src/editor.c:363
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:326
+#: ../src/editor.c:370
 msgid "Text:"
 msgstr "Text:"
 
-#: ../src/editor.c:333
+#: ../src/editor.c:377
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:335
+#: ../src/editor.c:379
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:358
+#: ../src/editor.c:402
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:403
+#: ../src/editor.c:447
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to discard them?"
 msgstr ""
 
-#: ../src/editor.c:410
+#: ../src/editor.c:454
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:469
+#: ../src/editor.c:513
 msgid "Open file..."
 msgstr "Offnen..."
 
-#: ../src/editor.c:519
+#: ../src/editor.c:563
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:547
+#: ../src/editor.c:591
 msgid "File exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:556
+#: ../src/editor.c:600
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:571
+#: ../src/editor.c:615
 msgid "Save as..."
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 4d41151..fcf0072 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: 2010-10-26 01:10+0200\n"
+"POT-Creation-Date: 2010-10-26 01:45+0200\n"
 "PO-Revision-Date: 2010-04-07 22:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -16,200 +16,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/callbacks.c:81
+#: ../src/callbacks.c:70
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/callbacks.c:98
+#: ../src/callbacks.c:87
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:276
-msgid "About Editor"
-msgstr ""
-
-#: ../src/callbacks.c:287
-msgid "C_redits"
-msgstr ""
-
-#: ../src/callbacks.c:291
-msgid "_License"
-msgstr ""
-
-#: ../src/callbacks.c:341
-msgid "Credits"
-msgstr ""
-
-#: ../src/callbacks.c:364
-msgid "Written by"
-msgstr ""
-
-#: ../src/callbacks.c:393
-msgid "License"
-msgstr ""
-
-#: ../src/editor.c:51
+#: ../src/editor.c:59
 msgid "_New"
 msgstr ""
 
-#: ../src/editor.c:53
+#: ../src/editor.c:61
 msgid "_Open"
 msgstr ""
 
-#: ../src/editor.c:56
+#: ../src/editor.c:64
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:58
+#: ../src/editor.c:66
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:61
+#: ../src/editor.c:69
 msgid "_Close"
 msgstr ""
 
-#: ../src/editor.c:68
+#: ../src/editor.c:76
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:70
+#: ../src/editor.c:78
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:72
+#: ../src/editor.c:80
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:73
+#: ../src/editor.c:81
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:74
+#: ../src/editor.c:82
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:76
-msgid "_Select all"
+#: ../src/editor.c:84
+msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:83
+#: ../src/editor.c:91
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:85
+#: ../src/editor.c:93
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:88
+#: ../src/editor.c:96
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/editor.c:96 ../src/editor.c:98
+#: ../src/editor.c:104 ../src/editor.c:106
 msgid "_About"
 msgstr ""
 
-#: ../src/editor.c:105
+#: ../src/editor.c:113
 msgid "_File"
 msgstr ""
 
-#: ../src/editor.c:106
+#: ../src/editor.c:114
 msgid "_Edit"
 msgstr ""
 
-#: ../src/editor.c:107
+#: ../src/editor.c:115
 msgid "_Help"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:122
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:115
+#: ../src/editor.c:123
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:117
+#: ../src/editor.c:125
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:118
+#: ../src/editor.c:126
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:122
+#: ../src/editor.c:130
 msgid "Preferences"
 msgstr ""
 
-#: ../src/editor.c:210
+#: ../src/editor.c:220
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:211
+#: ../src/editor.c:221
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:248 ../src/editor.c:253
+#: ../src/editor.c:292 ../src/editor.c:297
 msgid "Error"
 msgstr ""
 
-#: ../src/editor.c:280 ../src/editor.c:289 ../src/editor.c:399
-#: ../src/editor.c:413 ../src/editor.c:543 ../src/editor.c:548
+#: ../src/editor.c:324 ../src/editor.c:333 ../src/editor.c:443
+#: ../src/editor.c:457 ../src/editor.c:587 ../src/editor.c:592
 msgid "Warning"
 msgstr ""
 
-#: ../src/editor.c:284
+#: ../src/editor.c:328
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to close?"
 msgstr ""
 
-#: ../src/editor.c:319
+#: ../src/editor.c:363
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:326
+#: ../src/editor.c:370
 msgid "Text:"
 msgstr ""
 
-#: ../src/editor.c:333
+#: ../src/editor.c:377
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:335
+#: ../src/editor.c:379
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:358
+#: ../src/editor.c:402
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:403
+#: ../src/editor.c:447
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to discard them?"
 msgstr ""
 
-#: ../src/editor.c:410
+#: ../src/editor.c:454
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:469
+#: ../src/editor.c:513
 msgid "Open file..."
 msgstr ""
 
-#: ../src/editor.c:519
+#: ../src/editor.c:563
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:547
+#: ../src/editor.c:591
 msgid "File exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:556
+#: ../src/editor.c:600
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:571
+#: ../src/editor.c:615
 msgid "Save as..."
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index c209f51..bdf9f86 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: 2010-10-26 01:10+0200\n"
+"POT-Creation-Date: 2010-10-26 01:45+0200\n"
 "PO-Revision-Date: 2010-04-11 12:32+0200\n"
 "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
 "Language-Team: French\n"
@@ -16,148 +16,124 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/callbacks.c:81
+#: ../src/callbacks.c:70
 msgid "Text editor preferences"
 msgstr "Préférences de l'éditeur de texte"
 
-#: ../src/callbacks.c:98
+#: ../src/callbacks.c:87
 msgid "Font:"
 msgstr "Police :"
 
-#: ../src/callbacks.c:276
-msgid "About Editor"
-msgstr "À propos d'Editor"
-
-#: ../src/callbacks.c:287
-msgid "C_redits"
-msgstr "C_rédits"
-
-#: ../src/callbacks.c:291
-msgid "_License"
-msgstr "_Licence"
-
-#: ../src/callbacks.c:341
-msgid "Credits"
-msgstr "Crédits"
-
-#: ../src/callbacks.c:364
-msgid "Written by"
-msgstr "Écrit par"
-
-#: ../src/callbacks.c:393
-msgid "License"
-msgstr "Licence"
-
-#: ../src/editor.c:51
+#: ../src/editor.c:59
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../src/editor.c:53
+#: ../src/editor.c:61
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/editor.c:56
+#: ../src/editor.c:64
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/editor.c:58
+#: ../src/editor.c:66
 msgid "_Save as..."
 msgstr "_Enregistrer sous..."
 
-#: ../src/editor.c:61
+#: ../src/editor.c:69
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/editor.c:68
+#: ../src/editor.c:76
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: ../src/editor.c:70
+#: ../src/editor.c:78
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: ../src/editor.c:72
+#: ../src/editor.c:80
 msgid "_Cut"
 msgstr "Co_uper"
 
-#: ../src/editor.c:73
+#: ../src/editor.c:81
 msgid "_Copy"
 msgstr "_Copier"
 
-#: ../src/editor.c:74
+#: ../src/editor.c:82
 msgid "_Paste"
 msgstr "C_oller"
 
-#: ../src/editor.c:76
-msgid "_Select all"
+#: ../src/editor.c:84
+msgid "Select _all"
 msgstr "Sélectionner _tout"
 
-#: ../src/editor.c:83
+#: ../src/editor.c:91
 msgid "_Unselect all"
 msgstr "Tout _désélectionner"
 
-#: ../src/editor.c:85
+#: ../src/editor.c:93
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../src/editor.c:88
+#: ../src/editor.c:96
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/editor.c:96 ../src/editor.c:98
+#: ../src/editor.c:104 ../src/editor.c:106
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/editor.c:105
+#: ../src/editor.c:113
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/editor.c:106
+#: ../src/editor.c:114
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../src/editor.c:107
+#: ../src/editor.c:115
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/editor.c:114
+#: ../src/editor.c:122
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/editor.c:115
+#: ../src/editor.c:123
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../src/editor.c:117
+#: ../src/editor.c:125
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/editor.c:118
+#: ../src/editor.c:126
 msgid "Save as"
 msgstr "Enregistrer sous"
 
-#: ../src/editor.c:122
+#: ../src/editor.c:130
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/editor.c:210
+#: ../src/editor.c:220
 msgid "Text editor - "
 msgstr "Éditeur de texte - "
 
-#: ../src/editor.c:211
+#: ../src/editor.c:221
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: ../src/editor.c:248 ../src/editor.c:253
+#: ../src/editor.c:292 ../src/editor.c:297
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/editor.c:280 ../src/editor.c:289 ../src/editor.c:399
-#: ../src/editor.c:413 ../src/editor.c:543 ../src/editor.c:548
+#: ../src/editor.c:324 ../src/editor.c:333 ../src/editor.c:443
+#: ../src/editor.c:457 ../src/editor.c:587 ../src/editor.c:592
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../src/editor.c:284
+#: ../src/editor.c:328
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to close?"
@@ -165,27 +141,27 @@ msgstr ""
 "Il y a des modifications non enregistrées.\n"
 "Voulez-vous fermer tout de même ?"
 
-#: ../src/editor.c:319
+#: ../src/editor.c:363
 msgid "Find text"
 msgstr "Rechercher"
 
-#: ../src/editor.c:326
+#: ../src/editor.c:370
 msgid "Text:"
 msgstr "Texte :"
 
-#: ../src/editor.c:333
+#: ../src/editor.c:377
 msgid "Case-sensitive"
 msgstr "Sensible à la casse"
 
-#: ../src/editor.c:335
+#: ../src/editor.c:379
 msgid "Wrap"
 msgstr "Boucler"
 
-#: ../src/editor.c:358
+#: ../src/editor.c:402
 msgid "Text not found"
 msgstr "Texte non trouvé"
 
-#: ../src/editor.c:403
+#: ../src/editor.c:447
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to discard them?"
@@ -193,27 +169,27 @@ msgstr ""
 "Il y a des changements non enregistrés.\n"
 "Êtes-vous sûr de vouloir les annuler ?"
 
-#: ../src/editor.c:410
+#: ../src/editor.c:454
 msgid "Discard"
 msgstr "Annuler"
 
-#: ../src/editor.c:469
+#: ../src/editor.c:513
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: ../src/editor.c:519
+#: ../src/editor.c:563
 msgid "Partial write"
 msgstr "Écriture partielle"
 
-#: ../src/editor.c:547
+#: ../src/editor.c:591
 msgid "File exists. Overwrite?"
 msgstr "Le fichier existe. L'écraser ?"
 
-#: ../src/editor.c:556
+#: ../src/editor.c:600
 msgid "Allocation error"
 msgstr "Erreur d'allocation"
 
-#: ../src/editor.c:571
+#: ../src/editor.c:615
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
diff --git a/po/it.po b/po/it.po
index a4e1b4c..988c0c4 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: 2010-10-26 01:10+0200\n"
+"POT-Creation-Date: 2010-10-26 01:45+0200\n"
 "PO-Revision-Date: 2010-04-09 16:43+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
@@ -17,200 +17,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/callbacks.c:81
+#: ../src/callbacks.c:70
 msgid "Text editor preferences"
 msgstr ""
 
-#: ../src/callbacks.c:98
+#: ../src/callbacks.c:87
 msgid "Font:"
 msgstr ""
 
-#: ../src/callbacks.c:276
-msgid "About Editor"
-msgstr ""
-
-#: ../src/callbacks.c:287
-msgid "C_redits"
-msgstr ""
-
-#: ../src/callbacks.c:291
-msgid "_License"
-msgstr ""
-
-#: ../src/callbacks.c:341
-msgid "Credits"
-msgstr ""
-
-#: ../src/callbacks.c:364
-msgid "Written by"
-msgstr ""
-
-#: ../src/callbacks.c:393
-msgid "License"
-msgstr ""
-
-#: ../src/editor.c:51
+#: ../src/editor.c:59
 msgid "_New"
 msgstr ""
 
-#: ../src/editor.c:53
+#: ../src/editor.c:61
 msgid "_Open"
 msgstr ""
 
-#: ../src/editor.c:56
+#: ../src/editor.c:64
 msgid "_Save"
 msgstr ""
 
-#: ../src/editor.c:58
+#: ../src/editor.c:66
 msgid "_Save as..."
 msgstr ""
 
-#: ../src/editor.c:61
+#: ../src/editor.c:69
 msgid "_Close"
 msgstr ""
 
-#: ../src/editor.c:68
+#: ../src/editor.c:76
 msgid "_Undo"
 msgstr ""
 
-#: ../src/editor.c:70
+#: ../src/editor.c:78
 msgid "_Redo"
 msgstr ""
 
-#: ../src/editor.c:72
+#: ../src/editor.c:80
 msgid "_Cut"
 msgstr ""
 
-#: ../src/editor.c:73
+#: ../src/editor.c:81
 msgid "_Copy"
 msgstr ""
 
-#: ../src/editor.c:74
+#: ../src/editor.c:82
 msgid "_Paste"
 msgstr ""
 
-#: ../src/editor.c:76
-msgid "_Select all"
+#: ../src/editor.c:84
+msgid "Select _all"
 msgstr ""
 
-#: ../src/editor.c:83
+#: ../src/editor.c:91
 msgid "_Unselect all"
 msgstr ""
 
-#: ../src/editor.c:85
+#: ../src/editor.c:93
 msgid "_Find"
 msgstr ""
 
-#: ../src/editor.c:88
+#: ../src/editor.c:96
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/editor.c:96 ../src/editor.c:98
+#: ../src/editor.c:104 ../src/editor.c:106
 msgid "_About"
 msgstr ""
 
-#: ../src/editor.c:105
+#: ../src/editor.c:113
 msgid "_File"
 msgstr ""
 
-#: ../src/editor.c:106
+#: ../src/editor.c:114
 msgid "_Edit"
 msgstr ""
 
-#: ../src/editor.c:107
+#: ../src/editor.c:115
 msgid "_Help"
 msgstr ""
 
-#: ../src/editor.c:114
+#: ../src/editor.c:122
 msgid "New"
 msgstr ""
 
-#: ../src/editor.c:115
+#: ../src/editor.c:123
 msgid "Open"
 msgstr ""
 
-#: ../src/editor.c:117
+#: ../src/editor.c:125
 msgid "Save"
 msgstr ""
 
-#: ../src/editor.c:118
+#: ../src/editor.c:126
 msgid "Save as"
 msgstr ""
 
-#: ../src/editor.c:122
+#: ../src/editor.c:130
 msgid "Preferences"
 msgstr ""
 
-#: ../src/editor.c:210
+#: ../src/editor.c:220
 msgid "Text editor - "
 msgstr ""
 
-#: ../src/editor.c:211
+#: ../src/editor.c:221
 msgid "(Untitled)"
 msgstr ""
 
-#: ../src/editor.c:248 ../src/editor.c:253
+#: ../src/editor.c:292 ../src/editor.c:297
 msgid "Error"
 msgstr ""
 
-#: ../src/editor.c:280 ../src/editor.c:289 ../src/editor.c:399
-#: ../src/editor.c:413 ../src/editor.c:543 ../src/editor.c:548
+#: ../src/editor.c:324 ../src/editor.c:333 ../src/editor.c:443
+#: ../src/editor.c:457 ../src/editor.c:587 ../src/editor.c:592
 msgid "Warning"
 msgstr ""
 
-#: ../src/editor.c:284
+#: ../src/editor.c:328
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to close?"
 msgstr ""
 
-#: ../src/editor.c:319
+#: ../src/editor.c:363
 msgid "Find text"
 msgstr ""
 
-#: ../src/editor.c:326
+#: ../src/editor.c:370
 msgid "Text:"
 msgstr ""
 
-#: ../src/editor.c:333
+#: ../src/editor.c:377
 msgid "Case-sensitive"
 msgstr ""
 
-#: ../src/editor.c:335
+#: ../src/editor.c:379
 msgid "Wrap"
 msgstr ""
 
-#: ../src/editor.c:358
+#: ../src/editor.c:402
 msgid "Text not found"
 msgstr ""
 
-#: ../src/editor.c:403
+#: ../src/editor.c:447
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to discard them?"
 msgstr ""
 
-#: ../src/editor.c:410
+#: ../src/editor.c:454
 msgid "Discard"
 msgstr ""
 
-#: ../src/editor.c:469
+#: ../src/editor.c:513
 msgid "Open file..."
 msgstr ""
 
-#: ../src/editor.c:519
+#: ../src/editor.c:563
 msgid "Partial write"
 msgstr ""
 
-#: ../src/editor.c:547
+#: ../src/editor.c:591
 msgid "File exists. Overwrite?"
 msgstr ""
 
-#: ../src/editor.c:556
+#: ../src/editor.c:600
 msgid "Allocation error"
 msgstr ""
 
-#: ../src/editor.c:571
+#: ../src/editor.c:615
 msgid "Save as..."
 msgstr ""
 
diff --git a/src/callbacks.c b/src/callbacks.c
index 1b77f92..0fb5138 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1,19 +1,17 @@
 /* $Id$ */
-static char const _copyright[] =
-"Copyright (c) 2010 Pierre Pronchery <khorben@defora.org>";
+/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
 /* This file is part of DeforaOS Desktop Editor */
-static char const _license[] =
-"Editor is free software; you can redistribute it and/or modify it under the\n"
-"terms of the GNU General Public License version 3 as published by the Free\n"
-"Software Foundation.\n"
-"\n"
-"Editor is distributed in the hope that it will be useful, but WITHOUT ANY\n"
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n"
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\n"
-"details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with\n"
-"Editor; if not, see <http://www.gnu.org/licenses/>.\n";
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 
 
@@ -25,15 +23,6 @@ static char const _license[] =
 #define _(string) gettext(string)
 
 
-/* private */
-/* constants */
-static char const * _authors[] =
-{
-	"Pierre Pronchery <khorben@defora.org>",
-	NULL
-};
-
-
 /* public */
 /* functions */
 gboolean on_closex(gpointer data)
@@ -214,208 +203,12 @@ void on_file_save_as(gpointer data)
 
 
 /* on_help_about */
-static gboolean _about_on_closex(gpointer data);
-#if !GTK_CHECK_VERSION(2, 6, 0)
-static void _about_on_close(GtkWidget * widget, gpointer data);
-static void _about_on_credits(GtkWidget * widget, gpointer data);
-static void _about_on_license(GtkWidget * widget, gpointer data);
-#endif
-
 void on_help_about(gpointer data)
 {
 	Editor * editor = data;
-	static GtkWidget * window = NULL;
-#if GTK_CHECK_VERSION(2, 6, 0)
-	gsize cnt = 65536;
-	gchar * buf;
 
-	if(window != NULL)
-	{
-		gtk_widget_show(window);
-		return;
-	}
-	if((buf = malloc(sizeof(*buf) * cnt)) == NULL)
-	{
-		editor_error(editor, "malloc", 0);
-		return;
-	}
-	window = gtk_about_dialog_new();
-	gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
-				editor->window));
-	g_signal_connect_swapped(G_OBJECT(window), "delete-event", G_CALLBACK(
-				_about_on_closex), window);
-	g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(
-				gtk_widget_hide), NULL);
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(window), PACKAGE);
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window), VERSION);
-	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(window), _authors);
-	gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(window), _copyright);
-	gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(window),
-			"text-editor");
-	if(g_file_get_contents("/usr/share/common-licenses/GPL-2", &buf, &cnt,
-				NULL) == TRUE)
-		gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window), buf);
-	else
-		gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window),
-				_license);
-	free(buf);
-	gtk_widget_show(window);
+	editor_about(editor);
 }
-#else
-	GtkWidget * vbox;
-	GtkWidget * hbox;
-	GtkWidget * button;
-
-	if(window != NULL)
-	{
-		gtk_widget_show(window);
-		return;
-	}
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_container_set_border_width(GTK_CONTAINER(window), 4);
-	gtk_window_set_title(GTK_WINDOW(window), _("About Editor"));
-	gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
-				editor->window));
-	g_signal_connect_swapped(G_OBJECT(window), "delete-event", G_CALLBACK(
-				_about_on_closex), window);
-	vbox = gtk_vbox_new(FALSE, 2);
-	gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(PACKAGE " " VERSION),
-			FALSE, FALSE, 2); 
-	gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(_copyright), FALSE,
-			FALSE, 2);
-	hbox = gtk_hbox_new(TRUE, 4);
-	button = gtk_button_new_with_mnemonic(_("C_redits"));
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
-				_about_on_credits), window);
-	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
-	button = gtk_button_new_with_mnemonic(_("_License"));
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
-				_about_on_license), window);
-	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
-	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
-				_about_on_close), window);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 4);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	gtk_widget_show_all(window);
-}
-#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
-
-static gboolean _about_on_closex(gpointer data)
-{
-	GtkWidget * widget = data;
-
-	gtk_widget_hide(widget);
-	return TRUE;
-}
-
-#if !GTK_CHECK_VERSION(2, 6, 0)
-static void _about_on_close(GtkWidget * widget, gpointer data)
-{
-        GtkWidget * window = data;
-
-        gtk_widget_hide(window);
-}
-
-static void _about_on_credits(GtkWidget * widget, gpointer data)
-{
-	static GtkWidget * window = NULL;
-	GtkWidget * about = data;
-	GtkWidget * vbox;
-	GtkWidget * notebook;
-	GtkWidget * textview;
-	GtkTextBuffer * tbuf;
-	GtkTextIter iter;
-	GtkWidget * hbox;
-	size_t i;
-
-	if(window != NULL)
-	{
-		gtk_widget_show(window);
-		return;
-	}
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
-	gtk_container_set_border_width(GTK_CONTAINER(window), 4);
-	gtk_window_set_title(GTK_WINDOW(window), _("Credits"));
-	gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
-	g_signal_connect_swapped(G_OBJECT(window), "delete-event", G_CALLBACK(
-				_about_on_closex), window);
-	vbox = gtk_vbox_new(FALSE, 0);
-	textview = gtk_text_view_new();
-	gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
-	tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
-	gtk_text_buffer_set_text(tbuf, "", 0);
-	for(i = 0; _authors[i] != NULL; i++)
-	{
-		gtk_text_buffer_get_end_iter(tbuf, &iter);
-		gtk_text_buffer_insert(tbuf, &iter, _authors[i], strlen(
-					_authors[i]));
-	}
-	widget = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
-			GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
-			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add(GTK_CONTAINER(widget), textview);
-	notebook = gtk_notebook_new();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget,
-			gtk_label_new(_("Written by")));
-	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 4);
-	hbox = gtk_hbox_new(FALSE, 0);
-	widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
-				_about_on_close), window);
-	gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	gtk_widget_show_all(window);
-}
-
-static void _about_on_license(GtkWidget * widget, gpointer data)
-{
-	static GtkWidget * window = NULL;
-	GtkWidget * about = data;
-	GtkWidget * vbox;
-	GtkWidget * textview;
-	GtkTextBuffer * tbuf;
-	GtkWidget * hbox;
-
-	if(window != NULL)
-	{
-		gtk_widget_show(window);
-		return;
-	}
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
-	gtk_container_set_border_width(GTK_CONTAINER(window), 4);
-	gtk_window_set_title(GTK_WINDOW(window), _("License"));
-	gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
-	g_signal_connect_swapped(G_OBJECT(window), "delete-event", G_CALLBACK(
-				_about_on_closex), window);
-	vbox = gtk_vbox_new(FALSE, 0);
-	textview = gtk_text_view_new();
-	gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
-	tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
-	gtk_text_buffer_set_text(tbuf, _license, strlen(_license));
-	widget = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
-			GTK_SHADOW_IN);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
-			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add(GTK_CONTAINER(widget), textview);
-	gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 4);
-	hbox = gtk_hbox_new(FALSE, 0);
-	widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	g_signal_connect(G_OBJECT(widget), "clicked",
-			G_CALLBACK(_about_on_close), window);
-	gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	gtk_widget_show_all(window);
-}
-#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
 
 
 /* toolbar */
diff --git a/src/editor.c b/src/editor.c
index 0c6b584..4cd6830 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,17 +1,19 @@
 /* $Id$ */
-/* Copyright (c) 2010 Pierre Pronchery <khorben@defora.org> */
+static char const _copyright[] =
+"Copyright (c) 2010 Pierre Pronchery <khorben@defora.org>";
 /* This file is part of DeforaOS Desktop Editor */
-/* Editor is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License version 3 as published by the Free
- * Software Foundation.
- *
- * Editor is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * Editor; if not, see <http://www.gnu.org/licenses/>. */
+static char const _license[] =
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, version 3 of the License.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\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";
 
 
 
@@ -32,6 +34,12 @@
 /* Editor */
 /* private */
 /* variables */
+static char const * _authors[] =
+{
+	"Pierre Pronchery <khorben@defora.org>",
+	NULL
+};
+
 #ifdef EMBEDDED
 static DesktopAccel _editor_accel[] =
 {
@@ -197,6 +205,8 @@ Editor * editor_new(void)
 	editor->pr_window = NULL;
 	/* find */
 	editor->fi_dialog = NULL;
+	/* about */
+	editor->ab_window = NULL;
 	gtk_container_add(GTK_CONTAINER(editor->window), vbox);
 	gtk_window_set_focus(GTK_WINDOW(editor->window), editor->view);
 	gtk_widget_show_all(editor->window);
@@ -236,6 +246,40 @@ void editor_set_font(Editor * editor, char const * font)
 
 
 /* useful */
+/* editor_about */
+static gboolean _about_on_closex(gpointer data);
+
+void editor_about(Editor * editor)
+{
+	if(editor->ab_window != NULL)
+	{
+		gtk_widget_show(editor->ab_window);
+		return;
+	}
+	editor->ab_window = desktop_about_dialog_new();
+	gtk_window_set_transient_for(GTK_WINDOW(editor->ab_window),
+			GTK_WINDOW(editor->window));
+	desktop_about_dialog_set_authors(editor->ab_window, _authors);
+	desktop_about_dialog_set_copyright(editor->ab_window, _copyright);
+	desktop_about_dialog_set_logo_icon_name(editor->ab_window,
+			"text-editor");
+	desktop_about_dialog_set_license(editor->ab_window, _license);
+	desktop_about_dialog_set_name(editor->ab_window, PACKAGE);
+	desktop_about_dialog_set_version(editor->ab_window, VERSION);
+	g_signal_connect_swapped(G_OBJECT(editor->ab_window), "delete-event",
+			G_CALLBACK(_about_on_closex), editor);
+	gtk_widget_show(editor->ab_window);
+}
+
+static gboolean _about_on_closex(gpointer data)
+{
+	Editor * editor = data;
+
+	gtk_widget_hide(editor->ab_window);
+	return TRUE;
+}
+
+
 /* editor_error */
 int editor_error(Editor * editor, char const * message, int ret)
 {
diff --git a/src/editor.h b/src/editor.h
index 2b50c49..ffda211 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -41,6 +41,8 @@ typedef struct _Editor
 	GtkWidget * fi_text;
 	GtkWidget * fi_case;
 	GtkWidget * fi_wrap;
+	/* about */
+	GtkWidget * ab_window;
 } Editor;
 
 
@@ -56,6 +58,8 @@ void editor_delete(Editor * editor);
 void editor_set_font(Editor * editor, char const * font);
 
 /* useful */
+void editor_about(Editor * editor);
+
 int editor_error(Editor * editor, char const * message, int ret);
 
 gboolean editor_close(Editor * editor);