diff options
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | org.mate.control-center.gschema.xml.in | 47 | ||||
| -rw-r--r-- | org.mate.control-center.gschema.xml.in.in | 47 | ||||
| -rw-r--r-- | org.mate.control-center.keybinding.gschema.xml.in (renamed from org.mate.control-center.keybinding.gschema.xml.in.in) | 12 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
6 files changed, 64 insertions, 65 deletions
diff --git a/Makefile.am b/Makefile.am index 4feaf0ba..58d51686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,13 +14,12 @@ SUBDIRS += typing-break endif @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = \ - org.mate.control-center.gschema.xml \ - org.mate.control-center.keybinding.gschema.xml -@GSETTINGS_RULES@ +gsettingsschema_in_files = \ + org.mate.control-center.gschema.xml.in \ + org.mate.control-center.keybinding.gschema.xml.in -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +@GSETTINGS_RULES@ convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-control-center.convert @@ -28,7 +27,6 @@ convert_DATA = mate-control-center.convert ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} CLEANFILES = \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid @@ -53,8 +51,7 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ autogen.sh \ - org.mate.control-center.gschema.xml.in.in \ - org.mate.control-center.keybinding.gschema.xml.in.in \ + $(gsettingsschema_in_files) \ $(convert_DATA) DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb diff --git a/configure.ac b/configure.ac index f9d9d105..3646a63d 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ changequote([,])dnl # Internationalization support -IT_PROG_INTLTOOL([0.37.1]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=mate-control-center AC_SUBST(GETTEXT_PACKAGE) @@ -327,6 +327,8 @@ fi AC_CONFIG_FILES([ Makefile +org.mate.control-center.gschema.xml +org.mate.control-center.keybinding.gschema.xml capplets/Makefile capplets/about-me/Makefile capplets/about-me/mate-about-me.desktop.in diff --git a/org.mate.control-center.gschema.xml.in b/org.mate.control-center.gschema.xml.in new file mode 100644 index 00000000..e8546185 --- /dev/null +++ b/org.mate.control-center.gschema.xml.in @@ -0,0 +1,47 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.control-center" path="/org/mate/control-center/"> + <child name="appearance" schema="org.mate.control-center.appearance" /> + <key name="cc-actions-list" type="as"> + <default l10n="messages">[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;mate-default-applications-properties.desktop' ]</default> + <summary>Task names and associated .desktop files</summary> + <description>The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</description> + </key> + <key name="cc-exit-shell-on-static-action" type="b"> + <default>false</default> + <summary>Close the control-center when a task is activated</summary> + <description>if true, the control-center will close when a "Common Task" is activated.</description> + </key> + <key name="cc-exit-shell-on-action-start" type="b"> + <default>false</default> + <summary>Exit shell on start action performed</summary> + <description>Indicates whether to close the shell when a start action is performed.</description> + </key> + <key name="cc-exit-shell-on-action-help" type="b"> + <default>false</default> + <summary>Exit shell on help action performed</summary> + <description>Indicates whether to close the shell when a help action is performed.</description> + </key> + <key name="cc-exit-shell-on-action-add-remove" type="b"> + <default>false</default> + <summary>Exit shell on add or remove action performed</summary> + <description>Indicates whether to close the shell when an add or remove action is performed.</description> + </key> + <key name="cc-exit-shell-on-action-upgrade-uninstall" type="b"> + <default>false</default> + <summary>Exit shell on upgrade or uninstall action performed</summary> + <description>Indicates whether to close the shell when an upgrade or uninstall action is performed.</description> + </key> + </schema> + <schema id="org.mate.control-center.appearance" path="/org/mate/control-center/appearance/"> + <key name="more-backgrounds-url" type="s"> + <default>'http://mate-desktop.org/backgrounds/'</default> + <summary>More backgrounds URL</summary> + <description>URL for where to get more desktop backgrounds. If set to an empty string the link will not appear.</description> + </key> + <key name="more-themes-url" type="s"> + <default>'http://mate-desktop.org/themes/'</default> + <summary>More themes URL</summary> + <description>URL for where to get more desktop themes. If set to an empty string the link will not appear.</description> + </key> + </schema> +</schemalist> diff --git a/org.mate.control-center.gschema.xml.in.in b/org.mate.control-center.gschema.xml.in.in deleted file mode 100644 index 89760b08..00000000 --- a/org.mate.control-center.gschema.xml.in.in +++ /dev/null @@ -1,47 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.control-center" path="/org/mate/control-center/"> - <child name="appearance" schema="org.mate.control-center.appearance" /> - <key name="cc-actions-list" type="as"> - <_default l10n="messages">[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;mate-default-applications-properties.desktop' ]</_default> - <_summary>Task names and associated .desktop files</_summary> - <_description>The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task.</_description> - </key> - <key name="cc-exit-shell-on-static-action" type="b"> - <default>false</default> - <_summary>Close the control-center when a task is activated</_summary> - <_description>if true, the control-center will close when a "Common Task" is activated.</_description> - </key> - <key name="cc-exit-shell-on-action-start" type="b"> - <default>false</default> - <_summary>Exit shell on start action performed</_summary> - <_description>Indicates whether to close the shell when a start action is performed.</_description> - </key> - <key name="cc-exit-shell-on-action-help" type="b"> - <default>false</default> - <_summary>Exit shell on help action performed</_summary> - <_description>Indicates whether to close the shell when a help action is performed.</_description> - </key> - <key name="cc-exit-shell-on-action-add-remove" type="b"> - <default>false</default> - <_summary>Exit shell on add or remove action performed</_summary> - <_description>Indicates whether to close the shell when an add or remove action is performed.</_description> - </key> - <key name="cc-exit-shell-on-action-upgrade-uninstall" type="b"> - <default>false</default> - <_summary>Exit shell on upgrade or uninstall action performed</_summary> - <_description>Indicates whether to close the shell when an upgrade or uninstall action is performed.</_description> - </key> - </schema> - <schema id="org.mate.control-center.appearance" path="/org/mate/control-center/appearance/"> - <key name="more-backgrounds-url" type="s"> - <default>'http://mate-desktop.org/backgrounds/'</default> - <_summary>More backgrounds URL</_summary> - <_description>URL for where to get more desktop backgrounds. If set to an empty string the link will not appear.</_description> - </key> - <key name="more-themes-url" type="s"> - <default>'http://mate-desktop.org/themes/'</default> - <_summary>More themes URL</_summary> - <_description>URL for where to get more desktop themes. If set to an empty string the link will not appear.</_description> - </key> - </schema> -</schemalist> diff --git a/org.mate.control-center.keybinding.gschema.xml.in.in b/org.mate.control-center.keybinding.gschema.xml.in index acecc6b2..b06beb73 100644 --- a/org.mate.control-center.keybinding.gschema.xml.in.in +++ b/org.mate.control-center.keybinding.gschema.xml.in @@ -2,18 +2,18 @@ <schema id="org.mate.control-center.keybinding"> <key name="binding" type="s"> <default>''</default> - <_summary>Keybinding</_summary> - <_description>Keybinding associated with a custom shortcut.</_description> + <summary>Keybinding</summary> + <description>Keybinding associated with a custom shortcut.</description> </key> <key name="action" type="s"> <default>''</default> - <_summary>Command</_summary> - <_description>Command associated with a custom keybinding.</_description> + <summary>Command</summary> + <description>Command associated with a custom keybinding.</description> </key> <key name="name" type="s"> <default>''</default> - <_summary>Name</_summary> - <_description>Description associated with a custom keybinding.</_description> + <summary>Name</summary> + <description>Description associated with a custom keybinding.</description> </key> </schema> </schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index 797c4e64..93fa69d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,8 @@ # Add files with translateable strings here. # Please keep this file sorted alphabetically. [encoding: UTF-8] -org.mate.control-center.gschema.xml.in.in -org.mate.control-center.keybinding.gschema.xml.in.in +[type: gettext/gsettings]org.mate.control-center.gschema.xml.in +[type: gettext/gsettings]org.mate.control-center.keybinding.gschema.xml.in capplets/about-me/eel-alert-dialog.c capplets/about-me/e-image-chooser.c capplets/about-me/mate-about-me.c |