From f4b68b94578486aae471e522c64919fd2cf004bc Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 13:50:20 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files * Add gettext domain to gschema --- configure.ac | 3 +- data/Makefile.am | 7 +- data/org.mate.power-manager.gschema.xml.in | 240 ++++++++++++++--------------- po/POTFILES.in | 2 +- 4 files changed, 126 insertions(+), 126 deletions(-) diff --git a/configure.ac b/configure.ac index c27a7a2..eee06d9 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AM_PROG_CC_C_O AC_PROG_INSTALL LT_INIT -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.50.1]) MATE_COMPILE_WARNINGS YELP_HELP_INIT @@ -350,6 +350,7 @@ data/Makefile data/mate-power-manager.desktop.in data/mate-power-preferences.desktop.in data/mate-power-statistics.desktop.in +data/org.mate.power-manager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 398fd0c..e5544dc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,7 +22,7 @@ $(service_DATA): $(service_in_files) Makefile @GSETTINGS_RULES@ @INTLTOOL_XML_NOMERGE_RULE@ gsettings_schemas_in_files = org.mate.power-manager.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) +gsettings_SCHEMAS = $(gsettings_schemas_in_files:.xml.in=.xml) convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-power-manager.convert @@ -34,7 +34,6 @@ pkgdata_DATA = \ acme.ui EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ $(service_in_files) \ $(autostart_in_files) \ $(desktop_in_files) \ @@ -49,5 +48,5 @@ DISTCLEANFILES = \ mate-power-manager.desktop \ mate-power-preferences.desktop \ mate-power-statistics.desktop \ - org.mate.PowerManager.service \ - org.mate.power-manager.gschema.xml + org.mate.PowerManager.service \ + $(gsettings_SCHEMAS) diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in index ba0cab1..d4a443d 100644 --- a/data/org.mate.power-manager.gschema.xml.in +++ b/data/org.mate.power-manager.gschema.xml.in @@ -1,4 +1,4 @@ - + @@ -23,43 +23,43 @@ 'hibernate' - <_summary>Whether to hibernate, suspend or do nothing when inactive - <_description>The type of sleeping that should be performed when the computer is inactive. + Whether to hibernate, suspend or do nothing when inactive + The type of sleeping that should be performed when the computer is inactive. 'hibernate' - <_summary>Battery critical low action - <_description>The action to take when the battery is critically low. + Battery critical low action + The action to take when the battery is critically low. true - <_summary>If the battery event should occur when the lid is shut and the power disconnected - <_description>If the battery lid close event should occur (for example 'Suspend when lid closed on battery') when the lid is previously shut and the AC power disconnected at a later time. + If the battery event should occur when the lid is shut and the power disconnected + If the battery lid close event should occur (for example 'Suspend when lid closed on battery') when the lid is previously shut and the AC power disconnected at a later time. 'suspend' - <_summary>Whether to hibernate, suspend or do nothing when inactive - <_description>The type of sleeping that should be performed when the computer is inactive. + Whether to hibernate, suspend or do nothing when inactive + The type of sleeping that should be performed when the computer is inactive. 'shutdown' - <_summary>UPS critical low action - <_description>The action to take when the UPS is critically low. + UPS critical low action + The action to take when the UPS is critically low. 'hibernate' - <_summary>UPS low power action - <_description>The action to take when the UPS is low. + UPS low power action + The action to take when the UPS is low. true - <_summary>Allow backlight brightness adjustment - <_description>If the screen brightness should be changed when switching between AC and battery power. + Allow backlight brightness adjustment + If the screen brightness should be changed when switching between AC and battery power. true - <_summary>Reduce the backlight brightness when on battery power - <_description>If the screen should be reduced in brightness when the computer is on battery power. + Reduce the backlight brightness when on battery power + If the screen should be reduced in brightness when the computer is on battery power. true @@ -83,262 +83,262 @@ 30 - <_summary>The brightness of the screen when idle - <_description>This is the laptop panel screen brightness used when the session is idle. Only valid when use-time-for-policy is true. + The brightness of the screen when idle + This is the laptop panel screen brightness used when the session is idle. Only valid when use-time-for-policy is true. true - <_summary>Dim the screen after a period of inactivity when on battery power - <_description>If the screen should be dimmed to save power when the computer is idle when on battery power. + Dim the screen after a period of inactivity when on battery power + If the screen should be dimmed to save power when the computer is idle when on battery power. 10 - <_summary>The default amount of time to dim the screen after idle - <_description>The default amount of time to dim the screen after idle. + The default amount of time to dim the screen after idle + The default amount of time to dim the screen after idle. 50 - <_summary>LCD dimming amount when on battery - <_description>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100. + LCD dimming amount when on battery + The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100. false - <_summary>Dim the screen after a period of inactivity when on AC power - <_description>If the screen should be dimmed to save power when the computer is idle when on AC power. + Dim the screen after a period of inactivity when on AC power + If the screen should be dimmed to save power when the computer is idle when on AC power. 'off' - <_summary>Method used to blank screen on AC - <_description>The DPMS method used to blank the screen when on AC power. + Method used to blank screen on AC + The DPMS method used to blank the screen when on AC power. 'off' - <_summary>Method used to blank screen on battery - <_description>The DPMS method used to blank the screen when on battery power. + Method used to blank screen on battery + The DPMS method used to blank the screen when on battery power. 100.0 - <_summary>LCD brightness when on AC - <_description>The brightness of the display when on AC power. Possible values are between 0.0 and 100.0. + LCD brightness when on AC + The brightness of the display when on AC power. Possible values are between 0.0 and 100.0. 'suspend' - <_summary>Suspend button action - <_description>The action to take when the system suspend button is pressed. + Suspend button action + The action to take when the system suspend button is pressed. 'hibernate' - <_summary>Hibernate button action - <_description>The action to take when the system hibernate button is pressed. + Hibernate button action + The action to take when the system hibernate button is pressed. 'interactive' - <_summary>Power button action - <_description>The action to take when the system power button is pressed. + Power button action + The action to take when the system power button is pressed. 'suspend' - <_summary>Laptop lid close action on battery - <_description>The action to take when the laptop lid is closed and the laptop is on battery power. + Laptop lid close action on battery + The action to take when the laptop lid is closed and the laptop is on battery power. 'suspend' - <_summary>Laptop lid close action when on AC - <_description>The action to take when the laptop lid is closed and the laptop is on AC power. + Laptop lid close action when on AC + The action to take when the laptop lid is closed and the laptop is on AC power. true - <_summary>Whether to use time-based notifications - <_description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS. + Whether to use time-based notifications + If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS. false - <_summary>Check CPU load before sleeping - <_description>If the CPU load should be checked before doing the idle action. + Check CPU load before sleeping + If the CPU load should be checked before doing the idle action. false - <_summary>Whether NetworkManager should be connected and disconnected on sleep. - <_description>Whether NetworkManager should disconnect before suspending or hibernating and connect on resume. + Whether NetworkManager should be connected and disconnected on sleep. + Whether NetworkManager should disconnect before suspending or hibernating and connect on resume. true - <_summary>Use mate-screensaver lock setting - <_description>Whether to use the screen lock setting of mate-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen. + Use mate-screensaver lock setting + Whether to use the screen lock setting of mate-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen. true - <_summary>Lock screen when blanked - <_description>Whether the screen is locked when the screen is turned off. Only used if lock-use-screensaver is false. + Lock screen when blanked + Whether the screen is locked when the screen is turned off. Only used if lock-use-screensaver is false. true - <_summary>Lock screen on suspend - <_description>Whether the screen is locked when the computer wakes up from a suspend. Only used if lock-use-screensaver is false. + Lock screen on suspend + Whether the screen is locked when the computer wakes up from a suspend. Only used if lock-use-screensaver is false. true - <_summary>Lock screen on hibernate - <_description>Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock-use-screensaver is false. + Lock screen on hibernate + Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock-use-screensaver is false. false - <_summary>Lock GNOME keyring on sleep - <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume. + Lock GNOME keyring on sleep + Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume. true - <_summary>Lock GNOME keyring on sleep - <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume. + Lock GNOME keyring on sleep + Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume. true - <_summary>If we should show the low capacity warning for a broken battery - <_description>If we should show the low capacity warning for a broken battery. + If we should show the low capacity warning for a broken battery + If we should show the low capacity warning for a broken battery. true - <_summary>Notify when AC adapter is disconnected - <_description>If the user should be notified when the AC adapter is disconnected. + Notify when AC adapter is disconnected + If the user should be notified when the AC adapter is disconnected. false - <_summary>Notify when fully charged - <_description>If a notification message should be displayed when the battery is fully charged. + Notify when fully charged + If a notification message should be displayed when the battery is fully charged. true - <_summary>Notify on a sleep failure - <_description>If a notification message should be displayed after suspend or hibernate failed. + Notify on a sleep failure + If a notification message should be displayed after suspend or hibernate failed. '' - <_summary>The URI to show to the user on sleep failure - <_description>When sleep fails we can show the user a button to help fix the situation. Leave this blank if the button should not be shown. + The URI to show to the user on sleep failure + When sleep fails we can show the user a button to help fix the situation. Leave this blank if the button should not be shown. true - <_summary>Notify on a low power - <_description>If a notification message should be displayed when the battery is getting low. + Notify on a low power + If a notification message should be displayed when the battery is getting low. true - <_summary>Whether we should show the history data points - <_description>Whether we should show the history data points in the statistics window. + Whether we should show the history data points + Whether we should show the history data points in the statistics window. true - <_summary>Whether we should smooth the history data - <_description>Whether we should smooth the history data in the graph. + Whether we should smooth the history data + Whether we should smooth the history data in the graph. 'power' - <_summary>The default graph type to show for history - <_description>The default graph type to show in the history window. + The default graph type to show for history + The default graph type to show in the history window. 21600 - <_summary>The maximum time displayed for history - <_description>The maximum duration of time displayed on the x-axis of the history graph. + The maximum time displayed for history + The maximum duration of time displayed on the x-axis of the history graph. true - <_summary>Whether we should show the stats data points - <_description>Whether we should show the stats data points in the statistics window. + Whether we should show the stats data points + Whether we should show the stats data points in the statistics window. true - <_summary>Whether we should smooth the stats data - <_description>Whether we should smooth the stats data in the graph. + Whether we should smooth the stats data + Whether we should smooth the stats data in the graph. 'power' - <_summary>The default graph type to show for stats - <_description>The default graph type to show in the stats window. + The default graph type to show for stats + The default graph type to show in the stats window. 0 - <_summary>The index of the page number to show by default - <_description>The index of the page number to show by default which is used to return focus to the correct page. + The index of the page number to show by default + The index of the page number to show by default which is used to return focus to the correct page. '' - <_summary>The ID of the last device selected - <_description>The identifier of the last device which is used to return focus to the correct device. + The ID of the last device selected + The identifier of the last device which is used to return focus to the correct device. 10 - <_summary>Percentage considered low - <_description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false. + Percentage considered low + The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false. 3 - <_summary>Percentage considered critical - <_description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false. + Percentage considered critical + The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false. 2 - <_summary>Percentage action is taken - <_description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false. + Percentage action is taken + The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false. 1200 - <_summary>The time remaining when low - <_description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true. + The time remaining when low + The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true. 300 - <_summary>The time remaining when critical - <_description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true. + The time remaining when critical + The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true. 120 - <_summary>The time remaining when action is taken - <_description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true. + The time remaining when action is taken + The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true. 0 - <_summary>Sleep timeout computer when on battery - <_description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. + Sleep timeout computer when on battery + The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. 0 - <_summary>Sleep timeout computer when on AC - <_description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. + Sleep timeout computer when on AC + The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. 0 - <_summary>Sleep timeout computer when on UPS - <_description>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep. + Sleep timeout computer when on UPS + The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep. 1800 - <_summary>Sleep timeout display when on AC - <_description>The amount of time in seconds before the display goes to sleep when the computer is on AC power. + Sleep timeout display when on AC + The amount of time in seconds before the display goes to sleep when the computer is on AC power. 600 - <_summary>Sleep timeout display when on battery - <_description>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep. + Sleep timeout display when on battery + The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep. 600 - <_summary>Sleep timeout display when on UPS - <_description>The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep. + Sleep timeout display when on UPS + The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep. true - <_summary>If sounds should be used - <_description>If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action. + If sounds should be used + If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action. true - <_summary>If preferences and statistics items should be shown in the context menu + If preferences and statistics items should be shown in the context menu 'present' - <_summary>When to show the notification icon - <_description>Display options for the notification icon. + When to show the notification icon + Display options for the notification icon. diff --git a/po/POTFILES.in b/po/POTFILES.in index fb97b9f..cc0511e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ applets/brightness/brightness-applet.c applets/inhibit/inhibit-applet.c [type: gettext/ini]applets/inhibit/org.mate.InhibitApplet.mate-panel-applet.in.in data/mate-power-manager.desktop.in.in -data/org.mate.power-manager.gschema.xml.in +[type: gettext/gsettings]data/org.mate.power-manager.gschema.xml.in data/mate-power-preferences.desktop.in.in data/mate-power-statistics.desktop.in.in [type: gettext/glade]data/gpm-feedback-widget.ui -- cgit v1.2.1