diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9497faa..c308287 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,80 +4,103 @@
 [type: gettext/gsettings]data/org.x.editor.gschema.xml.in
 data/xed.appdata.xml.in
 data/xed.desktop.in.in
-xed/dialogs/xed-close-confirmation-dialog.c
-xed/dialogs/xed-encodings-dialog.c
-[type: gettext/glade]xed/dialogs/xed-encodings-dialog.ui
-xed/dialogs/xed-preferences-dialog.c
-[type: gettext/glade]xed/dialogs/xed-preferences-dialog.ui
-xed/xed.c
+xed/xed-app-activatable.c
 xed/xed-app.c
+xed/xed-close-button.c
+xed/xed-close-confirmation-dialog.c
+xed/xed-commands-documents.c
+xed/xed-commands-edit.c
+xed/xed-commands-file-print.c
 xed/xed-commands-file.c
 xed/xed-commands-help.c
 xed/xed-commands-search.c
+xed/xed-commands-view.c
 xed/xed-debug.c
+xed/xed-dirs.c
 xed/xed-document.c
 xed/xed-documents-panel.c
 xed/xed-encodings-combo-box.c
+xed/xed-encodings-dialog.c
 xed/xed-file-chooser-dialog.c
-xed/xed-gio-document-loader.c
-xed/xed-gio-document-saver.c
-xed/xed-help.c
-xed/xed-io-error-message-area.c
+xed/xed-history-entry.c
+xed/xed-io-error-info-bar.c
+xed/xed-message-bus.c
+xed/xed-message-type.c
+xed/xed-message.c
+xed/xed-metadata-manager.c
 xed/xed-notebook.c
+xed/xed-paned.c
 xed/xed-panel.c
 xed/xed-plugins-engine.c
-xed/xed-prefs-manager.c
+xed/xed-preferences-dialog.c
+xed/xed-preferences-dialog.c
 xed/xed-print-job.c
-[type: gettext/glade]xed/xed-print-preferences.ui
-[type: gettext/glade]xed/xed-searchbar.ui
 xed/xed-print-preview.c
-xed/xed-smart-charset-converter.c
+xed/xed-progress-info-bar.c
+[type: gettext/glade]xed/resources/ui/xed-encodings-dialog.ui
+[type: gettext/glade]xed/resources/ui/xed-preferences-dialog.ui
+[type: gettext/glade]xed/resources/ui/xed-print-preferences.ui
+[type: gettext/glade]xed/resources/ui/xed-searchbar.ui
+[type: gettext/glade]xed/resources/ui/xed-view-frame.ui
+xed/resources/ui/xed-ui.xml
 xed/xed-searchbar.c
+xed/xed-searchbar.c
+xed/xed-settings.c
+xed/xed-status-combo-box.c
+xed/xed-statusbar.c
 xed/xed-statusbar.c
-xed/xed-style-scheme-manager.c
-xed/xed-tab.c
 xed/xed-tab-label.c
+xed/xed-tab.c
 xed/xed-ui.h
-xed/xed-ui.xml
 xed/xed-utils.c
+xed/xed-view-activatable.c
+xed/xed-view-frame.c
+xed/xed-view-gutter-renderer.c
 xed/xed-view.c
+xed/xed-window-activatable.c
 xed/xed-window.c
+xed/xed.c
 plugins/docinfo/docinfo.plugin.desktop.in
 [type: gettext/glade]plugins/docinfo/docinfo.ui
 plugins/docinfo/xed-docinfo-plugin.c
 plugins/filebrowser/filebrowser.plugin.desktop.in
 [type: gettext/gsettings]plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in
 plugins/filebrowser/xed-file-bookmarks-store.c
+plugins/filebrowser/xed-file-browser-messages.c
 plugins/filebrowser/xed-file-browser-plugin.c
 plugins/filebrowser/xed-file-browser-store.c
+plugins/filebrowser/xed-file-browser-utils.c
 plugins/filebrowser/xed-file-browser-view.c
 plugins/filebrowser/xed-file-browser-widget.c
+plugins/modelines/modeline-parser.c
 plugins/modelines/modelines.plugin.desktop.in
-plugins/sort/xed-sort-plugin.c
+plugins/modelines/xed-modeline-plugin.c
 plugins/sort/sort.plugin.desktop.in
-[type: gettext/glade]plugins/sort/sort.ui
+plugins/sort/xed-sort-plugin.c
+[type: gettext/glade]plugins/spell/languages-dialog.ui
 [type: gettext/gsettings]plugins/spell/org.x.editor.plugins.spell.gschema.xml.in
+[type: gettext/glade]plugins/spell/spell-checker.ui
+plugins/spell/spell.plugin.desktop.in
 plugins/spell/xed-automatic-spell-checker.c
-plugins/spell/xed-spell-checker.c
 plugins/spell/xed-spell-checker-dialog.c
 plugins/spell/xed-spell-checker-language.c
+plugins/spell/xed-spell-checker.c
 plugins/spell/xed-spell-language-dialog.c
 plugins/spell/xed-spell-plugin.c
-[type: gettext/glade]plugins/spell/languages-dialog.ui
-[type: gettext/glade]plugins/spell/spell-checker.ui
 [type: gettext/glade]plugins/spell/xed-spell-setup-dialog.ui
-plugins/spell/spell.plugin.desktop.in
-plugins/taglist/xed-taglist-plugin.c
-plugins/taglist/xed-taglist-plugin-panel.c
-plugins/taglist/xed-taglist-plugin-parser.c
+plugins/spell/xed-spell-utils.c
 plugins/taglist/HTML.tags.xml.in
 plugins/taglist/Latex.tags.xml.in
 plugins/taglist/taglist.plugin.desktop.in
+plugins/taglist/xed-taglist-plugin-panel.c
+plugins/taglist/xed-taglist-plugin-parser.c
+plugins/taglist/xed-taglist-plugin.c
 plugins/taglist/XSLT.tags.xml.in
 plugins/taglist/XUL.tags.xml.in
 [type: gettext/gsettings]plugins/time/org.x.editor.plugins.time.gschema.xml.in
-plugins/time/xed-time-plugin.c
 plugins/time/time.plugin.desktop.in
-plugins/trailsave/trailsave.plugin.desktop.in
 [type: gettext/glade]plugins/time/xed-time-dialog.ui
+plugins/time/xed-time-plugin.c
 [type: gettext/glade]plugins/time/xed-time-setup-dialog.ui
+plugins/trailsave/trailsave.plugin.desktop.in
+plugins/trailsave/xed-trail-save-plugin.c
diff --git a/po/xed.pot b/po/xed.pot
index 6e646b7..47b3bc2 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: 2016-12-05 11:34+0000\n"
+"POT-Creation-Date: 2017-04-26 12:50+0100\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"
@@ -46,362 +46,387 @@ msgid ""
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:6
-msgid "Style Scheme"
+msgid "Prefer Dark Theme"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:7
-msgid "The ID of a GtkSourceView Style Scheme used to color the text."
+msgid ""
+"Whether xed should prefer the dark variation of the current Gtk theme if "
+"available."
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:8
-msgid "Create Backup Copies"
+msgid "Style Scheme"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:9
+msgid "The ID of a GtkSourceView Style Scheme used to color the text."
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:10
+msgid "Create Backup Copies"
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:11
 msgid ""
 "Whether xed should create backup copies for the files it saves. You can set "
 "the backup file extension with the \"Backup Copy Extension\" option."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:10
+#: ../data/org.x.editor.gschema.xml.in.h:12
 msgid "Autosave"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:11
+#: ../data/org.x.editor.gschema.xml.in.h:13
 msgid ""
 "Whether xed should automatically save modified files after a time interval. "
 "You can set the time interval with the \"Autosave Interval\" option."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:12
+#: ../data/org.x.editor.gschema.xml.in.h:14
 msgid "Autosave Interval"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:13
+#: ../data/org.x.editor.gschema.xml.in.h:15
 msgid ""
 "Number of minutes after which xed will automatically save modified files. "
 "This will only take effect if the \"Autosave\" option is turned on."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:14
+#: ../data/org.x.editor.gschema.xml.in.h:16
 msgid "Writable VFS schemes"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:15
+#: ../data/org.x.editor.gschema.xml.in.h:17
 msgid ""
 "List of VFS schemes xed supports in write mode. The 'file' scheme is "
 "writable by default."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:16
+#: ../data/org.x.editor.gschema.xml.in.h:18
 msgid "Maximum Number of Undo Actions"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:17
+#: ../data/org.x.editor.gschema.xml.in.h:19
 msgid ""
 "Maximum number of actions that xed will be able to undo or redo. Use \"-1\" "
 "for unlimited number of actions."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:18
+#: ../data/org.x.editor.gschema.xml.in.h:20
 msgid "Line Wrapping Mode"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:19
+#: ../data/org.x.editor.gschema.xml.in.h:21
 msgid ""
-"Specifies how to wrap long lines in the editing area. Use \"GTK_WRAP_NONE\" "
-"for no wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
-"\"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that "
-"the values are case-sensitive, so make sure they appear exactly as mentioned "
-"here."
+"Specifies how to wrap long lines in the editing area. Use \"none\" for no "
+"wrapping, \"word\" for wrapping at word boundaries, and \"char\" for "
+"wrapping at individual character boundaries. Note that the values are case-"
+"sensitive, so make sure they appear exactly as mentioned here."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:20
+#: ../data/org.x.editor.gschema.xml.in.h:22
 msgid "Tab Size"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:21
+#: ../data/org.x.editor.gschema.xml.in.h:23
 msgid ""
 "Specifies the number of spaces that should be displayed instead of Tab "
 "characters."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:22
+#: ../data/org.x.editor.gschema.xml.in.h:24
 msgid "Insert spaces"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:23
+#: ../data/org.x.editor.gschema.xml.in.h:25
 msgid "Whether xed should insert spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:24
+#: ../data/org.x.editor.gschema.xml.in.h:26
 msgid "Automatic indent"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:25
+#: ../data/org.x.editor.gschema.xml.in.h:27
 msgid "Whether xed should enable automatic indentation."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:26
+#: ../data/org.x.editor.gschema.xml.in.h:28
 msgid "Display Line Numbers"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:27
+#: ../data/org.x.editor.gschema.xml.in.h:29
 msgid "Whether xed should display line numbers in the editing area."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:28
+#: ../data/org.x.editor.gschema.xml.in.h:30
 msgid "Highlight Current Line"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:29
+#: ../data/org.x.editor.gschema.xml.in.h:31
 msgid "Whether xed should highlight the current line."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:30
+#: ../data/org.x.editor.gschema.xml.in.h:32
 msgid "Highlight Matching Bracket"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:31
+#: ../data/org.x.editor.gschema.xml.in.h:33
 msgid "Whether xed should highlight the bracket matching the selected one."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:32
