[gnome-settings-daemon/wip/inigomartinez/meson: 4/6] build: Migrate from Intltool to Gettext
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/wip/inigomartinez/meson: 4/6] build: Migrate from Intltool to Gettext
- Date: Sat, 3 Feb 2018 10:39:01 +0000 (UTC)
commit 4be90812d6fa3fc4ee26c554293243b03a626935
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Fri Feb 2 10:19:54 2018 +0100
build: Migrate from Intltool to Gettext
Recent versions of Gettext are able to translate several formats
that are used in GNOME applications. This patch migrates from
Intltool to Gettext by using meson's i18n features.
Explicit encoding has also been added to the gschema files due to
an issue in gettext[0] with default encoding in XML files.
https://bugzilla.gnome.org/show_bug.cgi?id=793087
[0] https://savannah.gnu.org/bugs/?52932
data/meson.build | 13 +-
...ome.settings-daemon.peripherals.gschema.xml.in} | 93 +++++-----
...ettings-daemon.peripherals.wacom.gschema.xml.in | 92 +++++++++
...ings-daemon.peripherals.wacom.gschema.xml.in.in | 91 ---------
...me.settings-daemon.plugins.color.gschema.xml.in | 45 +++++
...settings-daemon.plugins.color.gschema.xml.in.in | 44 -----
...g.gnome.settings-daemon.plugins.gschema.xml.in} | 7 +-
...ings-daemon.plugins.housekeeping.gschema.xml.in | 32 +++
...s-daemon.plugins.housekeeping.gschema.xml.in.in | 31 ---
...ttings-daemon.plugins.media-keys.gschema.xml.in | 203 ++++++++++++++++++++
...ngs-daemon.plugins.media-keys.gschema.xml.in.in | 202 -------------------
...me.settings-daemon.plugins.power.gschema.xml.in | 45 +++++
...settings-daemon.plugins.power.gschema.xml.in.in | 44 -----
....settings-daemon.plugins.sharing.gschema.xml.in | 10 +
...ttings-daemon.plugins.sharing.gschema.xml.in.in | 9 -
...ettings-daemon.plugins.xsettings.gschema.xml.in | 35 ++++
...ings-daemon.plugins.xsettings.gschema.xml.in.in | 34 ----
meson.build | 5 -
plugins/power/meson.build | 4 +-
...nome.settings-daemon.plugins.power.policy.in.in | 4 +-
plugins/wacom/meson.build | 4 +-
...nome.settings-daemon.plugins.wacom.policy.in.in | 8 +-
po/POTFILES.in | 18 +-
po/POTFILES.skip | 10 -
24 files changed, 535 insertions(+), 548 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index fcba7bb..5c4fb50 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,17 +16,10 @@ schema_conf = configuration_data()
schema_conf.set('GETTEXT_PACKAGE', meson.project_name())
foreach schema: schemas
- schema_in = configure_file(
- input: schema + '.in.in',
- output: schema + '.in',
- configuration: schema_conf
- )
-
- custom_target(
- schema,
- input: schema_in,
+ configure_file(
+ input: schema + '.in',
output: schema,
- command: [intltool_merge, '-x', '-u', '--no-translations', '@INPUT@', '@OUTPUT@'],
+ configuration: schema_conf,
install: true,
install_dir: gsd_schemadir
)
diff --git a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
similarity index 53%
rename from data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
rename to data/org.gnome.settings-daemon.peripherals.gschema.xml.in
index 0bca3f9..f1785ed 100644
--- a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals"
path="/org/gnome/settings-daemon/peripherals/">
<child name="smartcard" schema="org.gnome.settings-daemon.peripherals.smartcard"/>
@@ -8,8 +9,8 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.smartcard"
path="/org/gnome/settings-daemon/peripherals/smartcard/">
<key name="removal-action" enum="org.gnome.settings-daemon.GsdSmartcardRemovalAction">
<default>'none'</default>
- <_summary>Smartcard removal action</_summary>
- <_description>Set this to one of “none”, “lock-screen”, or “force-logout”. The action will get
performed when the smartcard used for log in is removed.</_description>
+ <summary>Smartcard removal action</summary>
+ <description>Set this to one of “none”, “lock-screen”, or “force-logout”. The action will get
performed when the smartcard used for log in is removed.</description>
</key>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.keyboard"
path="/org/gnome/settings-daemon/peripherals/keyboard/">
@@ -21,7 +22,7 @@
</key>
<key name="bell-mode" enum="org.gnome.settings-daemon.GsdBellMode">
<default>'on'</default>
- <_description>Possible values are “on”, “off”, and “custom”.</_description>
+ <description>Possible values are “on”, “off”, and “custom”.</description>
</key>
<key name="bell-pitch" type="i">
<default>400</default>
@@ -31,40 +32,40 @@
</key>
<key name="bell-custom-file" type="s">
<default>''</default>
- <_summary>Keyboard Bell Custom Filename</_summary>
- <_description>File name of the bell sound to be played.</_description>
+ <summary>Keyboard Bell Custom Filename</summary>
+ <description>File name of the bell sound to be played.</description>
</key>
<key name="remember-numlock-state" type="b">
<default>true</default>
- <_summary>Remember NumLock state</_summary>
- <_description>When set to true, GNOME will remember the state of the NumLock LED between
sessions.</_description>
+ <summary>Remember NumLock state</summary>
+ <description>When set to true, GNOME will remember the state of the NumLock LED between
sessions.</description>
</key>
<key name="numlock-state" enum="org.gnome.settings-daemon.GsdNumLockState">
<default>'unknown'</default>
- <_summary>NumLock state</_summary>
- <_description>The remembered state of the NumLock LED.</_description>
+ <summary>NumLock state</summary>
+ <description>The remembered state of the NumLock LED.</description>
</key>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.mouse"
path="/org/gnome/settings-daemon/peripherals/mouse/">
<key name="locate-pointer" type="b">
<default>false</default>
- <_summary>Highlights the current location of the pointer when the Control key is pressed and
released.</_summary>
+ <summary>Highlights the current location of the pointer when the Control key is pressed and
released.</summary>
</key>
<key name="double-click" type="i">
<default>400</default>
- <_summary>Double click time</_summary>
- <_description> Length of a double click in milliseconds.</_description>
+ <summary>Double click time</summary>
+ <description> Length of a double click in milliseconds.</description>
</key>
<key name="drag-threshold" type="i">
<default>8</default>
- <_summary>Drag threshold</_summary>
- <_description>Distance before a drag is started.</_description>
+ <summary>Drag threshold</summary>
+ <description>Distance before a drag is started.</description>
</key>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.touchscreen"
path="/org/gnome/settings-daemon/peripherals/touchscreen/">
<key name="orientation-lock" type="b">
<default>false</default>
- <_summary>Whether the tablet’s orientation is locked, or rotated automatically.</_summary>
+ <summary>Whether the tablet’s orientation is locked, or rotated automatically.</summary>
</key>
</schema>
@@ -72,23 +73,23 @@
<schema id="org.gnome.settings-daemon.peripherals.mouse.deprecated">
<key name="left-handed" type="b">
<default>false</default>
- <_summary>Mouse button orientation</_summary>
- <_description>Swap left and right mouse buttons for left-handed mice.</_description>
+ <summary>Mouse button orientation</summary>
+ <description>Swap left and right mouse buttons for left-handed mice.</description>
</key>
<key name="motion-acceleration" type="d">
<default>-1</default>
- <_summary>Single Click</_summary>
- <_description>Acceleration multiplier for mouse motion. A value of -1 is the system
default.</_description>
+ <summary>Single Click</summary>
+ <description>Acceleration multiplier for mouse motion. A value of -1 is the system
default.</description>
</key>
<key name="motion-threshold" type="i">
<default>-1</default>
- <_summary>Motion Threshold</_summary>
- <_description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A
value of -1 is the system default.</_description>
+ <summary>Motion Threshold</summary>
+ <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A
value of -1 is the system default.</description>
</key>
<key name="middle-button-enabled" type="b">
<default>false</default>
- <_summary>Middle button emulation</_summary>
- <_description>Enables middle mouse button emulation through simultaneous left and right button
click.</_description>
+ <summary>Middle button emulation</summary>
+ <description>Enables middle mouse button emulation through simultaneous left and right button
click.</description>
</key>
</schema>
<schema id="org.gnome.settings-daemon.peripherals.keyboard.deprecated">
@@ -97,67 +98,67 @@
</key>
<key name="repeat-interval" type="u">
<default>30</default>
- <_summary>Key Repeat Interval</_summary>
- <_description>Delay between repeats in milliseconds.</_description>
+ <summary>Key Repeat Interval</summary>
+ <description>Delay between repeats in milliseconds.</description>
</key>
<key name="delay" type="u">
<default>500</default>
- <_summary>Initial Key Repeat Delay</_summary>
- <_description>Initial key repeat delay in milliseconds.</_description>
+ <summary>Initial Key Repeat Delay</summary>
+ <description>Initial key repeat delay in milliseconds.</description>
</key>
</schema>
<schema id="org.gnome.settings-daemon.peripherals.touchpad.deprecated">
<key name="disable-while-typing" type="b">
<default>false</default>
- <_summary>Disable touchpad while typing</_summary>
- <_description>Set this to TRUE if you have problems with accidentally hitting the touchpad while
typing.</_description>
+ <summary>Disable touchpad while typing</summary>
+ <description>Set this to TRUE if you have problems with accidentally hitting the touchpad while
typing.</description>
</key>
<key name="horiz-scroll-enabled" type="b">
<default>true</default>
- <_summary>Enable horizontal scrolling</_summary>
- <_description>Set this to TRUE to allow horizontal scrolling by the same method selected with the
scroll_method key.</_description>
+ <summary>Enable horizontal scrolling</summary>
+ <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the
scroll_method key.</description>
</key>
<key name="scroll-method" enum="org.gnome.settings-daemon.GsdTouchpadScrollMethod">
<default>'two-finger-scrolling'</default>
- <_summary>Select the touchpad scroll method</_summary>
- <_description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”,
“two-finger-scrolling”.</_description>
+ <summary>Select the touchpad scroll method</summary>
+ <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”,
“two-finger-scrolling”.</description>
</key>
<key name="tap-to-click" type="b">
<default>false</default>
- <_summary>Enable mouse clicks with touchpad</_summary>
- <_description>Set this to TRUE to be able to send mouse clicks by tapping on the
touchpad.</_description>
+ <summary>Enable mouse clicks with touchpad</summary>
+ <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
</key>
<key name="touchpad-enabled" type="b">
<default>true</default>
- <_summary>Enable touchpad</_summary>
- <_description>Set this to TRUE to enable all touchpads.</_description>
+ <summary>Enable touchpad</summary>
+ <description>Set this to TRUE to enable all touchpads.</description>
</key>
<key name="left-handed" enum="org.gnome.settings-daemon.GsdTouchpadHandedness">
<default>'mouse'</default>
- <_summary>Touchpad button orientation</_summary>
- <_description>Swap left and right mouse buttons for left-handed mice with “left”, “right” for
right-handed, “mouse” to follow the mouse setting.</_description>
+ <summary>Touchpad button orientation</summary>
+ <description>Swap left and right mouse buttons for left-handed mice with “left”, “right” for
right-handed, “mouse” to follow the mouse setting.</description>
</key>
<key name="motion-acceleration" type="d">
<default>-1</default>
- <_summary>Single Click</_summary>
- <_description>Acceleration multiplier for mouse motion. A value of -1 is the system
default.</_description>
+ <summary>Single Click</summary>
+ <description>Acceleration multiplier for mouse motion. A value of -1 is the system
default.</description>
</key>
<key name="motion-threshold" type="i">
<default>-1</default>
- <_summary>Motion Threshold</_summary>
- <_description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A
value of -1 is the system default.</_description>
+ <summary>Motion Threshold</summary>
+ <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A
value of -1 is the system default.</description>
</key>
<key name="natural-scroll" type="b">
<default>false</default>
- <_summary>Natural scrolling</_summary>
- <_description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</_description>
+ <summary>Natural scrolling</summary>
+ <description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</description>
</key>
</schema>
<schema id="org.gnome.settings-daemon.peripherals.trackball.deprecated">
<key name="scroll-wheel-emulation-button" type="i">
<default>0</default>
<range min="0" max="24"/>
- <_summary>Mouse wheel emulation button. 0 to disable the feature.</_summary>
+ <summary>Mouse wheel emulation button. 0 to disable the feature.</summary>
</key>
</schema>
</schemalist>
diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
new file mode 100644
index 0000000..52d8c72
--- /dev/null
+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema id="org.gnome.settings-daemon.peripherals.wacom.deprecated">
+ <child name="stylus" schema="org.gnome.settings-daemon.peripherals.wacom.stylus.deprecated"/>
+ <child name="eraser" schema="org.gnome.settings-daemon.peripherals.wacom.eraser.deprecated"/>
+
+ <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
+ <key name="is-absolute" type="b">
+ <default>true</default>
+ <summary>Wacom stylus absolute mode</summary>
+ <description>Enable this to set the tablet to absolute mode.</description>
+ </key>
+ <key name="area" type="ai">
+ <default>[-1, -1, -1, -1]</default>
+ <summary>Wacom tablet area</summary>
+ <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
+ </key>
+ <key name="keep-aspect" type="b">
+ <default>false</default>
+ <summary>Wacom tablet aspect ratio</summary>
+ <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the
output.</description>
+ </key>
+ <key name="rotation" enum="org.gnome.settings-daemon.GsdWacomRotation">
+ <default>'none'</default>
+ <summary>Wacom tablet rotation</summary>
+ <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90
degree counterclockwise.</description>
+ </key>
+ <key name="touch" type="b">
+ <default>true</default>
+ <summary>Wacom touch feature</summary>
+ <description>Enable this to move the cursor when the user touches the tablet.</description>
+ </key>
+ </schema>
+ <schema id="org.gnome.settings-daemon.peripherals.wacom.stylus.deprecated">
+ <key name="pressurecurve" type="ai">
+ <default>[0, 0, 100, 100]</default>
+ <summary>Wacom stylus pressure curve</summary>
+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
+ </key>
+ <key name="buttonmapping" type="ai">
+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+ <summary>Wacom stylus button mapping</summary>
+ <description>Set this to the logical button mapping.</description>
+ </key>
+ <key name="pressurethreshold" type="i">
+ <default>-1</default>
+ <summary>Wacom stylus pressure threshold</summary>
+ <description>Set this to the pressure value at which a stylus click event is generated.</description>
+ </key>
+ </schema>
+ <schema id="org.gnome.settings-daemon.peripherals.wacom.eraser.deprecated">
+ <key name="pressurecurve" type="ai">
+ <default>[0, 0, 100, 100]</default>
+ <summary>Wacom eraser pressure curve</summary>
+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
+ </key>
+ <key name="buttonmapping" type="ai">
+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+ <summary>Wacom eraser button mapping</summary>
+ <description>Set this to the logical button mapping.</description>
+ </key>
+ <key name="pressurethreshold" type="i">
+ <default>-1</default>
+ <summary>Wacom eraser pressure threshold</summary>
+ <description>Set this to the pressure value at which an eraser click event is generated.</description>
+ </key>
+ </schema>
+ <schema id="org.gnome.settings-daemon.peripherals.wacom.tablet-button.deprecated">
+ <key name="action-type" enum="org.gnome.settings-daemon.GsdWacomActionType">
+ <default>'none'</default>
+ <summary>Wacom button action type</summary>
+ <description>The type of action triggered by the button being pressed.</description>
+ </key>
+ <key name="custom-action" type="s">
+ <default>''</default>
+ <summary>Key combination for the custom action</summary>
+ <description>The keyboard shortcut generated when the button is pressed for custom
actions.</description>
+ </key>
+ <key name="custom-elevator-action" type="as">
+ <default>['', '']</default>
+ <summary>Key combinations for a touchring or touchstrip custom action</summary>
+ <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom
actions (up followed by down).</description>
+ </key>
+ <key name="oled-label" type="s">
+ <default>''</default>
+ <!-- Translators: This is the OLED display on an Intuos4 tablet:
+ http://eu.shop.wacom.eu/images/articles/d9abd9f2d4d88aa0649cda97a8077e2b_8.jpg -->
+ <summary>Button label for OLED display.</summary>
+ <description>Label will be rendered to OLED display belonging to the button</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
new file mode 100644
index 0000000..830cbb8
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.color"
path="/org/gnome/settings-daemon/plugins/color/">
+ <key name="recalibrate-display-threshold" type="u">
+ <default>0</default>
+ <summary>The duration a display profile is valid</summary>
+ <description>This is the number of days after which the display color profile is considered
invalid.</description>
+ </key>
+ <key name="recalibrate-printer-threshold" type="u">
+ <default>0</default>
+ <summary>The duration a printer profile is valid</summary>
+ <description>This is the number of days after which the printer color profile is considered
invalid.</description>
+ </key>
+ <key name="night-light-enabled" type="b">
+ <default>false</default>
+ <summary>If the night light mode is enabled</summary>
+ <description>Night light mode changes the color temperature of your display when the sun has gone down
or at present times.</description>
+ </key>
+ <key name="night-light-temperature" type="u">
+ <default>4000</default>
+ <summary>Temperature of the display when enabled</summary>
+ <description>This temperature in Kelvin is used to modify the screen tones when night light mode is
enabled. Higher values are bluer, lower redder.</description>
+ </key>
+ <key name="night-light-schedule-automatic" type="b">
+ <default>true</default>
+ <summary>Use the sunrise and sunset</summary>
+ <description>Calculate the sunrise and sunset times automatically, from the current
location.</description>
+ </key>
+ <key name="night-light-schedule-from" type="d">
+ <default>20.00</default>
+ <summary>The start time</summary>
+ <description>When “night-light-schedule-automatic” is disabled, use this start time in hours from
midnight.</description>
+ </key>
+ <key name="night-light-schedule-to" type="d">
+ <default>6.00</default>
+ <summary>The end time</summary>
+ <description>When “night-light-schedule-automatic” is disabled, use this end time in hours from
midnight.</description>
+ </key>
+ <key name="night-light-last-coordinates" type="(dd)">
+ <default>(91,181)</default>
+ <summary>The last detected position</summary>
+ <description>When location services are available this represents the last detected location. The
default value is an invalid value to ensure it is always updated at startup.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
b/data/org.gnome.settings-daemon.plugins.gschema.xml.in
similarity index 84%
rename from data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
rename to data/org.gnome.settings-daemon.plugins.gschema.xml.in
index 020f46e..e53ed17 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins"
path="/org/gnome/settings-daemon/plugins/">
<key name="whitelisted-plugins" type="as">
<default>['all']</default>
- <_summary>List of plugins that are allowed to be loaded</_summary>
- <_description>
+ <summary>List of plugins that are allowed to be loaded</summary>
+ <description>
A list of strings representing the plugins that are allowed to be loaded (default: “all”).
This is only evaluated on startup.
- </_description>
+ </description>
</key>
<child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
<child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
diff --git a/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
new file mode 100644
index 0000000..cf93ebe
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.housekeeping"
path="/org/gnome/settings-daemon/plugins/housekeeping/">
+ <key name="ignore-paths" type="as">
+ <default>[]</default>
+ <summary>Mount paths to ignore</summary>
+ <description>Specify a list of mount paths to ignore when they run low on space.</description>
+ </key>
+ <key name="free-percent-notify" type="d">
+ <default>0.05</default>
+ <range min="0.0" max="1.0"/>
+ <summary>Free percentage notify threshold</summary>
+ <description>Percentage free space threshold for initial warning of low disk space. If the percentage
free space drops below this, a warning will be shown.</description>
+ </key>
+ <key name="free-percent-notify-again" type="d">
+ <default>0.01</default>
+ <range min="0.0" max="1.0"/>
+ <summary>Subsequent free space percentage notify threshold</summary>
+ <description>Specify the percentage that the free disk space should reduce by before issuing a
subsequent warning.</description>
+ </key>
+ <key name="free-size-gb-no-notify" type="i">
+ <default>1</default>
+ <summary>Free space notify threshold</summary>
+ <description>Specify an amount in GB. If the amount of free space is more than this, no warning will
be shown.</description>
+ </key>
+ <key name="min-notify-period" type="i">
+ <default>10</default>
+ <summary>Minimum notify period for repeated warnings</summary>
+ <description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often
than this period.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
new file mode 100644
index 0000000..9a469d5
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys"
path="/org/gnome/settings-daemon/plugins/media-keys/">
+ <key name="custom-keybindings" type="as">
+ <default>[]</default>
+ <summary>Custom keybindings</summary>
+ <description>List of custom keybindings</description>
+ </key>
+ <key name="calculator" type="s">
+ <default>'XF86Calculator'</default>
+ <summary>Launch calculator</summary>
+ <description>Binding to launch the calculator.</description>
+ </key>
+ <key name="control-center" type="s">
+ <default>'XF86Tools'</default>
+ <summary>Launch settings</summary>
+ <description>Binding to launch GNOME settings.</description>
+ </key>
+ <key name="email" type="s">
+ <default>'XF86Mail'</default>
+ <summary>Launch email client</summary>
+ <description>Binding to launch the email client.</description>
+ </key>
+ <key name="eject" type="s">
+ <default>'XF86Eject'</default>
+ <summary>Eject</summary>
+ <description>Binding to eject an optical disc.</description>
+ </key>
+ <key name="help" type="s">
+ <default>''</default>
+ <summary>Launch help browser</summary>
+ <description>Binding to launch the help browser.</description>
+ </key>
+ <key name="home" type="s">
+ <default>'XF86Explorer'</default>
+ <summary>Home folder</summary>
+ <description>Binding to open the Home folder.</description>
+ </key>
+ <key name="media" type="s">
+ <default>'XF86AudioMedia'</default>
+ <summary>Launch media player</summary>
+ <description>Binding to launch the media player.</description>
+ </key>
+ <key name="next" type="s">
+ <default>'XF86AudioNext'</default>
+ <summary>Next track</summary>
+ <description>Binding to skip to next track.</description>
+ </key>
+ <key name="pause" type="s">
+ <default>'XF86AudioPause'</default>
+ <summary>Pause playback</summary>
+ <description>Binding to pause playback.</description>
+ </key>
+ <key name="play" type="s">
+ <default>'XF86AudioPlay'</default>
+ <summary>Play (or play/pause)</summary>
+ <description>Binding to start playback (or toggle play/pause).</description>
+ </key>
+ <key name="logout" type="s">
+ <default>'<Control><Alt>Delete'</default>
+ <summary>Log out</summary>
+ <description>Binding to log out.</description>
+ </key>
+ <key name="previous" type="s">
+ <default>'XF86AudioPrev'</default>
+ <summary>Previous track</summary>
+ <description>Binding to skip to previous track.</description>
+ </key>
+ <key name="screensaver" type="s">
+ <default>'<Super>l'</default>
+ <summary>Lock screen</summary>
+ <description>Binding to lock the screen.</description>
+ </key>
+ <key name="search" type="s">
+ <default>'XF86Search'</default>
+ <summary>Search</summary>
+ <description>Binding to launch the search tool.</description>
+ </key>
+ <key name="stop" type="s">
+ <default>'XF86AudioStop'</default>
+ <summary>Stop playback</summary>
+ <description>Binding to stop playback.</description>
+ </key>
+ <key name="volume-down" type="s">
+ <default>'XF86AudioLowerVolume'</default>
+ <summary>Volume down</summary>
+ <description>Binding to lower the system volume.</description>
+ </key>
+ <key name="volume-mute" type="s">
+ <default>'XF86AudioMute'</default>
+ <summary>Volume mute</summary>
+ <description>Binding to mute the system volume.</description>
+ </key>
+ <key name="volume-up" type="s">
+ <default>'XF86AudioRaiseVolume'</default>
+ <summary>Volume up</summary>
+ <description>Binding to raise the system volume.</description>
+ </key>
+ <key name="screenshot" type="s">
+ <default>'Print'</default>
+ <summary>Take a screenshot</summary>
+ <description>Binding to take a screenshot.</description>
+ </key>
+ <key name="window-screenshot" type="s">
+ <default>'<Alt>Print'</default>
+ <summary>Take a screenshot of a window</summary>
+ <description>Binding to take a screenshot of a window.</description>
+ </key>
+ <key name="area-screenshot" type="s">
+ <default>'<Shift>Print'</default>
+ <summary>Take a screenshot of an area</summary>
+ <description>Binding to take a screenshot of an area.</description>
+ </key>
+ <key name="screenshot-clip" type="s">
+ <default>'<Ctrl>Print'</default>
+ <summary>Copy a screenshot to clipboard</summary>
+ <description>Binding to copy a screenshot to clipboard.</description>
+ </key>
+ <key name="window-screenshot-clip" type="s">
+ <default>'<Ctrl><Alt>Print'</default>
+ <summary>Copy a screenshot of a window to clipboard</summary>
+ <description>Binding to copy a screenshot of a window to clipboard.</description>
+ </key>
+ <key name="area-screenshot-clip" type="s">
+ <default>'<Ctrl><Shift>Print'</default>
+ <summary>Copy a screenshot of an area to clipboard</summary>
+ <description>Binding to copy a screenshot of an area to clipboard.</description>
+ </key>
+ <key name="screencast" type="s">
+ <default>'<Ctrl><Shift><Alt>R'</default>
+ <summary>Record a short video of the screen</summary>
+ <description>Binding to record a short video of the screen</description>
+ </key>
+ <key name="www" type="s">
+ <default>'XF86WWW'</default>
+ <summary>Launch web browser</summary>
+ <description>Binding to launch the web browser.</description>
+ </key>
+ <key name="magnifier" type="s">
+ <default>'<Alt><Super>8'</default>
+ <summary>Toggle magnifier</summary>
+ <description>Binding to show the screen magnifier</description>
+ </key>
+ <key name="screenreader" type="s">
+ <default>'<Alt><Super>s'</default>
+ <summary>Toggle screen reader</summary>
+ <description>Binding to start the screen reader</description>
+ </key>
+ <key name="on-screen-keyboard" type="s">
+ <default>''</default>
+ <summary>Toggle on-screen keyboard</summary>
+ <description>Binding to show the on-screen keyboard</description>
+ </key>
+ <key name="increase-text-size" type="s">
+ <default>''</default>
+ <summary>Increase text size</summary>
+ <description>Binding to increase the text size</description>
+ </key>
+ <key name="decrease-text-size" type="s">
+ <default>''</default>
+ <summary>Decrease text size</summary>
+ <description>Binding to decrease the text size</description>
+ </key>
+ <key name="toggle-contrast" type="s">
+ <default>''</default>
+ <summary>Toggle contrast</summary>
+ <description>Binding to toggle the interface contrast</description>
+ </key>
+ <key name="magnifier-zoom-in" type="s">
+ <default>'<Alt><Super>equal'</default>
+ <summary>Magnifier zoom in</summary>
+ <description>Binding for the magnifier to zoom in</description>
+ </key>
+ <key name="magnifier-zoom-out" type="s">
+ <default>'<Alt><Super>minus'</default>
+ <summary>Magnifier zoom out</summary>
+ <description>Binding for the magnifier to zoom out</description>
+ </key>
+ <key name="max-screencast-length" type="u">
+ <default>30</default>
+ <summary>Maximum length of screen recordings</summary>
+ <description>The maximum length of single screen cast recordings in seconds or 0 for
unlimited</description>
+ </key>
+ </schema>
+
+ <schema gettext-domain="@GETTEXT_PACKAGE@"
id="org.gnome.settings-daemon.plugins.media-keys.custom-keybinding">
+ <key name="name" type="s">
+ <default>''</default>
+ <summary>Name</summary>
+ <description>Name of the custom binding</description>
+ </key>
+ <key name="binding" type="s">
+ <default>''</default>
+ <summary>Binding</summary>
+ <description>Binding for the custom binding</description>
+ </key>
+ <key name="command" type="s">
+ <default>''</default>
+ <summary>Command</summary>
+ <description>Command to run when the binding is invoked</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
new file mode 100644
index 0000000..93c704e
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.power"
path="/org/gnome/settings-daemon/plugins/power/">
+ <key name="idle-brightness" type="i">
+ <default>30</default>
+ <summary>The brightness of the screen when idle</summary>
+ <description>This is the laptop panel screen brightness used when the session is idle.</description>
+ </key>
+ <key name="idle-dim" type="b">
+ <default>true</default>
+ <summary>Dim the screen after a period of inactivity</summary>
+ <description>If the screen should be dimmed to save power when the computer is idle.</description>
+ </key>
+ <key name="sleep-inactive-ac-timeout" type="i">
+ <default>1200</default>
+ <summary>Sleep timeout computer when on AC</summary>
+ <description>The amount of time in seconds the computer on AC power needs to be inactive before it
goes to sleep. A value of 0 means never.</description>
+ </key>
+ <key name="sleep-inactive-ac-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
+ <default>'suspend'</default>
+ <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+ <description>The type of sleeping that should be performed when the computer is inactive.</description>
+ </key>
+ <key name="sleep-inactive-battery-timeout" type="i">
+ <default>1200</default>
+ <summary>Sleep timeout computer when on battery</summary>
+ <description>The amount of time in seconds the computer on battery power needs to be inactive before
it goes to sleep. A value of 0 means never.</description>
+ </key>
+ <key name="sleep-inactive-battery-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
+ <default>'suspend'</default>
+ <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+ <description>The type of sleeping that should be performed when the computer is inactive.</description>
+ </key>
+ <key name="ambient-enabled" type="b">
+ <default>true</default>
+ <summary>Enable the ALS sensor</summary>
+ <description>If the ambient light sensor functionality is enabled.</description>
+ </key>
+ <key name="power-button-action" enum="org.gnome.settings-daemon.GsdPowerButtonActionType">
+ <default>'suspend'</default>
+ <summary>Power button action</summary>
+ <description>The action to take when the system power button is pressed. This action is hard-coded
(and the setting ignored) on virtual machines (power off) and tablets (suspend).</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
new file mode 100644
index 0000000..5efdce7
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sharing.service">
+ <key name="enabled-connections" type="as">
+ <default>[]</default>
+ <summary>On which connections the service is enabled</summary>
+ <description>The list of NetworkManager connections (each one represented with its UUID) on which this
service is enabled and started.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
new file mode 100644
index 0000000..ce45ac6
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xsettings"
path="/org/gnome/settings-daemon/plugins/xsettings/">
+ <key name="antialiasing" enum="org.gnome.settings-daemon.GsdFontAntialiasingMode">
+ <default>'grayscale'</default>
+ <summary>Antialiasing</summary>
+ <description>The type of antialiasing to use when rendering fonts. Possible values are: “none” for no
antialiasing, “grayscale” for standard grayscale antialiasing, and “rgba” for subpixel antialiasing (LCD
screens only).</description>
+ </key>
+ <key name="hinting" enum="org.gnome.settings-daemon.GsdFontHinting">
+ <default>'slight'</default>
+ <summary>Hinting</summary>
+ <description>The type of hinting to use when rendering fonts. Possible values are: “none” for no
hinting and “slight” for fitting only to the Y-axis like Microsoft’s ClearType, DirectWrite and Adobe’s
proprietary font rendering engine. Ignores native hinting within the font, generates hints algorithmically.
Used on Ubuntu by default. Recommended. The meaning of “medium” and “full” depends on the font format (.ttf,
.otf, .pfa/.pfb) and the installed version of FreeType. They usually try to fit glyphs to both the X and the
Y axis (except for .otf: Y-only). This can lead to distortion and/or inconsistent rendering depending on the
quality of the font, the font format and the state of FreeType’s font engines.</description>
+ </key>
+ <key name="rgba-order" enum="org.gnome.settings-daemon.GsdFontRgbaOrder">
+ <default>'rgb'</default>
+ <summary>RGBA order</summary>
+ <description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to
“rgba”. Possible values are: “rgb” for red on left (most common), “bgr” for blue on left, “vrgb” for red on
top, “vbgr” for red on bottom.</description>
+ </key>
+ <key name="disabled-gtk-modules" type="as">
+ <default>[]</default>
+ <summary>List of explicitly disabled GTK+ modules</summary>
+ <description>A list of strings representing the GTK+ modules that will not be loaded, even if enabled
by default in their configuration.</description>
+ </key>
+ <key name="enabled-gtk-modules" type="as">
+ <default>[]</default>
+ <summary>List of explicitly enabled GTK+ modules</summary>
+ <description>A list of strings representing the GTK+ modules that will be loaded, usually in addition
to conditional and forcibly disabled ones.</description>
+ </key>
+ <key type="a{sv}" name="overrides">
+ <default>{}</default>
+ <summary>A dictionary of XSETTINGS to override</summary>
+ <description>This dictionary maps XSETTINGS names to overrides values. The values must be either
strings, signed int32s or (in the case of colors), 4-tuples of uint16 (red, green, blue, alpha; 65535 is
fully opaque).</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/meson.build b/meson.build
index fa24f4b..d032dd5 100644
--- a/meson.build
+++ b/meson.build
@@ -195,11 +195,6 @@ pkg = import('pkgconfig')
po_dir = join_paths(meson.source_root(), 'po')
-intltool_merge = find_program('intltool-merge')
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-
top_inc = include_directories('.')
subdir('gnome-settings-daemon')
diff --git a/plugins/power/meson.build b/plugins/power/meson.build
index ee08fdd..69c6ba0 100644
--- a/plugins/power/meson.build
+++ b/plugins/power/meson.build
@@ -76,11 +76,11 @@ if enable_gudev
configuration: plugins_conf
)
- custom_target(
+ i18n.merge_file(
policy,
input: policy_in,
output: policy,
- command: intltool_xml_cmd,
+ po_dir: po_dir,
install: true,
install_dir: join_paths(gsd_datadir, 'polkit-1', 'actions')
)
diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
index 5adbc41..f16300f 100644
--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
@@ -18,8 +18,8 @@
- A normal active user on the local machine does not need permission
to change the backlight brightness.
-->
- <_description>Modify the laptop brightness</_description>
- <_message>Authentication is required to modify the laptop brightness</_message>
+ <description>Modify the laptop brightness</description>
+ <message>Authentication is required to modify the laptop brightness</message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
index 064b576..c150b3c 100644
--- a/plugins/wacom/meson.build
+++ b/plugins/wacom/meson.build
@@ -16,11 +16,11 @@ policy_in = configure_file(
configuration: plugins_conf
)
-custom_target(
+i18n.merge_file(
policy,
input: policy_in,
output: policy,
- command: intltool_xml_cmd,
+ po_dir: po_dir,
install: true,
install_dir: join_paths(gsd_datadir, 'polkit-1', 'actions')
)
diff --git a/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
b/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
index 6bf77dd..fe0df93 100644
--- a/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
+++ b/plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
@@ -17,8 +17,8 @@
- A normal active user on the local machine does not need permission
to change the LED setting for a Wacom tablet
-->
- <_description>Modify the lit LED for a Wacom tablet</_description>
- <_message>Authentication is required to modify the lit LED for a Wacom tablet</_message>
+ <description>Modify the lit LED for a Wacom tablet</description>
+ <message>Authentication is required to modify the lit LED for a Wacom tablet</message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
@@ -32,8 +32,8 @@
- A normal active user on the local machine does not need permission
to change the OLED images for a Wacom tablet
-->
- <_description>Modify the OLED image for a Wacom tablet</_description>
- <_message>Authentication is required to modify the OLED image for a Wacom tablet</_message>
+ <description>Modify the OLED image for a Wacom tablet</description>
+ <message>Authentication is required to modify the OLED image for a Wacom tablet</message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fba87b2..7f17d5b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,14 @@
# Files with translatable strings.
# Please keep this file in alphabetical order.
-data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
-data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
+data/org.gnome.settings-daemon.peripherals.gschema.xml.in
+data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
plugins/color/gsd-color-calibrate.c
plugins/color/gsd-color-manager.c
plugins/datetime/gsd-datetime-manager.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 222a898..7fc1847 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,15 +1,5 @@
# Files with translatable strings to skip.
# Please keep this file in alphabetical order.
-#
-data/org.gnome.settings-daemon.peripherals.gschema.xml.in
-data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
plugins/automount/gnome-fallback-mount-helper.desktop.in
plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
