summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-09-06 18:08:40 +0200
committerinfirit <[email protected]>2015-09-06 18:08:40 +0200
commit397335baee8c21654b0a55b23c22edbff21d39b3 (patch)
treebce011cecab6e256cafe520360c8375712134355
parent5e8918b2905203dc31c79b0ce3fc53e5806f2177 (diff)
downloadlibmateweather-397335baee8c21654b0a55b23c22edbff21d39b3.tar.bz2
libmateweather-397335baee8c21654b0a55b23c22edbff21d39b3.tar.xz
Bump required intltool version for gsettings support
And mark the gschema accordingly in POTFILES
-rw-r--r--configure.ac2
-rw-r--r--libmateweather/Makefile.am10
-rw-r--r--libmateweather/org.mate.weather.gschema.xml.in (renamed from libmateweather/org.mate.weather.gschema.xml.in.in)72
-rw-r--r--po/POTFILES.in2
4 files changed, 42 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac
index cbcc20a..f90be06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ LT_PREREQ([2.2.6])
LT_INIT([dlopen disable-static])
LT_LIB_M
-IT_PROG_INTLTOOL([0.40.6])
+IT_PROG_INTLTOOL([0.50.1])
PKG_PROG_PKG_CONFIG([0.19])
diff --git a/libmateweather/Makefile.am b/libmateweather/Makefile.am
index b97a4f7..330dd46 100644
--- a/libmateweather/Makefile.am
+++ b/libmateweather/Makefile.am
@@ -86,14 +86,12 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mateweather.pc
-gsettings_SCHEMAS = org.mate.weather.gschema.xml
+gsettingsschema_in_files = org.mate.weather.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > [email protected]
+EXTRA_DIST = mateweather.pc.in mateweather-uninstalled.pc.in $(gsettingsschema_in_files)
-EXTRA_DIST = mateweather.pc.in mateweather-uninstalled.pc.in $(gsettings_SCHEMAS).in.in
-
-CLEANFILES = $(noinst_PROGRAMS) $(BUILT_SOURCES) $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(noinst_PROGRAMS) $(BUILT_SOURCES) $(gsettings_SCHEMAS) *.gschema.valid
-include $(top_srcdir)/git.mk
diff --git a/libmateweather/org.mate.weather.gschema.xml.in.in b/libmateweather/org.mate.weather.gschema.xml.in
index 2289b38..c482563 100644
--- a/libmateweather/org.mate.weather.gschema.xml.in.in
+++ b/libmateweather/org.mate.weather.gschema.xml.in
@@ -35,60 +35,60 @@
<schema id="org.mate.weather">
<key name="show-notifications" type="b">
<default>false</default>
- <_summary>Show notifications</_summary>
- <_description>Determines whether the applet shows a notification on each update.</_description>
+ <summary>Show notifications</summary>
+ <description>Determines whether the applet shows a notification on each update.</description>
</key>
<key name="auto-update" type="b">
<default>true</default>
- <_summary>Update the data automatically</_summary>
- <_description>Determines whether the applet automatically updates its weather statistics or not.</_description>
+ <summary>Update the data automatically</summary>
+ <description>Determines whether the applet automatically updates its weather statistics or not.</description>
</key>
<key name="auto-update-interval" type="i">
<default>1800</default>
- <_summary>Update interval</_summary>
- <_description>The interval, in seconds, between automatic updates.</_description>
+ <summary>Update interval</summary>
+ <description>The interval, in seconds, between automatic updates.</description>
</key>
<key name="enable-metric" type="b">
<default>false</default>
- <_summary>Use metric units</_summary>
- <_description>Use metric units instead of english units.</_description>
+ <summary>Use metric units</summary>
+ <description>Use metric units instead of english units.</description>
</key>
<key name="distance-unit" enum="org.mate.weather.DistanceUnit">
<!-- TRANSLATORS: pick a default distance unit for your locale, see key description
for valid values; values must be quoted -->
<_default l10n="messages">'miles'</_default>
- <_summary>Distance unit</_summary>
- <_description>The unit to use for visibility. Values: 'meters', 'km' ,'miles'.</_description>
+ <summary>Distance unit</summary>
+ <description>The unit to use for visibility. Values: 'meters', 'km' ,'miles'.</description>
</key>
<key name="pressure-unit" enum="org.mate.weather.PressureUnit">
<!-- TRANSLATORS: pick a default pressure unit for your locale, see key description
for valid values; values must be quoted -->
<_default l10n="messages">'inHg'</_default>
- <_summary>Pressure unit</_summary>
- <_description>The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'.</_description>
+ <summary>Pressure unit</summary>
+ <description>The unit to use for pressure. Values: 'kPa', 'hPa', 'mb', 'mmHg', 'inHg, 'atm'.</description>
</key>
<key name="speed-unit" enum="org.mate.weather.SpeedUnit">
<!-- TRANSLATORS: pick a default speed unit for your locale, see key description
for valid values; values must be quoted -->
<_default l10n="messages">'knots'</_default>
- <_summary>Speed unit</_summary>
- <_description>The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', 'Beaufort scale'.</_description>
+ <summary>Speed unit</summary>
+ <description>The unit to use for wind speed. Values: 'm/s', 'km/h, 'mph', 'knots', 'Beaufort scale'.</description>
</key>
<key name="temperature-unit" enum="org.mate.weather.TemperatureUnit">
<!-- TRANSLATORS: pick a temperature unit that should be used by default in your
locale, see key description for valid values; values must be quoted -->
<_default l10n="messages">'Fahrenheit'</_default>
- <_summary>Temperature unit</_summary>
- <_description>The unit to use for temperature. Values: 'Kelvin', 'Centigrade', 'Fahrenheit'.</_description>
+ <summary>Temperature unit</summary>
+ <description>The unit to use for temperature. Values: 'Kelvin', 'Centigrade', 'Fahrenheit'.</description>
</key>
<key name="enable-detailed-forecast" type="b">
<default>false</default>
- <_summary>Not used anymore</_summary>
+ <summary>Not used anymore</summary>
</key>
<key name="enable-radar-map" type="b">
<default>false</default>
- <_summary>Display radar map</_summary>
- <_description>Fetch a radar map on each update.</_description>
+ <summary>Display radar map</summary>
+ <description>Fetch a radar map on each update.</description>
</key>
<key name="location0" type="s">
<!-- TRANSLATORS: Change this to the default location name, used
@@ -100,21 +100,21 @@
do not require a DEFAULT_LOCATION, set this to
"DEFAULT_LOCATION". -->
<_default l10n="messages">'DEFAULT_LOCATION'</_default>
- <_summary>Weather location information</_summary>
- <_description>Weather location information.</_description>
+ <summary>Weather location information</summary>
+ <description>Weather location information.</description>
</key>
<key name="location1" type="s">
<!-- TRANSLATORS: Change this to the code of your default location
that corresponds to the DEFAULT_LOCATION name you put above. This
- is normally a four-letter (ICAO) code and can be found in
+ is normally a four-letter (ICAO) code and can be found in
https://github.com/mate-desktop/libmateweather/blob/master/data/Locations.xml.in.
NB. The web page is over 1.7MB in size. Pick a default location
like a capital city so that it would be ok for more of your users.
For example, for Greek, we use "LGAV" for the capital city, Athens.
If you do not require a DEFAULT_CODE, set this to "DEFAULT_CODE". -->
<_default l10n="messages">'DEFAULT_CODE'</_default>
- <_summary>Nearby city</_summary>
- <_description>Nearby major zone, such as a capital city, as found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</_description>
+ <summary>Nearby city</summary>
+ <description>Nearby major zone, such as a capital city, as found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</description>
</key>
<key name="location2" type="s">
<!-- TRANSLATORS: Change this to the zone of your default location
@@ -126,8 +126,8 @@
file. If your default location does not have a zone, set this to
"DEFAULT_ZONE". -->
<_default l10n="messages">'DEFAULT_ZONE'</_default>
- <_summary>Zone location</_summary>
- <_description>A unique zone for the city, as found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</_description>
+ <summary>Zone location</summary>
+ <description>A unique zone for the city, as found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</description>
</key>
<key name="location3" type="s">
<!-- TRANSLATORS: Change this to the radar of your default location
@@ -140,13 +140,13 @@
" " (or space).
If you do not have a default location, set this to DEFAULT_RADAR. -->
<_default l10n="messages">'DEFAULT_RADAR'</_default>
- <_summary>Radar location</_summary>
- <_description>A three-digit-long code for retrieving radar maps from weather.com, found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</_description>
+ <summary>Radar location</summary>
+ <description>A three-digit-long code for retrieving radar maps from weather.com, found from https://raw.github.com/mate-desktop/libmateweather/master/data/Locations.xml.in</description>
</key>
<key name="location4" type="s">
<_default l10n="messages">'DEFAULT_LOCATION'</_default>
- <_summary>Weather for a city</_summary>
- <_description>The city that mateweather displays information for.</_description>
+ <summary>Weather for a city</summary>
+ <description>The city that mateweather displays information for.</description>
</key>
<key name="coordinates" type="s">
<!-- TRANSLATORS: Change this to the coordinates of your default
@@ -158,18 +158,18 @@
coordinates, set this to " " (or space). If you do not have a
default location, set this to DEFAULT_COORDINATES. -->
<_default l10n="messages">'DEFAULT_COORDINATES'</_default>
- <_summary>Location coordinates</_summary>
- <_description>Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW].</_description>
+ <summary>Location coordinates</summary>
+ <description>Latitude and longitude of your location expressed in DD-MM-SS[NS] DD-MM-SS[EW].</description>
</key>
<key name="use-custom-radar-url" type="b">
<default>false</default>
- <_summary>Use custom url for the radar map</_summary>
- <_description>If true, then retrieve a radar map from a location specified by the "radar" key.</_description>
+ <summary>Use custom url for the radar map</summary>
+ <description>If true, then retrieve a radar map from a location specified by the "radar" key.</description>
</key>
<key name="radar" type="s">
<default>''</default>
- <_summary>Url for the radar map</_summary>
- <_description>The custom url from where to retrieve a radar map.</_description>
+ <summary>Url for the radar map</summary>
+ <description>The custom url from where to retrieve a radar map.</description>
</key>
</schema>
</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f12e12c..29b2782 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@
[encoding: UTF-8]
libmateweather/mateweather-prefs.c
libmateweather/mateweather-timezone.c
-libmateweather/org.mate.weather.gschema.xml.in.in
+[type: gettext/gsettings]libmateweather/org.mate.weather.gschema.xml.in
libmateweather/timezone-menu.c
libmateweather/weather-iwin.c
libmateweather/weather-metar.c