From: fbrehm Date: Mon, 23 Apr 2012 13:10:18 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=00a227f309e3ffd11d362ad89e6fe7afec08fae7;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 8a1d5ea..1b9f6f0 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -993,89 +993,89 @@ - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + @@ -9176,7 +9176,7 @@ - + present @@ -9184,12 +9184,13 @@ Display options for the notification icon. Valid options are "never", "low", "critical", "charge", "present" and "always". - + + - + If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action. @@ -9197,37 +9198,37 @@ - + The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep. - + The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep. - + The amount of time in seconds before the display goes to sleep when the computer is on AC power. - + The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep. - + The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. - + The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. @@ -9235,37 +9236,37 @@ - + 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 in seconds of the battery when it is considered critical. Only valid when use_time_for_policy is true. - + The time remaining in seconds of the battery when it is considered low. Only valid when use_time_for_policy is true. - + The percentage of the battery when the critical action is performed. Only valid when use_time_for_policy is false. - + The percentage of the battery when it is considered critical. Only valid when use_time_for_policy is false. - + The percentage of the battery when it is considered low. Only valid when use_time_for_policy is false. @@ -9273,13 +9274,13 @@ - + The maximum duration of time displayed on the x-axis of the graph. - + power @@ -9287,19 +9288,19 @@ The default graph type to show in the statistics window. - + Whether we should smooth the data in the graph. - + Whether we should show the events in the statistics window. - + Whether we should show the axis labels in the statistics window. @@ -9307,13 +9308,13 @@ - + If a notification message should be displayed when the battery is getting low. - + @@ -9321,31 +9322,31 @@ 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. - + If a notification message should be displayed after suspend or hibernate failed. - + If a notification message should be displayed when the battery is fully charged. - + If the user should be notified when the AC adapter is disconnected. - + If we should show the low capacity warning for a broken battery. - + If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay. @@ -9353,25 +9354,25 @@ - + The number of seconds of inactivity to spin down the disks when on battery power. - + The number of seconds of inactivity to spin down the disks when on AC power. - + If the system low-power mode should be enabled when on laptop battery power. - + If the system low-power mode should be enabled when on AC power. @@ -9379,37 +9380,37 @@ - + Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume. - + Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume. - + Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock_use_screensaver_settings is false. - + Whether the screen is locked when the computer wakes up from a suspend. Only used if lock_use_screensaver_settings is false. - + Whether the screen is locked when the screen is turned off. Only used if lock_use_screensaver_settings is false. - + Whether to use the screen lock setting of gnome-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen. @@ -9417,31 +9418,31 @@ - + Whether NetworkManager should disconnect before suspending or hibernating and connect on resume. - + If the CPU load should be checked before doing the idle action. - + 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. - + If the learnt profile should be used to calculate the time remaining. Only turn this off for debugging. - + The version of the installed version of the schema. Do not edit this value, it is used so that configure changes between versions can be detected. @@ -9449,7 +9450,7 @@ - + suspend @@ -9457,7 +9458,7 @@ The action to take when the laptop lid is closed and the laptop is on AC power. Possible values are "suspend", "hibernate", "blank" and "nothing". - + suspend @@ -9465,7 +9466,7 @@ The action to take when the laptop lid is closed and the laptop is on battery power. Possible values are "suspend", "hibernate", "blank", and "nothing". - + interactive @@ -9473,7 +9474,7 @@ The action to take when the system power button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing". - + hibernate @@ -9481,7 +9482,7 @@ The action to take when the system hibernate button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing". - + suspend @@ -9491,13 +9492,13 @@ - + The brightness of the display when on AC power. Possible values are between 0 and 100. - + off @@ -9505,7 +9506,7 @@ The DPMS method used to blank the screen when on battery power. Possible values are "standby", "suspend" and "off". - + off @@ -9513,43 +9514,43 @@ The DPMS method used to blank the screen when on AC power. Possible values are "standby", "suspend" and "off". - + If the screen should be dimmed to save power when the computer is idle when on AC power. - + The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100. - + The default amount of time to dim the screen after idle. - + If the screen should be dimmed to save power when the computer is idle when on battery power. - + This is the laptop panel screen brightness used when the session is idle. Only valid when use_time_for_policy is true. - + If the screen should be reduced in brightness when the computer is on battery power. - + If the screen brightness should be changed when switching between AC and battery power. @@ -9557,7 +9558,7 @@ - + hibernate @@ -9565,7 +9566,7 @@ The action to take when the UPS is low. Possible values are "hibernate", "suspend", "shutdown" and "nothing". - + shutdown @@ -9573,7 +9574,7 @@ The action to take when the UPS is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing". - + suspend @@ -9581,13 +9582,13 @@ The type of sleeping that should be performed when the computer is inactive. Possible values are "hibernate", "suspend" and "nothing". - + 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. - + hibernate @@ -9595,7 +9596,7 @@ The action to take when the battery is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing". - + hibernate @@ -18699,13 +18700,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18715,13 +18714,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18731,13 +18728,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - -