From 7c5fe783292f573e73369434c621e91fdb6b3291 Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 1 Aug 2013 14:10:44 +0200 Subject: Use yelp-tools instead of mate-doc-utils --- Makefile.am | 3 +- applets/brightness/gpm-common.c | 4 +- applets/inhibit/gpm-common.c | 4 +- autogen.sh | 7 +- configure.ac | 2 +- help/C/index.docbook | 770 ++++++++++++++++++++++++++++++++++++++++ help/C/legal.xml | 2 +- help/C/mate-power-manager.xml | 770 ---------------------------------------- help/Makefile.am | 12 +- help/ca/ca.po | 4 +- help/de/de.po | 4 +- help/el/el.po | 4 +- help/en_GB/en_GB.po | 4 +- help/es/es.po | 6 +- help/eu/eu.po | 4 +- help/fi/fi.po | 4 +- help/fr/fr.po | 6 +- help/hu/hu.po | 4 +- help/it/it.po | 4 +- help/oc/oc.po | 2 +- help/pa/pa.po | 4 +- help/ru/ru.po | 4 +- help/sv/sv.po | 4 +- help/zh_CN/zh_CN.po | 6 +- src/gpm-common.c | 4 +- 25 files changed, 822 insertions(+), 820 deletions(-) create mode 100644 help/C/index.docbook delete mode 100644 help/C/mate-power-manager.xml diff --git a/Makefile.am b/Makefile.am index 460dce3..2e91e16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,7 @@ EXTRA_DIST = \ HACKING \ intltool-extract.in \ intltool-merge.in \ - intltool-update.in \ - mate-doc-utils.make + intltool-update.in clean-local : rm -f *~ diff --git a/applets/brightness/gpm-common.c b/applets/brightness/gpm-common.c index 0d0e536..2249d63 100644 --- a/applets/brightness/gpm-common.c +++ b/applets/brightness/gpm-common.c @@ -173,9 +173,9 @@ gpm_help_display (const gchar *link_id) gchar *uri; if (link_id != NULL) - uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL); + uri = g_strconcat ("help:mate-power-manager?", link_id, NULL); else - uri = g_strdup ("ghelp:mate-power-manager"); + uri = g_strdup ("help:mate-power-manager"); gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error); diff --git a/applets/inhibit/gpm-common.c b/applets/inhibit/gpm-common.c index 0d0e536..2249d63 100644 --- a/applets/inhibit/gpm-common.c +++ b/applets/inhibit/gpm-common.c @@ -173,9 +173,9 @@ gpm_help_display (const gchar *link_id) gchar *uri; if (link_id != NULL) - uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL); + uri = g_strconcat ("help:mate-power-manager?", link_id, NULL); else - uri = g_strdup ("ghelp:mate-power-manager"); + uri = g_strdup ("help:mate-power-manager"); gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error); diff --git a/autogen.sh b/autogen.sh index 193b10a..d53e0eb 100755 --- a/autogen.sh +++ b/autogen.sh @@ -13,7 +13,12 @@ PKG_NAME="mate-power-manager" } which mate-autogen || { - echo "You need to install mate-common from the MATE Git" + echo "You need to install mate-common" + exit 1 +} + +which yelp-build || { + echo "You need to install yelp-tools" exit 1 } diff --git a/configure.ac b/configure.ac index 89309ff..75cc9fa 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ LT_INIT IT_PROG_INTLTOOL([0.35.0]) MATE_COMPILE_WARNINGS -MATE_DOC_INIT +YELP_HELP_INIT AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) diff --git a/help/C/index.docbook b/help/C/index.docbook new file mode 100644 index 0000000..8a4a7ee --- /dev/null +++ b/help/C/index.docbook @@ -0,0 +1,770 @@ + + + + + &app;"> + + +]> + + + +
+ + + + + &application; Manual + + + &application; is a session daemon for the MATE Desktop that + manages the power settings for your laptop or desktop computer. + + + + 2006-2009 + Richard Hughes (richard@hughsie.com) + + + + + + + Richard Hughes + + + &legal; + + + + + Richard + Hughes + richard@hughsie.com + + + + + + + 2.0 + 2006-08-30 + + Richard Hughes + richard@hughsie.com + + Richard Hughes + + + + + + Feedback + + To report a bug or make a suggestion regarding the &app; application or + this manual, follow the directions in the + &application; Contact Page. + + + + + + + &application; + + + mate-power-manager + + + + +
+ Introduction + + + + + &application; + Manual + mate-power-manager + + + + The &app; session daemon is a power management daemon + for the MATE desktop + + +
+ +
+ Usage + + &app; is usually started in MATE startup, but + you can manually start &app; by doing: + + + + Command line + + + Type mate-power-manager --verbose --no-daemon, + then press Return: + + + + +
+ +
+ Notification Messages + + When &application; has started, the following notifications may be displayed. + + +
+ AC Adapter Unplugged +
+ &app; Notification when AC adapter is removed + + + + + + + +
+ + + You can disable this notification by changing the MateConf key + /apps/mate-power-manager/notify/discharging. + + +
+ +
+ Fully Charged +
+ &app; Notification when laptop primary battery is fully charged + + + + + + + +
+ + + You can disable this notification by changing the MateConf key + /apps/mate-power-manager/notify/fully_charged. + + + + + You will only get a repeat notification if your battery percentage charge + drops below 95% and then is again fully charged. + This prevents some machines from showing unwanted repeat notifications + if the battery is incorrectly reporting the charged status. + + +
+ +
+ Power Low + + When the battery is low, you will receive the following notification. + You should consider switching to AC power really soon. + +
+ &app; Notification when battery power is low + + + + + + + +
+ + + You can disable this notification by changing the MateConf key + /apps/mate-power-manager/notify/low_power. + + +
+ +
+ Power Critical + + When the computer has run out of power, it will show this notification + explaining what action is required. + You can change the critical low action using the preferences tool. + +
+ &app; Notification when the system power is critically low + + + + + + + +
+
+ +
+ Suspend Failure + + When a suspend failure occurs you may get this following warning. + The most common reason for this notification is that the current user does + not have permission to suspend or hibernate the computer. + +
+ &app; Notification when suspend failure occurs + + + + + + + +
+ + + You can disable this notification by changing the MateConf key + /apps/mate-power-manager/notify/sleep_failed. + + +
+
+ +
+ Statistics + + The statistics program allows you to visualize the power consumption + of your laptop hardware. + + + + This has been removed from the information window of previous versions of + &app; as the data interface is now using DBUS rather than internal IPC. + This allows other applications to query and display the data if required. + + +
+ Power History going from battery power to AC + + + + + + + +
+ + + You may not see some options or graphs if your computer does not + have the required hardware. + You may also see other hardware not shown here (for example + UPS devices) but these are treated the same way as other devices. + + + +
+ Charge History + + This graph shows the percentage charge available for the composite primary + battery, so if you have a main laptop battery and an auxiliary battery + then only the averaged value will be shown. + A legend is not shown with this graph. + +
+ +
+ Power History + + This graph shows the power history charge used by the composite + primary battery. + This line represents the amount of power that is either being used to + charge the batteries in the system, or the power being used by the system + from the batteries. + You should see the line go up when processor intensive tasks are + performed, and down when the system is at idle, or when the screen is + dimmed. + A legend is shown with this graph when data events have been received. + + + + + You do will not receive rate data from your computer if it is not + charging or discharging, or if the computer is suspended. + This is due to hardware limitations where the rate is only sent from + the battery management chip, rather than the power management chip on + the motherboard. + + +
+ +
+ Estimated Time History + + This graph shows the estimated charge history for the composite primary + battery. + This line represents the amount of time required until charged, or the + amount of time until discharge. + This line should go proportionally up when the rate decreases and down + when the rate increases. + A legend is shown with this graph when data events have been received. + +
+
+ +
+ Preferences + + The preferences window allows you to control: + + + + + The LCD brightness when on AC and battery power + + + + + The idle time for the screen power-down and suspend action + + + + + The actions to perform when the laptop lid is closed + + + + + The notification area icon policy + + + + + + + Some sliders or option boxes may be disabled if the MateConf policy keys are + not writable. + This allows administrators to lock-down the actions that a user can select. + + + +
+ AC Preferences +
+ &app; AC tab + + + + + + + +
+
+ +
+ Battery Preferences +
+ &app; battery tab + + + + + + + +
+ + This allows a powerful computer to reduce the power usage when + idle, or when the full capabilities are not required. + +
+ +
+ General Preferences +
+ &app; general tab + + + + + + + +
+
+ +
+ Session and system idle times + + mate-screensaver is a session daemon that monitors user + input, and if the mouse has not been moved, or the keyboard been pressed then + it starts a timeout. + When the value of this timeout reaches the value set in + mate-screensaver-preferences, then the login is marked + as 'session idle'. + This is when &application; performs all the session idle actions such as + enabling low-power mode and lowering the laptop panel brightness. + + +
+ + Changing the session idle timeout in <command>mate-screensaver-preferences</command> + + + + + + + + +
+ + As soon as the session is marked at idle, &application; starts its own + 'system' timer. + When the timeout set in mate-power-preferences is reached, + and the CPU load is idle, then the idle action is + performed, which is usually to turn off the screen, or to suspend or hibernate. + + + To make this clearer, the sliders in mate-power-preferences + are set to start at the value of the session-timeout + 1 minute, as we cannot + logically trigger before the session is marked as idle. + If you adjust the value of the 'session idle' timeout in + mate-screensaver-preferences then the start of the sliders + in mate-power-preferences will change accordingly. + +
+
+ +
+ Advanced Preferences + +
+ Screen Dim Brightness + + + You can change the idle laptop panel brightness by changing the MateConf key + /apps/mate-power-manager/backlight/idle_brightness. + + +
+ +
+ Screen Locking + + By default, &application; supports a simple locking scheme. + This means that the screen will lock if set to "Lock screen" in + mate-screensaver when the lid is closed, or the system performs a suspend or + hibernate action. + + + There is a complex locking scheme available for power users that allows + locking policy to change for the lid, suspend and hibernate actions. + To enable this complex mode, you will have to disable the MateConf key: + + + + + + /apps/mate-power-manager/lock/use_screensaver_settings + + + + + Then the policy keys can be set to force a mate-screensaver lock and unlock + when the action is performed: + + + + + + /apps/mate-power-manager/lock/blank_screen + + + + + /apps/mate-power-manager/lock/suspend + + + + + /apps/mate-power-manager/lock/hibernate + + + + + + + The lock policy for mate-screensaver is ignored until the simple mode + is re-enabled. + + +
+
+ +
+ MATE Power Applets + +
+ Brightness Applet + + The brightness applet allows the user to change the brightness + temporarily without changing the default policy. + This may be useful if you have got a laptop without brightness + buttons, as you can now change the brightness easily. + +
+ + Brightness applet drop-down. + + + + + + + + +
+ + + You will not get the slider if your hardware is not supported. + + +
+ +
+ Inhibit Applet + + The inhibit applet allows the user to prevent the computer + auto-sleeping when inactive. This may be required with old or + proprietary programs such as VMWare or Matlab. + Just click the icon for the auto-suspend to be inhibited, + and click it again for normal operation. + +
+ + Inhibit applet in inhibited state. + + + + + + + + +
+ + + Don't use this applet if you just use MATE software, instead + file a bug to make the application use the Inhibit() and + UnInhibit() methods as this should 'just work'. + + +
+
+ +
+ Frequently Asked Questions + + These are questions the mailing list gets asked frequently. + +
+ What is battery capacity? + + Capacity is how much charge your battery can store compared to its + manufacturer's guidelines. + +
+ + This graph shows the capacity of a typical lithium ion battery over a + few hundred charge-discharge cycles. + + + + + + + + +
+
+ +
+ What's the difference between suspend and hibernate? + + The Suspend state is a power saving feature which is the lowest level of + power consumption that preserves program data in the computer's memory. + When your computer is in the Suspended state, computation will not be + performed until normal activity is resumed. + It will not resume until signaled by an external event such as a keyboard + button press. + It generally takes a few seconds to suspend and then resume your computer. + + + + You still use a small amount of battery power while suspended, so is + not recommended for the low power action. + If you remove AC power on a desktop, or run out of battery power on a + laptop then you will lose your work. + + + + The Hibernation state saves the complete state of the computer to hard + disk and turns off the power, so that the computer appears to be off. + It will not resume until signaled by an external event such as a + keyboard button press. + This is the lowest power sleeping state available. + If you remove AC power on a desktop, or run out of battery power on a + laptop then work will not be lost. + It can take up to a minute or more to hibernate and wake your computer. + +
+ +
+ + My monitor is broken and treats DPMS standby and off states as + 'no-signal' which leaves the monitor powered on. + + + You have to change the DPMS suspend mode &application; uses. + Open mateconf-editor, and then change the keys + /apps/mate-power-manager/backlight/dpms_method_ac and + /apps/mate-power-manager/backlight/dpms_method_battery + to one of the modes that work, e.g. standby, suspend or off. + +
+ +
+ + My time to discharge is always incorrect due to a faulty battery, what + can I do? + + + You might be able to use the percentage charge for g-p-m to use as the + policy data. + Open mateconf-editor, and then change the key + /apps/mate-power-manager/general/use_time_for_policy to false. + You can do this easily by doing: + + mateconftool-2 --set --type bool + /apps/mate-power-manager/general/use_time_for_policy false + + + + This should get the policy actions working for you, but of course the + time remaining will still be incorrect. + +
+ +
+ + How do I make my application stop the computer auto-suspending? + + + If your application is doing a long operation, you might want to + disable the ability to suspend for a little while. + You should use mate-session if you really don't want the user to be + able to suspend, or for the computer to save power by hibernating + or suspending. + +
+ +
+ + I'm running ACPI. Why do events (such as removing the AC adapter) + take so long to register? + + + One of two things might be the problem. + + + + + HAL might not be running the addon that captures the ACPI event. + + + + + You BIOS could be faulty, and might need a work-around. + Please send a bug report. + + + + + For the first case, try to find the HAL processes that are running: + ps -eaf | grep hal + + + And check for the process hald-addon-acpi. + If it is not being run, then please make sure that HAL is being run + with the --retain-privileges option in the + haldaemon initscript. + An alternative to this is to use acpid, rather than the kernel proc file. + +
+ +
+ +
+ About + + &app; was written by Richard Hughes richard@hughsie.com. + To find more information about &app;, please visit the + + &application; web page. + + + To report a bug or make a suggestion regarding this application or + this manual, follow the directions at the + + &application; Bug Page. + + This program is distributed under the terms of the GNU + General Public license as published by the Free Software + Foundation; either version 2 of the License, or (at your option) + any later version. A copy of this license can be found at this + link, or in the file + COPYING included with the source code of this program. + +
+ +
diff --git a/help/C/legal.xml b/help/C/legal.xml index acb0b40..9c4e248 100644 --- a/help/C/legal.xml +++ b/help/C/legal.xml @@ -6,7 +6,7 @@ by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS + url="help:fdl">link or in the file COPYING-DOCS distributed with this manual. This manual is part of a collection of MATE manuals diff --git a/help/C/mate-power-manager.xml b/help/C/mate-power-manager.xml deleted file mode 100644 index 8a4a7ee..0000000 --- a/help/C/mate-power-manager.xml +++ /dev/null @@ -1,770 +0,0 @@ - - - - - &app;"> - - -]> - - - -
- - - - - &application; Manual - - - &application; is a session daemon for the MATE Desktop that - manages the power settings for your laptop or desktop computer. - - - - 2006-2009 - Richard Hughes (richard@hughsie.com) - - - - - - - Richard Hughes - - - &legal; - - - - - Richard - Hughes - richard@hughsie.com - - - - - - - 2.0 - 2006-08-30 - - Richard Hughes - richard@hughsie.com - - Richard Hughes - - - - - - Feedback - - To report a bug or make a suggestion regarding the &app; application or - this manual, follow the directions in the - &application; Contact Page. - - - - - - - &application; - - - mate-power-manager - - - - -
- Introduction - - - - - &application; - Manual - mate-power-manager - - - - The &app; session daemon is a power management daemon - for the MATE desktop - - -
- -
- Usage - - &app; is usually started in MATE startup, but - you can manually start &app; by doing: - - - - Command line - - - Type mate-power-manager --verbose --no-daemon, - then press Return: - - - - -
- -
- Notification Messages - - When &application; has started, the following notifications may be displayed. - - -
- AC Adapter Unplugged -
- &app; Notification when AC adapter is removed - - - - - - - -
- - - You can disable this notification by changing the MateConf key - /apps/mate-power-manager/notify/discharging. - - -
- -
- Fully Charged -
- &app; Notification when laptop primary battery is fully charged - - - - - - - -
- - - You can disable this notification by changing the MateConf key - /apps/mate-power-manager/notify/fully_charged. - - - - - You will only get a repeat notification if your battery percentage charge - drops below 95% and then is again fully charged. - This prevents some machines from showing unwanted repeat notifications - if the battery is incorrectly reporting the charged status. - - -
- -
- Power Low - - When the battery is low, you will receive the following notification. - You should consider switching to AC power really soon. - -
- &app; Notification when battery power is low - - - - - - - -
- - - You can disable this notification by changing the MateConf key - /apps/mate-power-manager/notify/low_power. - - -
- -
- Power Critical - - When the computer has run out of power, it will show this notification - explaining what action is required. - You can change the critical low action using the preferences tool. - -
- &app; Notification when the system power is critically low - - - - - - - -
-
- -
- Suspend Failure - - When a suspend failure occurs you may get this following warning. - The most common reason for this notification is that the current user does - not have permission to suspend or hibernate the computer. - -
- &app; Notification when suspend failure occurs - - - - - - - -
- - - You can disable this notification by changing the MateConf key - /apps/mate-power-manager/notify/sleep_failed. - - -
-
- -
- Statistics - - The statistics program allows you to visualize the power consumption - of your laptop hardware. - - - - This has been removed from the information window of previous versions of - &app; as the data interface is now using DBUS rather than internal IPC. - This allows other applications to query and display the data if required. - - -
- Power History going from battery power to AC - - - - - - - -
- - - You may not see some options or graphs if your computer does not - have the required hardware. - You may also see other hardware not shown here (for example - UPS devices) but these are treated the same way as other devices. - - - -
- Charge History - - This graph shows the percentage charge available for the composite primary - battery, so if you have a main laptop battery and an auxiliary battery - then only the averaged value will be shown. - A legend is not shown with this graph. - -
- -
- Power History - - This graph shows the power history charge used by the composite - primary battery. - This line represents the amount of power that is either being used to - charge the batteries in the system, or the power being used by the system - from the batteries. - You should see the line go up when processor intensive tasks are - performed, and down when the system is at idle, or when the screen is - dimmed. - A legend is shown with this graph when data events have been received. - - - - - You do will not receive rate data from your computer if it is not - charging or discharging, or if the computer is suspended. - This is due to hardware limitations where the rate is only sent from - the battery management chip, rather than the power management chip on - the motherboard. - - -
- -
- Estimated Time History - - This graph shows the estimated charge history for the composite primary - battery. - This line represents the amount of time required until charged, or the - amount of time until discharge. - This line should go proportionally up when the rate decreases and down - when the rate increases. - A legend is shown with this graph when data events have been received. - -
-
- -
- Preferences - - The preferences window allows you to control: - - - - - The LCD brightness when on AC and battery power - - - - - The idle time for the screen power-down and suspend action - - - - - The actions to perform when the laptop lid is closed - - - - - The notification area icon policy - - - - - - - Some sliders or option boxes may be disabled if the MateConf policy keys are - not writable. - This allows administrators to lock-down the actions that a user can select. - - - -
- AC Preferences -
- &app; AC tab - - - - - - - -
-
- -
- Battery Preferences -
- &app; battery tab - - - - - - - -
- - This allows a powerful computer to reduce the power usage when - idle, or when the full capabilities are not required. - -
- -
- General Preferences -
- &app; general tab - - - - - - - -
-
- -
- Session and system idle times - - mate-screensaver is a session daemon that monitors user - input, and if the mouse has not been moved, or the keyboard been pressed then - it starts a timeout. - When the value of this timeout reaches the value set in - mate-screensaver-preferences, then the login is marked - as 'session idle'. - This is when &application; performs all the session idle actions such as - enabling low-power mode and lowering the laptop panel brightness. - - -
- - Changing the session idle timeout in <command>mate-screensaver-preferences</command> - - - - - - - - -
- - As soon as the session is marked at idle, &application; starts its own - 'system' timer. - When the timeout set in mate-power-preferences is reached, - and the CPU load is idle, then the idle action is - performed, which is usually to turn off the screen, or to suspend or hibernate. - - - To make this clearer, the sliders in mate-power-preferences - are set to start at the value of the session-timeout + 1 minute, as we cannot - logically trigger before the session is marked as idle. - If you adjust the value of the 'session idle' timeout in - mate-screensaver-preferences then the start of the sliders - in mate-power-preferences will change accordingly. - -
-
- -
- Advanced Preferences - -
- Screen Dim Brightness - - - You can change the idle laptop panel brightness by changing the MateConf key - /apps/mate-power-manager/backlight/idle_brightness. - - -
- -
- Screen Locking - - By default, &application; supports a simple locking scheme. - This means that the screen will lock if set to "Lock screen" in - mate-screensaver when the lid is closed, or the system performs a suspend or - hibernate action. - - - There is a complex locking scheme available for power users that allows - locking policy to change for the lid, suspend and hibernate actions. - To enable this complex mode, you will have to disable the MateConf key: - - - - - - /apps/mate-power-manager/lock/use_screensaver_settings - - - - - Then the policy keys can be set to force a mate-screensaver lock and unlock - when the action is performed: - - - - - - /apps/mate-power-manager/lock/blank_screen - - - - - /apps/mate-power-manager/lock/suspend - - - - - /apps/mate-power-manager/lock/hibernate - - - - - - - The lock policy for mate-screensaver is ignored until the simple mode - is re-enabled. - - -
-
- -
- MATE Power Applets - -
- Brightness Applet - - The brightness applet allows the user to change the brightness - temporarily without changing the default policy. - This may be useful if you have got a laptop without brightness - buttons, as you can now change the brightness easily. - -
- - Brightness applet drop-down. - - - - - - - - -
- - - You will not get the slider if your hardware is not supported. - - -
- -
- Inhibit Applet - - The inhibit applet allows the user to prevent the computer - auto-sleeping when inactive. This may be required with old or - proprietary programs such as VMWare or Matlab. - Just click the icon for the auto-suspend to be inhibited, - and click it again for normal operation. - -
- - Inhibit applet in inhibited state. - - - - - - - - -
- - - Don't use this applet if you just use MATE software, instead - file a bug to make the application use the Inhibit() and - UnInhibit() methods as this should 'just work'. - - -
-
- -
- Frequently Asked Questions - - These are questions the mailing list gets asked frequently. - -
- What is battery capacity? - - Capacity is how much charge your battery can store compared to its - manufacturer's guidelines. - -
- - This graph shows the capacity of a typical lithium ion battery over a - few hundred charge-discharge cycles. - - - - - - - - -
-
- -
- What's the difference between suspend and hibernate? - - The Suspend state is a power saving feature which is the lowest level of - power consumption that preserves program data in the computer's memory. - When your computer is in the Suspended state, computation will not be - performed until normal activity is resumed. - It will not resume until signaled by an external event such as a keyboard - button press. - It generally takes a few seconds to suspend and then resume your computer. - - - - You still use a small amount of battery power while suspended, so is - not recommended for the low power action. - If you remove AC power on a desktop, or run out of battery power on a - laptop then you will lose your work. - - - - The Hibernation state saves the complete state of the computer to hard - disk and turns off the power, so that the computer appears to be off. - It will not resume until signaled by an external event such as a - keyboard button press. - This is the lowest power sleeping state available. - If you remove AC power on a desktop, or run out of battery power on a - laptop then work will not be lost. - It can take up to a minute or more to hibernate and wake your computer. - -
- -
- - My monitor is broken and treats DPMS standby and off states as - 'no-signal' which leaves the monitor powered on. - - - You have to change the DPMS suspend mode &application; uses. - Open mateconf-editor, and then change the keys - /apps/mate-power-manager/backlight/dpms_method_ac and - /apps/mate-power-manager/backlight/dpms_method_battery - to one of the modes that work, e.g. standby, suspend or off. - -
- -
- - My time to discharge is always incorrect due to a faulty battery, what - can I do? - - - You might be able to use the percentage charge for g-p-m to use as the - policy data. - Open mateconf-editor, and then change the key - /apps/mate-power-manager/general/use_time_for_policy to false. - You can do this easily by doing: - - mateconftool-2 --set --type bool - /apps/mate-power-manager/general/use_time_for_policy false - - - - This should get the policy actions working for you, but of course the - time remaining will still be incorrect. - -
- -
- - How do I make my application stop the computer auto-suspending? - - - If your application is doing a long operation, you might want to - disable the ability to suspend for a little while. - You should use mate-session if you really don't want the user to be - able to suspend, or for the computer to save power by hibernating - or suspending. - -
- -
- - I'm running ACPI. Why do events (such as removing the AC adapter) - take so long to register? - - - One of two things might be the problem. - - - - - HAL might not be running the addon that captures the ACPI event. - - - - - You BIOS could be faulty, and might need a work-around. - Please send a bug report. - - - - - For the first case, try to find the HAL processes that are running: - ps -eaf | grep hal - - - And check for the process hald-addon-acpi. - If it is not being run, then please make sure that HAL is being run - with the --retain-privileges option in the - haldaemon initscript. - An alternative to this is to use acpid, rather than the kernel proc file. - -
- -
- -
- About - - &app; was written by Richard Hughes richard@hughsie.com. - To find more information about &app;, please visit the - - &application; web page. - - - To report a bug or make a suggestion regarding this application or - this manual, follow the directions at the - - &application; Bug Page. - - This program is distributed under the terms of the GNU - General Public license as published by the Free Software - Foundation; either version 2 of the License, or (at your option) - any later version. A copy of this license can be found at this - link, or in the file - COPYING included with the source code of this program. - -
- -
diff --git a/help/Makefile.am b/help/Makefile.am index 813cb60..863f554 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,10 +1,8 @@ -include $(top_srcdir)/mate-doc-utils.make -dist-hook: doc-dist-hook +@YELP_HELP_RULES@ -DOC_MODULE = mate-power-manager -DOC_ENTITIES = legal.xml -DOC_INCLUDES = -DOC_FIGURES = \ +HELP_ID = mate-power-manager +HELP_FILES = index.docbook legal.xml +HELP_MEDIA = \ figures/applet-brightness.png \ figures/applet-inhibit.png \ figures/gpm-cell-capacity.png \ @@ -19,4 +17,4 @@ DOC_FIGURES = \ figures/gpm-unplugged.png \ figures/gs-prefs.png -DOC_LINGUAS = ca de el en_GB es eu fi fr hu it oc pa ru sv zh_CN +HELP_LINGUAS = ca de el en_GB es eu fi fr hu it oc pa ru sv zh_CN diff --git a/help/ca/ca.po b/help/ca/ca.po index 7dc8abc..762f15d 100644 --- a/help/ca/ca.po +++ b/help/ca/ca.po @@ -157,7 +157,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Teniu permís per a copiar, distribuir i/o modificar aquest document, sota " @@ -165,7 +165,7 @@ msgstr "" "qualsevol versió publicada posteriorment per la Free Software Foundation, " "sense seccions invariants, sense texts de portada i sense texts de " "contraportada. Podeu trobar una còpia de la GFDL en aquest enllaç o en el fitxer COPYING-DOCS distribuït " +"\" url=\"help:fdl\">enllaç o en el fitxer COPYING-DOCS distribuït " "amb aquest manual." #: C/mate-power-manager.xml:12(para) diff --git a/help/de/de.po b/help/de/de.po index 3aa4b92..761d713 100644 --- a/help/de/de.po +++ b/help/de/de.po @@ -136,7 +136,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or in " +"of the GFDL at this link or in " "the file COPYING-DOCS distributed with this manual." msgstr "" "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free " @@ -144,7 +144,7 @@ msgstr "" "Software Foundation veröffentlichten Version ohne unveränderbare Abschnitte " "sowie ohne Texte auf dem vorderen und hinteren Buchdeckel kopiert, verteilt " "und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem " -"Link oder in der mit diesem " +"Link oder in der mit diesem " "Handbuch gelieferten Datei COPYING-DOCS." #: C/mate-power-manager.xml:12(para) diff --git a/help/el/el.po b/help/el/el.po index 308ea22..1651efe 100644 --- a/help/el/el.po +++ b/help/el/el.po @@ -159,7 +159,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Χορηγείται άδεια αντιγραφής, διανομής και/ή τροποποίησης του παρόντος " @@ -167,7 +167,7 @@ msgstr "" "(GFDL), ή οποιασδήποτε μεταγενέστερης έκδοσής της από το Ίδρυμα Ελεύθερου " "Λογισμικού (FSF), χωρίς αμετάβλητα τμήματα, κείμενα εξώφυλλου και κείμενα " "οπισθόφυλλου. Αντίγραφο της άδειας GFDL είναι διαθέσιμο στον ακόλουθο σύνδεσμο, ή στο αρχείο COPYING-DOCS " +"type=\"help\" url=\"help:fdl\">σύνδεσμο, ή στο αρχείο COPYING-DOCS " "που διανέμεται μαζί με το παρόν εγχειρίδιο." #: C/mate-power-manager.xml:12(para) diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po index 94d6e84..7287600 100644 --- a/help/en_GB/en_GB.po +++ b/help/en_GB/en_GB.po @@ -158,14 +158,14 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Permission is granted to copy, distribute and/or modify this document under " "the terms of the GNU Free Documentation Licence (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." #: ../C/mate-power-manager.xml:12(para) diff --git a/help/es/es.po b/help/es/es.po index 6faa4ef..deef1e1 100644 --- a/help/es/es.po +++ b/help/es/es.po @@ -159,14 +159,14 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Se concede permiso para copiar, distribuir o modificar este documento según " "las condiciones de la GNU Free Documentation License (GFDL), versión 1.1 o " "cualquier versión posterior publicada por la Free Software Foundation, sin " "Secciones invariantes, Textos de portada y Textos de contraportada. " -"Encontrará una copia de la GFDL en este enlace o en el archivo COPYING-DOCS distribuido con este manual." #: C/mate-power-manager.xml:12(para) @@ -1101,7 +1101,7 @@ msgstr "" "Este programa se distribuye bajo los términos de la Licencia Pública General " "GNU tal como la publica la Free Software Foundation; tanto en la versión 2 " "de la Licencia, o (a su opción) cualquier otra versión posterior. Puede " -"encontrarse una copia de esta licencia en este enlace, o en el archivo COPYING incluido con el código " "fuente de este programa." diff --git a/help/eu/eu.po b/help/eu/eu.po index bee592f..817832a 100644 --- a/help/eu/eu.po +++ b/help/eu/eu.po @@ -144,7 +144,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Baimena ematen da dokumentu hau kopiatu, banatu eta/edo aldatzeko Free " @@ -152,7 +152,7 @@ msgstr "" "Lizentziaren 1.1. bertsioan edo berriago batean ezarritako baldintzak " "betetzen badira; Atal Aldaezinik, Aurreko azaleko testurik eta Atzeko " "azaleko testurik gabe. GFDL lizentziaren kopia esteka honetan edo eskuliburu honekin batera ematen " +"\"help:fdl\">esteka honetan edo eskuliburu honekin batera ematen " "den COPYING-DOCS fitxategian aurkituko duzu." #: C/mate-power-manager.xml:12(para) diff --git a/help/fi/fi.po b/help/fi/fi.po index d36ba52..7ffec71 100644 --- a/help/fi/fi.po +++ b/help/fi/fi.po @@ -112,8 +112,8 @@ msgid "Richard Hughes" msgstr "Richard Hughes" #: C/mate-power-manager.xml:2(para) -msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." -msgstr "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla tätä linkkiä, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston." +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Tätä asiakirjaa saa kopioida, jakaa edelleen ja/tai muokata Free Software Foundationin julkaiseman GNU Free Documentation Licensen (GFDL) version 1.1 tai valinnaisesti myöhemmän version mukaisesti, ilman vaatimuksia muuttamattomista osioista ja etu- tai takakansiteksteistä. Kopion GFDL:stä voi nähdä napsauttamalla tätä linkkiä, tai lukemalla ohjeen mukana toimitetun COPYING-DOCS-nimisen tiedoston." #: C/mate-power-manager.xml:12(para) msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." diff --git a/help/fr/fr.po b/help/fr/fr.po index b3e06d5..9942155 100644 --- a/help/fr/fr.po +++ b/help/fr/fr.po @@ -160,7 +160,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Permission vous est donnée de copier, distribuer et/ou modifier ce document " @@ -168,7 +168,7 @@ msgstr "" "ou ultérieure publiée par la Free Software Foundation sans section " "inaltérable, sans texte de première page de couverture ni texte de dernière " "page de couverture. Vous trouverez un exemplaire de cette licence en suivant " -"ce lien ou dans le fichier " +"ce lien ou dans le fichier " "COPYING-DOCS fourni avec le présent manuel." #: C/mate-power-manager.xml:12(para) @@ -1752,7 +1752,7 @@ msgstr "" "Ce programme est distribué selon les termes de la GNU General Public " "License, tels que publiés par la Free Software Foundation ; soit la version " "2 de cette licence ou (à votre choix) toute version ultérieure. Une copie de " -"cette licence est disponible à ce " +"cette licence est disponible à ce " "lien ou dans le fichier COPYING inclus dans le code source de ce " "programme." diff --git a/help/hu/hu.po b/help/hu/hu.po index 5cbf1f3..e927b4b 100644 --- a/help/hu/hu.po +++ b/help/hu/hu.po @@ -145,7 +145,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "E közlemény felhatalmazást ad önnek jelen dokumentum sokszorosítására, " @@ -153,7 +153,7 @@ msgstr "" "kiadott GNU Szabad Dokumentációs Licenc 1.1-es, vagy bármely azt követő " "verziójának feltételei alapján.Nincs Nem Változtatható Szakasz, nincs Címlap-" "szöveg, nincs Hátlap-szöveg. E licenc egy példányát itt, vagy a kézikönyvvel szállított COPYING-DOCS " +"\"help:fdl\">itt, vagy a kézikönyvvel szállított COPYING-DOCS " "fájlban találja." #: C/mate-power-manager.xml:12(para) diff --git a/help/it/it.po b/help/it/it.po index cb81450..b495c3e 100644 --- a/help/it/it.po +++ b/help/it/it.po @@ -156,14 +156,14 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Questo documento può essere copiato, distribuito o modificato in base ai " "termini della GNU Free Documentation License (GFDL), versione 1.1 o di " "versioni successive pubblicate dalla Free Software Foundation che siano " "prive di sezioni invariabili, frontespizi e retrocopertine. La GFDL è " -"disponibile accedendo a questo linklink o nel file COPYING-DOCS distribuito con questo manuale." #: C/mate-power-manager.xml:12(para) diff --git a/help/oc/oc.po b/help/oc/oc.po index 5378e4d..fbcd7a0 100644 --- a/help/oc/oc.po +++ b/help/oc/oc.po @@ -159,7 +159,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" diff --git a/help/pa/pa.po b/help/pa/pa.po index 3e325f2..4ec0cff 100644 --- a/help/pa/pa.po +++ b/help/pa/pa.po @@ -166,13 +166,13 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "ਇਹ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਗਨੂ ਮੁਕਤ ਦਸਤਾਵੇਜ਼ ਲਾਈਸੈਂਸ (GFDL), ਵਰਜਨ 1.1 ਜਾਂ ਨਵੇਂ, ਜੋ ਕਿ ਫਰੀ ਸਾਫਟਵੇਅਰ " "ਫਾਊਡੇਸ਼ਨ ਵਲੋਂ ਬਦਲਵੇਂ ਭਾਗ, ਨਾ ਮੁੱਢਲੇ-ਢੱਕਣ ਪਾਠ ਅਤੇ ਨਾ ਹੀ ਪਿੱਛੇ-ਢੱਕਣ ਪਾਠ ਨਾਲ ਜਾਰੀ ਹੈ, ਦੀਆਂ ਸ਼ਰਤਾਂ " "ਅਧੀਨ ਨਕਲ ਕਰਨ, ਵੰਡਣ ਅਤੇ/ਜਾਂ ਸੋਧਣ ਦਾ ਅਧਿਕਾਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਤੁਸੀਂ GFDL ਦੀ ਨਕਲ ਸਬੰਧ ਉੱਤੇ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ 'ਚ COPYING-DOCS " +"type=\"help\" url=\"help:fdl\"> ਸਬੰਧ ਉੱਤੇ ਜਾਂ ਇਹ ਦਸਤਾਵੇਜ਼ 'ਚ COPYING-DOCS " "ਫਾਇਲ ਵਿੱਚੋਂ ਲੈ ਸਕਦੇ ਹੋ।" #: C/mate-power-manager.xml:12(para) diff --git a/help/ru/ru.po b/help/ru/ru.po index f684cb0..6e56771 100644 --- a/help/ru/ru.po +++ b/help/ru/ru.po @@ -95,7 +95,7 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "Разрешается копировать, распространять и/или изменять этот документ на " @@ -103,7 +103,7 @@ msgstr "" "License (GFDL)), версии 1.1 или любой более поздней версии, опубликованной " "Ассоциацией Свободного Программного Обеспечения без изменения разделов, без " "текстов обложки. Вы можете найти копию GFDL по этому адресу или в файле COPYING-DOCS, " +"url=\"help:fdl\">этому адресу или в файле COPYING-DOCS, " "распространяемого вместе с данным руководством." #: C/mate-power-manager.xml:12(para) diff --git a/help/sv/sv.po b/help/sv/sv.po index 02d6fbd..3b530de 100644 --- a/help/sv/sv.po +++ b/help/sv/sv.po @@ -112,8 +112,8 @@ msgid "Richard Hughes" msgstr "Richard Hughes" #: C/mate-power-manager.xml:2(para) -msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." -msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna länk eller i filen COPYING-DOCS som medföljer denna handbok." +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Tillstånd att kopiera, distribuera och/eller modifiera detta dokument ges under villkoren i GNU Free Documentation License (GFDL), version 1.1 eller senare, utgivet av Free Software Foundation utan standardavsnitt och omslagstexter. En kopia av GFDL finns att hämta på denna länk eller i filen COPYING-DOCS som medföljer denna handbok." #: C/mate-power-manager.xml:12(para) msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po index 18fe8dd..5c14f53 100644 --- a/help/zh_CN/zh_CN.po +++ b/help/zh_CN/zh_CN.po @@ -156,12 +156,12 @@ msgid "" "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " +"of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." msgstr "" "对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software " "Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没" -"有固定的部分、没有封面和背页文本。您可以在 link 或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副" "本。" @@ -274,7 +274,7 @@ msgid "" "\">MATE Power Manager Contact Page." msgstr "" "报告一个错误或者一个关于 Brasero 程序以及本文档的" -"建议，请看 MATE Feedback " +"建议，请看 MATE Feedback " "Page。" #: C/mate-power-manager.xml:0(application) diff --git a/src/gpm-common.c b/src/gpm-common.c index e7d1d66..2c55d97 100644 --- a/src/gpm-common.c +++ b/src/gpm-common.c @@ -135,9 +135,9 @@ gpm_help_display (const gchar *link_id) gchar *uri; if (link_id != NULL) - uri = g_strconcat ("ghelp:mate-power-manager?", link_id, NULL); + uri = g_strconcat ("help:mate-power-manager?", link_id, NULL); else - uri = g_strdup ("ghelp:mate-power-manager"); + uri = g_strdup ("help:mate-power-manager"); gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error); -- cgit v1.2.1