diff --git a/po/xed.pot b/po/xed.pot
index 79fa1b1..962929c 100644
--- a/po/xed.pot
+++ b/po/xed.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-08 12:08+0100\n"
+"POT-Creation-Date: 2018-11-19 11:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,105 +455,98 @@ msgid ""
 "indentation levels. </p>"
 msgstr ""
 
-#: ../data/xed.desktop.in.in.h:1 ../xed/xed-print-job.c:710
-msgid "Text Editor"
-msgstr ""
-
-#: ../data/xed.desktop.in.in.h:2
-msgid "Edit text files"
-msgstr ""
-
-#: ../xed/xed-app.c:105
+#: ../xed/xed-app.c:102
 msgid "Show the application's version"
 msgstr ""
 
-#: ../xed/xed-app.c:111
+#: ../xed/xed-app.c:108
 msgid "Display list of possible values for the encoding option"
 msgstr ""
 
-#: ../xed/xed-app.c:118
+#: ../xed/xed-app.c:115
 msgid ""
 "Set the character encoding to be used to open the files listed on the "
 "command line"
 msgstr ""
 
-#: ../xed/xed-app.c:119
+#: ../xed/xed-app.c:116
 msgid "ENCODING"
 msgstr ""
 
-#: ../xed/xed-app.c:125
+#: ../xed/xed-app.c:122
 msgid "Create a new top-level window in an existing instance of xed"
 msgstr ""
 
-#: ../xed/xed-app.c:132
+#: ../xed/xed-app.c:129
 msgid "Create a new document in an existing instance of xed"
 msgstr ""
 
-#: ../xed/xed-app.c:139
+#: ../xed/xed-app.c:136
 msgid "Set the size and position of the window (WIDTHxHEIGHT+X+Y)"
 msgstr ""
 
-#: ../xed/xed-app.c:140
+#: ../xed/xed-app.c:137
 msgid "GEOMETRY"
 msgstr ""
 
-#: ../xed/xed-app.c:146
+#: ../xed/xed-app.c:143
 msgid "Open files and block process until files are closed"
 msgstr ""
 
-#: ../xed/xed-app.c:153
+#: ../xed/xed-app.c:150
 msgid "Run xed in standalone mode"
 msgstr ""
 
-#: ../xed/xed-app.c:160
+#: ../xed/xed-app.c:157
 msgid "[FILE...] [+LINE]"
 msgstr ""
 
-#: ../xed/xed-app.c:619
+#: ../xed/xed-app.c:616
 #, c-format
 msgid "%s: invalid encoding."
 msgstr ""
 
-#: ../xed/xed-app.c:1269
+#: ../xed/xed-app.c:1266
 msgid "There was an error displaying the help."
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:136
+#: ../xed/xed-close-confirmation-dialog.c:133
 msgid "Log Out _without Saving"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:137
+#: ../xed/xed-close-confirmation-dialog.c:134
 msgid "_Cancel Logout"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:141
+#: ../xed/xed-close-confirmation-dialog.c:138
 msgid "Close _without Saving"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:142 ../xed/xed-commands-file.c:402
-#: ../xed/xed-commands-file.c:505 ../xed/xed-commands-file.c:651
-#: ../xed/xed-commands-file.c:1336 ../xed/xed-encodings-dialog.c:340
-#: ../xed/xed-io-error-info-bar.c:151 ../xed/xed-io-error-info-bar.c:410
-#: ../xed/xed-io-error-info-bar.c:1055
-#: ../plugins/filebrowser/xed-file-browser-utils.c:156
+#: ../xed/xed-close-confirmation-dialog.c:139 ../xed/xed-commands-file.c:399
+#: ../xed/xed-commands-file.c:502 ../xed/xed-commands-file.c:648
+#: ../xed/xed-commands-file.c:1333 ../xed/xed-encodings-dialog.c:336
+#: ../xed/xed-io-error-info-bar.c:147 ../xed/xed-io-error-info-bar.c:406
+#: ../xed/xed-io-error-info-bar.c:1051
+#: ../xed/resources/ui/xed-highlight-mode-dialog.ui.h:2
+#: ../plugins/filebrowser/xed-file-browser-utils.c:153
 msgid "_Cancel"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:162
+#: ../xed/xed-close-confirmation-dialog.c:159
 msgid "_Save As..."
 msgstr ""
 
 #. File menu
-#: ../xed/xed-close-confirmation-dialog.c:166 ../xed/xed-commands-file.c:652
-#: ../xed/xed-ui.h:82
+#: ../xed/xed-close-confirmation-dialog.c:165 ../xed/xed-commands-file.c:649
+#: ../xed/xed-ui.h:79
 msgid "_Save"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:191
+#: ../xed/xed-close-confirmation-dialog.c:192
 msgid "Question"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:384
+#: ../xed/xed-close-confirmation-dialog.c:385
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld second will be permanently lost."
@@ -563,12 +556,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:393
+#: ../xed/xed-close-confirmation-dialog.c:394
 msgid ""
 "If you don't save, changes from the last minute will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:398
+#: ../xed/xed-close-confirmation-dialog.c:399
 #, c-format
 msgid ""
 "If you don't save, changes from the last minute and %ld second will be "
@@ -579,7 +572,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:407
+#: ../xed/xed-close-confirmation-dialog.c:408
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld minute will be permanently lost."
@@ -589,11 +582,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:422
+#: ../xed/xed-close-confirmation-dialog.c:423
 msgid "If you don't save, changes from the last hour will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:427
+#: ../xed/xed-close-confirmation-dialog.c:428
 #, c-format
 msgid ""
 "If you don't save, changes from the last hour and %d minute will be "
@@ -604,7 +597,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:441
+#: ../xed/xed-close-confirmation-dialog.c:442
 #, c-format
 msgid ""
 "If you don't save, changes from the last %d hour will be permanently lost."
@@ -613,12 +606,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:482
+#: ../xed/xed-close-confirmation-dialog.c:483
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: ../xed/xed-close-confirmation-dialog.c:647
+#: ../xed/xed-close-confirmation-dialog.c:648
 #, c-format
 msgid "There is %d document with unsaved changes. Save changes before closing?"
 msgid_plural ""
@@ -626,21 +619,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-close-confirmation-dialog.c:664
+#: ../xed/xed-close-confirmation-dialog.c:665
 msgid "S_elect the documents you want to save:"
 msgstr ""
 
 #. Secondary label
-#: ../xed/xed-close-confirmation-dialog.c:680
+#: ../xed/xed-close-confirmation-dialog.c:681
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:232
+#: ../xed/xed-commands-file.c:229
 #, c-format
 msgid "Loading file '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:241
+#: ../xed/xed-commands-file.c:238
 #, c-format
 msgid "Loading %d file…"
 msgid_plural "Loading %d files…"
@@ -648,48 +641,48 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: "Open Files" is the title of the file chooser window
-#: ../xed/xed-commands-file.c:398
+#: ../xed/xed-commands-file.c:395
 msgid "Open Files"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:403
-#: ../plugins/filebrowser/xed-file-browser-widget.c:770
+#: ../xed/xed-commands-file.c:400
+#: ../plugins/filebrowser/xed-file-browser-widget.c:766
 msgid "_Open"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:497
+#: ../xed/xed-commands-file.c:494
 #, c-format
 msgid "The file \"%s\" is read-only."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:502
