Permalink
Browse files

Make schema translatable

  • Loading branch information...
1 parent 5b97411 commit efd1945d1914b99ef80329dc7bd6e6a93d385874 @bhull2010 bhull2010 committed Nov 20, 2012
Showing with 20 additions and 18 deletions.
  1. +9 −4 Makefile.am
  2. +0 −2 configure.in
  3. +0 −9 org.mate.caja-open-terminal.gschema.xml
  4. +9 −0 org.mate.caja-open-terminal.gschema.xml.in
  5. +1 −1 po/POTFILES.in
  6. +1 −2 src/Makefile.am
View
@@ -1,4 +1,8 @@
-gsettings_SCHEMAS = org.mate.caja-open-terminal.gschema.xml
+gsettings_schemas_in_files = org.mate.caja-open-terminal.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
@GSETTINGS_RULES@
SUBDIRS = \
@@ -8,11 +12,12 @@ SUBDIRS = \
EXTRA_DIST = \
intltool-extract.in \
intltool-update.in \
- intltool-merge.in
+ intltool-merge.in \
+ $(gsettings_schemas_in_files)
DISTCLEANFILES = \
intltool-extract \
intltool-update \
intltool-merge \
- po/.intltool-merge-cache
-
+ po/.intltool-merge-cache \
+ org.mate.caja-open-terminal.gschema.xml
View
@@ -46,8 +46,6 @@ dnl Get caja extensions directory
CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
AC_SUBST(CAJA_EXTENSION_DIR)
-dnl MateConf
-
dnl intltool stuff
AC_PROG_INTLTOOL(0.18)
dnl AM_WITH_NLS
@@ -1,9 +0,0 @@
-<schemalist>
- <schema id="org.mate.caja-open-terminal" path="/org/mate/caja-open-terminal/">
- <key name="desktop-opens-home-dir" type="b">
- <default>false</default>
- <summary>Whether opening a terminal on the desktop opens a terminal in the home directory</summary>
- <description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</description>
- </key>
- </schema>
-</schemalist>
@@ -0,0 +1,9 @@
+<schemalist>
+ <schema id="org.mate.caja-open-terminal" path="/org/mate/caja-open-terminal/">
+ <key name="desktop-opens-home-dir" type="b">
+ <default>false</default>
+ <_summary>Whether opening a terminal on the desktop opens a terminal in the home directory</_summary>
+ <_description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</_description>
+ </key>
+ </schema>
+</schemalist>
View
@@ -1,4 +1,4 @@
# List of source files containing translatable strings.
# Please keep this list in alphabetic order.
-org.mate.caja-open-terminal.gschema.xml
+org.mate.caja-open-terminal.gschema.xml.in
src/caja-open-terminal.c
View
@@ -7,7 +7,6 @@ INCLUDES = \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(CAJA_CFLAGS) \
- $(MATECONF_CFLAGS) \
$(MATEDESKTOP_CFLAGS)
caja_extensiondir=$(CAJA_EXTENSION_DIR)
@@ -20,4 +19,4 @@ libcaja_open_terminal_la_SOURCES = \
open-terminal.c
libcaja_open_terminal_la_LDFLAGS = -module -avoid-version
-libcaja_open_terminal_la_LIBADD = $(CAJA_LIBS) $(MATEVFS_LIBS) $(MATECONF_LIBS) $(MATEDESKTOP_LIBS)
+libcaja_open_terminal_la_LIBADD = $(CAJA_LIBS) $(MATEDESKTOP_LIBS)

0 comments on commit efd1945

Please sign in to comment.