diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2015-04-14 00:09:58 +0100 |
---|---|---|
committer | Jonas Danielsson <jonas@threetimestwo.org> | 2016-07-30 15:21:18 +0200 |
commit | 81fd17f0118d82b4222cda07b370b1e6a14cf5de (patch) | |
tree | b68976b412cce3e95867bd3b546d927a282cca9d | |
parent | 2977a2ad818ff941606ff77eeac6ef3e4a8c96a9 (diff) | |
download | gnome-maps-81fd17f0118d82b4222cda07b370b1e6a14cf5de.tar.gz |
Do not use intltool to translate GSettings schema
There's no need to do that, and since intltool merges translations into
the XML by default, it actively breaks the gschema format.
https://bugzilla.gnome.org/show_bug.cgi?id=747810
-rw-r--r-- | data/Makefile.am | 7 | ||||
-rw-r--r-- | data/org.gnome.Maps.gschema.xml | 49 | ||||
-rw-r--r-- | data/org.gnome.Maps.gschema.xml.in | 49 | ||||
-rw-r--r-- | po/POTFILES.in | 2 |
4 files changed, 52 insertions, 55 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 81dcfe28..e0ce3e98 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,9 +19,9 @@ apps_DATA = org.gnome.Maps.desktop @INTLTOOL_DESKTOP_RULE@ -gsettings_SCHEMAS = org.gnome.Maps.gschema.xml - @INTLTOOL_XML_RULE@ + +gsettings_SCHEMAS = org.gnome.Maps.gschema.xml @GSETTINGS_RULES@ appdatadir = $(datadir)/appdata @@ -43,7 +43,6 @@ EXTRA_DIST = \ org.gnome.Maps.service.in \ org.gnome.Maps.data.gresource.xml \ org.gnome.Maps.appdata.xml.in \ - org.gnome.Maps.gschema.xml.in \ $(app_resource_files) \ $(NULL) @@ -53,10 +52,8 @@ CLEANFILES = \ org.gnome.Maps.appdata.xml \ org.gnome.Maps.appdata.valid \ $(apps_DATA) \ - org.gnome.Maps.gschema.xml \ org.gnome.Maps.gschema.valid \ gschemas.compiled \ - $(gsettings_SCHEMAS) \ $(NULL) # For uninstalled use diff --git a/data/org.gnome.Maps.gschema.xml b/data/org.gnome.Maps.gschema.xml new file mode 100644 index 00000000..f4415ffb --- /dev/null +++ b/data/org.gnome.Maps.gschema.xml @@ -0,0 +1,49 @@ +<schemalist gettext-domain="gnome-maps"> + <schema id="org.gnome.Maps" path="/org/gnome/maps/"> + <key name="window-size" type="ai"> + <default>[768, 600]</default> + <summary>Window size</summary> + <description>Window size (width and height).</description> + </key> + <key name="window-position" type="ai"> + <default>[]</default> + <summary>Window position</summary> + <description>Window position (X and Y).</description> + </key> + <key name="window-maximized" type="b"> + <default>true</default> + <summary>Window maximized</summary> + <description>Window maximization state</description> + </key> + <key name="max-search-results" type="i"> + <default>100</default> + <summary>Maximum number of search results</summary> + <description>Maximum number of search results from geocode search.</description> + </key> + <key name="recent-places-limit" type="i"> + <default>50</default> + <summary>Number of recent places to store</summary> + <description>Number of recently visited places to store.</description> + </key> + <key name="checkin-facebook-privacy" type="s"> + <default>"EVERYONE"</default> + <summary>Facebook check-in privacy setting</summary> + <description>Latest used Facebook check-in privacy setting. Possible values are: EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF.</description> + </key> + <key name="checkin-foursquare-privacy" type="s"> + <default>"public"</default> + <summary>Foursquare check-in privacy setting</summary> + <description>Latest used Foursquare check-in privacy setting. Possible values are: public, followers or private.</description> + </key> + <key name="checkin-foursquare-broadcast-facebook" type="b"> + <default>false</default> + <summary>Foursquare check-in Facebook broadcasting</summary> + <description>Indicates if Foursquare should broadcast the check-in as a post in the Facebook account associated with the Foursquare account.</description> + </key> + <key name="checkin-foursquare-broadcast-twitter" type="b"> + <default>false</default> + <summary>Foursquare check-in Twitter broadcasting</summary> + <description>Indicates if Foursquare should broadcast the check-in as a tweet in the Twitter account associated with the Foursquare account.</description> + </key> + </schema> +</schemalist> diff --git a/data/org.gnome.Maps.gschema.xml.in b/data/org.gnome.Maps.gschema.xml.in deleted file mode 100644 index 6492678a..00000000 --- a/data/org.gnome.Maps.gschema.xml.in +++ /dev/null @@ -1,49 +0,0 @@ -<schemalist gettext-domain="gnome-maps"> - <schema id="org.gnome.Maps" path="/org/gnome/maps/"> - <key name="window-size" type="ai"> - <default>[768, 600]</default> - <_summary>Window size</_summary> - <_description>Window size (width and height).</_description> - </key> - <key name="window-position" type="ai"> - <default>[]</default> - <_summary>Window position</_summary> - <_description>Window position (X and Y).</_description> - </key> - <key name="window-maximized" type="b"> - <default>true</default> - <_summary>Window maximized</_summary> - <_description>Window maximization state</_description> - </key> - <key name="max-search-results" type="i"> - <default>100</default> - <_summary>Maximum number of search results</_summary> - <_description>Maximum number of search results from geocode search.</_description> - </key> - <key name="recent-places-limit" type="i"> - <default>50</default> - <_summary>Number of recent places to store</_summary> - <_description>Number of recently visited places to store.</_description> - </key> - <key name="checkin-facebook-privacy" type="s"> - <default>"EVERYONE"</default> - <_summary>Facebook check-in privacy setting</_summary> - <_description>Latest used Facebook check-in privacy setting. Possible values are: EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF.</_description> - </key> - <key name="checkin-foursquare-privacy" type="s"> - <default>"public"</default> - <_summary>Foursquare check-in privacy setting</_summary> - <_description>Latest used Foursquare check-in privacy setting. Possible values are: public, followers or private.</_description> - </key> - <key name="checkin-foursquare-broadcast-facebook" type="b"> - <default>false</default> - <_summary>Foursquare check-in Facebook broadcasting</_summary> - <_description>Indicates if Foursquare should broadcast the check-in as a post in the Facebook account associated with the Foursquare account.</_description> - </key> - <key name="checkin-foursquare-broadcast-twitter" type="b"> - <default>false</default> - <_summary>Foursquare check-in Twitter broadcasting</_summary> - <_description>Indicates if Foursquare should broadcast the check-in as a tweet in the Twitter account associated with the Foursquare account.</_description> - </key> - </schema> -</schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index fffb9897..d71849b7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ [encoding: UTF-8] data/org.gnome.Maps.appdata.xml.in data/org.gnome.Maps.desktop.in -data/org.gnome.Maps.gschema.xml.in +data/org.gnome.Maps.gschema.xml [type: gettext/glade]data/ui/app-menu.ui [type: gettext/glade]data/ui/check-in-dialog.ui [type: gettext/glade]data/ui/context-menu.ui |