+#: ../data/org.x.editor.gschema.xml.in.h:34
 msgid "Display Right Margin"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:33
+#: ../data/org.x.editor.gschema.xml.in.h:35
 msgid "Whether xed should display the right margin in the editing area."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:34
+#: ../data/org.x.editor.gschema.xml.in.h:36
 msgid "Right Margin Position"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:35
+#: ../data/org.x.editor.gschema.xml.in.h:37
 msgid "Specifies the position of the right margin."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:36
+#: ../data/org.x.editor.gschema.xml.in.h:38
 msgid "Smart Home End"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:37
+#: ../data/org.x.editor.gschema.xml.in.h:39
 msgid ""
 "Specifies how the cursor moves when the HOME and END keys are pressed. Use "
-"\"DISABLED\" to always move at the start/end of the line, \"AFTER\" to move "
+"\"disabled\" to always move at the start/end of the line, \"after\" to move "
 "to the start/end of the line the first time the keys are pressed and to the "
 "start/end of the text ignoring whitespaces the second time the keys are "
-"pressed, \"BEFORE\" to move to the start/end of the text before moving to "
-"the start/end of the line and \"ALWAYS\" to always move to the start/end of "
+"pressed, \"before\" to move to the start/end of the text before moving to "
+"the start/end of the line and \"always\" to always move to the start/end of "
 "the text instead of the start/end of the line."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:38
+#: ../data/org.x.editor.gschema.xml.in.h:40
 msgid "Restore Previous Cursor Position"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:39
+#: ../data/org.x.editor.gschema.xml.in.h:41
 msgid ""
 "Whether xed should restore the previous cursor position when a file is "
 "loaded."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:40
+#: ../data/org.x.editor.gschema.xml.in.h:42
 msgid "Enable Search Highlighting"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:41
+#: ../data/org.x.editor.gschema.xml.in.h:43
 msgid "Whether xed should highlight all the occurrences of the searched text."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:42
+#: ../data/org.x.editor.gschema.xml.in.h:44
 msgid "Enable Syntax Highlighting"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:43
+#: ../data/org.x.editor.gschema.xml.in.h:45
 msgid "Whether xed should enable syntax highlighting."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:44
-msgid "Toolbar is Visible"
-msgstr ""
-
-#: ../data/org.x.editor.gschema.xml.in.h:45
-msgid "Whether the toolbar should be visible in editing windows."
-msgstr ""
-
 #: ../data/org.x.editor.gschema.xml.in.h:46
-msgid "Status Bar is Visible"
+msgid "Ensure Trailing Newline"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:47
 msgid ""
-"Whether the status bar at the bottom of editing windows should be visible."
+"Whether gedit will ensure that documents always end with a trailing newline."
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:48
-msgid "Side Pane is Visible"
+msgid "Toolbar is Visible"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:49
-msgid "Whether the side pane at the left of editing windows should be visible."
+msgid "Whether the toolbar should be visible in editing windows."
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:50
-msgid "Bottom Panel is Visible"
+msgid "Status Bar is Visible"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:51
 msgid ""
-"Whether the bottom panel at the bottom of editing windows should be visible."
+"Whether the status bar at the bottom of editing windows should be visible."
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:52
-msgid "Maximum Recent Files"
+msgid "Side Pane is Visible"
 msgstr ""
 
 #: ../data/org.x.editor.gschema.xml.in.h:53
+msgid "Whether the side pane at the left of editing windows should be visible."
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:54
+msgid "Bottom Panel is Visible"
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:55
+msgid ""
+"Whether the bottom panel at the bottom of editing windows should be visible."
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:56
+msgid "Allow changing active tabs by scrolling"
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:57
+msgid "Whether you can change active tabs by scrolling."
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:58
+msgid "Maximum Recent Files"
+msgstr ""
+
+#: ../data/org.x.editor.gschema.xml.in.h:59
 msgid ""
 "Specifies the maximum number of recently opened files that will be displayed "
 "in the \"Recent Files\" submenu."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:54
+#: ../data/org.x.editor.gschema.xml.in.h:60
 msgid "Print Syntax Highlighting"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:55
+#: ../data/org.x.editor.gschema.xml.in.h:61
 msgid "Whether xed should print syntax highlighting when printing documents."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:56
+#: ../data/org.x.editor.gschema.xml.in.h:62
 msgid "Print Header"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:57
+#: ../data/org.x.editor.gschema.xml.in.h:63
 msgid "Whether xed should include a document header when printing documents."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:58
+#: ../data/org.x.editor.gschema.xml.in.h:64
 msgid "Printing Line Wrapping Mode"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:59
+#: ../data/org.x.editor.gschema.xml.in.h:65
 msgid ""
-"Specifies how to wrap long lines for printing. Use \"GTK_WRAP_NONE\" for no "
-"wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
-"\"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that "
-"the values are case-sensitive, so make sure they appear exactly as mentioned "
-"here."
+"Specifies how to wrap long lines for printing. Use \"none\" for no wrapping, "
+"\"word\" for wrapping at word boundaries, and \"char\" for wrapping at "
+"individual character boundaries. Note that the values are case-sensitive, so "
+"make sure they appear exactly as mentioned here."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:60
+#: ../data/org.x.editor.gschema.xml.in.h:66
 msgid "Print Line Numbers"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:61
+#: ../data/org.x.editor.gschema.xml.in.h:67
 msgid ""
 "If this value is 0, then no line numbers will be inserted when printing a "
 "document. Otherwise, xed will print line numbers every such number of lines."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:62
+#: ../data/org.x.editor.gschema.xml.in.h:68
 msgctxt "print-font-body-pango"
 msgid "'Monospace 9'"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:63
+#: ../data/org.x.editor.gschema.xml.in.h:69
 msgid "Body Font for Printing"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:64
+#: ../data/org.x.editor.gschema.xml.in.h:70
 msgid ""
 "Specifies the font to use for a document's body when printing documents."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:65
+#: ../data/org.x.editor.gschema.xml.in.h:71
 msgctxt "print-font-header-pango"
 msgid "'Sans 11'"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:66
+#: ../data/org.x.editor.gschema.xml.in.h:72
 msgid "Header Font for Printing"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:67
+#: ../data/org.x.editor.gschema.xml.in.h:73
 msgid ""
 "Specifies the font to use for page headers when printing a document. This "
 "will only take effect if the \"Print Header\" option is turned on."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:68
+#: ../data/org.x.editor.gschema.xml.in.h:74
 msgctxt "print-font-numbers-pango"
 msgid "'Sans 8'"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:69
+#: ../data/org.x.editor.gschema.xml.in.h:75
 msgid "Line Number Font for Printing"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:70
+#: ../data/org.x.editor.gschema.xml.in.h:76
 msgid ""
 "Specifies the font to use for line numbers when printing. This will only "
 "take effect if the \"Print Line Numbers\" option is non-zero."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:71
+#: ../data/org.x.editor.gschema.xml.in.h:77
 msgctxt "auto-detected"
 msgid "[ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:72
+#: ../data/org.x.editor.gschema.xml.in.h:78
 msgid "Automatically Detected Encodings"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:73
+#: ../data/org.x.editor.gschema.xml.in.h:79
 msgid ""
 "Sorted list of encodings used by xed for automatically detecting the "
 "encoding of a file. \"CURRENT\" represents the current locale encoding. Only "
 "recognized encodings are used."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:74
+#: ../data/org.x.editor.gschema.xml.in.h:80
 msgctxt "shown-in-menu"
 msgid "[ 'ISO-8859-15' ]"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:75
+#: ../data/org.x.editor.gschema.xml.in.h:81
 msgid "Encodings shown in menu"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:76
+#: ../data/org.x.editor.gschema.xml.in.h:82
 msgid ""
 "List of encodings shown in the Character Encoding menu in open/save file "
 "selector. Only recognized encodings are used."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:77
+#: ../data/org.x.editor.gschema.xml.in.h:83
 msgid "History for \"search for\" entries"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:78
+#: ../data/org.x.editor.gschema.xml.in.h:84
 msgid "List of entries in \"search for\" textbox."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:79
+#: ../data/org.x.editor.gschema.xml.in.h:85
 msgid "History for \"replace with\" entries"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:80
+#: ../data/org.x.editor.gschema.xml.in.h:86
 msgid "List of entries in \"replace with\" textbox."
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:81
+#: ../data/org.x.editor.gschema.xml.in.h:87
 msgid "Active plugins"
 msgstr ""
 
-#: ../data/org.x.editor.gschema.xml.in.h:82
+#: ../data/org.x.editor.gschema.xml.in.h:88
 msgid ""
 "List of active plugins. It contains the \"Location\" of the active plugins. "
 "See the .xed-plugin file for obtaining the \"Location\" of a given plugin."
@@ -422,7 +447,7 @@ msgid ""
 "indentation levels. </p>"
 msgstr ""
 
-#: ../data/xed.desktop.in.in.h:1 ../xed/xed-print-job.c:763
+#: ../data/xed.desktop.in.in.h:1 ../xed/xed-print-job.c:710
 msgid "Text Editor"
 msgstr ""
 
@@ -430,23 +455,98 @@ msgstr ""
 msgid "Edit text files"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:139
+#: ../xed/xed-app.c:105
+msgid "Show the application's version"
+msgstr ""
+
+#: ../xed/xed-app.c:111
+msgid "Display list of possible values for the encoding option"
+msgstr ""
+
+#: ../xed/xed-app.c:118
+msgid ""
+"Set the character encoding to be used to open the files listed on the "
+"command line"
+msgstr ""
+
+#: ../xed/xed-app.c:119
+msgid "ENCODING"
+msgstr ""
+
+#: ../xed/xed-app.c:125
+msgid "Create a new top-level window in an existing instance of xed"
+msgstr ""
+
+#: ../xed/xed-app.c:132
+msgid "Create a new document in an existing instance of xed"
+msgstr ""
+
+#: ../xed/xed-app.c:139
+msgid "Set the size and position of the window (WIDTHxHEIGHT+X+Y)"
+msgstr ""
+
+#: ../xed/xed-app.c:140
+msgid "GEOMETRY"
+msgstr ""
+
+#: ../xed/xed-app.c:146
+msgid "Open files and block process until files are closed"
+msgstr ""
+
+#: ../xed/xed-app.c:153
+msgid "Run xed in standalone mode"
+msgstr ""
+
+#: ../xed/xed-app.c:160
+msgid "[FILE...] [+LINE]"
+msgstr ""
+
+#: ../xed/xed-app.c:551
+#, c-format
+msgid "%s: invalid encoding."
+msgstr ""
+
+#: ../xed/xed-app.c:1201
+msgid "There was an error displaying the help."
+msgstr ""
+
+#: ../xed/xed-close-confirmation-dialog.c:133
 msgid "Log Out _without Saving"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:143
+#: ../xed/xed-close-confirmation-dialog.c:134
 msgid "_Cancel Logout"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:150
+#: ../xed/xed-close-confirmation-dialog.c:138
 msgid "Close _without Saving"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:199
+#: ../xed/xed-close-confirmation-dialog.c:139 ../xed/xed-commands-file.c:406
+#: ../xed/xed-commands-file.c:509 ../xed/xed-commands-file.c:688
+#: ../xed/xed-commands-file.c:1117 ../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
+#: ../plugins/spell/xed-spell-language-dialog.c:130
+msgid "_Cancel"
+msgstr ""
+
+#: ../xed/xed-close-confirmation-dialog.c:159
+msgid "_Save As..."
+msgstr ""
+
+#. File menu
+#: ../xed/xed-close-confirmation-dialog.c:163 ../xed/xed-commands-file.c:689
+#: ../xed/xed-ui.h:80
+msgid "_Save"
+msgstr ""
+
+#: ../xed/xed-close-confirmation-dialog.c:188
 msgid "Question"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:399
+#: ../xed/xed-close-confirmation-dialog.c:381
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld second will be permanently lost."
@@ -456,12 +556,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:408
+#: ../xed/xed-close-confirmation-dialog.c:390
 msgid ""
 "If you don't save, changes from the last minute will be permanently lost."
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:414
+#: ../xed/xed-close-confirmation-dialog.c:395
 #, c-format
 msgid ""
 "If you don't save, changes from the last minute and %ld second will be "
@@ -472,7 +572,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:424
+#: ../xed/xed-close-confirmation-dialog.c:404
 #, c-format
 msgid ""
 "If you don't save, changes from the last %ld minute will be permanently lost."
@@ -482,11 +582,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:439
+#: ../xed/xed-close-confirmation-dialog.c:419
 msgid "If you don't save, changes from the last hour will be permanently lost."
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:445
+#: ../xed/xed-close-confirmation-dialog.c:424
 #, c-format
 msgid ""
 "If you don't save, changes from the last hour and %d minute will be "
@@ -497,7 +597,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:460
+#: ../xed/xed-close-confirmation-dialog.c:438
 #, c-format
 msgid ""
 "If you don't save, changes from the last %d hour will be permanently lost."
@@ -506,12 +606,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:503
+#: ../xed/xed-close-confirmation-dialog.c:479
 #, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:677
+#: ../xed/xed-close-confirmation-dialog.c:644
 #, c-format
 msgid "There is %d document with unsaved changes. Save changes before closing?"
 msgid_plural ""
@@ -519,267 +619,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:694
+#: ../xed/xed-close-confirmation-dialog.c:661
 msgid "S_elect the documents you want to save:"
 msgstr ""
 
 #. Secondary label
-#: ../xed/dialogs/xed-close-confirmation-dialog.c:713
+#: ../xed/xed-close-confirmation-dialog.c:677
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr ""
 
-#: ../xed/dialogs/xed-encodings-dialog.c:321
-msgid "Character Encodings"
-msgstr ""
-
-#: ../xed/dialogs/xed-encodings-dialog.c:384
-#: ../xed/dialogs/xed-encodings-dialog.c:445
-msgid "_Description"
-msgstr ""
-
-#: ../xed/dialogs/xed-encodings-dialog.c:393
-#: ../xed/dialogs/xed-encodings-dialog.c:454
-msgid "_Encoding"
-msgstr ""
-
-#: ../xed/dialogs/xed-encodings-dialog.ui.h:1
-msgid "Character encodings"
-msgstr ""
-
-#: ../xed/dialogs/xed-encodings-dialog.ui.h:2
-msgid "A_vailable encodings:"
-msgstr ""
-
-#: ../xed/dialogs/xed-encodings-dialog.ui.h:3
-msgid "E_ncodings shown in menu:"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:572
-msgid "Click on this button to select the font to be used by the editor"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:582
-#, c-format
-msgid "_Use the system fixed width font (%s)"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:785
-msgid "The selected color scheme cannot be installed."
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:810
-msgid "Add Scheme"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:817
-msgid "A_dd Scheme"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:825
-msgid "Color Scheme Files"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:832
-#: ../xed/xed-file-chooser-dialog.c:53
-msgid "All Files"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:877
-#, c-format
-msgid "Could not remove color scheme \"%s\"."
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.c:1088
-msgid "Xed Preferences"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:1
-msgid "Preferences"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:2
-#: ../xed/xed-print-preferences.ui.h:9
-msgid "Text Wrapping"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:3
-#: ../plugins/docinfo/docinfo.ui.h:4 ../plugins/time/xed-time-dialog.ui.h:4
-#: ../plugins/time/xed-time-setup-dialog.ui.h:3
-msgid "    "
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:4
-#: ../xed/xed-print-preferences.ui.h:10
-msgid "Enable text _wrapping"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:5
-#: ../xed/xed-print-preferences.ui.h:11
-msgid "Do not _split words over two lines"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:6
-#: ../xed/xed-print-preferences.ui.h:3
-msgid "Line Numbers"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:7 ../xed/xed-view.c:1106
-msgid "_Display line numbers"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:8
-msgid "Current Line"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:9
-msgid "Highlight current _line"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:10
-msgid "Right Margin"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:11
-msgid "Display right _margin"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:12
-msgid "_Right margin at column:"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:13
-msgid "Bracket Matching"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:14
-msgid "Highlight matching _bracket"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:15
-msgid "View"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:16
-msgid "Tab Stops"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:17
-msgid "_Tab width:"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:18
-msgid "Insert _spaces instead of tabs"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:19
-msgid "Automatic Indentation"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:20
-msgid "_Enable automatic indentation"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:21
-msgid "File Saving"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:22
-msgid "Create a _backup copy of files before saving"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:23
-msgid "_Autosave files every"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:24
-msgid "_minutes"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:25
-msgid "Editor"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:26
-msgid "Font"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:27
-msgid "Editor _font: "
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:28
-msgid "Pick the editor font"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:29
-msgid "Color Scheme"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:30
-msgid "_Add..."
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:31
-msgid "Font & Colors"
-msgstr ""
-
-#: ../xed/dialogs/xed-preferences-dialog.ui.h:32
-msgid "Plugins"
-msgstr ""
-
-#: ../xed/xed.c:104
-msgid "Show the application's version"
-msgstr ""
-
-#: ../xed/xed.c:107
-msgid ""
-"Set the character encoding to be used to open the files listed on the "
-"command line"
-msgstr ""
-
-#: ../xed/xed.c:107
-msgid "ENCODING"
-msgstr ""
-
-#: ../xed/xed.c:110
-msgid "Display list of possible values for the encoding option"
-msgstr ""
-
-#: ../xed/xed.c:113
-msgid "Create a new top-level window in an existing instance of xed"
-msgstr ""
-
-#: ../xed/xed.c:116
-msgid "Create a new document in an existing instance of xed"
-msgstr ""
-
-#: ../xed/xed.c:119
-msgid "[FILE...]"
-msgstr ""
-
-#: ../xed/xed.c:174
-#, c-format
-msgid "%s: invalid encoding.\n"
-msgstr ""
-
-#. Setup command line options
-#: ../xed/xed.c:520
-msgid "- Edit text files"
-msgstr ""
-
-#: ../xed/xed.c:529
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: ../xed/xed-commands-file.c:250
+#: ../xed/xed-commands-file.c:236
 #, c-format
 msgid "Loading file '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:259
+#: ../xed/xed-commands-file.c:245
 #, c-format
 msgid "Loading %d file…"
 msgid_plural "Loading %d files…"
@@ -787,43 +641,48 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: "Open Files" is the title of the file chooser window
-#: ../xed/xed-commands-file.c:465
+#: ../xed/xed-commands-file.c:402
 msgid "Open Files"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:576
+#: ../xed/xed-commands-file.c:407
+#: ../plugins/filebrowser/xed-file-browser-widget.c:770
+msgid "_Open"
+msgstr ""
+
+#: ../xed/xed-commands-file.c:501
 #, c-format
 msgid "The file \"%s\" is read-only."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:581
+#: ../xed/xed-commands-file.c:506
 msgid "Do you want to try to replace it with the one you are saving?"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:589 ../xed/xed-ui.h:117
+#: ../xed/xed-commands-file.c:510 ../xed/xed-ui.h:117
 msgid "_Replace"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:650 ../xed/xed-commands-file.c:873
+#: ../xed/xed-commands-file.c:576 ../xed/xed-commands-file.c:786
 #, c-format
 msgid "Saving file '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:758
+#: ../xed/xed-commands-file.c:684
 msgid "Save As…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1087
+#: ../xed/xed-commands-file.c:986
 #, c-format
 msgid "Reverting the document '%s'…"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1132
+#: ../xed/xed-commands-file.c:1033
 #, c-format
 msgid "Revert unsaved changes to document '%s'?"
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1141
+#: ../xed/xed-commands-file.c:1040
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld second will be permanently lost."
@@ -833,12 +692,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1150
+#: ../xed/xed-commands-file.c:1049
 msgid ""
 "Changes made to the document in the last minute will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1156
+#: ../xed/xed-commands-file.c:1054
 #, c-format
 msgid ""
 "Changes made to the document in the last minute and %ld second will be "
@@ -849,7 +708,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1166
+#: ../xed/xed-commands-file.c:1063
 #, c-format
 msgid ""
 "Changes made to the document in the last %ld minute will be permanently lost."
@@ -859,11 +718,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1181
+#: ../xed/xed-commands-file.c:1078
 msgid "Changes made to the document in the last hour will be permanently lost."
 msgstr ""
 
-#: ../xed/xed-commands-file.c:1187
+#: ../xed/xed-commands-file.c:1083
 #, c-format
 msgid ""
 "Changes made to the document in the last hour and %d minute will be "
@@ -874,7 +733,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1202
+#: ../xed/xed-commands-file.c:1097
 #, c-format
 msgid ""
 "Changes made to the document in the last %d hour will be permanently lost."
@@ -883,396 +742,296 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-commands-file.c:1228
+#: ../xed/xed-commands-file.c:1118
 msgid "_Revert"
 msgstr ""
 
-#: ../xed/xed-commands-help.c:56
+#: ../xed/xed-commands-help.c:58
 msgid "A small and lightweight text editor"
 msgstr ""
 
-#: ../xed/xed-document.c:1082 ../xed/xed-document.c:1102
+#: ../xed/xed-document.c:850 ../xed/xed-document.c:879
 #, c-format
 msgid "Unsaved Document %d"
 msgstr ""
 
-#: ../xed/xed-documents-panel.c:97 ../xed/xed-documents-panel.c:111
-#: ../xed/xed-window.c:1860 ../xed/xed-window.c:1864
+#: ../xed/xed-documents-panel.c:95 ../xed/xed-documents-panel.c:106
+#: ../xed/xed-window.c:1994 ../xed/xed-window.c:1998
 msgid "Read-Only"
 msgstr ""
 
-#: ../xed/xed-documents-panel.c:784 ../xed/xed-window.c:3089
+#: ../xed/xed-documents-panel.c:732 ../xed/xed-window.c:3320
 msgid "Documents"
 msgstr ""
 
-#: ../xed/xed-encodings.c:138 ../xed/xed-encodings.c:180
-#: ../xed/xed-encodings.c:182 ../xed/xed-encodings.c:184
-#: ../xed/xed-encodings.c:186 ../xed/xed-encodings.c:188
-#: ../xed/xed-encodings.c:190 ../xed/xed-encodings.c:192
-msgid "Unicode"
-msgstr ""
-
-#: ../xed/xed-encodings.c:151 ../xed/xed-encodings.c:175
-#: ../xed/xed-encodings.c:225 ../xed/xed-encodings.c:268
-msgid "Western"
-msgstr ""
-
-#: ../xed/xed-encodings.c:153 ../xed/xed-encodings.c:227
-#: ../xed/xed-encodings.c:264
-msgid "Central European"
-msgstr ""
-
-#: ../xed/xed-encodings.c:155
-msgid "South European"
-msgstr ""
-
-#: ../xed/xed-encodings.c:157 ../xed/xed-encodings.c:171
-#: ../xed/xed-encodings.c:278
-msgid "Baltic"
-msgstr ""
-
-#: ../xed/xed-encodings.c:159 ../xed/xed-encodings.c:229
-#: ../xed/xed-encodings.c:242 ../xed/xed-encodings.c:246
-#: ../xed/xed-encodings.c:248 ../xed/xed-encodings.c:266
-msgid "Cyrillic"
-msgstr ""
-
-#: ../xed/xed-encodings.c:161 ../xed/xed-encodings.c:235
-#: ../xed/xed-encodings.c:276
-msgid "Arabic"
-msgstr ""
-
-#: ../xed/xed-encodings.c:163 ../xed/xed-encodings.c:270
-msgid "Greek"
-msgstr ""
-
-#: ../xed/xed-encodings.c:165
-msgid "Hebrew Visual"
-msgstr ""
-
-#: ../xed/xed-encodings.c:167 ../xed/xed-encodings.c:231
-#: ../xed/xed-encodings.c:272
-msgid "Turkish"
-msgstr ""
-
-#: ../xed/xed-encodings.c:169
-msgid "Nordic"
-msgstr ""
-
-#: ../xed/xed-encodings.c:173
-msgid "Celtic"
-msgstr ""
-
-#: ../xed/xed-encodings.c:177
-msgid "Romanian"
-msgstr ""
-
-#: ../xed/xed-encodings.c:195
-msgid "Armenian"
-msgstr ""
-
-#: ../xed/xed-encodings.c:197 ../xed/xed-encodings.c:199
-#: ../xed/xed-encodings.c:213
-msgid "Chinese Traditional"
-msgstr ""
-
-#: ../xed/xed-encodings.c:201
-msgid "Cyrillic/Russian"
-msgstr ""
-
-#: ../xed/xed-encodings.c:204 ../xed/xed-encodings.c:206
-#: ../xed/xed-encodings.c:208 ../xed/xed-encodings.c:238
-#: ../xed/xed-encodings.c:253
-msgid "Japanese"
-msgstr ""
-
-#: ../xed/xed-encodings.c:211 ../xed/xed-encodings.c:240
-#: ../xed/xed-encodings.c:244 ../xed/xed-encodings.c:259
-msgid "Korean"
-msgstr ""
-
-#: ../xed/xed-encodings.c:216 ../xed/xed-encodings.c:218
-#: ../xed/xed-encodings.c:220
-msgid "Chinese Simplified"
-msgstr ""
-
-#: ../xed/xed-encodings.c:222
-msgid "Georgian"
-msgstr ""
-
-#: ../xed/xed-encodings.c:233 ../xed/xed-encodings.c:274
-msgid "Hebrew"
-msgstr ""
-
-#: ../xed/xed-encodings.c:250
-msgid "Cyrillic/Ukrainian"
-msgstr ""
-
-#: ../xed/xed-encodings.c:255 ../xed/xed-encodings.c:261
-#: ../xed/xed-encodings.c:280
-msgid "Vietnamese"
-msgstr ""
-
-#: ../xed/xed-encodings.c:257
-msgid "Thai"
-msgstr ""
-
-#: ../xed/xed-encodings.c:431
-msgid "Unknown"
-msgstr ""
-
-#: ../xed/xed-encodings-combo-box.c:272
+#: ../xed/xed-encodings-combo-box.c:268
 msgid "Automatically Detected"
 msgstr ""
 
-#: ../xed/xed-encodings-combo-box.c:288 ../xed/xed-encodings-combo-box.c:303
+#: ../xed/xed-encodings-combo-box.c:287 ../xed/xed-encodings-combo-box.c:301
 #, c-format
 msgid "Current Locale (%s)"
 msgstr ""
 
-#: ../xed/xed-encodings-combo-box.c:353
+#: ../xed/xed-encodings-combo-box.c:348
 msgid "Add or Remove..."
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:54
+#: ../xed/xed-encodings-dialog.c:341
+#: ../plugins/spell/xed-spell-language-dialog.c:131
+#: ../plugins/time/xed-time-plugin.c:793
+msgid "_OK"
+msgstr ""
+
+#: ../xed/xed-encodings-dialog.c:342 ../xed/xed-ui.h:53
+#: ../plugins/spell/xed-spell-language-dialog.c:132
+msgid "_Help"
+msgstr ""
+
+#: ../xed/xed-encodings-dialog.c:345
+msgid "Character Encodings"
+msgstr ""
+
+#: ../xed/xed-encodings-dialog.c:378 ../xed/xed-encodings-dialog.c:415
+msgid "_Description"
+msgstr ""
+
+#: ../xed/xed-encodings-dialog.c:386 ../xed/xed-encodings-dialog.c:423
+msgid "_Encoding"
+msgstr ""
+
+#: ../xed/xed-file-chooser-dialog.c:50 ../xed/xed-preferences-dialog.c:870
+msgid "All Files"
+msgstr ""
+
+#: ../xed/xed-file-chooser-dialog.c:51
 msgid "All Text Files"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:82
+#: ../xed/xed-file-chooser-dialog.c:93
 msgid "C_haracter Encoding:"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:147
+#: ../xed/xed-file-chooser-dialog.c:149
 msgid "L_ine Ending:"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:166
+#: ../xed/xed-file-chooser-dialog.c:160
 msgid "Unix/Linux"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:172
+#: ../xed/xed-file-chooser-dialog.c:161
 msgid "Mac OS Classic"
 msgstr ""
 
-#: ../xed/xed-file-chooser-dialog.c:178
+#: ../xed/xed-file-chooser-dialog.c:162
 msgid "Windows"
 msgstr ""
 
-#: ../xed/xed-help.c:81
-msgid "There was an error displaying the help."
-msgstr ""
-
-#: ../xed/xed-io-error-message-area.c:179
-#: ../xed/xed-io-error-message-area.c:481
+#: ../xed/xed-io-error-info-bar.c:158 ../xed/xed-io-error-info-bar.c:394
 msgid "_Retry"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:200
+#: ../xed/xed-io-error-info-bar.c:177
 #, c-format
 msgid "Could not find the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:202
-#: ../xed/xed-io-error-message-area.c:241
-#: ../xed/xed-io-error-message-area.c:248
+#: ../xed/xed-io-error-info-bar.c:178 ../xed/xed-io-error-info-bar.c:212
+#: ../xed/xed-io-error-info-bar.c:217
 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-message-area.c:217
+#: ../xed/xed-io-error-info-bar.c:193
 #, c-format
 msgid "xed cannot handle %s locations."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:223
+#: ../xed/xed-io-error-info-bar.c:198
 msgid "xed cannot handle this location."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:231
+#: ../xed/xed-io-error-info-bar.c:205
 msgid "The location of the file cannot be mounted."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:235
+#: ../xed/xed-io-error-info-bar.c:208
 msgid "The location of the file cannot be accessed because it is not mounted."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:239
+#: ../xed/xed-io-error-info-bar.c:211
 #, c-format
 msgid "%s is a directory."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:246
+#: ../xed/xed-io-error-info-bar.c:216
 #, c-format
 msgid "%s is not a valid location."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:276
+#. Translators: %s is a host name
+#: ../xed/xed-io-error-info-bar.c:246
 #, c-format
 msgid ""
 "Host %s could not be found. Please check that your proxy settings are "
 "correct and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:289
+#. use the same string as INVALID_HOST
+#: ../xed/xed-io-error-info-bar.c:260
 #, c-format
 msgid ""
 "Hostname was invalid. Please check that you typed the location correctly and "
 "try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:297
+#: ../xed/xed-io-error-info-bar.c:267
 #, c-format
 msgid "%s is not a regular file."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:302
+#: ../xed/xed-io-error-info-bar.c:270
 msgid "Connection timed out. Please try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:325
-msgid "The file is too big."
-msgstr ""
-
-#: ../xed/xed-io-error-message-area.c:366
+#: ../xed/xed-io-error-info-bar.c:297
 #, c-format
 msgid "Unexpected error: %s"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:402
+#: ../xed/xed-io-error-info-bar.c:330
 msgid "xed cannot find the file. Perhaps it has recently been deleted."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:412
+#: ../xed/xed-io-error-info-bar.c:340
 #, c-format
 msgid "Could not revert the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:438
+#: ../xed/xed-io-error-info-bar.c:363
 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-message-area.c:490
-#: ../xed/xed-io-error-message-area.c:765
+#: ../xed/xed-io-error-info-bar.c:401 ../xed/xed-io-error-info-bar.c:658
 msgid "Edit Any_way"
 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-message-area.c:495
-#: ../xed/xed-io-error-message-area.c:770
-msgid "D_on't Edit"
-msgstr ""
-
-#: ../xed/xed-io-error-message-area.c:591
+#: ../xed/xed-io-error-info-bar.c:493
 msgid ""
 "The number of followed links is limited and the actual file could not be "
 "found within this limit."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:595
+#: ../xed/xed-io-error-info-bar.c:497
 msgid "You do not have the permissions necessary to open the file."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:601
+#: ../xed/xed-io-error-info-bar.c:503
 msgid "xed has not been able to detect the character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:603
-#: ../xed/xed-io-error-message-area.c:625
+#: ../xed/xed-io-error-info-bar.c:505 ../xed/xed-io-error-info-bar.c:528
 msgid "Please check that you are not trying to open a binary file."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:604
+#: ../xed/xed-io-error-info-bar.c:506
 msgid "Select a character encoding from the menu and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:610
+#: ../xed/xed-io-error-info-bar.c:512
 #, c-format
 msgid "There was a problem opening the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:612
+#: ../xed/xed-io-error-info-bar.c:513
 msgid ""
 "The file you opened has some invalid characters. If you continue editing "
-"this file you could make this document useless."
+"this file you could corrupt this document."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:615
+#: ../xed/xed-io-error-info-bar.c:516
 msgid "You can also choose another character encoding and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:622
+#: ../xed/xed-io-error-info-bar.c:525
 #, c-format
 msgid "Could not open the file %s using the %s character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:626
-#: ../xed/xed-io-error-message-area.c:701
+#: ../xed/xed-io-error-info-bar.c:529 ../xed/xed-io-error-info-bar.c:598
 msgid "Select a different character encoding from the menu and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:636
+#: ../xed/xed-io-error-info-bar.c:541
 #, c-format
 msgid "Could not open the file %s."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:696
+#: ../xed/xed-io-error-info-bar.c:593
 #, c-format
 msgid "Could not save the file %s using the %s character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:699
+#: ../xed/xed-io-error-info-bar.c:596
 msgid ""
 "The document contains one or more characters that cannot be encoded using "
 "the specified character encoding."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:785
+#. 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
+msgid "D_on't Edit"
+msgstr ""
+
+#: ../xed/xed-io-error-info-bar.c:677
 #, c-format
 msgid "This file (%s) is already open in another xed window."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:799
+#: ../xed/xed-io-error-info-bar.c:691
 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-message-area.c:858
-#: ../xed/xed-io-error-message-area.c:954
+#: ../xed/xed-io-error-info-bar.c:746 ../xed/xed-io-error-info-bar.c:834
+#: ../xed/xed-io-error-info-bar.c:1096
 msgid "S_ave Anyway"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:862
-#: ../xed/xed-io-error-message-area.c:958
+#: ../xed/xed-io-error-info-bar.c:747 ../xed/xed-io-error-info-bar.c:835
+#: ../xed/xed-io-error-info-bar.c:1098
 msgid "D_on't Save"
 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-message-area.c:880
+#. * 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
 #, c-format
 msgid "The file %s has been modified since reading it."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:895
+#: ../xed/xed-io-error-info-bar.c:778
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:976
+#: ../xed/xed-io-error-info-bar.c:855
 #, c-format
 msgid "Could not create a backup file while saving %s"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:979
+#: ../xed/xed-io-error-info-bar.c:859
 #, c-format
 msgid "Could not create a temporary backup file while saving %s"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:995
+#: ../xed/xed-io-error-info-bar.c:875
 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 "
@@ -1280,62 +1039,62 @@ msgid ""
 msgstr ""
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../xed/xed-io-error-message-area.c:1055
+#: ../xed/xed-io-error-info-bar.c:932
 #, 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-message-area.c:1063
+#: ../xed/xed-io-error-info-bar.c:940
 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-message-area.c:1072
+#: ../xed/xed-io-error-info-bar.c:949
 #, 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-message-area.c:1078
+#: ../xed/xed-io-error-info-bar.c:955
 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-message-area.c:1084
+#: ../xed/xed-io-error-info-bar.c:961
 msgid ""
 "There is not enough disk space to save the file. Please free some disk space "
 "and try again."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:1089
+#: ../xed/xed-io-error-info-bar.c:966
 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-message-area.c:1095
+#: ../xed/xed-io-error-info-bar.c:972
 msgid "A file with the same name already exists. Please use a different name."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:1100
+#: ../xed/xed-io-error-info-bar.c:977
 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-message-area.c:1107
+#: ../xed/xed-io-error-info-bar.c:987
 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-message-area.c:1123
+#: ../xed/xed-io-error-info-bar.c:1000
 #, c-format
 msgid "Could not save the file %s."
 msgstr ""
@@ -1343,175 +1102,95 @@ 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-message-area.c:1167
+#: ../xed/xed-io-error-info-bar.c:1040
 #, c-format
 msgid "The file %s changed on disk."
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:1172
+#: ../xed/xed-io-error-info-bar.c:1045
 msgid "Do you want to drop your changes and reload the file?"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:1174
+#: ../xed/xed-io-error-info-bar.c:1049
 msgid "Do you want to reload the file?"
 msgstr ""
 
-#: ../xed/xed-io-error-message-area.c:1179
+#: ../xed/xed-io-error-info-bar.c:1054
 msgid "_Reload"
 msgstr ""
 
-#: ../xed/xed-panel.c:338 ../xed/xed-panel.c:513
-msgid "Empty"
+#: ../xed/xed-io-error-info-bar.c:1111
+#, c-format
+msgid "Some invalid chars have been detected while saving %s"
 msgstr ""
 
-#: ../xed/xed-panel.c:403
-msgid "Hide panel"
+#: ../xed/xed-io-error-info-bar.c:1126
+msgid ""
+"If you continue saving this file you can corrupt the document.  Save anyway?"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:54
-msgid "Plugin"
+#: ../xed/xed-preferences-dialog.c:390
+msgid "Click on this button to select the font to be used by the editor"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:55
-msgid "Enabled"
+#: ../xed/xed-preferences-dialog.c:404
+#, c-format
+msgid "_Use the system fixed width font (%s)"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:504 ../xed/xed-ui.h:68
-msgid "_About"
+#: ../xed/xed-preferences-dialog.c:630
+#, c-format
+msgid "Directory '%s' could not be created: g_mkdir_with_parents() failed: %s"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:512
-msgid "C_onfigure"
+#: ../xed/xed-preferences-dialog.c:826
+msgid "The selected color scheme cannot be installed."
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:521
-msgid "A_ctivate"
+#: ../xed/xed-preferences-dialog.c:851 ../xed/xed-preferences-dialog.c:857
+msgid "Add Scheme"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:532
-msgid "Ac_tivate All"
+#: ../xed/xed-preferences-dialog.c:854 ../xed/xed-progress-info-bar.c:67
+msgid "Cancel"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:537
-msgid "_Deactivate All"
+#: ../xed/xed-preferences-dialog.c:863
+msgid "Color Scheme Files"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:803
-msgid "Active _Plugins:"
+#: ../xed/xed-preferences-dialog.c:906
+#, c-format
+msgid "Could not remove color scheme \"%s\"."
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:829
-msgid "_About Plugin"
+#: ../xed/xed-preferences-dialog.c:1100
+#: ../xed/resources/ui/xed-searchbar.ui.h:11
+msgid "Close"
 msgstr ""
 
-#: ../xed/xed-plugin-manager.c:833
-msgid "C_onfigure Plugin"
+#: ../xed/xed-preferences-dialog.c:1101
+msgid "Help"
 msgstr ""
 
-#: ../xed/xed-print-job.c:547
+#: ../xed/xed-preferences-dialog.c:1104
+msgid "Xed Preferences"
+msgstr ""
+
+#: ../xed/xed-print-job.c:497
 #, c-format
 msgid "File: %s"
 msgstr ""
 
-#: ../xed/xed-print-job.c:556
+#: ../xed/xed-print-job.c:506
 msgid "Page %N of %Q"
 msgstr ""
 
-#: ../xed/xed-print-job.c:813
+#: ../xed/xed-print-job.c:743
 msgid "Preparing..."
 msgstr ""
 
-#: ../xed/xed-print-preferences.ui.h:1
-msgid "Syntax Highlighting"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:2
-msgid "Print synta_x highlighting"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:4
-msgid "Print line nu_mbers"
-msgstr ""
-
-#.
-#: ../xed/xed-print-preferences.ui.h:6
-msgid "_Number every"
-msgstr ""
-
-#.
-#: ../xed/xed-print-preferences.ui.h:8
-msgid "lines"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:12
-msgid "Page header"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:13
-msgid "Print page _headers"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:14
-msgid "Fonts"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:15
-msgid "_Body:"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:16
-msgid "_Line numbers:"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:17
-msgid "He_aders and footers:"
-msgstr ""
-
-#: ../xed/xed-print-preferences.ui.h:18
-msgid "_Restore Default Fonts"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:1
-msgid "Replace All"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:2
-msgid "Replace"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:3
-msgid "_Search for: "
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:4
-msgid "Replace _with: "
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:5
-msgid "Next"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:6
-msgid "Previous"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:7
-msgid "Case sensitive"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:8
-msgid "Whole word"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:9
-msgid "Wrap"
-msgstr ""
-
-#: ../xed/xed-searchbar.ui.h:10
-msgid "Close"
-msgstr ""
-
-#: ../xed/xed-print-preview.c:564
+#: ../xed/xed-print-preview.c:570
 msgid "Show the previous page"
 msgstr ""
 
@@ -1519,84 +1198,348 @@ msgstr ""
 msgid "Show the next page"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:592
+#: ../xed/xed-print-preview.c:590
 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:615
+#: ../xed/xed-print-preview.c:604
 msgid "of"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:623
+#: ../xed/xed-print-preview.c:609
 msgid "Page total"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:624
+#: ../xed/xed-print-preview.c:610
 msgid "The total number of pages in the document"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:641
+#: ../xed/xed-print-preview.c:630
 msgid "Show multiple pages"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:654
+#: ../xed/xed-print-preview.c:648
 msgid "Zoom 1:1"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:663
+#: ../xed/xed-print-preview.c:654
 msgid "Zoom to fit the whole page"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:672
+#: ../xed/xed-print-preview.c:660
 msgid "Zoom the page in"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:681
+#: ../xed/xed-print-preview.c:666
 msgid "Zoom the page out"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:693
-msgid "_Close Preview"
+#: ../xed/xed-print-preview.c:681
+msgid "_Close preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:696
+#: ../xed/xed-print-preview.c:683
 msgid "Close print preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:766
+#: ../xed/xed-print-preview.c:761
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:950
+#: ../xed/xed-print-preview.c:946
 msgid "Page Preview"
 msgstr ""
 
-#: ../xed/xed-print-preview.c:951
+#: ../xed/xed-print-preview.c:947
 msgid "The preview of a page in the document to be printed"
 msgstr ""
 
-#: ../xed/xed-smart-charset-converter.c:319
-msgid "It is not possible to detect the encoding automatically"
+#: ../xed/resources/ui/xed-encodings-dialog.ui.h:1
+msgid "Character encodings"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:70
+#: ../xed/resources/ui/xed-encodings-dialog.ui.h:2
+msgid "A_vailable encodings:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-encodings-dialog.ui.h:3
+msgid "E_ncodings shown in menu:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:2
+#: ../xed/resources/ui/xed-print-preferences.ui.h:9
+msgid "Text Wrapping"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:3
+#: ../plugins/docinfo/docinfo.ui.h:4 ../plugins/time/xed-time-dialog.ui.h:4
+#: ../plugins/time/xed-time-setup-dialog.ui.h:3
+msgid "    "
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:4
+#: ../xed/resources/ui/xed-print-preferences.ui.h:10
+msgid "Enable text _wrapping"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:5
+#: ../xed/resources/ui/xed-print-preferences.ui.h:11
+msgid "Do not _split words over two lines"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:6
+#: ../xed/resources/ui/xed-print-preferences.ui.h:3
+msgid "Line Numbers"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:7 ../xed/xed-view.c:381
+msgid "_Display line numbers"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:8
+msgid "Current Line"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:9
+msgid "Highlight current _line"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:10
+msgid "Right Margin"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:11
+msgid "Display right _margin"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:12
+msgid "_Right margin at column:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:13
+msgid "Bracket Matching"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:14
+msgid "Highlight matching _bracket"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:15
+msgid "View"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:16
+msgid "Tab Stops"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:17
+msgid "_Tab width:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:18
+msgid "Insert _spaces instead of tabs"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:19
+msgid "Automatic Indentation"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:20
+msgid "_Enable automatic indentation"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:21
+msgid "File Saving"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:22
+msgid "Create a _backup copy of files before saving"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:23
+msgid "_Autosave files every"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:24
+msgid "_minutes"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:25
+msgid "Tab Scrolling"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:26
+msgid "Allow mouse wheel scrolling to change tabs"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:27
+msgid "Editor"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:28
+msgid "Font"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:29
+msgid "Editor _font: "
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:30
+msgid "Pick the editor font"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:31
+msgid "Color Scheme"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:32
+msgid "Use dark theme variant (if available)"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:33
+msgid "_Add..."
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:34
+msgid "Font & Colors"
+msgstr ""
+
+#: ../xed/resources/ui/xed-preferences-dialog.ui.h:35
+msgid "Plugins"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:1
+msgid "Syntax Highlighting"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:2
+msgid "Print synta_x highlighting"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:4
+msgid "Print line nu_mbers"
+msgstr ""
+
+#.
+#: ../xed/resources/ui/xed-print-preferences.ui.h:6
+msgid "_Number every"
+msgstr ""
+
+#.
+#: ../xed/resources/ui/xed-print-preferences.ui.h:8
+msgid "lines"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:12
+msgid "Page header"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:13
+msgid "Print page _headers"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:14
+msgid "Fonts"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:15
+msgid "_Body:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:16
+msgid "_Line numbers:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:17
+msgid "He_aders and footers:"
+msgstr ""
+
+#: ../xed/resources/ui/xed-print-preferences.ui.h:18
+msgid "_Restore Default Fonts"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:1
+msgid "Replace All"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:2
+msgid "Replace"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:3
+msgid "_Search for: "
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:4
+msgid "Replace _with: "
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:5
+msgid "Next"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:6
+msgid "Previous"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:7
+msgid "Regular expression"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:8
+msgid "Case sensitive"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:9
+msgid "Whole word"
+msgstr ""
+
+#: ../xed/resources/ui/xed-searchbar.ui.h:10
+msgid "Wrap"
+msgstr ""
+
+#: ../xed/xed-searchbar.c:95
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-searchbar.c:78
+#: ../xed/xed-searchbar.c:105
 msgid "Found and replaced one occurrence"
 msgstr ""
 
-#: ../xed/xed-searchbar.c:96
+#: ../xed/xed-searchbar.c:127
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
+#: ../xed/xed-searchbar.c:305
+msgid "No matches found"
+msgstr ""
+
+#: ../xed/xed-searchbar.c:313
+#, c-format
+msgid "%d match"
+msgid_plural "%d matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../xed/xed-searchbar.c:319
+#, 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
 msgid "OVR"
 msgstr ""
@@ -1607,99 +1550,90 @@ 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:252
+#: ../xed/xed-statusbar.c:231
 #, c-format
 msgid "  Ln %d, Col %d"
 msgstr ""
 
-#: ../xed/xed-statusbar.c:353
+#: ../xed/xed-statusbar.c:330
 #, c-format
 msgid "There is a tab with errors"
 msgid_plural "There are %d tabs with errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../xed/xed-style-scheme-manager.c:214
-#, c-format
-msgid "Directory '%s' could not be created: g_mkdir_with_parents() failed: %s"
+#: ../xed/xed-tab-label.c:278
+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:656
+#: ../xed/xed-tab.c:716
 #, c-format
 msgid "Reverting %s from %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:663
+#: ../xed/xed-tab.c:721
 #, 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:679
+#: ../xed/xed-tab.c:734
 #, c-format
 msgid "Loading %s from %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:686
+#: ../xed/xed-tab.c:739
 #, 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:769
+#: ../xed/xed-tab.c:820
 #, c-format
 msgid "Saving %s to %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:776
+#: ../xed/xed-tab.c:825
 #, c-format
 msgid "Saving %s"
 msgstr ""
 
 #. Read only
-#: ../xed/xed-tab.c:1647
+#: ../xed/xed-tab.c:1305
 msgid "RO"
 msgstr ""
 
-#: ../xed/xed-tab.c:1694
+#: ../xed/xed-tab.c:1353
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1699
+#: ../xed/xed-tab.c:1357
 #, c-format
 msgid "Error reverting file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1704
+#: ../xed/xed-tab.c:1361
 #, c-format
 msgid "Error saving file %s"
 msgstr ""
 
-#: ../xed/xed-tab.c:1725
-msgid "Unicode (UTF-8)"
-msgstr ""
-
-#: ../xed/xed-tab.c:1732
+#: ../xed/xed-tab.c:1394
 msgid "Name:"
 msgstr ""
 
-#: ../xed/xed-tab.c:1733
+#: ../xed/xed-tab.c:1395
 msgid "MIME Type:"
 msgstr ""
 
-#: ../xed/xed-tab.c:1734
+#: ../xed/xed-tab.c:1396
 msgid "Encoding:"
 msgstr ""
 
-#: ../xed/xed-tab-label.c:275
-msgid "Close document"
-msgstr ""
-
 #. Toplevel
 #: ../xed/xed-ui.h:47
 msgid "_File"
@@ -1725,10 +1659,6 @@ msgstr ""
 msgid "_Documents"
 msgstr ""
 
-#: ../xed/xed-ui.h:53
-msgid "_Help"
-msgstr ""
-
 #. File menu
 #: ../xed/xed-ui.h:56
 msgid "_New"
@@ -1764,6 +1694,10 @@ msgstr ""
 msgid "Open the xed manual"
 msgstr ""
 
+#: ../xed/xed-ui.h:68
+msgid "_About"
+msgstr ""
+
 #: ../xed/xed-ui.h:69
 msgid "About this application"
 msgstr ""
@@ -1772,11 +1706,6 @@ msgstr ""
 msgid "Leave fullscreen mode"
 msgstr ""
 
-#. File menu
-#: ../xed/xed-ui.h:80
-msgid "_Save"
-msgstr ""
-
 #: ../xed/xed-ui.h:81
 msgid "Save the current file"
 msgstr ""
@@ -1854,7 +1783,9 @@ msgstr ""
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../xed/xed-ui.h:102 ../plugins/filebrowser/xed-file-browser-widget.c:800
+#: ../xed/xed-ui.h:102 ../plugins/filebrowser/xed-file-browser-plugin.c:972
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:1007
+#: ../plugins/filebrowser/xed-file-browser-widget.c:764
 msgid "_Delete"
 msgstr ""
 
@@ -1953,7 +1884,7 @@ msgstr ""
 msgid "Move the current document to a new window"
 msgstr ""
 
-#: ../xed/xed-ui.h:138
+#: ../xed/xed-ui.h:138 ../plugins/spell/spell-checker.ui.h:14
 msgid "_Close"
 msgstr ""
 
@@ -1989,47 +1920,51 @@ msgstr ""
 msgid "Edit text in fullscreen"
 msgstr ""
 
-#: ../xed/xed-ui.h:165
-msgid "Side _Pane"
+#: ../xed/xed-ui.h:160
+msgid "_Word wrap"
 msgstr ""
 
-#: ../xed/xed-ui.h:166
-msgid "Show or hide the side pane in the current window"
+#: ../xed/xed-ui.h:161
+msgid "Set word wrap for the current document"
 msgstr ""
 
 #: ../xed/xed-ui.h:168
-msgid "_Bottom Pane"
+msgid "Side _Pane"
 msgstr ""
 
 #: ../xed/xed-ui.h:169
+msgid "Show or hide the side pane in the current window"
+msgstr ""
+
+#: ../xed/xed-ui.h:171
+msgid "_Bottom Pane"
+msgstr ""
+
+#: ../xed/xed-ui.h:172
 msgid "Show or hide the bottom pane in the current window"
 msgstr ""
 
-#: ../xed/xed-utils.c:1093
+#: ../xed/xed-utils.c:925
 msgid "Please check your installation."
 msgstr ""
 
-#: ../xed/xed-utils.c:1166
+#: ../xed/xed-utils.c:993
 #, c-format
 msgid "Unable to open UI file %s. Error: %s"
 msgstr ""
 
-#: ../xed/xed-utils.c:1186
+#: ../xed/xed-utils.c:1013
 #, c-format
 msgid "Unable to find the object '%s' inside file %s."
 msgstr ""
 
 #. Translators: '/ on <remote-share>'
-#: ../xed/xed-utils.c:1346
+#: ../xed/xed-utils.c:1181
 #, c-format
 msgid "/ on %s"
 msgstr ""
 
-#: ../xed/xed-view.c:719
-msgid "Line you want to move the cursor to"
-msgstr ""
-
-#: ../xed/xed-window.c:742
+#: ../xed/xed-window.c:773
 #, c-format
 msgid "Use %s highlight mode"
 msgstr ""
@@ -2037,88 +1972,48 @@ 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:782 ../xed/xed-window.c:1591
+#: ../xed/xed-window.c:861 ../xed/xed-window.c:1679
 msgid "Plain Text"
 msgstr ""
 
-#: ../xed/xed-window.c:782
+#: ../xed/xed-window.c:861
 msgid "Disable syntax highlighting"
 msgstr ""
 
 #. Translators: %s is a URI
-#: ../xed/xed-window.c:1036
+#: ../xed/xed-window.c:1135
 #, c-format
 msgid "Open '%s'"
 msgstr ""
 
 #. Translators: %s is a URI
-#: ../xed/xed-window.c:1321
+#: ../xed/xed-window.c:1414
 #, c-format
 msgid "Activate '%s'"
 msgstr ""
 
-#: ../xed/xed-window.c:1572
+#: ../xed/xed-window.c:1663
 msgid "Use Spaces"
 msgstr ""
 
-#: ../xed/xed-window.c:1629
+#: ../xed/xed-window.c:1728
 msgid "Tab Width"
 msgstr ""
 
-#: ../xed/xed-window.c:3310
+#: ../xed/xed-window.c:2440
+msgid "There are unsaved documents"
+msgstr ""
+
+#: ../xed/xed-window.c:3586
 msgid "Elevated Privileges"
 msgstr ""
 
-#: ../plugins/changecase/changecase.xed-plugin.desktop.in.h:1
-msgid "Change Case"
-msgstr ""
-
-#: ../plugins/changecase/changecase.xed-plugin.desktop.in.h:2
-msgid "Changes the case of selected text."
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:222
-msgid "C_hange Case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:223
-msgid "All _Upper Case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:224
-msgid "Change selected text to upper case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:226
-msgid "All _Lower Case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:227
-msgid "Change selected text to lower case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:229
-msgid "_Invert Case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:230
-msgid "Invert the case of selected text"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:232
-msgid "_Title Case"
-msgstr ""
-
-#: ../plugins/changecase/xed-changecase-plugin.c:233
-msgid "Capitalize the first letter of each selected word"
-msgstr ""
-
-#: ../plugins/docinfo/docinfo.xed-plugin.desktop.in.h:1
+#: ../plugins/docinfo/docinfo.plugin.desktop.in.h:1
 #: ../plugins/docinfo/docinfo.ui.h:1
 msgid "Document Statistics"
 msgstr ""
 
-#: ../plugins/docinfo/docinfo.xed-plugin.desktop.in.h:2
+#: ../plugins/docinfo/docinfo.plugin.desktop.in.h:2
 msgid ""
 "Analyzes the current document and reports the number of words, lines, "
 "characters and non-space characters in it."
@@ -2160,19 +2055,19 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
-#: ../plugins/docinfo/xed-docinfo-plugin.c:423
+#: ../plugins/docinfo/xed-docinfo-plugin.c:382
 msgid "_Document Statistics"
 msgstr ""
 
-#: ../plugins/docinfo/xed-docinfo-plugin.c:425
+#: ../plugins/docinfo/xed-docinfo-plugin.c:384
 msgid "Get statistical information on the current document"
 msgstr ""
 
-#: ../plugins/filebrowser/filebrowser.xed-plugin.desktop.in.h:1
+#: ../plugins/filebrowser/filebrowser.plugin.desktop.in.h:1
 msgid "File Browser Pane"
 msgstr ""
 
-#: ../plugins/filebrowser/filebrowser.xed-plugin.desktop.in.h:2
+#: ../plugins/filebrowser/filebrowser.plugin.desktop.in.h:2
 msgid "Easy file access from the side pane"
 msgstr ""
 
@@ -2211,388 +2106,415 @@ msgid ""
 msgstr ""
 
 #: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:7
-msgid "Open With Tree View"
+msgid "Terminal Command"
 msgstr ""
 
 #: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.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
+msgid "Open With Tree View"
+msgstr ""
+
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.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:9
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:11
 msgid "File Browser Root Directory"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:10
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.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:11
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:13
 msgid "File Browser Virtual Root Directory"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:12
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.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:13
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:15
 msgid "Enable Restore of Remote Locations"
 msgstr ""
 
-#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:14
+#: ../plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml.in.h:16
 msgid "Sets whether to enable restoring of remote locations."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-bookmarks-store.c:235
+#: ../plugins/filebrowser/xed-file-bookmarks-store.c:256
 msgid "File System"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:407
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:445
 msgid "_Set root to active document"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:409
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:447
 msgid "Set the root to the active document location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:414
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:452
 msgid "_Open terminal here"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:416
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:454
 msgid "Open a terminal at the currently opened directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:557
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:566
 msgid "File Browser"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:674
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:677
 msgid "An error occurred while creating a new directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:677
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:680
 msgid "An error occurred while creating a new file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:682
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:683
 msgid "An error occurred while renaming a file or directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:687
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:686
 msgid "An error occurred while deleting a file or directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:692
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:689
 msgid "An error occurred while opening a directory in the file manager"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:696
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:692
 msgid "An error occurred while setting a root directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:700
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:695
 msgid "An error occurred while loading a directory"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:703
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:698
 msgid "An error occurred"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:934
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:955
 msgid ""
 "Cannot move file to trash, do you\n"
 "want to delete permanently?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:938
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:960
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:941
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:965
 msgid "The selected files cannot be moved to the trash."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:971
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:993
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:974
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:998
 msgid "Are you sure you want to permanently delete the selected files?"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-plugin.c:977
+#: ../plugins/filebrowser/xed-file-browser-plugin.c:1001
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:1667
+#: ../plugins/filebrowser/xed-file-browser-store.c:1818
 msgid "(Empty)"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3305
+#: ../plugins/filebrowser/xed-file-browser-store.c:3508
 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:3544
-msgid "file"
+#: ../plugins/filebrowser/xed-file-browser-store.c:3774
+msgid "Untitled File"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3568
+#: ../plugins/filebrowser/xed-file-browser-store.c:3802
 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:3597
-msgid "directory"
+#: ../plugins/filebrowser/xed-file-browser-store.c:3829
+msgid "Untitled Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-store.c:3617
+#: ../plugins/filebrowser/xed-file-browser-store.c:3854
 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:711
+#: ../plugins/filebrowser/xed-file-browser-widget.c:720
 msgid "Bookmarks"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:792
+#: ../plugins/filebrowser/xed-file-browser-widget.c:757
 msgid "_Filter"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:797
+#: ../plugins/filebrowser/xed-file-browser-widget.c:762
 msgid "_Move to Trash"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:798
+#: ../plugins/filebrowser/xed-file-browser-widget.c:763
 msgid "Move selected file or folder to trash"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:801
+#: ../plugins/filebrowser/xed-file-browser-widget.c:765
 msgid "Delete selected file or folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:807
-msgid "Open"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:808
+#: ../plugins/filebrowser/xed-file-browser-widget.c:771
 msgid "Open selected file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:814
+#: ../plugins/filebrowser/xed-file-browser-widget.c:776
 msgid "Up"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:815
+#: ../plugins/filebrowser/xed-file-browser-widget.c:777
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:820
+#: ../plugins/filebrowser/xed-file-browser-widget.c:782
 msgid "_New Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:821
+#: ../plugins/filebrowser/xed-file-browser-widget.c:783
 msgid "Add new empty folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:823
+#: ../plugins/filebrowser/xed-file-browser-widget.c:784
 msgid "New F_ile"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:824
+#: ../plugins/filebrowser/xed-file-browser-widget.c:785
 msgid "Add new empty file"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:829
-msgid "_Rename"
+#: ../plugins/filebrowser/xed-file-browser-widget.c:790
+msgid "_Rename..."
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:830
+#: ../plugins/filebrowser/xed-file-browser-widget.c:791
 msgid "Rename selected file or folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:836
+#: ../plugins/filebrowser/xed-file-browser-widget.c:796
 msgid "_Previous Location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:837
+#: ../plugins/filebrowser/xed-file-browser-widget.c:797
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:839
+#: ../plugins/filebrowser/xed-file-browser-widget.c:798
 msgid "_Next Location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:840
+#: ../plugins/filebrowser/xed-file-browser-widget.c:799
 msgid "Go to the next visited location"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:841
+#: ../plugins/filebrowser/xed-file-browser-widget.c:800
 msgid "Re_fresh View"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:842
+#: ../plugins/filebrowser/xed-file-browser-widget.c:801
 msgid "Refresh the view"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:843
-#: ../plugins/filebrowser/xed-file-browser-widget.c:861
+#: ../plugins/filebrowser/xed-file-browser-widget.c:802
+#: ../plugins/filebrowser/xed-file-browser-widget.c:816
 msgid "_View Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:844
-#: ../plugins/filebrowser/xed-file-browser-widget.c:862
+#: ../plugins/filebrowser/xed-file-browser-widget.c:803
+#: ../plugins/filebrowser/xed-file-browser-widget.c:817
 msgid "View folder in file manager"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:851
+#: ../plugins/filebrowser/xed-file-browser-widget.c:808
 msgid "Show _Hidden"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:852
+#: ../plugins/filebrowser/xed-file-browser-widget.c:809
 msgid "Show hidden files and folders"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:854
+#: ../plugins/filebrowser/xed-file-browser-widget.c:810
 msgid "Show _Binary"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:855
+#: ../plugins/filebrowser/xed-file-browser-widget.c:811
 msgid "Show binary files"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:987
-#: ../plugins/filebrowser/xed-file-browser-widget.c:996
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1017
-msgid "Previous location"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:989
-msgid "Go to previous location"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:991
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1012
-msgid "Go to a previously opened location"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1008
-msgid "Next location"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1010
-msgid "Go to next location"
-msgstr ""
-
-#: ../plugins/filebrowser/xed-file-browser-widget.c:1222
+#: ../plugins/filebrowser/xed-file-browser-widget.c:1154
 msgid "_Match Filename"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:2129
+#: ../plugins/filebrowser/xed-file-browser-widget.c:1995
 #, c-format
 msgid "No mount object for mounted volume: %s"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:2209
+#: ../plugins/filebrowser/xed-file-browser-widget.c:2073
 #, c-format
 msgid "Could not open media: %s"
 msgstr ""
 
-#: ../plugins/filebrowser/xed-file-browser-widget.c:2256
+#: ../plugins/filebrowser/xed-file-browser-widget.c:2122
 #, c-format
 msgid "Could not mount volume: %s"
 msgstr ""
 
-#. ex:ts=8:noet:
-#: ../plugins/modelines/modelines.xed-plugin.desktop.in.h:1
+#. vi:ts=8
+#: ../plugins/modelines/modelines.plugin.desktop.in.h:1
 msgid "Modelines"
 msgstr ""
 
-#: ../plugins/modelines/modelines.xed-plugin.desktop.in.h:2
+#: ../plugins/modelines/modelines.plugin.desktop.in.h:2
 msgid "Emacs, Kate and Vim-style modelines support for xed."
 msgstr ""
 
-#: ../plugins/sort/xed-sort-plugin.c:88
-msgid "S_ort..."
-msgstr ""
-
-#: ../plugins/sort/xed-sort-plugin.c:90
-msgid "Sort the current document or selection"
-msgstr ""
-
-#: ../plugins/sort/sort.xed-plugin.desktop.in.h:1 ../plugins/sort/sort.ui.h:1
+#: ../plugins/sort/sort.plugin.desktop.in.h:1
 msgid "Sort"
 msgstr ""
 
-#: ../plugins/sort/sort.xed-plugin.desktop.in.h:2
+#: ../plugins/sort/sort.plugin.desktop.in.h:2
 msgid "Sorts a document or selected text."
 msgstr ""
 
-#: ../plugins/sort/sort.ui.h:2
-msgid "_Sort"
+#: ../plugins/sort/xed-sort-plugin.c:80
+msgid "S_ort lines"
 msgstr ""
 
-#: ../plugins/sort/sort.ui.h:3
-msgid "_Reverse order"
+#: ../plugins/sort/xed-sort-plugin.c:82
+msgid "Sort the current document or selection"
 msgstr ""
 