+#: ../xed/xed-commands-file.c:499
 msgid "Do you want to try to replace it with the one you are saving?"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:506 ../xed/xed-ui.h:119
+#: ../xed/xed-commands-file.c:503 ../xed/xed-ui.h:118
 msgid "_Replace"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:567 ../xed/xed-commands-file.c:804
+#: ../xed/xed-commands-file.c:564 ../xed/xed-commands-file.c:801
 #, c-format
 msgid "Saving file '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:647
+#: ../xed/xed-commands-file.c:644
 msgid "Save As…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1205
+#: ../xed/xed-commands-file.c:1202
 #, c-format
 msgid "Reverting the document '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1252
+#: ../xed/xed-commands-file.c:1249
 #, c-format
 msgid "Revert unsaved changes to document '%s'?"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1259
+#: ../xed/xed-commands-file.c:1256
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld second will be permanently lost."
@@ -699,12 +692,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1268
+#: ../xed/xed-commands-file.c:1265
 msgid ""
 "Changes made to the document in the last minute will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1273
+#: ../xed/xed-commands-file.c:1270
 #, c-format
 msgid ""
 "Changes made to the document in the last minute and %ld second will be "
@@ -715,7 +708,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1282
+#: ../xed/xed-commands-file.c:1279
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld minute will be permanently lost."
@@ -725,11 +718,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1297
+#: ../xed/xed-commands-file.c:1294
 msgid "Changes made to the document in the last hour will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1302
+#: ../xed/xed-commands-file.c:1299
 #, c-format
 msgid ""
 "Changes made to the document in the last hour and %d minute will be "
@@ -740,7 +733,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1316
+#: ../xed/xed-commands-file.c:1313
 #, c-format
 msgid ""
 "Changes made to the document in the last %d hour will be permanently lost."
@@ -749,135 +742,139 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1337
+#: ../xed/xed-commands-file.c:1334
 msgid "_Revert"
 msgstr ""
 
-#: ../xed/xed-commands-help.c:58
+#: ../xed/xed-commands-help.c:55
 msgid "A small and lightweight text editor"
 msgstr ""
 
-#: ../xed/xed-document.c:977 ../xed/xed-document.c:1009
+#: ../xed/xed-document.c:973 ../xed/xed-document.c:1005
 #, c-format
 msgid "Unsaved Document %d"
 msgstr ""
 
-#: ../xed/xed-documents-panel.c:95 ../xed/xed-documents-panel.c:106
-#: ../xed/xed-window.c:1995 ../xed/xed-window.c:1999
+#: ../xed/xed-documents-panel.c:93 ../xed/xed-documents-panel.c:104
+#: ../xed/xed-window.c:1731 ../xed/xed-window.c:1735
 msgid "Read-Only"
 msgstr ""
 
-#: ../xed/xed-documents-panel.c:732 ../xed/resources/ui/xed-shortcuts.ui.h:1
-#: ../xed/xed-window.c:3244
+#: ../xed/xed-documents-panel.c:730 ../xed/resources/ui/xed-shortcuts.ui.h:1
+#: ../xed/xed-window.c:2956
 msgid "Documents"
 msgstr ""
 
-#: ../xed/xed-encodings-combo-box.c:268
+#: ../xed/xed-encodings-combo-box.c:264
 msgid "Automatically Detected"
 msgstr ""
 
-#: ../xed/xed-encodings-combo-box.c:287 ../xed/xed-encodings-combo-box.c:301
+#: ../xed/xed-encodings-combo-box.c:283 ../xed/xed-encodings-combo-box.c:297
 #, c-format
 msgid "Current Locale (%s)"
 msgstr ""
 
-#: ../xed/xed-encodings-combo-box.c:348
+#: ../xed/xed-encodings-combo-box.c:344
 msgid "Add or Remove..."
 msgstr ""
 
-#: ../xed/xed-encodings-dialog.c:341 ../plugins/time/xed-time-plugin.c:793
+#: ../xed/xed-encodings-dialog.c:337 ../plugins/time/xed-time-plugin.c:789
 msgid "_OK"
 msgstr ""
 
-#: ../xed/xed-encodings-dialog.c:342 ../xed/xed-ui.h:53
-#: ../plugins/spell/xed-spell-plugin.c:438
+#: ../xed/xed-encodings-dialog.c:338 ../xed/xed-ui.h:50
+#: ../plugins/spell/xed-spell-plugin.c:435
 msgid "_Help"
 msgstr ""
 
-#: ../xed/xed-encodings-dialog.c:345
+#: ../xed/xed-encodings-dialog.c:341
 msgid "Character Encodings"
 msgstr ""
 
-#: ../xed/xed-encodings-dialog.c:378 ../xed/xed-encodings-dialog.c:415
+#: ../xed/xed-encodings-dialog.c:374 ../xed/xed-encodings-dialog.c:411
 msgid "_Description"
 msgstr ""
 
-#: ../xed/xed-encodings-dialog.c:386 ../xed/xed-encodings-dialog.c:423
+#: ../xed/xed-encodings-dialog.c:382 ../xed/xed-encodings-dialog.c:419
 msgid "_Encoding"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:50 ../xed/xed-preferences-dialog.c:727
+#: ../xed/xed-file-chooser-dialog.c:46 ../xed/xed-preferences-dialog.c:723
 msgid "All Files"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:51
+#: ../xed/xed-file-chooser-dialog.c:47
 msgid "All Text Files"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:93
+#: ../xed/xed-file-chooser-dialog.c:89
 msgid "C_haracter Encoding:"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:149
+#: ../xed/xed-file-chooser-dialog.c:145
 msgid "L_ine Ending:"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:160
+#: ../xed/xed-file-chooser-dialog.c:156
 msgid "Unix/Linux"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:161
+#: ../xed/xed-file-chooser-dialog.c:157
 msgid "Mac OS Classic"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:162
+#: ../xed/xed-file-chooser-dialog.c:158
 msgid "Windows"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:158 ../xed/xed-io-error-info-bar.c:394
+#: ../xed/xed-highlight-mode-selector.c:269 ../xed/xed-window.c:1849
+msgid "Plain Text"
+msgstr ""
+
+#: ../xed/xed-io-error-info-bar.c:154 ../xed/xed-io-error-info-bar.c:390
 msgid "_Retry"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:177
+#: ../xed/xed-io-error-info-bar.c:173
 #, c-format
 msgid "Could not find the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:178 ../xed/xed-io-error-info-bar.c:212
-#: ../xed/xed-io-error-info-bar.c:217
+#: ../xed/xed-io-error-info-bar.c:174 ../xed/xed-io-error-info-bar.c:208
+#: ../xed/xed-io-error-info-bar.c:213
 msgid "Please check that you typed the location correctly and try again."
 msgstr ""
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../xed/xed-io-error-info-bar.c:193
+#: ../xed/xed-io-error-info-bar.c:189
 #, c-format
 msgid "xed cannot handle %s locations."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:198
+#: ../xed/xed-io-error-info-bar.c:194
 msgid "xed cannot handle this location."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:205
+#: ../xed/xed-io-error-info-bar.c:201
 msgid "The location of the file cannot be mounted."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:208
+#: ../xed/xed-io-error-info-bar.c:204
 msgid "The location of the file cannot be accessed because it is not mounted."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:211
