diff --git a/configure.ac b/configure.ac
index 6a4a17d..b3812ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,7 +154,7 @@ dnl ================================================================
dnl Gettext stuff.
dnl ================================================================
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
GETTEXT_PACKAGE=pluma
AC_SUBST([GETTEXT_PACKAGE])
AM_GLIB_GNU_GETTEXT
@@ -513,6 +513,7 @@ Makefile
data/pluma.desktop.in
data/pluma-bugreport.sh
data/pluma.pc
+data/org.mate.pluma.gschema.xml
data/Makefile
docs/Makefile
docs/reference/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 002a903..110d583 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,13 +11,6 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
gsettings_SCHEMAS = org.mate.pluma.gschema.xml
@GSETTINGS_RULES@
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) \
- -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
- -e 's^\@ACTIVE_PLUGINS\@^$(ACTIVE_PLUGINS)^g' \
- -e 's^\@TOOLBAR_STYLE\@^$(TOOLBAR_STYLE)^g' \
- < $< > $@
-
convertdir = $(datadir)/MateConf/gsettings
convert_DATA = pluma.convert
@@ -29,21 +22,19 @@ pkgconfig_DATA = pluma.pc
bugreportdir = $(libexecdir)/pluma
bugreport_SCRIPTS = pluma-bugreport.sh
-EXTRA_DIST = \
- $(appdata_in_files) \
- $(desktop_in_files) \
- $(gsettings_SCHEMAS).in.in \
- $(convert_DATA) \
+EXTRA_DIST = \
+ $(appdata_in_files) \
+ $(desktop_in_files) \
+ $(convert_DATA) \
$(man_MANS) \
pluma.pc.in \
pluma-bugreport.sh.in
CLEANFILES = \
$(desktop_DATA) \
- $(gsettings_SCHEMAS_in) \
- $(gsettings_SCHEMAS) \
+ $(gsettings_SCHEMAS) \
$(pkgconfig_DATA) \
- pluma.appdata.xml
+ $(appdata_DATA)
diff --git a/data/org.mate.pluma.gschema.xml.in b/data/org.mate.pluma.gschema.xml.in
new file mode 100644
index 0000000..8f97fdb
--- /dev/null
+++ b/data/org.mate.pluma.gschema.xml.in
@@ -0,0 +1,200 @@
+
+
+
+
+ true
+ Use Default Font
+ Whether to use the system's default fixed width font for editing text instead of a font specific to pluma. If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.
+
+
+ 'Monospace 12'
+ Editor Font
+ A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off.
+
+
+ 'tango'
+ Style Scheme
+ The ID of a GtkSourceView Style Scheme used to color the text.
+
+
+ false
+ Create Backup Copies
+ Whether pluma should create backup copies for the files it saves. You can set the backup file extension with the "Backup Copy Extension" option.
+
+
+ false
+ Autosave
+ Whether pluma should automatically save modified files after a time interval. You can set the time interval with the "Autosave Interval" option.
+
+
+ 10
+ Autosave Interval
+ Number of minutes after which pluma will automatically save modified files. This will only take effect if the "Autosave" option is turned on.
+
+
+ [ 'dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh' ]
+ Writable VFS schemes
+ List of VFS schemes pluma supports in write mode. The 'file' scheme is writable by default.
+
+
+ 2000
+ Maximum Number of Undo Actions
+ Maximum number of actions that pluma will be able to undo or redo. Use "-1" for unlimited number of actions.
+
+
+ 'GTK_WRAP_WORD'
+ Line Wrapping Mode
+ 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.
+
+
+ 4
+ Tab Size
+ Specifies the number of spaces that should be displayed instead of Tab characters.
+
+
+ false
+ Insert spaces
+ Whether pluma should insert spaces instead of tabs.
+
+
+ false
+ Automatic indent
+ Whether pluma should enable automatic indentation.
+
+
+ false
+ Display Line Numbers
+ Whether pluma should display line numbers in the editing area.
+
+
+ false
+ Highlight Current Line
+ Whether pluma should highlight the current line.
+
+
+ false
+ Highlight Matching Bracket
+ Whether pluma should highlight the bracket matching the selected one.
+
+
+ false
+ Display Right Margin
+ Whether pluma should display the right margin in the editing area.
+
+
+ 80
+ Right Margin Position
+ Specifies the position of the right margin.
+
+
+ 'after'
+ Smart Home End
+ 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 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 the text instead of the start/end of the line.
+
+
+ true
+ Restore Previous Cursor Position
+ Whether pluma should restore the previous cursor position when a file is loaded.
+
+
+ true
+ Enable Search Highlighting
+ Whether pluma should highlight all the occurrences of the searched text.
+
+
+ true
+ Enable Syntax Highlighting
+ Whether pluma should enable syntax highlighting.
+
+
+ true
+ Toolbar is Visible
+ Whether the toolbar should be visible in editing windows.
+
+
+ '@TOOLBAR_STYLE@'
+ Toolbar Buttons Style
+ Style for the toolbar buttons. Possible values are "PLUMA_TOOLBAR_SYSTEM" to use the system's default style, "PLUMA_TOOLBAR_ICONS" to display icons only, "PLUMA_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and "PLUMA_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.
+
+
+ true
+ Status Bar is Visible
+ Whether the status bar at the bottom of editing windows should be visible.
+
+
+ false
+ Side Pane is Visible
+ Whether the side pane at the left of editing windows should be visible.
+
+
+ false
+ Bottom Panel is Visible
+ Whether the bottom panel at the bottom of editing windows should be visible.
+
+
+ 5
+ Maximum Recent Files
+ Specifies the maximum number of recently opened files that will be displayed in the "Recent Files" submenu.
+
+
+ true
+ Print Syntax Highlighting
+ Whether pluma should print syntax highlighting when printing documents.
+
+
+ true
+ Print Header
+ Whether pluma should include a document header when printing documents.
+
+
+ 'GTK_WRAP_WORD'
+ Printing Line Wrapping Mode
+ 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.
+
+
+ 0
+ Print Line Numbers
+ If this value is 0, then no line numbers will be inserted when printing a document. Otherwise, pluma will print line numbers every such number of lines.
+
+
+ 'Monospace 9'
+ Body Font for Printing
+ Specifies the font to use for a document's body when printing documents.
+
+
+ 'Sans 11'
+ Header Font for Printing
+ 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.
+
+
+ 'Sans 8'
+ Line Number Font for Printing
+ Specifies the font to use for line numbers when printing. This will only take effect if the "Print Line Numbers" option is non-zero.
+
+
+ [ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]
+ Automatically Detected Encodings
+ Sorted list of encodings used by pluma for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.
+
+
+ [ 'ISO-8859-15' ]
+ Encodings shown in menu
+ List of encodings shown in the Character Encoding menu in open/save file selector. Only recognized encodings are used.
+
+
+ []
+ History for "search for" entries
+ List of entries in "search for" textbox.
+
+
+ []
+ History for "replace with" entries
+ List of entries in "replace with" textbox.
+
+
+ [ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time' ]
+ Active plugins
+ List of active plugins. It contains the "Location" of the active plugins. See the .pluma-plugin file for obtaining the "Location" of a given plugin.
+
+
+
diff --git a/data/org.mate.pluma.gschema.xml.in.in b/data/org.mate.pluma.gschema.xml.in.in
deleted file mode 100644
index 1e34fba..0000000
--- a/data/org.mate.pluma.gschema.xml.in.in
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
- true
- <_summary>Use Default Font
- <_description>Whether to use the system's default fixed width font for editing text instead of a font specific to pluma. If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.
-
-
- 'Monospace 12'
- <_summary>Editor Font
- <_description>A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off.
-
-
- 'tango'
- <_summary>Style Scheme
- <_description>The ID of a GtkSourceView Style Scheme used to color the text.
-
-
- false
- <_summary>Create Backup Copies
- <_description>Whether pluma should create backup copies for the files it saves. You can set the backup file extension with the "Backup Copy Extension" option.
-
-
- false
- <_summary>Autosave
- <_description>Whether pluma should automatically save modified files after a time interval. You can set the time interval with the "Autosave Interval" option.
-
-
- 10
- <_summary>Autosave Interval
- <_description>Number of minutes after which pluma will automatically save modified files. This will only take effect if the "Autosave" option is turned on.
-
-
- [ 'dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh' ]
- <_summary>Writable VFS schemes
- <_description>List of VFS schemes pluma supports in write mode. The 'file' scheme is writable by default.
-
-
- 2000
- <_summary>Maximum Number of Undo Actions
- <_description>Maximum number of actions that pluma will be able to undo or redo. Use "-1" for unlimited number of actions.
-
-
- 'GTK_WRAP_WORD'
- <_summary>Line Wrapping Mode
- <_description>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.
-
-
- 4
- <_summary>Tab Size
- <_description>Specifies the number of spaces that should be displayed instead of Tab characters.
-
-
- false
- <_summary>Insert spaces
- <_description>Whether pluma should insert spaces instead of tabs.
-
-
- false
- <_summary>Automatic indent
- <_description>Whether pluma should enable automatic indentation.
-
-
- false
- <_summary>Display Line Numbers
- <_description>Whether pluma should display line numbers in the editing area.
-
-
- false
- <_summary>Highlight Current Line
- <_description>Whether pluma should highlight the current line.
-
-
- false
- <_summary>Highlight Matching Bracket
- <_description>Whether pluma should highlight the bracket matching the selected one.
-
-
- false
- <_summary>Display Right Margin
- <_description>Whether pluma should display the right margin in the editing area.
-
-
- 80
- <_summary>Right Margin Position
- <_description>Specifies the position of the right margin.
-
-
- 'after'
- <_summary>Smart Home End
- <_description>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 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 the text instead of the start/end of the line.
-
-
- true
- <_summary>Restore Previous Cursor Position
- <_description>Whether pluma should restore the previous cursor position when a file is loaded.
-
-
- true
- <_summary>Enable Search Highlighting
- <_description>Whether pluma should highlight all the occurrences of the searched text.
-
-
- true
- <_summary>Enable Syntax Highlighting
- <_description>Whether pluma should enable syntax highlighting.
-
-
- true
- <_summary>Toolbar is Visible
- <_description>Whether the toolbar should be visible in editing windows.
-
-
- '@TOOLBAR_STYLE@'
- <_summary>Toolbar Buttons Style
- <_description>Style for the toolbar buttons. Possible values are "PLUMA_TOOLBAR_SYSTEM" to use the system's default style, "PLUMA_TOOLBAR_ICONS" to display icons only, "PLUMA_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and "PLUMA_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.
-
-
- true
- <_summary>Status Bar is Visible
- <_description>Whether the status bar at the bottom of editing windows should be visible.
-
-
- false
- <_summary>Side Pane is Visible
- <_description>Whether the side pane at the left of editing windows should be visible.
-
-
- false
- <_summary>Bottom Panel is Visible
- <_description>Whether the bottom panel at the bottom of editing windows should be visible.
-
-
- 5
- <_summary>Maximum Recent Files
- <_description>Specifies the maximum number of recently opened files that will be displayed in the "Recent Files" submenu.
-
-
- true
- <_summary>Print Syntax Highlighting
- <_description>Whether pluma should print syntax highlighting when printing documents.
-
-
- true
- <_summary>Print Header
- <_description>Whether pluma should include a document header when printing documents.
-
-
- 'GTK_WRAP_WORD'
- <_summary>Printing Line Wrapping Mode
- <_description>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.
-
-
- 0
- <_summary>Print Line Numbers
- <_description>If this value is 0, then no line numbers will be inserted when printing a document. Otherwise, pluma will print line numbers every such number of lines.
-
-
- 'Monospace 9'
- <_summary>Body Font for Printing
- <_description>Specifies the font to use for a document's body when printing documents.
-
-
- 'Sans 11'
- <_summary>Header Font for Printing
- <_description>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.
-
-
- 'Sans 8'
- <_summary>Line Number Font for Printing
- <_description>Specifies the font to use for line numbers when printing. This will only take effect if the "Print Line Numbers" option is non-zero.
-
-
- [ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]
- <_summary>Automatically Detected Encodings
- <_description>Sorted list of encodings used by pluma for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.
-
-
- [ 'ISO-8859-15' ]
- <_summary>Encodings shown in menu
- <_description>List of encodings shown in the Character Encoding menu in open/save file selector. Only recognized encodings are used.
-
-
- []
- <_summary>History for "search for" entries
- <_description>List of entries in "search for" textbox.
-
-
- []
- <_summary>History for "replace with" entries
- <_description>List of entries in "replace with" textbox.
-
-
- [ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time' ]
- <_summary>Active plugins
- <_description>List of active plugins. It contains the "Location" of the active plugins. See the .pluma-plugin file for obtaining the "Location" of a given plugin.
-
-
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a994e39..65af65a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
-data/org.mate.pluma.gschema.xml.in.in
+[type: gettext/gsettings]data/org.mate.pluma.gschema.xml.in
data/pluma.appdata.xml.in
data/pluma.desktop.in.in
pluma/dialogs/pluma-close-confirmation-dialog.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9bdf1ad..1bd56e6 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,6 @@
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
data/pluma.desktop.in
-data/pluma.schemas.in
pluma/pluma-document-output-stream.c
pluma/dialogs/pluma-style-scheme-dialog.c
pluma/dialogs/pluma-style-scheme-dialog.ui