-#: ../plugins/sort/sort.ui.h:4
-msgid "R_emove duplicates"
+#: ../plugins/spell/languages-dialog.ui.h:1
+#: ../plugins/spell/xed-spell-language-dialog.c:135
+msgid "Set language"
 msgstr ""
 
-#: ../plugins/sort/sort.ui.h:5
-msgid "_Ignore case"
-msgstr ""
-
-#: ../plugins/sort/sort.ui.h:6
-msgid "S_tart at column:"
-msgstr ""
-
-#: ../plugins/sort/sort.ui.h:7
-msgid "You cannot undo a sort operation"
+#: ../plugins/spell/languages-dialog.ui.h:2
+msgid "Select the _language of the current document."
 msgstr ""
 
 #: ../plugins/spell/org.x.editor.plugins.spell.gschema.xml.in.h:1
 msgid "Autocheck Type"
 msgstr ""
 
+#: ../plugins/spell/spell-checker.ui.h:1
+msgid "Misspelled word:"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:2
+msgid "word"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:3
+msgid "Change _to:"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:4
+msgid "Check _Word"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:5
+msgid "_Suggestions:"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:6
+msgid "_Ignore"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:7
+msgid "Ignore _All"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:8
+msgid "Cha_nge"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:9
+msgid "Change A_ll"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:10
+msgid "User dictionary:"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:11
+msgid "Add w_ord"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:12
+msgid "Language:"
+msgstr ""
+
+#: ../plugins/spell/spell-checker.ui.h:13
+msgid "Language"
+msgstr ""
+
+#: ../plugins/spell/spell.plugin.desktop.in.h:1
+msgid "Spell Checker"
+msgstr ""
+
+#: ../plugins/spell/spell.plugin.desktop.in.h:2
+msgid "Checks the spelling of the current document."
+msgstr ""
+
 #. Translators: Displayed in the "Check Spelling" dialog if there are no suggestions for the current misspelled word
 #. Translators: Displayed in the "Check Spelling" dialog if there are no suggestions
 #. * for the current misspelled word
-#: ../plugins/spell/xed-automatic-spell-checker.c:420
+#: ../plugins/spell/xed-automatic-spell-checker.c:433
 #: ../plugins/spell/xed-spell-checker-dialog.c:455
 msgid "(no suggested words)"
 msgstr ""
 
-#: ../plugins/spell/xed-automatic-spell-checker.c:444
+#: ../plugins/spell/xed-automatic-spell-checker.c:457
 msgid "_More..."
 msgstr ""
 
 #. Ignore all
-#: ../plugins/spell/xed-automatic-spell-checker.c:499
+#: ../plugins/spell/xed-automatic-spell-checker.c:510
 msgid "_Ignore All"
 msgstr ""
 
 #. + Add to Dictionary
-#: ../plugins/spell/xed-automatic-spell-checker.c:514
+#: ../plugins/spell/xed-automatic-spell-checker.c:520
 msgid "_Add"
 msgstr ""
 
-#: ../plugins/spell/xed-automatic-spell-checker.c:553
+#. then, on top of it, the suggestions menu.
+#: ../plugins/spell/xed-automatic-spell-checker.c:557
 msgid "_Spelling Suggestions..."
 msgstr ""
 
@@ -2641,155 +2563,72 @@ msgctxt "language"
 msgid "Default"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-language-dialog.c:141
-#: ../plugins/spell/languages-dialog.ui.h:1
-msgid "Set language"
-msgstr ""
-
-#: ../plugins/spell/xed-spell-language-dialog.c:195
+#: ../plugins/spell/xed-spell-language-dialog.c:178
 msgid "Languages"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:92
+#: ../plugins/spell/xed-spell-plugin.c:116
 msgid "_Check Spelling..."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:94
+#: ../plugins/spell/xed-spell-plugin.c:118
 msgid "Check the current document for incorrect spelling"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:100
+#: ../plugins/spell/xed-spell-plugin.c:124
 msgid "Set _Language..."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:102
+#: ../plugins/spell/xed-spell-plugin.c:126
 msgid "Set the language of the current document"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:111
+#: ../plugins/spell/xed-spell-plugin.c:135
 msgid "_Autocheck Spelling"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:113
+#: ../plugins/spell/xed-spell-plugin.c:137
 msgid "Automatically spell-check the current document"
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:753
-msgid "Configure Spell Checker plugin..."
-msgstr ""
-
-#: ../plugins/spell/xed-spell-plugin.c:962
+#: ../plugins/spell/xed-spell-plugin.c:967
 msgid "The document is empty."
 msgstr ""
 
-#: ../plugins/spell/xed-spell-plugin.c:992
+#: ../plugins/spell/xed-spell-plugin.c:986
 msgid "No misspelled words"
 msgstr ""
 
-#: ../plugins/spell/languages-dialog.ui.h:2
-msgid "Select the _language of the current document."
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:1
-msgid "Check spelling"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:2
-msgid "Misspelled word:"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:3
-msgid "word"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:4
-msgid "Change _to:"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:5
-msgid "Check _Word"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:6
-msgid "_Suggestions:"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:7
-msgid "_Ignore"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:8
-msgid "Cha_nge"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:9
-msgid "Ignore _All"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:10
-msgid "Change A_ll"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:11
-msgid "User dictionary:"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:12
-msgid "Add w_ord"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:13
-msgid "Language:"
-msgstr ""
-
-#: ../plugins/spell/spell-checker.ui.h:14
-msgid "Language"
-msgstr ""
-
 #: ../plugins/spell/xed-spell-setup-dialog.ui.h:1
-msgid "_Configure Spell Checker plugin..."
+msgid "button"
 msgstr ""
 
 #: ../plugins/spell/xed-spell-setup-dialog.ui.h:2
-msgid "Autocheck spelling on document load..."
+msgid "Autocheck settings"
 msgstr ""
 
 #: ../plugins/spell/xed-spell-setup-dialog.ui.h:3
-msgid "_Never autocheck"
+msgid "Never"
 msgstr ""
 
 #: ../plugins/spell/xed-spell-setup-dialog.ui.h:4
-msgid "_Remember autocheck by document"
+msgid "Never autocheck spelling on document load"
 msgstr ""
 
 #: ../plugins/spell/xed-spell-setup-dialog.ui.h:5
-msgid "_Always autocheck"
+msgid "Remember by document"
 msgstr ""
 
-#: ../plugins/spell/spell.xed-plugin.desktop.in.h:1
-msgid "Spell Checker"
+#: ../plugins/spell/xed-spell-setup-dialog.ui.h:6
+msgid "Remembers the setting for each  document on load"
 msgstr ""
 
-#: ../plugins/spell/spell.xed-plugin.desktop.in.h:2
-msgid "Checks the spelling of the current document."
+#: ../plugins/spell/xed-spell-setup-dialog.ui.h:7
+msgid "Always"
 msgstr ""
 
-#: ../plugins/taglist/xed-taglist-plugin.c:98
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:706
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:722
-msgid "Tags"
-msgstr ""
-
-#: ../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:627
-msgid "_Preview"
-msgstr ""
-
-#: ../plugins/taglist/xed-taglist-plugin-panel.c:703
-msgid "Available Tag Lists"
+#: ../plugins/spell/xed-spell-setup-dialog.ui.h:8
+msgid "Always autocheck on document load"
 msgstr ""
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:1
@@ -4256,16 +4095,34 @@ msgstr ""
 msgid "Footnote"
 msgstr ""
 
-#: ../plugins/taglist/taglist.xed-plugin.desktop.in.h:1
+#: ../plugins/taglist/taglist.plugin.desktop.in.h:1
 msgid "Tag list"
 msgstr ""
 
-#: ../plugins/taglist/taglist.xed-plugin.desktop.in.h:2
+#: ../plugins/taglist/taglist.plugin.desktop.in.h:2
 msgid ""
 "Provides a method to easily insert commonly used tags/strings into a "
 "document without having to type them."
 msgstr ""
 
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:613
+msgid "Select the group of tags you want to use"
+msgstr ""
+
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:632
+msgid "_Preview"
+msgstr ""
+
+#: ../plugins/taglist/xed-taglist-plugin-panel.c:708
+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
+msgid "Tags"
+msgstr ""
+
 #: ../plugins/taglist/XSLT.tags.xml.in.h:1
 msgid "XSLT - Elements"
 msgstr ""
@@ -4346,38 +4203,14 @@ msgstr ""
 msgid "Custom format"
 msgstr ""
 
-#: ../plugins/time/xed-time-plugin.c:179
-msgid "In_sert Date and Time..."
-msgstr ""
-
-#: ../plugins/time/xed-time-plugin.c:181
-msgid "Insert current date and time at the cursor position"
-msgstr ""
-
-#: ../plugins/time/xed-time-plugin.c:562
-msgid "Available formats"
-msgstr ""
-
-#: ../plugins/time/xed-time-plugin.c:713
-msgid "Configure insert date/time plugin..."
-msgstr ""
-
-#: ../plugins/time/time.xed-plugin.desktop.in.h:1
+#: ../plugins/time/time.plugin.desktop.in.h:1
 msgid "Insert Date/Time"
 msgstr ""
 
-#: ../plugins/time/time.xed-plugin.desktop.in.h:2
+#: ../plugins/time/time.plugin.desktop.in.h:2
 msgid "Inserts current date and time at the cursor position."
 msgstr ""
 
-#: ../plugins/trailsave/trailsave.xed-plugin.desktop.in.h:1
-msgid "Save Without Trailing Spaces"
-msgstr ""
-
-#: ../plugins/trailsave/trailsave.xed-plugin.desktop.in.h:2
-msgid "Removes trailing spaces from lines before saving."
-msgstr ""
-
 #: ../plugins/time/xed-time-dialog.ui.h:1
 msgid "Insert Date and Time"
 msgstr ""
@@ -4409,6 +4242,18 @@ msgstr ""
 msgid "01/11/2009 17:52:00"
 msgstr ""
 
+#: ../plugins/time/xed-time-plugin.c:183
+msgid "In_sert Date and Time..."
+msgstr ""
+
+#: ../plugins/time/xed-time-plugin.c:185
+msgid "Insert current date and time at the cursor position"
+msgstr ""
+
+#: ../plugins/time/xed-time-plugin.c:461
+msgid "Available formats"
+msgstr ""
+
 #: ../plugins/time/xed-time-setup-dialog.ui.h:1
 msgid "Configure date/time plugin"
 msgstr ""
@@ -4420,3 +4265,11 @@ msgstr ""
 #: ../plugins/time/xed-time-setup-dialog.ui.h:4
 msgid "_Prompt for a format"
 msgstr ""
+
+#: ../plugins/trailsave/trailsave.plugin.desktop.in.h:1
+msgid "Save Without Trailing Spaces"
+msgstr ""
+
+#: ../plugins/trailsave/trailsave.plugin.desktop.in.h:2
+msgid "Removes trailing spaces from lines before saving."
+msgstr ""