+#: ../xed/xed-io-error-info-bar.c:207
 #, c-format
 msgid "%s is a directory."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:216
+#: ../xed/xed-io-error-info-bar.c:212
 #, c-format
 msgid "%s is not a valid location."
 msgstr ""
 
 #. Translators: %s is a host name
-#: ../xed/xed-io-error-info-bar.c:246
+#: ../xed/xed-io-error-info-bar.c:242
 #, c-format
 msgid ""
 "Host %s could not be found. Please check that your proxy settings are "
@@ -885,103 +882,103 @@ msgid ""
 msgstr ""
 
 #. use the same string as INVALID_HOST
-#: ../xed/xed-io-error-info-bar.c:260
+#: ../xed/xed-io-error-info-bar.c:256
 #, c-format
 msgid ""
 "Hostname was invalid. Please check that you typed the location correctly and "
 "try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:267
+#: ../xed/xed-io-error-info-bar.c:263
 #, c-format
 msgid "%s is not a regular file."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:270
+#: ../xed/xed-io-error-info-bar.c:266
 msgid "Connection timed out. Please try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:297
+#: ../xed/xed-io-error-info-bar.c:293
 #, c-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:330
+#: ../xed/xed-io-error-info-bar.c:326
 msgid "xed cannot find the file. Perhaps it has recently been deleted."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:340
+#: ../xed/xed-io-error-info-bar.c:336
 #, c-format
 msgid "Could not revert the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:363
+#: ../xed/xed-io-error-info-bar.c:359
 msgid "Ch_aracter Encoding:"
 msgstr ""
 
 #. Translators: the access key chosen for this string should be
 #. different from other main menu access keys (Open, Edit, View...)
-#: ../xed/xed-io-error-info-bar.c:401 ../xed/xed-io-error-info-bar.c:658
+#: ../xed/xed-io-error-info-bar.c:397 ../xed/xed-io-error-info-bar.c:654
 msgid "Edit Any_way"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:493
+#: ../xed/xed-io-error-info-bar.c:489
 msgid ""
 "The number of followed links is limited and the actual file could not be "
 "found within this limit."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:497
+#: ../xed/xed-io-error-info-bar.c:493
 msgid "You do not have the permissions necessary to open the file."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:503
+#: ../xed/xed-io-error-info-bar.c:499
 msgid "xed has not been able to detect the character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:505 ../xed/xed-io-error-info-bar.c:528
+#: ../xed/xed-io-error-info-bar.c:501 ../xed/xed-io-error-info-bar.c:524
 msgid "Please check that you are not trying to open a binary file."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:506
+#: ../xed/xed-io-error-info-bar.c:502
 msgid "Select a character encoding from the menu and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:512
+#: ../xed/xed-io-error-info-bar.c:508
 #, c-format
 msgid "There was a problem opening the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:513
+#: ../xed/xed-io-error-info-bar.c:509
 msgid ""
 "The file you opened has some invalid characters. If you continue editing "
 "this file you could corrupt this document."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:516
+#: ../xed/xed-io-error-info-bar.c:512
 msgid "You can also choose another character encoding and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:525
+#: ../xed/xed-io-error-info-bar.c:521
 #, c-format
 msgid "Could not open the file %s using the %s character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:529 ../xed/xed-io-error-info-bar.c:598
+#: ../xed/xed-io-error-info-bar.c:525 ../xed/xed-io-error-info-bar.c:594
 msgid "Select a different character encoding from the menu and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:541
+#: ../xed/xed-io-error-info-bar.c:537
 #, c-format
 msgid "Could not open the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:593
+#: ../xed/xed-io-error-info-bar.c:589
 #, c-format
 msgid "Could not save the file %s using the %s character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:596
+#: ../xed/xed-io-error-info-bar.c:592
 msgid ""
 "The document contains one or more characters that cannot be encoded using "
 "the specified character encoding."
@@ -989,28 +986,28 @@ msgstr ""
 
 #. Translators: the access key chosen for this string should be
 #. different from other main menu access keys (Open, Edit, View...)
-#: ../xed/xed-io-error-info-bar.c:663
+#: ../xed/xed-io-error-info-bar.c:659
 msgid "D_on't Edit"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:677
+#: ../xed/xed-io-error-info-bar.c:673
 #, c-format
 msgid "This file (%s) is already open in another xed window."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:691
+#: ../xed/xed-io-error-info-bar.c:687
 msgid ""
 "xed opened this instance of the file in a non-editable way. Do you want to "
 "edit it anyway?"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:746 ../xed/xed-io-error-info-bar.c:834
-#: ../xed/xed-io-error-info-bar.c:1096
+#: ../xed/xed-io-error-info-bar.c:742 ../xed/xed-io-error-info-bar.c:830
+#: ../xed/xed-io-error-info-bar.c:1092
 msgid "S_ave Anyway"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:747 ../xed/xed-io-error-info-bar.c:835
-#: ../xed/xed-io-error-info-bar.c:1098
+#: ../xed/xed-io-error-info-bar.c:743 ../xed/xed-io-error-info-bar.c:831
+#: ../xed/xed-io-error-info-bar.c:1094
 msgid "D_on't Save"
 msgstr ""
 
@@ -1018,26 +1015,26 @@ msgstr ""
 #. * could be interpreted as the changes he made in the document. beside "reading" is
 #. * not accurate (since last load/save)
 #.
-#: ../xed/xed-io-error-info-bar.c:764
+#: ../xed/xed-io-error-info-bar.c:760
 #, c-format
 msgid "The file %s has been modified since reading it."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:778
+#: ../xed/xed-io-error-info-bar.c:774
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:855
+#: ../xed/xed-io-error-info-bar.c:851
 #, c-format
 msgid "Could not create a backup file while saving %s"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:859
+#: ../xed/xed-io-error-info-bar.c:855
 #, c-format
 msgid "Could not create a temporary backup file while saving %s"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:875
+#: ../xed/xed-io-error-info-bar.c:871
 msgid ""
 "xed could not back up the old copy of the file before saving the new one. "
 "You can ignore this warning and save the file anyway, but if an error occurs "
@@ -1045,62 +1042,62 @@ msgid ""
 msgstr ""
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../xed/xed-io-error-info-bar.c:932
+#: ../xed/xed-io-error-info-bar.c:928
 #, c-format
 msgid ""
 "xed cannot handle %s locations in write mode. Please check that you typed "
 "the location correctly and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:940
+#: ../xed/xed-io-error-info-bar.c:936
 msgid ""
 "xed cannot handle this location in write mode. Please check that you typed "
 "the location correctly and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:949
+#: ../xed/xed-io-error-info-bar.c:945
 #, c-format
 msgid ""
 "%s is not a valid location. Please check that you typed the location "
 "correctly and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:955
+#: ../xed/xed-io-error-info-bar.c:951
 msgid ""
 "You do not have the permissions necessary to save the file. Please check "
 "that you typed the location correctly and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:961
+#: ../xed/xed-io-error-info-bar.c:957
 msgid ""
 "There is not enough disk space to save the file. Please free some disk space "
 "and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:966
+#: ../xed/xed-io-error-info-bar.c:962
 msgid ""
 "You are trying to save the file on a read-only disk. Please check that you "
 "typed the location correctly and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:972
+#: ../xed/xed-io-error-info-bar.c:968
 msgid "A file with the same name already exists. Please use a different name."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:977
+#: ../xed/xed-io-error-info-bar.c:973
 msgid ""
 "The disk where you are trying to save the file has a limitation on length of "
 "the file names. Please use a shorter name."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:987
+#: ../xed/xed-io-error-info-bar.c:983
 msgid ""
 "The disk where you are trying to save the file has a limitation on file "
 "sizes. Please try saving a smaller file or saving it to a disk that does not "
 "have this limitation."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1000
+#: ../xed/xed-io-error-info-bar.c:996
 #, c-format
 msgid "Could not save the file %s."
 msgstr ""
@@ -1108,175 +1105,191 @@ msgstr ""
 #. FIXME: review this message, it's not clear since for the user the "modification"
 #. could be interpreted as the changes he made in the document. beside "reading" is
 #. not accurate (since last load/save)
-#: ../xed/xed-io-error-info-bar.c:1040
+#: ../xed/xed-io-error-info-bar.c:1036
 #, c-format
 msgid "The file %s changed on disk."
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1045
+#: ../xed/xed-io-error-info-bar.c:1041
 msgid "Do you want to drop your changes and reload the file?"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1049
+#: ../xed/xed-io-error-info-bar.c:1045
 msgid "Do you want to reload the file?"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1054
+#: ../xed/xed-io-error-info-bar.c:1050
 msgid "_Reload"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1111
+#: ../xed/xed-io-error-info-bar.c:1107
 #, c-format
 msgid "Some invalid chars have been detected while saving %s"
 msgstr ""
 
-#: ../xed/xed-io-error-info-bar.c:1126
+#: ../xed/xed-io-error-info-bar.c:1122
 msgid ""
 "If you continue saving this file you can corrupt the document.  Save anyway?"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:268
+#: ../xed/xed-preferences-dialog.c:264
 #: ../xed/resources/ui/xed-preferences-dialog.ui.h:3
 #, no-c-format
 msgid "Use the system fixed width font (%s)"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:386
+#: ../xed/xed-preferences-dialog.c:382
 msgid "Editor"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:418
+#: ../xed/xed-preferences-dialog.c:414
 msgid "Save"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:531
+#: ../xed/xed-preferences-dialog.c:527
 #, c-format
 msgid "Directory '%s' could not be created: g_mkdir_with_parents() failed: %s"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:685
+#: ../xed/xed-preferences-dialog.c:681
 msgid "The selected color scheme cannot be installed."
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:708 ../xed/xed-preferences-dialog.c:714
+#: ../xed/xed-preferences-dialog.c:704 ../xed/xed-preferences-dialog.c:710
 msgid "Add Scheme"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:711 ../xed/xed-progress-info-bar.c:67
+#: ../xed/xed-preferences-dialog.c:707 ../xed/xed-progress-info-bar.c:64
 msgid "Cancel"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:720
+#: ../xed/xed-preferences-dialog.c:716
 msgid "Color Scheme Files"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:792
+#: ../xed/xed-preferences-dialog.c:788
 #, c-format
 msgid "Could not remove color scheme \"%s\"."
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:824
+#: ../xed/xed-preferences-dialog.c:820
 msgid "Theme"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:841
+#: ../xed/xed-preferences-dialog.c:837
 msgid "Plugins"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:849
+#: ../xed/xed-preferences-dialog.c:845
 msgid "Help"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:854
+#: ../xed/xed-preferences-dialog.c:850
 #: ../xed/resources/ui/xed-searchbar.ui.h:11
 msgid "Close"
 msgstr ""
 
-#: ../xed/xed-preferences-dialog.c:868
+#: ../xed/xed-preferences-dialog.c:864
 msgid "Xed Preferences"
 msgstr ""
 
-#: ../xed/xed-print-job.c:497
+#: ../xed/xed-print-job.c:494
 #, c-format
 msgid "File: %s"
 msgstr ""
 
-#: ../xed/xed-print-job.c:506
+#: ../xed/xed-print-job.c:503
 msgid "Page %N of %Q"
 msgstr ""
 
-#: ../xed/xed-print-job.c:743
+#: ../xed/xed-print-job.c:707
+msgid "Text Editor"
+msgstr ""
+
+#: ../xed/xed-print-job.c:740
 msgid "Preparing..."
 msgstr ""
 
-#: ../xed/xed-print-preview.c:570
+#: ../xed/xed-print-preview.c:567
 msgid "Show the previous page"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:576
+#: ../xed/xed-print-preview.c:573
 msgid "Show the next page"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:590
+#: ../xed/xed-print-preview.c:587
 msgid "Current page (Alt+P)"
 msgstr ""
 
 #. gtk_label_set_mnemonic_widget ((GtkLabel *) l, mp->priv->page_entry);
 #. We are displaying 'XXX of XXX'.
 #. Translators: the "of" from "1 of 19" in print preview.
-#: ../xed/xed-print-preview.c:604
+#: ../xed/xed-print-preview.c:601
 msgid "of"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:609
+#: ../xed/xed-print-preview.c:606
 msgid "Page total"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:610
+#: ../xed/xed-print-preview.c:607
 msgid "The total number of pages in the document"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:630
+#: ../xed/xed-print-preview.c:627
 msgid "Show multiple pages"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:648
+#: ../xed/xed-print-preview.c:645
 msgid "Zoom 1:1"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:654
+#: ../xed/xed-print-preview.c:651
 msgid "Zoom to fit the whole page"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:660
+#: ../xed/xed-print-preview.c:657
 msgid "Zoom the page in"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:666
+#: ../xed/xed-print-preview.c:663
 msgid "Zoom the page out"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:681
+#: ../xed/xed-print-preview.c:678
 msgid "_Close preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:683
+#: ../xed/xed-print-preview.c:680
 msgid "Close print preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:761
+#: ../xed/xed-print-preview.c:758
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:946
+#: ../xed/xed-print-preview.c:943
 msgid "Page Preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:947
+#: ../xed/xed-print-preview.c:944
 msgid "The preview of a page in the document to be printed"
 msgstr ""
 
+#: ../xed/resources/ui/xed-highlight-mode-dialog.ui.h:1
+msgid "Highlight Mode"
+msgstr ""
+
+#: ../xed/resources/ui/xed-highlight-mode-dialog.ui.h:3
+msgid "_Select"
+msgstr ""
+
+#: ../xed/resources/ui/xed-highlight-mode-selector.ui.h:1
+msgid "Search highlight mode…"
+msgstr ""
+
 #: ../xed/resources/ui/xed-encodings-dialog.ui.h:1
 msgid "Character encodings"
 msgstr ""
@@ -1503,7 +1516,7 @@ msgstr ""
 msgid "Wrap"
 msgstr ""
 
-#: ../xed/resources/ui/xed-shortcuts.ui.h:2 ../xed/xed-ui.h:57
+#: ../xed/resources/ui/xed-shortcuts.ui.h:2 ../xed/xed-ui.h:54
 msgid "Create a new document"
 msgstr ""
 
@@ -1683,521 +1696,518 @@ msgstr ""
 msgid "Decrement number at cursor"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:95
+#: ../xed/xed-searchbar.c:92
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-searchbar.c:105
+#: ../xed/xed-searchbar.c:102
 msgid "Found and replaced one occurrence"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:127
+#: ../xed/xed-searchbar.c:124
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:305
+#: ../xed/xed-searchbar.c:302
 msgid "No matches found"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:313
+#: ../xed/xed-searchbar.c:310
 #, c-format
 msgid "%d match"
 msgid_plural "%d matches"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-searchbar.c:319
+#: ../xed/xed-searchbar.c:316
 #, c-format
 msgid "%d of %d match"
 msgid_plural "%d of %d matches"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-statusbar.c:70 ../xed/xed-statusbar.c:76
+#: ../xed/xed-statusbar.c:67 ../xed/xed-statusbar.c:73
 msgid "OVR"
 msgstr ""
 
-#: ../xed/xed-statusbar.c:70 ../xed/xed-statusbar.c:76
+#: ../xed/xed-statusbar.c:67 ../xed/xed-statusbar.c:73
 msgid "INS"
 msgstr ""
 
 #. Translators: "Ln" is an abbreviation for "Line", Col is an abbreviation for "Column". Please,
 #. use abbreviations if possible to avoid space problems.
-#: ../xed/xed-statusbar.c:231
+#: ../xed/xed-statusbar.c:228
 #, c-format
 msgid "  Ln %d, Col %d"
 msgstr ""
 
-#: ../xed/xed-statusbar.c:330
+#: ../xed/xed-statusbar.c:327
 #, c-format
 msgid "There is a tab with errors"
 msgid_plural "There are %d tabs with errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-tab-label.c:278
+#: ../xed/xed-tab-label.c:276
 msgid "Close document"
 msgstr ""
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../xed/xed-tab.c:718
+#: ../xed/xed-tab.c:715
 #, c-format
 msgid "Reverting %s from %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:723
+#: ../xed/xed-tab.c:720
 #, c-format
 msgid "Reverting %s"
 msgstr ""
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../xed/xed-tab.c:736
+#: ../xed/xed-tab.c:733
 #, c-format
 msgid "Loading %s from %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:741
+#: ../xed/xed-tab.c:738
 #, c-format
 msgid "Loading %s"
 msgstr ""
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../xed/xed-tab.c:822
+#: ../xed/xed-tab.c:819
 #, c-format
 msgid "Saving %s to %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:827
+#: ../xed/xed-tab.c:824
 #, c-format
 msgid "Saving %s"
 msgstr ""
 
 #. Read only
-#: ../xed/xed-tab.c:1307
+#: ../xed/xed-tab.c:1304
 msgid "RO"
 msgstr ""
 
-#: ../xed/xed-tab.c:1355
+#: ../xed/xed-tab.c:1352
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1359
+#: ../xed/xed-tab.c:1356
 #, c-format
 msgid "Error reverting file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1363
+#: ../xed/xed-tab.c:1360
 #, c-format
 msgid "Error saving file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1396
+#: ../xed/xed-tab.c:1393
 msgid "Name:"
 msgstr ""
 
-#: ../xed/xed-tab.c:1397
+#: ../xed/xed-tab.c:1394
 msgid "MIME Type:"
 msgstr ""
 
-#: ../xed/xed-tab.c:1398
+#: ../xed/xed-tab.c:1395
 msgid "Encoding:"
 msgstr ""
 
 #. Toplevel
-#: ../xed/xed-ui.h:47
+#: ../xed/xed-ui.h:44
 msgid "_File"
 msgstr ""
 
-#: ../xed/xed-ui.h:48
+#: ../xed/xed-ui.h:45
 msgid "_Edit"
 msgstr ""
 
-#: ../xed/xed-ui.h:49
+#: ../xed/xed-ui.h:46
 msgid "_View"
 msgstr ""
 
-#: ../xed/xed-ui.h:50
+#: ../xed/xed-ui.h:47
 msgid "_Search"
 msgstr ""
 
-#: ../xed/xed-ui.h:51
+#: ../xed/xed-ui.h:48
 msgid "_Tools"
 msgstr ""
 
-#: ../xed/xed-ui.h:52
+#: ../xed/xed-ui.h:49
 msgid "_Documents"
 msgstr ""
 
 #. File menu
-#: ../xed/xed-ui.h:56
+#: ../xed/xed-ui.h:53
 msgid "_New"
 msgstr ""
 
-#: ../xed/xed-ui.h:58
+#: ../xed/xed-ui.h:55
 msgid "_Open..."
 msgstr ""
 
-#: ../xed/xed-ui.h:59
+#: ../xed/xed-ui.h:56
 msgid "Open a file"
 msgstr ""
 
 #. Edit menu
-#: ../xed/xed-ui.h:62
+#: ../xed/xed-ui.h:59
 msgid "Pr_eferences"
 msgstr ""
 
-#: ../xed/xed-ui.h:63
+#: ../xed/xed-ui.h:60
 msgid "Configure the application"
 msgstr ""
 
 #. Help menu
-#: ../xed/xed-ui.h:66
+#: ../xed/xed-ui.h:63
 msgid "_Contents"
 msgstr ""
 
-#: ../xed/xed-ui.h:67
+#: ../xed/xed-ui.h:64
 msgid "Open the xed manual"
 msgstr ""
 
-#: ../xed/xed-ui.h:68
+#: ../xed/xed-ui.h:65
 msgid "_About"
 msgstr ""
 
-#: ../xed/xed-ui.h:69
+#: ../xed/xed-ui.h:66
 msgid "About this application"
 msgstr ""
 
-#: ../xed/xed-ui.h:70
+#: ../xed/xed-ui.h:67
 msgid "_Keyboard Shortcuts"
 msgstr ""
 
-#: ../xed/xed-ui.h:71
+#: ../xed/xed-ui.h:68
 msgid "Show the keyboard shortcuts dialog"
 msgstr ""
 
-#: ../xed/xed-ui.h:75
+#: ../xed/xed-ui.h:72
 msgid "Leave fullscreen mode"
 msgstr ""
 
-#: ../xed/xed-ui.h:83
+#: ../xed/xed-ui.h:80
 msgid "Save the current file"
 msgstr ""
 
-#: ../xed/xed-ui.h:84
+#: ../xed/xed-ui.h:81
 msgid "Save _As..."
 msgstr ""
 
-#: ../xed/xed-ui.h:85
+#: ../xed/xed-ui.h:82
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ../xed/xed-ui.h:86
+#: ../xed/xed-ui.h:83
 msgid "Revert"
 msgstr ""
 
-#: ../xed/xed-ui.h:87
+#: ../xed/xed-ui.h:84
 msgid "Revert to a saved version of the file"
 msgstr ""
 
-#: ../xed/xed-ui.h:88
+#: ../xed/xed-ui.h:85
 msgid "Print Previe_w"
 msgstr ""
 
-#: ../xed/xed-ui.h:89
+#: ../xed/xed-ui.h:86
 msgid "Print preview"
 msgstr ""
 
-#: ../xed/xed-ui.h:90
+#: ../xed/xed-ui.h:87
 msgid "_Print..."
 msgstr ""
 
-#: ../xed/xed-ui.h:91
+#: ../xed/xed-ui.h:88
 msgid "Print the current page"
 msgstr ""
 
 #. Edit menu
-#: ../xed/xed-ui.h:94
+#: ../xed/xed-ui.h:91
 msgid "_Undo"
 msgstr ""
 
-#: ../xed/xed-ui.h:95
+#: ../xed/xed-ui.h:92
 msgid "Undo the last action"
 msgstr ""
 
-#: ../xed/xed-ui.h:96
+#: ../xed/xed-ui.h:93
 msgid "_Redo"
 msgstr ""
 
-#: ../xed/xed-ui.h:97
+#: ../xed/xed-ui.h:94
 msgid "Redo the last undone action"
 msgstr ""
 
-#: ../xed/xed-ui.h:98
+#: ../xed/xed-ui.h:95
 msgid "C_ut"
 msgstr ""
 
-#: ../xed/xed-ui.h:99
+#: ../xed/xed-ui.h:96
 msgid "Cut the selection"
 msgstr ""
 
-#: ../xed/xed-ui.h:100
+#: ../xed/xed-ui.h:97
 msgid "_Copy"
 msgstr ""
 
-#: ../xed/xed-ui.h:101
+#: ../xed/xed-ui.h:98
 msgid "Copy the selection"
 msgstr ""
 
-#: ../xed/xed-ui.h:102
+#: ../xed/xed-ui.h:99
 msgid "_Paste"
 msgstr ""
 
-#: ../xed/xed-ui.h:103
+#: ../xed/xed-ui.h:100
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../xed/xed-ui.h:104 ../plugins/filebrowser/xed-file-browser-plugin.c:972
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:1007
-#: ../plugins/filebrowser/xed-file-browser-widget.c:764
+#: ../xed/xed-ui.h:101 ../plugins/filebrowser/xed-file-browser-plugin.c:968
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:1003
+#: ../plugins/filebrowser/xed-file-browser-widget.c:760
 msgid "_Delete"
 msgstr ""
 
-#: ../xed/xed-ui.h:105
+#: ../xed/xed-ui.h:102
 msgid "Delete the selected text"
 msgstr ""
 
-#: ../xed/xed-ui.h:106
+#: ../xed/xed-ui.h:103
 msgid "Select _All"
 msgstr ""
 
-#: ../xed/xed-ui.h:107
+#: ../xed/xed-ui.h:104
 msgid "Select the entire document"
 msgstr ""
 
 #. View menu
-#: ../xed/xed-ui.h:110
+#: ../xed/xed-ui.h:107
 msgid "_Highlight Mode"
 msgstr ""
 
+#: ../xed/xed-ui.h:108
+msgid "Change syntax hightlight mode"
+msgstr ""
+
 #. Search menu
-#: ../xed/xed-ui.h:113
+#: ../xed/xed-ui.h:112
 msgid "_Find"
 msgstr ""
 
-#: ../xed/xed-ui.h:114
+#: ../xed/xed-ui.h:113
 msgid "Search for text"
 msgstr ""
 
-#: ../xed/xed-ui.h:115
+#: ../xed/xed-ui.h:114
 msgid "Find Ne_xt"
 msgstr ""
 
-#: ../xed/xed-ui.h:116
+#: ../xed/xed-ui.h:115
 msgid "Search forwards for the same text"
 msgstr ""
 
-#: ../xed/xed-ui.h:117
+#: ../xed/xed-ui.h:116
 msgid "Find Pre_vious"
 msgstr ""
 
-#: ../xed/xed-ui.h:118
+#: ../xed/xed-ui.h:117
 msgid "Search backwards for the same text"
 msgstr ""
 
-#: ../xed/xed-ui.h:120
+#: ../xed/xed-ui.h:119
 msgid "Search for and replace text"
 msgstr ""
 
-#: ../xed/xed-ui.h:121
+#: ../xed/xed-ui.h:120
 msgid "Go to _Line..."
 msgstr ""
 
-#: ../xed/xed-ui.h:122
+#: ../xed/xed-ui.h:121
 msgid "Go to a specific line"
 msgstr ""
 
 #. Documents menu
-#: ../xed/xed-ui.h:125
+#: ../xed/xed-ui.h:124
 msgid "_Save All"
 msgstr ""
 
-#: ../xed/xed-ui.h:126
+#: ../xed/xed-ui.h:125
 msgid "Save all open files"
 msgstr ""
 
-#: ../xed/xed-ui.h:127
+#: ../xed/xed-ui.h:126
 msgid "_Close All"
 msgstr ""
 
-#: ../xed/xed-ui.h:128
+#: ../xed/xed-ui.h:127
 msgid "Close all open files"
 msgstr ""
 
-#: ../xed/xed-ui.h:129
+#: ../xed/xed-ui.h:128
 msgid "_Previous Document"
 msgstr ""
 
-#: ../xed/xed-ui.h:130
+#: ../xed/xed-ui.h:129
 msgid "Activate previous document"
 msgstr ""
 
-#: ../xed/xed-ui.h:131
+#: ../xed/xed-ui.h:130
 msgid "_Next Document"
 msgstr ""
 
-#: ../xed/xed-ui.h:132
+#: ../xed/xed-ui.h:131
 msgid "Activate next document"
 msgstr ""
 
-#: ../xed/xed-ui.h:133
+#: ../xed/xed-ui.h:132
 msgid "_Move to New Window"
 msgstr ""
 
-#: ../xed/xed-ui.h:134
+#: ../xed/xed-ui.h:133
 msgid "Move the current document to a new window"
 msgstr ""
 
-#: ../xed/xed-ui.h:140
+#: ../xed/xed-ui.h:139
 msgid "_Close"
 msgstr ""
 
-#: ../xed/xed-ui.h:141
+#: ../xed/xed-ui.h:140
 msgid "Close the current file"
 msgstr ""
 
-#: ../xed/xed-ui.h:147
+#: ../xed/xed-ui.h:146
 msgid "_Quit"
 msgstr ""
 
-#: ../xed/xed-ui.h:148
+#: ../xed/xed-ui.h:147
 msgid "Quit the program"
 msgstr ""
 
-#: ../xed/xed-ui.h:153
+#: ../xed/xed-ui.h:152
 msgid "_Toolbar"
 msgstr ""
 
-#: ../xed/xed-ui.h:154
+#: ../xed/xed-ui.h:153
 msgid "Show or hide the toolbar in the current window"
 msgstr ""
 
-#: ../xed/xed-ui.h:156
+#: ../xed/xed-ui.h:155
 msgid "_Statusbar"
 msgstr ""
 
-#: ../xed/xed-ui.h:157
+#: ../xed/xed-ui.h:156
 msgid "Show or hide the statusbar in the current window"
 msgstr ""
 
-#: ../xed/xed-ui.h:160
+#: ../xed/xed-ui.h:159
 msgid "Edit text in fullscreen"
 msgstr ""
 
-#: ../xed/xed-ui.h:162
+#: ../xed/xed-ui.h:161
 msgid "_Word wrap"
 msgstr ""
 
-#: ../xed/xed-ui.h:163
+#: ../xed/xed-ui.h:162
 msgid "Set word wrap for the current document"
 msgstr ""
 
-#: ../xed/xed-ui.h:165
+#: ../xed/xed-ui.h:164
 msgid "_Overview Map"
 msgstr ""
 
-#: ../xed/xed-ui.h:166
+#: ../xed/xed-ui.h:165
 msgid "Show or hide the overview map for the current view"
 msgstr ""
 
-#: ../xed/xed-ui.h:173
+#: ../xed/xed-ui.h:172
 msgid "Side _Pane"
 msgstr ""
 
-#: ../xed/xed-ui.h:174
+#: ../xed/xed-ui.h:173
 msgid "Show or hide the side pane in the current window"
 msgstr ""
 
-#: ../xed/xed-ui.h:176
+#: ../xed/xed-ui.h:175
 msgid "_Bottom Pane"
 msgstr ""
 
-#: ../xed/xed-ui.h:177
+#: ../xed/xed-ui.h:176
 msgid "Show or hide the bottom pane in the current window"
 msgstr ""
 
-#: ../xed/xed-utils.c:927
+#: ../xed/xed-utils.c:922
 msgid "Please check your installation."
 msgstr ""
 
-#: ../xed/xed-utils.c:995
+#: ../xed/xed-utils.c:990
 #, c-format
 msgid "Unable to open UI file %s. Error: %s"
 msgstr ""
 
-#: ../xed/xed-utils.c:1015
+#: ../xed/xed-utils.c:1010
 #, c-format
 msgid "Unable to find the object '%s' inside file %s."
 msgstr ""
 
 #. Translators: '/ on <remote-share>'
-#: ../xed/xed-utils.c:1183
+#: ../xed/xed-utils.c:1178
 #, c-format
 msgid "/ on %s"
 msgstr ""
 
-#: ../xed/xed-view.c:383
+#: ../xed/xed-view.c:380
 msgid "_Display line numbers"
 msgstr ""
 
-#: ../xed/xed-window.c:767
-#, c-format
-msgid "Use %s highlight mode"
-msgstr ""
-
-#. add the "Plain Text" item before all the others
-#. Translators: "Plain Text" means that no highlight mode is selected in the
-#. * "View->Highlight Mode" submenu and so syntax highlighting is disabled
-#: ../xed/xed-window.c:859 ../xed/xed-window.c:1676
-msgid "Plain Text"
-msgstr ""
-
-#: ../xed/xed-window.c:859
-msgid "Disable syntax highlighting"
-msgstr ""
-
 #. Translators: %s is a URI
-#: ../xed/xed-window.c:1133
+#: ../xed/xed-window.c:872
 #, c-format
 msgid "Open '%s'"
 msgstr ""
 
 #. Translators: %s is a URI
-#: ../xed/xed-window.c:1411
+#: ../xed/xed-window.c:1142
 #, c-format
 msgid "Activate '%s'"
 msgstr ""
 
-#: ../xed/xed-window.c:1660
+#: ../xed/xed-window.c:1324
+msgid "Spaces"
+msgstr ""
+
+#: ../xed/xed-window.c:1328
+msgid "Tabs"
+msgstr ""
+
+#: ../xed/xed-window.c:1389
 msgid "Use Spaces"
 msgstr ""
 
-#: ../xed/xed-window.c:1729
-msgid "Tab Width"
+#: ../xed/xed-window.c:1829
+#, c-format
+msgid "Tab Width: %u"
 msgstr ""
 
-#: ../xed/xed-window.c:2466
+#: ../xed/xed-window.c:2179
 msgid "There are unsaved documents"
 msgstr ""
 
-#: ../xed/xed-window.c:3509
+#: ../xed/xed-window.c:3221
 msgid "Elevated Privileges"
 msgstr ""
 
@@ -2249,11 +2259,11 @@ msgstr ""
 msgid "Document"
 msgstr ""
 
-#: ../plugins/docinfo/xed-docinfo-plugin.c:382
+#: ../plugins/docinfo/xed-docinfo-plugin.c:378
 msgid "_Document Statistics"
 msgstr ""
 
-#: ../plugins/docinfo/xed-docinfo-plugin.c:384
+#: ../plugins/docinfo/xed-docinfo-plugin.c:380
 msgid "Get statistical information on the current document"
 msgstr ""
 
@@ -2265,11 +2275,11 @@ msgstr ""
 msgid "Easy file access from the side pane"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:1
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:1
 msgid "Set Location to First Document"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:2
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:2
 msgid ""
 "If TRUE the file browser plugin will view the directory of the first opened "
 "document given that the file browser hasn't been used yet. (Thus this "
@@ -2277,11 +2287,11 @@ msgid ""
 "with Caja, etc.)"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:3
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:3
 msgid "File Browser Filter Mode"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:4
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:4
 msgid ""
 "This value determines what files get filtered from the file browser. Valid "
 "values are: none (filter nothing), hidden (filter hidden files), binary "
@@ -2289,60 +2299,60 @@ msgid ""
 "files)."
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:5
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:5
 msgid "File Browser Filter Pattern"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:6
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:6
 msgid ""
 "The filter pattern to filter the file browser with. This filter works on top "
 "of the filter_mode."
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:7
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:7
 msgid "Terminal Command"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:8
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:8
 msgid "The terminal command when using the \"Open terminal here\" command."
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:9
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:9
 msgid "Open With Tree View"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:10
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:10
 msgid ""
 "Open the tree view when the file browser plugin gets loaded instead of the "
 "bookmarks view"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:11
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:11
 msgid "File Browser Root Directory"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:12
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:12
 msgid ""
 "The file browser root directory to use when loading the file browser plugin "
 "and onload/tree_view is TRUE."
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:13
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:13
 msgid "File Browser Virtual Root Directory"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:14
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:14
 msgid ""
 "The file browser virtual root directory to use when loading the file browser "
 "plugin when onload/tree_view is TRUE. The virtual root must always be below "
 "the actual root."
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:15
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:15
 msgid "Enable Restore of Remote Locations"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:16
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.h:16
 msgid "Sets whether to enable restoring of remote locations."
 msgstr ""
 
@@ -2350,239 +2360,239 @@ msgstr ""
 msgid "File System"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:445
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:441
 msgid "_Set root to active document"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:447
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:443
 msgid "Set the root to the active document location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:452
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:448
 msgid "_Open terminal here"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:454
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:450
 msgid "Open a terminal at the currently opened directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:566
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:562
 msgid "File Browser"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:677
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:673
 msgid "An error occurred while creating a new directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:680
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:676
 msgid "An error occurred while creating a new file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:683
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:679
 msgid "An error occurred while renaming a file or directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:686
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:682
 msgid "An error occurred while deleting a file or directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:689
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:685
 msgid "An error occurred while opening a directory in the file manager"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:692
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:688
 msgid "An error occurred while setting a root directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:695
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:691
 msgid "An error occurred while loading a directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:698
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:694
 msgid "An error occurred"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:955
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:951
 msgid ""
 "Cannot move file to trash, do you\n"
 "want to delete permanently?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:960
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:956
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:965
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:961
 msgid "The selected files cannot be moved to the trash."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:993
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:989
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:998
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:994
 msgid "Are you sure you want to permanently delete the selected files?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:1001
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:997
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:1818
+#: ../plugins/filebrowser/xed-file-browser-store.c:1815
 msgid "(Empty)"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3508
+#: ../plugins/filebrowser/xed-file-browser-store.c:3505
 msgid ""
 "The renamed file is currently filtered out. You need to adjust your filter "
 "settings to make the file visible"
 msgstr ""
 
 #. Translators: This is the default name of new files created by the file browser pane.
-#: ../plugins/filebrowser/xed-file-browser-store.c:3774
+#: ../plugins/filebrowser/xed-file-browser-store.c:3771
 msgid "Untitled File"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3802
+#: ../plugins/filebrowser/xed-file-browser-store.c:3799
 msgid ""
 "The new file is currently filtered out. You need to adjust your filter "
 "settings to make the file visible"
 msgstr ""
 
 #. Translators: This is the default name of new directories created by the file browser pane.
-#: ../plugins/filebrowser/xed-file-browser-store.c:3829
+#: ../plugins/filebrowser/xed-file-browser-store.c:3826
 msgid "Untitled Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3854
+#: ../plugins/filebrowser/xed-file-browser-store.c:3851
 msgid ""
 "The new directory is currently filtered out. You need to adjust your filter "
 "settings to make the directory visible"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:720
+#: ../plugins/filebrowser/xed-file-browser-widget.c:716
 msgid "Bookmarks"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:757
+#: ../plugins/filebrowser/xed-file-browser-widget.c:753
 msgid "_Filter"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:762
+#: ../plugins/filebrowser/xed-file-browser-widget.c:758
 msgid "_Move to Trash"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:763
+#: ../plugins/filebrowser/xed-file-browser-widget.c:759
 msgid "Move selected file or folder to trash"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:765
+#: ../plugins/filebrowser/xed-file-browser-widget.c:761
 msgid "Delete selected file or folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:771
+#: ../plugins/filebrowser/xed-file-browser-widget.c:767
 msgid "Open selected file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:776
+#: ../plugins/filebrowser/xed-file-browser-widget.c:772
 msgid "Up"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:777
+#: ../plugins/filebrowser/xed-file-browser-widget.c:773
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:782
+#: ../plugins/filebrowser/xed-file-browser-widget.c:778
 msgid "_New Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:783
+#: ../plugins/filebrowser/xed-file-browser-widget.c:779
 msgid "Add new empty folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:784
+#: ../plugins/filebrowser/xed-file-browser-widget.c:780
 msgid "New F_ile"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:785
+#: ../plugins/filebrowser/xed-file-browser-widget.c:781
 msgid "Add new empty file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:790
+#: ../plugins/filebrowser/xed-file-browser-widget.c:786
 msgid "_Rename..."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:791
+#: ../plugins/filebrowser/xed-file-browser-widget.c:787
 msgid "Rename selected file or folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:796
+#: ../plugins/filebrowser/xed-file-browser-widget.c:792
 msgid "_Previous Location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:797
+#: ../plugins/filebrowser/xed-file-browser-widget.c:793
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:798
+#: ../plugins/filebrowser/xed-file-browser-widget.c:794
 msgid "_Next Location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:799
+#: ../plugins/filebrowser/xed-file-browser-widget.c:795
 msgid "Go to the next visited location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:800
+#: ../plugins/filebrowser/xed-file-browser-widget.c:796
 msgid "Re_fresh View"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:801
+#: ../plugins/filebrowser/xed-file-browser-widget.c:797
 msgid "Refresh the view"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:802
-#: ../plugins/filebrowser/xed-file-browser-widget.c:816
+#: ../plugins/filebrowser/xed-file-browser-widget.c:798
+#: ../plugins/filebrowser/xed-file-browser-widget.c:812
 msgid "_View Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:803
-#: ../plugins/filebrowser/xed-file-browser-widget.c:817
+#: ../plugins/filebrowser/xed-file-browser-widget.c:799
+#: ../plugins/filebrowser/xed-file-browser-widget.c:813
 msgid "View folder in file manager"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:808
+#: ../plugins/filebrowser/xed-file-browser-widget.c:804
 msgid "Show _Hidden"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:809
+#: ../plugins/filebrowser/xed-file-browser-widget.c:805
 msgid "Show hidden files and folders"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:810
+#: ../plugins/filebrowser/xed-file-browser-widget.c:806
 msgid "Show _Binary"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:811
+#: ../plugins/filebrowser/xed-file-browser-widget.c:807
 msgid "Show binary files"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1154
+#: ../plugins/filebrowser/xed-file-browser-widget.c:1150
 msgid "_Match Filename"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1995
+#: ../plugins/filebrowser/xed-file-browser-widget.c:1991
 #, c-format
 msgid "No mount object for mounted volume: %s"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:2073
+#: ../plugins/filebrowser/xed-file-browser-widget.c:2069
 #, c-format
 msgid "Could not open media: %s"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:2122
+#: ../plugins/filebrowser/xed-file-browser-widget.c:2118
 #, c-format
 msgid "Could not mount volume: %s"
 msgstr ""
@@ -2604,11 +2614,11 @@ msgstr ""
 msgid "Sorts a document or selected text."
 msgstr ""
 
-#: ../plugins/sort/xed-sort-plugin.c:80
+#: ../plugins/sort/xed-sort-plugin.c:76
 msgid "S_ort lines"
 msgstr ""
 
-#: ../plugins/sort/xed-sort-plugin.c:82
+#: ../plugins/sort/xed-sort-plugin.c:78
 msgid "Sort the current document or selection"
 msgstr ""
 
@@ -2624,27 +2634,27 @@ msgstr ""
 msgid "Checks the spelling of the current document."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:89
+#: ../plugins/spell/xed-spell-plugin.c:86
 msgid "_Check Spelling..."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:91
+#: ../plugins/spell/xed-spell-plugin.c:88
 msgid "Check the current document for incorrect spelling"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:97
+#: ../plugins/spell/xed-spell-plugin.c:94
 msgid "Set _Language..."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:99
+#: ../plugins/spell/xed-spell-plugin.c:96
 msgid "Set the language of the current document"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:108
+#: ../plugins/spell/xed-spell-plugin.c:105
 msgid "_Autocheck Spelling"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:110
+#: ../plugins/spell/xed-spell-plugin.c:107
 msgid "Automatically spell-check the current document"
 msgstr ""
 
@@ -4154,21 +4164,21 @@ msgid ""
 "document without having to type them."
 msgstr ""
 
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:613
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:608
 msgid "Select the group of tags you want to use"
 msgstr ""
 
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:632
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:627
 msgid "_Preview"
 msgstr ""
 
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:708
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:703
 msgid "Available Tag Lists"
 msgstr ""
 
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:711
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:727
-#: ../plugins/taglist/xed-taglist-plugin.c:117
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:706
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:722
+#: ../plugins/taglist/xed-taglist-plugin.c:113
 msgid "Tags"
 msgstr ""
 
@@ -4311,15 +4321,15 @@ msgstr ""
 msgid "01/11/2009 17:52:00"
 msgstr ""
 
-#: ../plugins/time/xed-time-plugin.c:183
+#: ../plugins/time/xed-time-plugin.c:179
 msgid "In_sert Date and Time..."
 msgstr ""
 
-#: ../plugins/time/xed-time-plugin.c:185
+#: ../plugins/time/xed-time-plugin.c:181
 msgid "Insert current date and time at the cursor position"
 msgstr ""
 
-#: ../plugins/time/xed-time-plugin.c:461
+#: ../plugins/time/xed-time-plugin.c:457
 msgid "Available formats"
 msgstr ""
 
@@ -4359,6 +4369,6 @@ msgstr ""
 msgid "Minimum word size for auto-completion"
 msgstr ""
 
-#: ../plugins/wordcompletion/xed-wordcompletion-plugin.c:219
+#: ../plugins/wordcompletion/xed-wordcompletion-plugin.c:215
 msgid "Word completion"
 msgstr ""