[Goodies-commits] r6019 - in xfce4-power-manager/trunk: doc/C doc/C/images po src

Ali Abdallah aliov at xfce.org
Sat Nov 8 12:28:20 CET 2008


Author: aliov
Date: 2008-11-08 11:28:20 +0000 (Sat, 08 Nov 2008)
New Revision: 6019

Modified:
   xfce4-power-manager/trunk/doc/C/images/cpu-settings.png
   xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html
   xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml
   xfce4-power-manager/trunk/po/cs.po
   xfce4-power-manager/trunk/po/da.po
   xfce4-power-manager/trunk/po/de.po
   xfce4-power-manager/trunk/po/fi.po
   xfce4-power-manager/trunk/po/fr.po
   xfce4-power-manager/trunk/po/id.po
   xfce4-power-manager/trunk/po/ja.po
   xfce4-power-manager/trunk/po/nl.po
   xfce4-power-manager/trunk/po/pt_BR.po
   xfce4-power-manager/trunk/po/pt_PT.po
   xfce4-power-manager/trunk/po/xfce4-power-manager.pot
   xfce4-power-manager/trunk/src/xfpm-cpu.c
   xfce4-power-manager/trunk/src/xfpm-enums.h
   xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Use intuitive sentences to describe the cpu governors

Modified: xfce4-power-manager/trunk/doc/C/images/cpu-settings.png
===================================================================
(Binary files differ)

Modified: xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html
===================================================================
--- xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/doc/C/xfce4-power-manager.html	2008-11-08 11:28:20 UTC (rev 6019)
@@ -8,7 +8,7 @@
   a popup will be displayed to run the power manger if it is not already running. 
   Once the power manager is launched for the first time, it will place an autostart desktop file in your .config/autostart
   in order to be able to be launched automatically each time you log into your Xfce desktop.
-  </p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-configuration"></a>Power Manager Configuration</h2></div></div></div><div class="figure"><a name="id2791167"></a><p class="title"><b>Figure 1. Power Manager settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/settings.png" alt="Power Manager settings"></div></div></div></div><p><br class="figure-break"></p><p>
+  </p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-configuration"></a>Power Manager Configuration</h2></div></div></div><div class="figure"><a name="id2763457"></a><p class="title"><b>Figure 1. Power Manager settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/settings.png" alt="Power Manager settings"></div></div></div></div><p><br class="figure-break"></p><p>
   Almost all the <strong class="application"><code>xfce4-power-manager</code></strong> items are configurable from the configuration window, laptop users can set up 
   a power profile for two different modes “on battery power” and “on ac power”, desktop users still can change 
   DPMS settings and CPU frequency.
@@ -17,27 +17,25 @@
   the available manageabale interfaces.  
   </p><p>
   In this section we will describe the possible configuration for the power manager.
-  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General Settings</h3></div></div></div><div class="figure"><a name="id2782496"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
+  </p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-general"></a>General Settings</h3></div></div></div><div class="figure"><a name="id2782441"></a><p class="title"><b>Figure 2. General settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/general-settings.png" alt="General settings"></div></div></div></div><p><br class="figure-break"></p><p>
 	Here you can select the configuration of the system tray icon, enable/disable cpu frequency and DPMS controls. 
 	For example, you would need to disable DPMS control when watching a movie.	
-	</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-cpu"></a>CPU Settings</h3></div></div></div><div class="figure"><a name="id2788251"></a><p class="title"><b>Figure 3. CPU Linux governors</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/cpu-settings.png" alt="CPU Linux governors"></div></div></div></div><p><br class="figure-break"></p><p>
+	</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-cpu"></a>CPU Settings</h3></div></div></div><div class="figure"><a name="id2793311"></a><p class="title"><b>Figure 3. CPU Linux governors</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/cpu-settings.png" alt="CPU Linux governors"></div></div></div></div><p><br class="figure-break"></p><p>
 	The linux governors found in the system are listed as radio buttons.
 	If the acpi_cpufreq module is not loaded in the kernel or the cpu itself does not support frequency
 	changes these options might not show.
-	</p><p>Here is a brief descritption on linux cpu governors</p><div class="variablelist"><dl><dt><span class="term">Performance:</span></dt><dd><p> Set CPU to its maximum frequency: consume more power, 
+	</p><p>Here is a brief descritption on linux cpu governors</p><div class="variablelist"><dl><dt><span class="term">Best performance:</span></dt><dd><p> Set CPU to its maximum frequency: consume more power, 
 	and it is not ideal when running on battery.
-	</p></dd><dt><span class="term">Powersave:</span></dt><dd><p> 
+	</p></dd><dt><span class="term">Best power savings:</span></dt><dd><p> 
 	Set the CPU to its minimum frequency: ideal when running on battery power.	
-	</p></dd><dt><span class="term">Userspace:</span></dt><dd><p> This governor allows the use or any userspace
-	program running with UID "root" to set the CPU to a specific frequency.
-	</p></dd><dt><span class="term">Ondemand:</span></dt><dd><p> What you want is what you get: set the CPU depending on the
+	</p></dd><dt><span class="term">Ondemand performance:</span></dt><dd><p> What you want is what you get: set the CPU depending on the
 	current usage.
-	</p></dd><dt><span class="term">Conservative:</span></dt><dd><p> 
+	</p></dd><dt><span class="term">Good power savings:</span></dt><dd><p> 
 	 Same as Ondemand but differs in behaviour in that it gracefully increases and decreases 
 	 the CPU speed rather than jumping to max speed the moment there is any load on the CPU.
 	</p></dd></dl></div><p>
 NOTE:In <strong class="application"><code>xfce4-power-manager</code></strong> version 0.6.0 only Linux is supported for changing the CPU frequency.
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-battery"></a>Battery settings</h3></div></div></div><div class="figure"><a name="id2766178"></a><p class="title"><b>Figure 4. Battery settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-settings.png" alt="Battery settings"></div></div></div></div><p><br class="figure-break"></p><p>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-battery"></a>Battery settings</h3></div></div></div><div class="figure"><a name="id2799687"></a><p class="title"><b>Figure 4. Battery settings</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-settings.png" alt="Battery settings"></div></div></div></div><p><br class="figure-break"></p><p>
 	The user can select the his critical battery percentage, usually this is for a laptop or
 	UPS battery, this option is important for a broken battery for example, which lasts only 5 minutes when it
 	is 10% charged.    
@@ -48,11 +46,11 @@
    The battery notification is a way to notify the user when the battery state changes ( ex: battery charge is full )
    <p>
    
-   </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-button"></a>Keyboard shortcuts</h3></div></div></div><div class="figure"><a name="id2773802"></a><p class="title"><b>Figure 5. button control</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/button-settings.png" alt="button control"></div></div></div></div><p><br class="figure-break"></p>
+   </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-button"></a>Keyboard shortcuts</h3></div></div></div><div class="figure"><a name="id2781617"></a><p class="title"><b>Figure 5. button control</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/button-settings.png" alt="button control"></div></div></div></div><p><br class="figure-break"></p>
    For those buttons you can define an action to be taken by the power manager when pressing to one of them 
    - for example when you close the laptop screen. 
     
-  </div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-monitor"></a>Monitor settings</h3></div></div></div><div class="figure"><a name="id2795557"></a><p class="title"><b>Figure 6. Monitor DPMS and LCD brightness</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/monitor-settings.png" alt="Monitor DPMS and LCD brightness"></div></div></div></div><p><br class="figure-break"></p><p>
+  </div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xfpm-monitor"></a>Monitor settings</h3></div></div></div><div class="figure"><a name="id2800782"></a><p class="title"><b>Figure 6. Monitor DPMS and LCD brightness</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/monitor-settings.png" alt="Monitor DPMS and LCD brightness"></div></div></div></div><p><br class="figure-break"></p><p>
 	DPMS is an old X extension that allows standby/suspend/turn off options of the monitor, usually the timeouts 
 	have to be consecutive, so standby timeout is less than suspend timeout and so on, but any option can always
 	be disabled.
@@ -61,7 +59,7 @@
 	it detects that system in running on battery power and increase it again when the system is running
 	on AC power.
 	</p></div></div><p> </p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="xfpm-systray-notify"></a>System Tray Icon and Notification</h2></div></div></div><p>
-</p><div class="figure"><a name="id2784131"></a><p class="title"><b>Figure 7. Battery icon in the system tray</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery.png" alt="Battery icon in the system tray"></div></div></div></div><p><br class="figure-break"></p><p>
+</p><div class="figure"><a name="id2788178"></a><p class="title"><b>Figure 7. Battery icon in the system tray</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery.png" alt="Battery icon in the system tray"></div></div></div></div><p><br class="figure-break"></p><p>
 
 The "system tray" is an application running on a given X screen that can display small icons 
 provided by running applications. In Xfce, it is a panel plugin that catches the icon and resizes it
@@ -70,7 +68,7 @@
 </p><p>
 <strong class="application"><code>xfce4-power-manager</code></strong> uses GtkStatusIcon to display the different kinds of batteries found in the system.
 </p><p>
-</p><div class="figure"><a name="id2798136"></a><p class="title"><b>Figure 8. Battery Notification</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-discharging.png" alt="Battery Notification"></div></div></div></div><p><br class="figure-break"></p><p>
+</p><div class="figure"><a name="id2802112"></a><p class="title"><b>Figure 8. Battery Notification</b></p><div class="figure-contents"><div class="screenshot"><div class="mediaobject"><img src="images/battery-discharging.png" alt="Battery Notification"></div></div></div></div><p><br class="figure-break"></p><p>
 
 To notify the user about the status of the battery, serious errors occured, the notification daemon is used
 to display such messages.

Modified: xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml
===================================================================
--- xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/doc/C/xfce4-power-manager.xml	2008-11-08 11:28:20 UTC (rev 6019)
@@ -135,7 +135,7 @@
 <variablelist>
 
    <varlistentry>
-	<term>Performance:</term>
+	<term>Best performance:</term>
 	<listitem>
 	<para> Set CPU to its maximum frequency: consume more power, 
 	and it is not ideal when running on battery.
@@ -144,7 +144,7 @@
 	</varlistentry>
 	
 	<varlistentry>
-	<term>Powersave:</term>
+	<term>Best power savings:</term>
 	<listitem>
 	<para> 
 	Set the CPU to its minimum frequency: ideal when running on battery power.	
@@ -153,17 +153,8 @@
 	</varlistentry>
 	
 	<varlistentry>
-	<term>Userspace:</term>
+	<term>Ondemand performance:</term>
 	<listitem>
-	<para> This governor allows the use or any userspace
-	program running with UID "root" to set the CPU to a specific frequency.
-	</para>
-	</listitem>
-	</varlistentry>		
-	
-	<varlistentry>
-	<term>Ondemand:</term>
-	<listitem>
 	<para> What you want is what you get: set the CPU depending on the
 	current usage.
 	</para>
@@ -171,7 +162,7 @@
 	</varlistentry>	
 	
 	<varlistentry>
-	<term>Conservative:</term>
+	<term>Good power savings:</term>
 	<listitem>
 	<para> 
 	 Same as Ondemand but differs in behaviour in that it gracefully increases and decreases 

Modified: xfce4-power-manager/trunk/po/cs.po
===================================================================
--- xfce4-power-manager/trunk/po/cs.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/cs.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-07 15:03+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
@@ -20,61 +20,47 @@
 msgid "Unable to read adapter status, the power manager will not work properly"
 msgstr "Nelze zjistit stav adaptéru, správce napájení nebude fungovat korektně"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 msgid "Adapter is online"
 msgstr "Adaptér je připojen"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 msgid "Adapter is offline"
 msgstr "Adaptér je odpojen"
 
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:908
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:908
 msgid "Are you sure you want to hibernate the system?"
 msgstr "Opravdu chcete hibernovat systém?"
 
 #. Hibernate menu option
-#: ../src/xfpm-ac-adapter.c:360
-#: ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:803
-#: ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945
-#: ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954
-#: ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Hibernovat"
 
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:923
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:923
 msgid "Are you sure you want to suspend the system?"
 msgstr "Opravdu chcete přejít do režimu spánku"
 
 #. Suspend menu option
-#: ../src/xfpm-ac-adapter.c:374
-#: ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:925
-#: ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952
-#: ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Režim spánku"
 
 #: ../src/xfpm-battery.c:765
 msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Baterie je téměř vybitá. Uložte si svoji práci, abyste předešli ztrátě dat"
+msgstr ""
+"Baterie je téměř vybitá. Uložte si svoji práci, abyste předešli ztrátě dat"
 
-#: ../src/xfpm-battery.c:770
-#: ../src/xfpm-battery.c:1271
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:232
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:770 ../src/xfpm-battery.c:1271
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
+#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
 msgid "Xfce power manager"
 msgstr "Správce napájeni pro Xfce"
 
@@ -86,218 +72,227 @@
 msgid "Hibernate the system"
 msgstr "Hibernovat systém"
 
-#: ../src/xfpm-battery.c:810
-#: ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956
-#: ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Konfigurace záložního zdroje"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Konfigurace baterie"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Kritický stav nabití záložního zdroje"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Kritický stav nabití baterie"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "procent"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Je-li úroveň nabití baterie kritická, provést tuto akci:"
 
-#: ../src/xfpm-settings.c:463
-#: ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979
-#: ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Nic"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Povolit oznámení o nabíjení záložního zdroje"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Povolit oznámení o nabíjení baterie"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Povolit úsporný režim při napájení ze záložního zdroje"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Povolit úsporný režim při napájení z baterie"
 
-#: ../src/xfpm-settings.c:538
-#: ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Výkon"
 
-#: ../src/xfpm-settings.c:543
-#: ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Na vyžádání"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547
-#: ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Uživatelský prostor"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Výkon"
 
-#: ../src/xfpm-settings.c:551
-#: ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Úsporný"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555
-#: ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Konzervativní"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Správce napájeni pro Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Nastavení regulátoru procesoru při napájení ze záložního zdroje"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Nastavení regulátoru procesoru při napájení ze baterie"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Regulátor procesoru nebyl nalezen"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Ovládání frekvence procesoru nelze použít"
 
-#: ../src/xfpm-settings.c:743
-#: ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Při napájení z elektrické sítě"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Nastavení frekvence procesoru při napájení z elektrické sítě"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Nastavení frekvence procesoru"
 
-#: ../src/xfpm-settings.c:753
-#: ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Při napájení z baterie"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Povolit ovládání jasu displeje LCD"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Nastavení monitoru při napájení ze záložního zdroje"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Nastavení monitoru při napájení z baterie"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Nastavení monitoru při napájení z elektrické sítě"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Nastavení monitoru"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "Váš monitor nepodporuje ovládání DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Stisknete-li hlavní vypínač, provést tuto akci:"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Stisknete-li tlačítko režimu spánku, provést tuto akci:"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Při zavření laptopu"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Nebyly nalezeny žádné dostupné klávesové zkratky"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Obecná nastavení"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Ikon v oznamovací oblasti"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Vždy zobrazovat ikonu"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Pokud je přítomna baterie"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Pokud se baterie nabíjí nebo vybíjí"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Povolit ovládání změny frekvence procesoru"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Povolit ovládání správy napájení monitoru"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Pokročilá nastavení"
 
-#: ../src/xfpm-settings.c:1156
-#: ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Nastavení procesoru"
 
-#: ../src/xfpm-settings.c:1171
-#: ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Nastavení baterie"
 
-#: ../src/xfpm-settings.c:1187
-#: ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: ../src/xfpm-settings.c:1202
-#: ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Nastavení monitoru"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Předvolby správce napájení"
 
@@ -313,8 +308,7 @@
 msgid "You are running on Battery"
 msgstr "Napájení z baterie"
 
-#: ../src/xfpm-battery-icon.c:385
-#: ../src/xfpm-battery-icon.c:567
+#: ../src/xfpm-battery-icon.c:385 ../src/xfpm-battery-icon.c:567
 #: ../src/xfpm-battery-icon.c:571
 msgid "Battery is discharging"
 msgstr "Baterie se vybíjí"
@@ -323,8 +317,7 @@
 msgid "Your battery is discharging"
 msgstr "Baterie se vybíjí"
 
-#: ../src/xfpm-battery-icon.c:397
-#: ../src/xfpm-battery-icon.c:555
+#: ../src/xfpm-battery-icon.c:397 ../src/xfpm-battery-icon.c:555
 msgid "Battery is charging"
 msgstr "Baterie se nabíjí"
 
@@ -412,8 +405,7 @@
 msgid "Turn off after"
 msgstr "Vypnout po"
 
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1220
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1220
 msgid "Xfce4 Power Manager"
 msgstr "Správce napájení pro Xfce4"
 
@@ -471,11 +463,14 @@
 msgstr "Správce napájení pro Xfce"
 
 #: ../src/xfpm-main.c:88
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Nelze číst proměnnou prostředí domovského adresáře, funkce automatického spuštění nemusí fungovat"
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Nelze číst proměnnou prostředí domovského adresáře, funkce automatického "
+"spuštění nemusí fungovat"
 
-#: ../src/xfpm-main.c:163
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informace o použití získáte příkazem '%s --help'."
@@ -485,8 +480,7 @@
 msgid "Too many arguments"
 msgstr "Příliš mnoho argumentů"
 
-#: ../src/xfpm-main.c:198
-#: ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Správce napájení Xfce není spuštěn"
@@ -505,24 +499,41 @@
 msgstr "Správce napájení pro Xfce je již spuštěn"
 
 #: ../src/xfpm-main.c:233
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Nelze spustit správce napájení pro Xfce, ujistěte se, že abstraktní vrstva hardwaru a démon sběrnice zpráv běží"
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Nelze spustit správce napájení pro Xfce, ujistěte se, že abstraktní vrstva "
+"hardwaru a démon sběrnice zpráv běží"
 
 #: ../src/xfpm-main.c:237
 msgid "Unable to load xfce4 power manager"
 msgstr "Nelze zavést správce napájení pro xfce4"
 
 #: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Nelze číst stav adaptéru AC, správce napájení nebude pracovat správně. Možné důvody: Ovladač adaptéru AC není zaveden, přerušené spojení s abstraktní hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
+msgid ""
+"Unable to read AC adapter status, the power manager will not work properly. "
+"Possible reasons: The AC adapter driver is not loaded, broken connection "
+"with the hardware abstract layer or the message bus daemon is not running"
+msgstr ""
+"Nelze číst stav adaptéru AC, správce napájení nebude pracovat správně. Možné "
+"důvody: Ovladač adaptéru AC není zaveden, přerušené spojení s abstraktní "
+"hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
 
 #: ../src/xfpm-driver.c:728
 msgid "System failed to shutdown"
 msgstr "Vypnutí systému se nezdařilo"
 
 #: ../src/xfpm-driver.c:907
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Nelze použít službu správy napájení, funkce jako hibernace a režim spánku nebudou pracovat. Možné důvody: nemáte dostatečná oprávnění, přerušené spojení s abstraktní hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
+msgid ""
+"Unable to use power management service, functionalities like hibernate and "
+"suspend will not work. Possible reasons: you don't have enough permission, "
+"broken connection with the hardware abstract layer or the message bus daemon "
+"is not running"
+msgstr ""
+"Nelze použít službu správy napájení, funkce jako hibernace a režim spánku "
+"nebudou pracovat. Možné důvody: nemáte dostatečná oprávnění, přerušené "
+"spojení s abstraktní hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
 
 #: ../src/xfpm-driver.c:920
 msgid "Don't show this message again"
@@ -530,15 +541,16 @@
 
 #: ../src/xfpm-driver.c:1220
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "Načtení konfigurace správce napájení se nezdařilo, používá se výchozí nastavení"
+msgstr ""
+"Načtení konfigurace správce napájení se nezdařilo, používá se výchozí "
+"nastavení"
 
 #: ../src/xfpm-hal.c:172
 #, c-format
 msgid "Error monitoring HAL events"
 msgstr "Chyba při monitorování událostí vrstvy HAL"
 
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
 #, c-format
 msgid "Unable to connect to DBus: %s"
 msgstr "Spojení se sběrnicí DBus se nepodařilo navázat: %s"
@@ -572,14 +584,9 @@
 msgid "No hibernate method found"
 msgstr "Nebyla nalezena metoda pro hibernaci"
 
-#: ../src/xfpm-hal.c:675
-#: ../src/xfpm-hal.c:765
-#: ../src/xfpm-hal.c:859
-#: ../src/xfpm-hal.c:908
-#: ../src/xfpm-hal.c:958
-#: ../src/xfpm-hal.c:1010
-#: ../src/xfpm-hal.c:1062
-#: ../src/xfpm-hal.c:1108
+#: ../src/xfpm-hal.c:675 ../src/xfpm-hal.c:765 ../src/xfpm-hal.c:859
+#: ../src/xfpm-hal.c:908 ../src/xfpm-hal.c:958 ../src/xfpm-hal.c:1010
+#: ../src/xfpm-hal.c:1062 ../src/xfpm-hal.c:1108
 #, c-format
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
@@ -594,14 +601,12 @@
 msgid "System failed to hibernate"
 msgstr "Hibernace systému se nezdařila"
 
-#: ../src/xfpm-hal.c:734
-#: ../src/xfpm-hal.c:826
+#: ../src/xfpm-hal.c:734 ../src/xfpm-hal.c:826
 #, c-format
 msgid "Error occured while trying to suspend"
 msgstr "Při pokusu o přejití do režimu spánku došlo k chybě"
 
-#: ../src/xfpm-hal.c:737
-#: ../src/xfpm-hal.c:829
+#: ../src/xfpm-hal.c:737 ../src/xfpm-hal.c:829
 #, c-format
 msgid "Unknown reply from the message daemon"
 msgstr "Neznámá odpověď démona zpráv"
@@ -629,12 +634,16 @@
 #: ../src/xfpm-hal.c:976
 #, c-format
 msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Žádná odpověď od démona vrstvy HAL pro získání dostupných regulátorů procesoru"
+msgstr ""
+"Žádná odpověď od démona vrstvy HAL pro získání dostupných regulátorů "
+"procesoru"
 
 #: ../src/xfpm-hal.c:1028
 #, c-format
 msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "Žádná odpověď od démona vrstvy HAL pro získání stávajícího regulátoru procesoru"
+msgstr ""
+"Žádná odpověď od démona vrstvy HAL pro získání stávajícího regulátoru "
+"procesoru"
 
 #: ../src/xfpm-hal.c:1081
 #, c-format
@@ -644,8 +653,17 @@
 #: ../src/xfpm-hal.c:1127
 #, c-format
 msgid "No reply from HAL daemon to set power save profile"
-msgstr "Žádná odpověď od démona vrstvy HAL pro nastavení profilu úsporného režimu"
+msgstr ""
+"Žádná odpověď od démona vrstvy HAL pro nastavení profilu úsporného režimu"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Napájení"
@@ -662,3 +680,14 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Správce napájení pro Xfce 4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Na vyžádání"
+
+#~ msgid "Userspace"
+#~ msgstr "Uživatelský prostor"
+
+#~ msgid "Powersave"
+#~ msgstr "Úsporný"
+
+#~ msgid "Conservative"
+#~ msgstr "Konzervativní"

Modified: xfce4-power-manager/trunk/po/da.po
===================================================================
--- xfce4-power-manager/trunk/po/da.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/da.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-06 20:44+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -20,63 +20,51 @@
 
 #: ../src/xfpm-ac-adapter.c:217
 msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Kunne ikke aflæse tilslutningstilstand, strømstyringen vil ikke fungere korrekt"
+msgstr ""
+"Kunne ikke aflæse tilslutningstilstand, strømstyringen vil ikke fungere "
+"korrekt"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 msgid "Adapter is online"
 msgstr "Tilslutning tændt"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 msgid "Adapter is offline"
 msgstr "Tilslutning slukket"
 
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:908
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:908
 msgid "Are you sure you want to hibernate the system?"
 msgstr "Er du sikker på, at du ønsker systemet i dvaletilstand?"
 
 #. Hibernate menu option
-#: ../src/xfpm-ac-adapter.c:360
-#: ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:803
-#: ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945
-#: ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954
-#: ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Dvaletilstand"
 
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:923
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:923
 msgid "Are you sure you want to suspend the system?"
 msgstr "Er du sikker på, at du ønsker systemet i hviletilstand?"
 
 #. Suspend menu option
-#: ../src/xfpm-ac-adapter.c:374
-#: ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:925
-#: ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952
-#: ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Hviletilstand"
 
 #: ../src/xfpm-battery.c:765
 msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Dit batteris strømniveau er kritisk. Gem dine data for at undgå tab af data"
+msgstr ""
+"Dit batteris strømniveau er kritisk. Gem dine data for at undgå tab af data"
 
-#: ../src/xfpm-battery.c:770
-#: ../src/xfpm-battery.c:1271
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:232
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:770 ../src/xfpm-battery.c:1271
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
+#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
 msgid "Xfce power manager"
 msgstr "Strømstyring til Xfce"
 
@@ -88,223 +76,229 @@
 msgid "Hibernate the system"
 msgstr "Sæt systemet i dvaletilstand"
 
-#: ../src/xfpm-battery.c:810
-#: ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956
-#: ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Luk ned"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Nødstrømsindstilling"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Batteriindstilling"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Opfat nødstrømladning som kritisk"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Opfat batteriladning som kritisk"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "procent"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Ved kritisk strømniveau for batteri udfør"
 
-#: ../src/xfpm-settings.c:463
-#: ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979
-#: ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Aktivér påmindelse af UPS-ladning"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Aktivér påmindelse af batteritilstand"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Aktivér strømstyring ved nødstrømstrøm"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Aktivér strømstyring ved strøm fra batteri"
 
 # CPU governor
-#: ../src/xfpm-settings.c:538
-#: ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Ydelse (performance)"
 
-# CPU governor
-#: ../src/xfpm-settings.c:543
-#: ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Ved efterspørgsel (ondemand)"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
 # CPU governor
-#: ../src/xfpm-settings.c:547
-#: ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Bruger (userspace)"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Ydelse (performance)"
 
-# CPU governor
-#: ../src/xfpm-settings.c:551
-#: ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Maksimal strømbesparelse (powersave)"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-# CPU governor
-#: ../src/xfpm-settings.c:555
-#: ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Konservativ tilpasning (conservative)"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Strømstyring til Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Indstilling af processor-bestyrer ved nødstrøm"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Indstilling af processor-bestyrer ved strøm fra batteri"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Ingen processorbestyrer fundet"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Frekvenskontrol på processor kan ikke bruges"
 
-#: ../src/xfpm-settings.c:743
-#: ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Indstillinger ved vekselstrøm"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Indstilling af processorfrekvens ved vekselstrøm"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Indstillinger for processorfrekvens"
 
-#: ../src/xfpm-settings.c:753
-#: ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Når batteristrøm"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Aktivér LCD-lysstyrkekontrol"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Skærmindstillinger ved nødstrøm"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Skærmindstillinger ved strøm fra batteri"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Skærmindstillinger ved netstrøm"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Skærmindstillinger"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "Din skærm understøtter ikke DPMS-kontrol"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Tastaturgenveje"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Ved tryk på tænd-knap udfør"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Ved tryk på sove-knap udfør"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Når bærbarlåg er lukket"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Ingen tilgængelige tastaturgenveje fundet"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Generelle indstillinger"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Statusfeltikon"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Vis altid et ikon"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Når batteri er tilstede"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Når batteri oplader eller aflader"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Aktivér kontrol af frekvensskalering til processor"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Aktivér strømstyring til skærm"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Avancerede indstillinger"
 
-#: ../src/xfpm-settings.c:1156
-#: ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Processorindstillinger"
 
-#: ../src/xfpm-settings.c:1171
-#: ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Batteriindstillinger"
 
-#: ../src/xfpm-settings.c:1187
-#: ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: ../src/xfpm-settings.c:1202
-#: ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Skærmindstillinger"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Indstillinger af strømstyring"
 
@@ -320,8 +314,7 @@
 msgid "You are running on Battery"
 msgstr "Du kører på batterier"
 
-#: ../src/xfpm-battery-icon.c:385
-#: ../src/xfpm-battery-icon.c:567
+#: ../src/xfpm-battery-icon.c:385 ../src/xfpm-battery-icon.c:567
 #: ../src/xfpm-battery-icon.c:571
 msgid "Battery is discharging"
 msgstr "Batteri aflader"
@@ -330,8 +323,7 @@
 msgid "Your battery is discharging"
 msgstr "Dit batteri aflader"
 
-#: ../src/xfpm-battery-icon.c:397
-#: ../src/xfpm-battery-icon.c:555
+#: ../src/xfpm-battery-icon.c:397 ../src/xfpm-battery-icon.c:555
 msgid "Battery is charging"
 msgstr "Batteri oplader"
 
@@ -419,8 +411,7 @@
 msgid "Turn off after"
 msgstr "Sluk efter"
 
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1220
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1220
 msgid "Xfce4 Power Manager"
 msgstr "Strømstyring til Xfce4"
 
@@ -482,11 +473,14 @@
 msgstr "Strømstyring til Xfce"
 
 #: ../src/xfpm-main.c:88
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Kunne ikke læse din hjemmemappe-miljøvariabel, automatisk startvalg virker måske ikke"
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Kunne ikke læse din hjemmemappe-miljøvariabel, automatisk startvalg virker "
+"måske ikke"
 
-#: ../src/xfpm-main.c:163
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tast '%s --help' for brug."
@@ -496,8 +490,7 @@
 msgid "Too many arguments"
 msgstr "For mange argumenter"
 
-#: ../src/xfpm-main.c:198
-#: ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Strømstyring til Xfce kører ikke"
@@ -516,24 +509,41 @@
 msgstr "Strømstyring til Xfce kører allerede"
 
 #: ../src/xfpm-main.c:233
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Kunne ikke køre strømstyring til Xfce4. Kontrollér at HAL og beskedsbus-dæmonen kører"
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Kunne ikke køre strømstyring til Xfce4. Kontrollér at HAL og beskedsbus-"
+"dæmonen kører"
 
 #: ../src/xfpm-main.c:237
 msgid "Unable to load xfce4 power manager"
 msgstr "Kunne ikke indlæse strømstyring til Xfce4"
 
 #: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Kunne ikke læse strømtilslutnings status og derfor vil strømstyring ikke fungere korrekt. Mulige årsager: Drivprogrammet til strømstyring er ikke indlæst, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
+msgid ""
+"Unable to read AC adapter status, the power manager will not work properly. "
+"Possible reasons: The AC adapter driver is not loaded, broken connection "
+"with the hardware abstract layer or the message bus daemon is not running"
+msgstr ""
+"Kunne ikke læse strømtilslutnings status og derfor vil strømstyring ikke "
+"fungere korrekt. Mulige årsager: Drivprogrammet til strømstyring er ikke "
+"indlæst, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
 
 #: ../src/xfpm-driver.c:728
 msgid "System failed to shutdown"
 msgstr "Systemet kunne ikke lukke ned"
 
 #: ../src/xfpm-driver.c:907
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Kunne ikke bruge strømstyringstjeneste, funktioner som dvaletilstand og hviletilstand vil ikke virke. Mulige årsager: du har ikke tilstrækkelige rettigheder, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
+msgid ""
+"Unable to use power management service, functionalities like hibernate and "
+"suspend will not work. Possible reasons: you don't have enough permission, "
+"broken connection with the hardware abstract layer or the message bus daemon "
+"is not running"
+msgstr ""
+"Kunne ikke bruge strømstyringstjeneste, funktioner som dvaletilstand og "
+"hviletilstand vil ikke virke. Mulige årsager: du har ikke tilstrækkelige "
+"rettigheder, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
 
 #: ../src/xfpm-driver.c:920
 msgid "Don't show this message again"
@@ -541,15 +551,15 @@
 
 #: ../src/xfpm-driver.c:1220
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "Kunne ikke indlæse indstillinger for strømstyring, bruger standardværdier"
+msgstr ""
+"Kunne ikke indlæse indstillinger for strømstyring, bruger standardværdier"
 
 #: ../src/xfpm-hal.c:172
 #, c-format
 msgid "Error monitoring HAL events"
 msgstr "Fejl i overvågning af HAL-hændelser"
 
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
 #, c-format
 msgid "Unable to connect to DBus: %s"
 msgstr "Kunne ikke forbinde til DBus: %s"
@@ -583,14 +593,9 @@
 msgid "No hibernate method found"
 msgstr "Ingen hvile-metode fundet"
 
-#: ../src/xfpm-hal.c:675
-#: ../src/xfpm-hal.c:765
-#: ../src/xfpm-hal.c:859
-#: ../src/xfpm-hal.c:908
-#: ../src/xfpm-hal.c:958
-#: ../src/xfpm-hal.c:1010
-#: ../src/xfpm-hal.c:1062
-#: ../src/xfpm-hal.c:1108
+#: ../src/xfpm-hal.c:675 ../src/xfpm-hal.c:765 ../src/xfpm-hal.c:859
+#: ../src/xfpm-hal.c:908 ../src/xfpm-hal.c:958 ../src/xfpm-hal.c:1010
+#: ../src/xfpm-hal.c:1062 ../src/xfpm-hal.c:1108
 #, c-format
 msgid "Out of memory"
 msgstr "Er løbet tør for hukommelse"
@@ -605,14 +610,12 @@
 msgid "System failed to hibernate"
 msgstr "System kunne ikke gå i dvaletilstand"
 
-#: ../src/xfpm-hal.c:734
-#: ../src/xfpm-hal.c:826
+#: ../src/xfpm-hal.c:734 ../src/xfpm-hal.c:826
 #, c-format
 msgid "Error occured while trying to suspend"
 msgstr "En fejl opstod under forsøg på at bringe i hviletilstand"
 
-#: ../src/xfpm-hal.c:737
-#: ../src/xfpm-hal.c:829
+#: ../src/xfpm-hal.c:737 ../src/xfpm-hal.c:829
 #, c-format
 msgid "Unknown reply from the message daemon"
 msgstr "Ukendt svar fra besked-dæmonenen"
@@ -640,12 +643,15 @@
 #: ../src/xfpm-hal.c:976
 #, c-format
 msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Intet svar fra HAL-dæmon for at få kontakt til tilgængelige processor-bestyrere"
+msgstr ""
+"Intet svar fra HAL-dæmon for at få kontakt til tilgængelige processor-"
+"bestyrere"
 
 #: ../src/xfpm-hal.c:1028
 #, c-format
 msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "Intet svar fra HAL-dæmon for at få kontakt til nuværende processor-bestyrer"
+msgstr ""
+"Intet svar fra HAL-dæmon for at få kontakt til nuværende processor-bestyrer"
 
 #: ../src/xfpm-hal.c:1081
 #, c-format
@@ -657,6 +663,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr "Intet svar fra HAL-dæmon til indstilling af strømspareprofil"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Strøm"
@@ -673,3 +687,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Strømstyring til Xfce4"
 
+# CPU governor
+#~ msgid "Ondemand"
+#~ msgstr "Ved efterspørgsel (ondemand)"
+
+# CPU governor
+#~ msgid "Userspace"
+#~ msgstr "Bruger (userspace)"
+
+# CPU governor
+#~ msgid "Powersave"
+#~ msgstr "Maksimal strømbesparelse (powersave)"
+
+# CPU governor
+#~ msgid "Conservative"
+#~ msgstr "Konservativ tilpasning (conservative)"

Modified: xfce4-power-manager/trunk/po/de.po
===================================================================
--- xfce4-power-manager/trunk/po/de.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/de.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-10-27 22:38+0100\n"
 "Last-Translator: Mark Trompell <mark at foresightlinux.org>\n"
 "Language-Team: German\n"
@@ -41,9 +41,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Tiefschlaf"
 
@@ -55,8 +55,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Ruhezustand"
 
@@ -81,205 +81,229 @@
 msgid "Hibernate the system"
 msgstr "Das System in den Tiefschlaf versetzen"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Konfiguration der USV"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Batteriekonfiguration"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Ladezustand der USV als kritisch betrachten bei"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Ladezustand der Batterie als kritisch betrachten bei"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "Prozent"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Bei kritischem Ladezustand der Batterie:"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Nichts"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Benachrichtigung über Ladezustand der USV aktivieren"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Benachrichtigung über Batteriezustand aktivieren"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Stromsparen bei Strom über USV aktivieren"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Stromsparen bei Batteristrom aktivieren"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Leistung"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Bedarfsorientiert"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Benutzerdefiniert"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Leistung"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Strom sparen"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Gemächliche Bedarfsorientierung"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Energieverwaltung für Xfce4"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Einstellungen des CPU-Multiplikators bei Strom über USV"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Einstellungen des CPU-Multiplikators bei Batterieversorgung"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Kein CPU-Multiplikator gefunden"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Steuerung der CPU-Frequenz nicht möglich"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 #, fuzzy
 msgid "On electric power"
 msgstr "Monitoreinstellungen bei Netzversorgung"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Einstellungen der CPU-Frequenz bei Netzstrom"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Einstellungen der CPU-Frequenz"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 #, fuzzy
 msgid "On battery power"
 msgstr "Wenn die Batterie verfügbar ist"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Helligkeitssteuerung erlauben"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Monitoreinstellungen bei Strom über USV"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Monitoreinstellungen bei Batteriestrom"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Monitoreinstellungen bei Netzversorgung"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Monitoreinstellungen"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "Ihr Monitor unterstützt kein DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Tastenkürzel"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Bei Betätigung der Taste für den Schlafmodus:"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Beim Schließen der Bildschirmklappe:"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Keine verfügbaren Tastenkürzel gefunden"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Symbol in der Systemleiste"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Immer ein Symbol zeigen"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Wenn die Batterie verfügbar ist"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Wenn sich die Batterie lädt oder entlädt"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Skalierung der CPU-Frequenz aktivieren"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Energieverwaltung für Monitor aktivieren"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Erweitert"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "CPU-Einstellungen"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Batterieeinstellungen"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Monitoreinstellungen"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Einstellungen für die Energieverwaltung"
 
@@ -654,6 +678,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr "Keine Antwort vom HAL-Daemon, das Stromsparprofil zu laden"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Strom"
@@ -670,6 +702,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Energieverwaltung für Xfce4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Bedarfsorientiert"
+
+#~ msgid "Userspace"
+#~ msgstr "Benutzerdefiniert"
+
+#~ msgid "Powersave"
+#~ msgstr "Strom sparen"
+
+#~ msgid "Conservative"
+#~ msgstr "Gemächliche Bedarfsorientierung"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Teil der Xfce Goodies"
 

Modified: xfce4-power-manager/trunk/po/fi.po
===================================================================
--- xfce4-power-manager/trunk/po/fi.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/fi.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-04 17:47+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish\n"
@@ -36,9 +36,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Lepotila"
 
@@ -50,8 +50,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Keskeytystila"
 
@@ -73,203 +73,227 @@
 msgid "Hibernate the system"
 msgstr "Aseta järjestelmä lepotilaan"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Sammuta"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "UPS-laite"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Akkuvirta"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "UPS on lähes tyhjä, kun virtaa on:"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Akku on lähes tyhjä, kun virtaa on:"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "prosenttia"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Kun akku on lähes tyhjä:"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Älä tee mitään"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Ilmoita UPS-laitteen lataus"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Ilmoita akun tila"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Virransäästö UPS-laitteen varassa"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Virransäästö käytettäessä akkuvirtaa"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Täysi teho"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Tarpeen mukaan"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Käyttäjätaso"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Täysi teho"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Pienin teho"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Konservatiivinen"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Xfce:n virranhallinta"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Suorittimen tehoprofiili UPS:n varassa"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Suorittimen tehoprofiili akkuvirralla"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Ei tehoprofiileja käytettävissä"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Suorittimen taajuutta ei voi hallita"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Verkkovirta"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Suorittimen tehoprofiili verkkovirralla"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Suorittimen teho"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Akkukäyttö"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Säädä LCD:n kirkkautta"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Näytön virransäästö UPS:n varassa"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Näytön virransäästö akkuvirralla"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Näytön virransäästö verkkovirralla"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Näyttö"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "Näyttösi ei tue DPMS-virransäästöä"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Painettaessa virtanäppäintä"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Painettaessa lepotilanäppäintä"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Kun kansi on suljettu"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Pikanäppäimiä ei käytettävissä"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Yleiset asetukset"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Järjestelmälokeron kuvake"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Näytä kuvake aina"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Näytä, kun akku on liitetty"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Näytä, kun akku latautuu tai purkautuu"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Hallitse suorittimen taajuutta"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Hallitse näytön virransäästöä"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Lisäasetukset"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Suoritinasetukset"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Akkukäyttö"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Näytön asetukset"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Virranhallinnan asetukset"
 
@@ -629,6 +653,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr "HAL-palvelu ei vastannut virransäästöprofiilin asettamiseen"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Virranhallinta"
@@ -645,5 +677,17 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Xfce4 virranhallinta"
 
+#~ msgid "Ondemand"
+#~ msgstr "Tarpeen mukaan"
+
+#~ msgid "Userspace"
+#~ msgstr "Käyttäjätaso"
+
+#~ msgid "Powersave"
+#~ msgstr "Pienin teho"
+
+#~ msgid "Conservative"
+#~ msgstr "Konservatiivinen"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Osa Xfce:n goodies-projektia"

Modified: xfce4-power-manager/trunk/po/fr.po
===================================================================
--- xfce4-power-manager/trunk/po/fr.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/fr.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-10-31 21:05+0100\n"
 "Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -39,9 +39,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Mettre en hibernation"
 
@@ -53,8 +53,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Mettre en veille"
 
@@ -79,208 +79,231 @@
 msgid "Hibernate the system"
 msgstr "Mettre le système en hibernation"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Éteindre"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Configuration de l'onduleur"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Configuration de la batterie"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 #, fuzzy
 msgid "Consider UPS charge critical"
 msgstr "Niveau de la batterie critique"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Niveau de la batterie critique"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "pour cent"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Action pour le niveau de la batterie critique"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Rien"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Activer la notification du niveau de charge l'onduleur"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Activer la notification du niveau de la batterie"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr ""
 "Activer le mode d'économie d'énergie quand le système fonctionne sur onduleur"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr ""
 "Activer le mode d'économie d'énergie quand le système fonctionne sur batterie"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Performance"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Ondemand (à la demande du processeur)"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Userspace (géré par un programme)"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Performance"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Powersave (économie)"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Conservative"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Gestionnaire d'alimentation Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Mode du processeur quand le système fonctionne sur onduleur"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Mode du processeur quand le système fonctionne sur batterie"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Aucun mode du processeur disponible"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Le contrôle de fréquence du processeur est inutilisable"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Sur secteur"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Fréquence du processeur quand le système fonctionne sur secteur"
 
-#: ../src/xfpm-settings.c:748
+#: ../src/xfpm-settings.c:710
 #, fuzzy
-msgid "CPU freq settings"
+msgid "CPU frequency settings"
 msgstr "Contrôle de fréquence"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Sur batterie"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Activer le contrôle de la luminosité de l'écran"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Réglages de l'écran quand le système fonctionne sur onduleur"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Réglages de l'écran quand le système fonctionne sur batterie"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Réglages DPMS de l'écran quand le système fonctionne sur secteur"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Réglages DPMS de l'écran"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "L'écran ne supporte pas les réglages DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis claviers"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Action pour le bouton d'alimentation"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Action pour le bouton de mise en veille"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Aucun raccourci clavier disponible"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Options générales"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Icône dans la zone de notification"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Toujours afficher une icône"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Quand la batterie est présente"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Quand la batterie se charge ou se décharge"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Activer le contrôle de fréquence du processeur"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 #, fuzzy
 msgid "Enable monitor power management control"
 msgstr "Activer le contrôle de fréquence du processeur"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Réglages avancés"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Processeur"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Batterie"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Écran"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Préférences du gestionnaire d'alimentation"
 
@@ -653,6 +676,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr "Pas de réponse du démon HAL pour régler le profil d'économie d'énergie"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 #, fuzzy
 msgid "Power"
@@ -673,6 +704,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Gestionnaire d'alimentation Xfce4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Ondemand (à la demande du processeur)"
+
+#~ msgid "Userspace"
+#~ msgstr "Userspace (géré par un programme)"
+
+#~ msgid "Powersave"
+#~ msgstr "Powersave (économie)"
+
+#~ msgid "Conservative"
+#~ msgstr "Conservative"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Membre du projet Xfce Goodies"
 

Modified: xfce4-power-manager/trunk/po/id.po
===================================================================
--- xfce4-power-manager/trunk/po/id.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/id.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-10-30 21:13+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian\n"
@@ -37,9 +37,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Hibernasi"
 
@@ -51,8 +51,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Suspensi"
 
@@ -77,203 +77,227 @@
 msgid "Hibernate the system"
 msgstr "Hibernasi sistem"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Matikan"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Konfigurasi UPS"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Konfigurasi baterai"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Anggap muatan UPS kritis"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Anggap muatan baterai kritis"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "persen"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Ketika level muatan baterai kritis maka lakukan"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Tak ada"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Aktifkan notifikasi muatan UPS"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Aktifkan notifikasi kondisi baterai"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Aktifkan penyimpan daya di tenaga UPS"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Aktifkan penyimpan daya di tenaga baterai"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Performa"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Sesuaipermintaan"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Ruangpengguna"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Performa"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Penyimpandaya"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Konservatif"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Manajer daya Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Pengaturan governor CPU pada daya UPS"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Pengaturan governor CPU pada daya baterai"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Tak ada governor CPU yang ditemukan"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Kendali frekuensi CPU tak dapat digunakan"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Pada daya listrik"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Pengaturan frekuensi CPU pada daya listrik"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Pengaturan frekuensi CPU"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Pada daya baterai"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Aktifkan kendali kecerahan LCD"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Pengaturan monitor pada daya UPS"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Pengaturan monitor pada daya baterai"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Pengaturan monitor pada daya listrik"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Pengaturan monitor"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "Monitor anda tak mendukung kendali DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Jalan pintas papan ketik"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Ketika tombol power ditekan maka lakukan"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Ketika tombol sleep ditekan maka lakukan"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Ketika laptop ditutup"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Tak ada jalan pintas papan ketik yang ditemukan"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Opsi Umum"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Ikon baki sistem"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Selalu Tampilkan ikon"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Ketika baterai hadir"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Ketika baterai diisi ulang atau tidak diisi"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Aktifkan kendali skala frekuensi CPU"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Aktifkan monitor kendali manajemen daya"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Pengaturan mahir"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Pengaturan CPU"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Pengaturan baterai"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Jalan pintas"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Pengaturan Monitor"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Pengaturan Manajer Daya"
 
@@ -641,6 +665,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr "Tak ada balasan dari jurik HAL untuk mengatur profil penyimpanan daya"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Daya"
@@ -657,6 +689,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Manajer Daya Xfce 4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Sesuaipermintaan"
+
+#~ msgid "Userspace"
+#~ msgstr "Ruangpengguna"
+
+#~ msgid "Powersave"
+#~ msgstr "Penyimpandaya"
+
+#~ msgid "Conservative"
+#~ msgstr "Konservatif"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Bagian dari proyek goodies Xfce"
 

Modified: xfce4-power-manager/trunk/po/ja.po
===================================================================
--- xfce4-power-manager/trunk/po/ja.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/ja.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-10-29 23:41+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -38,9 +38,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "ハイバネート"
 
@@ -52,8 +52,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "サスペンド"
 
@@ -78,203 +78,227 @@
 msgid "Hibernate the system"
 msgstr "システムをハイバネートします"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "シャットダウン"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "UPS 設定"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "バッテリ設定"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "UPS 充電量が危機的とみなす割合"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "バッテリ充電量が危機的とみなす割合"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "パーセント"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "バッテリ充電量が危機的状態になった時"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "何もしない"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "UPS 充電通知を有効にする"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "バッテリの状態通知を有効にする"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "UPS 電源時のパワーセーブを有効にする"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "バッテリ駆動時のパワーセーブを有効にする"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "パフォーマンス"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "オンデマンド"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "ユーザスペース"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "パフォーマンス"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "パワーセーブ"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "コンサバティブ"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Xfce 電源管理"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "UPS 電源時の CPU ガバナ設定"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "バッテリ駆動時の CPU ガバナ設定"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "CPU ガバナが見つかりません"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "CPU 周波数制御は使用できません"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "通常電源時"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "通常電源時の CPU 周波数設定"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "CPU 周波数設定"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "バッテリ電源"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "LCD 輝度制御を有効にする"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "UPS 電源時のモニタ設定"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "バッテリ駆動時のモニタ設定"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "通常電源時のモニタ設定"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "モニタ設定"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "モニタは DPMS 制御をサポートしていません"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "電源ボタンが押されたときに動作"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "スリープボタンが押されたときに動作"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "ラップトップの蓋が閉じられたとき"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "有効なキーボードショートカットが見つかりません"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "一般設定"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "システムトレイアイコン"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "常に表示する"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "バッテリが存在するとき"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "バッテリが充電中または放電中の時"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "CPU 周波数スケーリング制御を有効にする"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "モニタ電源管理制御を有効にする"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "拡張設定"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "CPU 設定"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "バッテリ設定"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "ショートカットキー"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "モニタ設定"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "電源管理設定"
 
@@ -640,6 +664,14 @@
 msgstr ""
 "HAL デーモンからパワーセーブプロファイルを設定するための応答がありません"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "電源"
@@ -656,6 +688,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Xfce 4 電源管理"
 
+#~ msgid "Ondemand"
+#~ msgstr "オンデマンド"
+
+#~ msgid "Userspace"
+#~ msgstr "ユーザスペース"
+
+#~ msgid "Powersave"
+#~ msgstr "パワーセーブ"
+
+#~ msgid "Conservative"
+#~ msgstr "コンサバティブ"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Xfce goodies project のひとつ"
 

Modified: xfce4-power-manager/trunk/po/nl.po
===================================================================
--- xfce4-power-manager/trunk/po/nl.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/nl.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-07 14:21+0100\n"
 "Last-Translator: Vincent Tunru <projects at vinnl.nl>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -15,68 +15,56 @@
 #: ../src/xfpm-ac-adapter.c:217
 #, fuzzy
 msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Onbekende status van adapter, energiebeheer werkt mogelijk niet correct"
+msgstr ""
+"Onbekende status van adapter, energiebeheer werkt mogelijk niet correct"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 #, fuzzy
 msgid "Adapter is online"
 msgstr "De adapter is online"
 
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
 #, fuzzy
 msgid "Adapter is offline"
 msgstr "De adapter is offline"
 
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:908
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:908
 #, fuzzy
 msgid "Are you sure you want to hibernate the system?"
 msgstr "Weet u zeker dat u het systeem in de slaapstand wilt brengen"
 
 #. Hibernate menu option
-#: ../src/xfpm-ac-adapter.c:360
-#: ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:803
-#: ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945
-#: ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954
-#: ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Slaapstand"
 
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:923
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:923
 #, fuzzy
 msgid "Are you sure you want to suspend the system?"
 msgstr "Weet u zeker dat u het systeem in de pauzestand wilt brengen"
 
 #. Suspend menu option
-#: ../src/xfpm-ac-adapter.c:374
-#: ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:925
-#: ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952
-#: ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Pauzestand"
 
 #: ../src/xfpm-battery.c:765
 #, fuzzy
 msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Het energie-niveau van de batterij is kritiek - sla uw werk op om dataverlies te voorkomen"
+msgstr ""
+"Het energie-niveau van de batterij is kritiek - sla uw werk op om "
+"dataverlies te voorkomen"
 
-#: ../src/xfpm-battery.c:770
-#: ../src/xfpm-battery.c:1271
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:232
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:770 ../src/xfpm-battery.c:1271
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
+#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
 msgid "Xfce power manager"
 msgstr "Xfce energiebeheer"
 
@@ -88,230 +76,237 @@
 msgid "Hibernate the system"
 msgstr "Slaapstand"
 
-#: ../src/xfpm-battery.c:810
-#: ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956
-#: ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Afsluiten"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 #, fuzzy
 msgid "UPS configuration"
 msgstr "Ups-configuratie"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Batterij-configuratie"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 #, fuzzy
 msgid "Consider UPS charge critical"
 msgstr "Beschouw de batterijlading als kritiek"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Beschouw de batterijlading als kritiek"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "procent"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Als het energieniveau van de batterij kritiek is"
 
-#: ../src/xfpm-settings.c:463
-#: ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979
-#: ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Niets doen"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 #, fuzzy
 msgid "Enable UPS charge notification"
 msgstr "Ups-opladen notificatie inschakelen"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Batterij-status-notificatie inschakelen"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 #, fuzzy
 msgid "Enable power save on UPS power"
 msgstr "Energiebesparende modus op ups-energie inschakelen"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 #, fuzzy
 msgid "Enable power save on battery power"
 msgstr "Energiebesparende modus op batterij inschakelen"
 
-#: ../src/xfpm-settings.c:538
-#: ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Prestaties"
 
-#: ../src/xfpm-settings.c:543
-#: ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Op verzoek"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547
-#: ../src/xfpm-settings.c:640
-msgid "Userspace"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Prestaties"
+
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
 msgstr ""
 
-#: ../src/xfpm-settings.c:551
-#: ../src/xfpm-settings.c:644
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
 #, fuzzy
-msgid "Powersave"
-msgstr "Energiebesparend"
+msgid "Best power savings"
+msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-settings.c:555
-#: ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Conservatief"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
 msgstr ""
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
+msgstr "CPU-instellingen"
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
+msgstr "Energiebesparende modus op batterij inschakelen"
+
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr ""
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr ""
 
-#: ../src/xfpm-settings.c:743
-#: ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
-msgstr ""
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
+msgstr "Energiebesparende modus op batterij inschakelen"
 
-#: ../src/xfpm-settings.c:748
+#: ../src/xfpm-settings.c:710
 #, fuzzy
-msgid "CPU freq settings"
+msgid "CPU frequency settings"
 msgstr "CPU-instellingen"
 
-#: ../src/xfpm-settings.c:753
-#: ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 #, fuzzy
 msgid "On battery power"
 msgstr "Als er een batterij is"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 #, fuzzy
 msgid "Enable LCD brightness control"
 msgstr "LCD-helderheid-beheer inschakelen"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 #, fuzzy
 msgid "Monitor settings on battery power"
 msgstr "Energiebesparende modus op batterij inschakelen"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Als de aan/uit-knop wordt ingedrukt"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 #, fuzzy
 msgid "When sleep button is pressed do"
 msgstr "Als de slaapknop wordt ingedrukt"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Geen beschikbare sneltoetsen gevonden"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Algemene opties"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Pictogram in systeemvak"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Altijd een pictogram weergeven"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Als er een batterij is"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Als de batterij aan het opladen of ontladen is"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
-msgstr ""
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
+msgstr "LCD-helderheid-beheer inschakelen"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Geavanceerde instellingen"
 
-#: ../src/xfpm-settings.c:1156
-#: ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 #, fuzzy
 msgid "CPU settings"
 msgstr "CPU-instellingen"
 
-#: ../src/xfpm-settings.c:1171
-#: ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Batterij-instellingen"
 
-#: ../src/xfpm-settings.c:1187
-#: ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../src/xfpm-settings.c:1202
-#: ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Voorkeuren energiebeheer"
 
@@ -330,8 +325,7 @@
 msgid "You are running on Battery"
 msgstr "U werkt op de batterij"
 
-#: ../src/xfpm-battery-icon.c:385
-#: ../src/xfpm-battery-icon.c:567
+#: ../src/xfpm-battery-icon.c:385 ../src/xfpm-battery-icon.c:567
 #: ../src/xfpm-battery-icon.c:571
 msgid "Battery is discharging"
 msgstr "De batterij is aan het ontladen"
@@ -340,8 +334,7 @@
 msgid "Your battery is discharging"
 msgstr "De batterij is aan het ontladen"
 
-#: ../src/xfpm-battery-icon.c:397
-#: ../src/xfpm-battery-icon.c:555
+#: ../src/xfpm-battery-icon.c:397 ../src/xfpm-battery-icon.c:555
 msgid "Battery is charging"
 msgstr "De batterij is aan het opladen"
 
@@ -431,8 +424,7 @@
 msgid "Turn off after"
 msgstr "Afsluiten na"
 
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1220
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1220
 msgid "Xfce4 Power Manager"
 msgstr "Energiebeheer"
 
@@ -494,11 +486,14 @@
 msgstr "Energiebeheer"
 
 #: ../src/xfpm-main.c:88
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Kan de locatie van uw persoonlijke map niet uitlezen, wellicht werkt autostarten niet"
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Kan de locatie van uw persoonlijke map niet uitlezen, wellicht werkt "
+"autostarten niet"
 
-#: ../src/xfpm-main.c:163
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Type '%s --help' voor gebruiksinstructies."
@@ -508,8 +503,7 @@
 msgid "Too many arguments"
 msgstr "Te veel argumenten"
 
-#: ../src/xfpm-main.c:198
-#: ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
 #, fuzzy, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce energiebeheer"
@@ -530,8 +524,12 @@
 
 #: ../src/xfpm-main.c:233
 #, fuzzy
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Kan het energiebeheer niet uitvoeren, controlleer of HAL en de berichtenserver draaien"
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Kan het energiebeheer niet uitvoeren, controlleer of HAL en de "
+"berichtenserver draaien"
 
 #: ../src/xfpm-main.c:237
 #, fuzzy
@@ -539,7 +537,10 @@
 msgstr "Energiebeheer"
 
 #: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
+msgid ""
+"Unable to read AC adapter status, the power manager will not work properly. "
+"Possible reasons: The AC adapter driver is not loaded, broken connection "
+"with the hardware abstract layer or the message bus daemon is not running"
 msgstr ""
 
 #: ../src/xfpm-driver.c:728
@@ -548,8 +549,15 @@
 
 #: ../src/xfpm-driver.c:907
 #, fuzzy
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Kan energiebeheer niet gebruiken, functies zoals de slaap- en pauzestand zullen niet werken. Mogelijke redenen: onvoldoende rechten, foutieve verbinding met de hardware, of de berichtenserver is niet actief."
+msgid ""
+"Unable to use power management service, functionalities like hibernate and "
+"suspend will not work. Possible reasons: you don't have enough permission, "
+"broken connection with the hardware abstract layer or the message bus daemon "
+"is not running"
+msgstr ""
+"Kan energiebeheer niet gebruiken, functies zoals de slaap- en pauzestand "
+"zullen niet werken. Mogelijke redenen: onvoldoende rechten, foutieve "
+"verbinding met de hardware, of de berichtenserver is niet actief."
 
 #: ../src/xfpm-driver.c:920
 msgid "Don't show this message again"
@@ -565,8 +573,7 @@
 msgid "Error monitoring HAL events"
 msgstr ""
 
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
 #, c-format
 msgid "Unable to connect to DBus: %s"
 msgstr ""
@@ -600,14 +607,9 @@
 msgid "No hibernate method found"
 msgstr "Geen slaapstand-methode gevonden"
 
-#: ../src/xfpm-hal.c:675
-#: ../src/xfpm-hal.c:765
-#: ../src/xfpm-hal.c:859
-#: ../src/xfpm-hal.c:908
-#: ../src/xfpm-hal.c:958
-#: ../src/xfpm-hal.c:1010
-#: ../src/xfpm-hal.c:1062
-#: ../src/xfpm-hal.c:1108
+#: ../src/xfpm-hal.c:675 ../src/xfpm-hal.c:765 ../src/xfpm-hal.c:859
+#: ../src/xfpm-hal.c:908 ../src/xfpm-hal.c:958 ../src/xfpm-hal.c:1010
+#: ../src/xfpm-hal.c:1062 ../src/xfpm-hal.c:1108
 #, c-format
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen"
@@ -623,14 +625,12 @@
 msgid "System failed to hibernate"
 msgstr "Kon de slaapstand niet aanvangen"
 
-#: ../src/xfpm-hal.c:734
-#: ../src/xfpm-hal.c:826
+#: ../src/xfpm-hal.c:734 ../src/xfpm-hal.c:826
 #, c-format
 msgid "Error occured while trying to suspend"
 msgstr "Fout bij aanvangen van pauzestand"
 
-#: ../src/xfpm-hal.c:737
-#: ../src/xfpm-hal.c:829
+#: ../src/xfpm-hal.c:737 ../src/xfpm-hal.c:829
 #, fuzzy, c-format
 msgid "Unknown reply from the message daemon"
 msgstr "Onbekend antwoord van de berichtenserver"
@@ -659,12 +659,14 @@
 #: ../src/xfpm-hal.c:976
 #, fuzzy, c-format
 msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Geen antwoord van HAL-daemon om de beschikbare CPU-beheerders te achterhalen"
+msgstr ""
+"Geen antwoord van HAL-daemon om de beschikbare CPU-beheerders te achterhalen"
 
 #: ../src/xfpm-hal.c:1028
 #, fuzzy, c-format
 msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "Geen antwoord van HAL-daemon om de huidige CPU-beheerder te achterhalen"
+msgstr ""
+"Geen antwoord van HAL-daemon om de huidige CPU-beheerder te achterhalen"
 
 #: ../src/xfpm-hal.c:1081
 #, c-format
@@ -674,8 +676,17 @@
 #: ../src/xfpm-hal.c:1127
 #, c-format
 msgid "No reply from HAL daemon to set power save profile"
-msgstr "Geen antwoord van HAL-daemon om een energiebesparend profiel op te slaan"
+msgstr ""
+"Geen antwoord van HAL-daemon om een energiebesparend profiel op te slaan"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 #, fuzzy
 msgid "Power"
@@ -696,8 +707,19 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Energiebeheer"
 
+#~ msgid "Ondemand"
+#~ msgstr "Op verzoek"
+
+#, fuzzy
+#~ msgid "Powersave"
+#~ msgstr "Energiebesparend"
+
+#~ msgid "Conservative"
+#~ msgstr "Conservatief"
+
 #~ msgid "Your battery charge level is critical"
 #~ msgstr "Het energie-niveau van de batterij is kritiek"
+
 #~ msgid "Battery charge level is critical"
 #~ msgstr "Het energie-niveau van de batterij is kritiek"
 
@@ -708,4 +730,3 @@
 #, fuzzy
 #~ msgid "When lid button is pressed do"
 #~ msgstr "Als de deksel-knop wordt omgezet"
-

Modified: xfce4-power-manager/trunk/po/pt_BR.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_BR.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/pt_BR.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-03 20:07+0100\n"
 "Last-Translator: Vladimir Melo <vmelo at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -37,9 +37,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -50,8 +50,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Suspender"
 
@@ -75,203 +75,227 @@
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Desligar"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Configuração de UPS"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Configuração da bateria"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Considerar carga de UPS crítica"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Considerar carga da bateria crítica"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "percentagem"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Quando o nível da carga da bateria estiver crítico fazer"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Nada"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Habilitar notificação da carga de UPS"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Habilitar notificação do estado da bateria"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Habilitar economia de energia de UPS"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Habilitar economia de energia da bateria"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Desempenho"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Sob demanda"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Espaço de usuário"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Desempenho"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Economia de energia"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Conservador"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Gerenciador de energia Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Configurações do governador de CPU quando usando UPS"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Configurações do governador de CPU quando usando bateria"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Nenhum governador de CPU localizado"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Controle de freqüência da CPU não pode ser usado"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "Em energia elétrica"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Configurações de freqüência da CPU quando usando energia elétrica"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Configurações de freqüência da CPU"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "Em energia da bateria"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Habilitar controle de brilho do LCD"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Configurações do monitor quando usando UPS"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Configurações do monitor quando usando energia da bateria"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Configurações do monitor quando usando energia elétrica"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "configurações do monitor"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "O seu monitor não tem suporte para controlar DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Atalhos de teclado"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Quando o botão desligar é pressionado fazer"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Quando o botão sleep é pressionado fazer"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Quando a tampa do laptop está fechada"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Nenhum atalho de teclado foi localizado"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Opções gerais"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Ícone de notificação do sistema"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Sempre exibir um ícone"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Quando a bateria está presente"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Quando a bateria está carregando ou descarregando"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Habilitar controle da escala de frequência da CPU"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Habilitar controle do gerenciador de energia do monitor"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Configurações avançadas"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Configurações da CPU"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Configurações da bateria"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Configurações do monitor"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Preferências do Gerenciador de energia"
 
@@ -638,6 +662,14 @@
 msgstr ""
 "Nenhuma resposta do daemon HAL para definir o perfil de economia de energia"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Energia"
@@ -654,6 +686,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Gerenciador de energia do Xfce 4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Sob demanda"
+
+#~ msgid "Userspace"
+#~ msgstr "Espaço de usuário"
+
+#~ msgid "Powersave"
+#~ msgstr "Economia de energia"
+
+#~ msgid "Conservative"
+#~ msgstr "Conservador"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Parte do projecto Xfce goodies"
 

Modified: xfce4-power-manager/trunk/po/pt_PT.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_PT.po	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/pt_PT.po	2008-11-08 11:28:20 UTC (rev 6019)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: 2008-11-01 20:07+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
@@ -38,9 +38,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -52,8 +52,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr "Suspender"
 
@@ -77,203 +77,227 @@
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr "Desligar"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr "Configuração Ups"
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr "Configuração de bateria"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr "Considerar carga UPS crítica"
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr "Considerar carga da bateria crítica"
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr "percentagem"
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr "Quando o nível da carga da bateria é crítico fazer"
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr "Nada"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr "Ligar notificação de carga UPS"
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr "Ligar notificação do estado da bateria"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr "Ligar poupança de energia do UPS"
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr "Ligar poupança de energia em modo bateria"
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
 msgstr "Performance"
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Ondemand"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Userspace"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Performance"
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Powersave"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Conservative"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Gestão de energia Xfce"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
 msgstr "Definições do CPU governor em modo UPS"
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
 msgstr "Definições do CPU governor em modo bateria"
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr "Nenhum CPU governor encontrado"
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr "Controlo de frequência do CPU não pode ser usado"
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr "A usar energia eléctrica"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
 msgstr "Definições de frequência do CPU em energia eléctrica"
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
 msgstr "Definições de freq do cpu"
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr "A usar bateria"
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr "Ligar controlo de brilho LCD"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr "Definições de monitor em UPS"
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr "Definições de monitor de bateria"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr "Definições do monitor em energia eléctrica"
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr "Definições de monitor"
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr "O seu monitor não suporta controlo DPMS"
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr "Atalhos do teclado"
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr "Quando o botão desligar é pressionado fazer"
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr "Quando o botão sleep é pressionado fazer"
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr "Quando a tampa do laptop é fechada"
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr "Atalhos de teclado não encontrados"
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr "Opções Gerais"
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr "Ícone de bandeja de sistema"
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr "Sempre mostrar um ícone"
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr "Quando a bateria está presente"
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr "Quando a bateria está a carregar ou a descarregar"
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
 msgstr "Ligar controlo de escala de frequência do CPU"
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr "Ligar controlo de gestão de energia do monitor"
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr "Configurações avançadas"
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr "Definições de cpu"
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr "Definições de bateria"
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr "Definições do Monitor"
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr "Preferências de Gestão de Energia"
 
@@ -642,6 +666,14 @@
 msgstr ""
 "Sem resposta do daemon HAL para definir o perfil de poupança de energia"
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr "Energia"
@@ -658,6 +690,18 @@
 msgid "Xfce 4 Power Manager"
 msgstr "Gestão de Energia Xfce 4"
 
+#~ msgid "Ondemand"
+#~ msgstr "Ondemand"
+
+#~ msgid "Userspace"
+#~ msgstr "Userspace"
+
+#~ msgid "Powersave"
+#~ msgstr "Powersave"
+
+#~ msgid "Conservative"
+#~ msgstr "Conservative"
+
 #~ msgid "Part of the Xfce goodies project"
 #~ msgstr "Parte do projecto Xfce goodies"
 

Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot	2008-11-08 11:28:20 UTC (rev 6019)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2008-11-08 12:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,9 +35,9 @@
 #. Hibernate menu option
 #: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
 #: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:968
 msgid "Hibernate"
 msgstr ""
 
@@ -48,8 +48,8 @@
 #. Suspend menu option
 #: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
 #: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
+#: ../src/xfpm-settings.c:966
 msgid "Suspend"
 msgstr ""
 
@@ -71,203 +71,219 @@
 msgid "Hibernate the system"
 msgstr ""
 
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
+#: ../src/xfpm-settings.c:970
 msgid "Shutdown"
 msgstr ""
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "UPS configuration"
 msgstr ""
 
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:418
 msgid "Battery configuration"
 msgstr ""
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider UPS charge critical"
 msgstr ""
 
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:422
 msgid "Consider battery charge critical"
 msgstr ""
 
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:427
 msgid "percent"
 msgstr ""
 
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:437
 msgid "When battery charge level is critical do"
 msgstr ""
 
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
+#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
 msgid "Nothing"
 msgstr ""
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable UPS charge notification"
 msgstr ""
 
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:464
 msgid "Enable battery state notification"
 msgstr ""
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on UPS power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:478
 msgid "Enable power save on battery power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+msgid "Best performance"
 msgstr ""
 
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
 msgstr ""
 
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+msgid "Ondemand performance"
 msgstr ""
 
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
 msgstr ""
 
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+msgid "Best power savings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
 msgstr ""
 
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+msgid "CPU frequency settings on UPS power"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+msgid "CPU frequency settings on battery power"
+msgstr ""
+
+#: ../src/xfpm-settings.c:685
 msgid "No CPU governor found"
 msgstr ""
 
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
 msgid "CPU frequency control cannot be used"
 msgstr ""
 
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
 msgid "On electric power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+msgid "CPU frequency settings on electric power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+msgid "CPU frequency settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
 msgid "On battery power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:734
 msgid "Enable LCD brightness control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on UPS power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:756
 msgid "Monitor settings on battery power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings on electric power"
 msgstr ""
 
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:849
 msgid "Monitor settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:866
 msgid "Your monitor doesn't support DPMS control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:897
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:907
 msgid "When power button is pressed do"
 msgstr ""
 
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:933
 msgid "When sleep button is pressed do"
 msgstr ""
 
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:958
 msgid "When laptop lid is closed"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:982
 msgid "No available keyboard shortcuts found"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:999
 msgid "General Options"
 msgstr ""
 
 #. Systray icon
-#: ../src/xfpm-settings.c:1043
+#: ../src/xfpm-settings.c:1006
 msgid "System tray icon"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1012
 msgid "Always Display an icon"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1013
 msgid "When battery is present"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1016
 msgid "When battery is charging or discharging"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1037
+msgid "Enable CPU frequency scaling control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1082
+#: ../src/xfpm-settings.c:1051
 msgid "Enable monitor power management control"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1104
 msgid "Advanced settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
 msgid "CPU settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
 msgid "Battery settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
 msgid "Shortcuts"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
 msgid "Monitor Settings"
 msgstr ""
 
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1209
 msgid "Power Manager Preferences"
 msgstr ""
 
@@ -602,6 +618,14 @@
 msgid "No reply from HAL daemon to set power save profile"
 msgstr ""
 
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
 #: ../src/xfce4-power-manager.desktop.in.h:1
 msgid "Power"
 msgstr ""

Modified: xfce4-power-manager/trunk/src/xfpm-cpu.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-cpu.c	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/src/xfpm-cpu.c	2008-11-08 11:28:20 UTC (rev 6019)
@@ -271,10 +271,6 @@
     {
         return "performance";
     }
-    else if ( governor == USERSPACE )
-    {
-        return "userspace";
-    }
     else if ( governor == CONSERVATIVE )
     {
         return "conservative";
@@ -322,7 +318,6 @@
 			if ( !strcmp(govs[i],"ondemand") )     governors |= ONDEMAND;
 			if ( !strcmp(govs[i],"performance") )  governors |= PERFORMANCE;
 			if ( !strcmp(govs[i],"conservative") ) governors |= CONSERVATIVE;
-			if ( !strcmp(govs[i],"userspace") )    governors |= USERSPACE;
 		}   
 		libhal_free_string_array(govs);
 	}	

Modified: xfce4-power-manager/trunk/src/xfpm-enums.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-enums.h	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/src/xfpm-enums.h	2008-11-08 11:28:20 UTC (rev 6019)
@@ -52,8 +52,7 @@
     POWERSAVE               = (1<<1),
     ONDEMAND                = (1<<2),
     PERFORMANCE             = (1<<3),
-    CONSERVATIVE            = (1<<4),
-    USERSPACE               = (1<<5)
+    CONSERVATIVE            = (1<<4)
     
 } XfpmCpuGovernor;
 

Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c	2008-11-08 08:55:27 UTC (rev 6018)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c	2008-11-08 11:28:20 UTC (rev 6019)
@@ -61,13 +61,11 @@
 static GtkWidget *ondemand_on_ac;
 static GtkWidget *powersave_on_ac;
 static GtkWidget *conservative_on_ac;
-static GtkWidget *userspace_on_ac;
 
 static GtkWidget *performance_on_batt;
 static GtkWidget *ondemand_on_batt;
 static GtkWidget *powersave_on_batt;
 static GtkWidget *conservative_on_batt;
-static GtkWidget *userspace_on_batt;
 
 #ifdef HAVE_DPMS
 static GtkWidget *dpms_op;
@@ -278,7 +276,6 @@
         gtk_widget_set_sensitive(performance_on_ac,value);
         gtk_widget_set_sensitive(powersave_on_ac,value);
         gtk_widget_set_sensitive(conservative_on_ac,value);
-        gtk_widget_set_sensitive(userspace_on_ac,value);
     }
     
     if ( GTK_IS_WIDGET(ondemand_on_batt) )  /* enough to check only one widget */ 
@@ -287,7 +284,6 @@
         gtk_widget_set_sensitive(performance_on_batt,value);
         gtk_widget_set_sensitive(powersave_on_batt,value);
         gtk_widget_set_sensitive(conservative_on_batt,value);
-        gtk_widget_set_sensitive(userspace_on_batt,value);
     }
 }
 
@@ -332,15 +328,6 @@
 }
 
 static void
-set_userspace_on_ac_cb(GtkWidget *widget,XfconfChannel *channel)
-{
-    if(!xfconf_channel_set_uint(channel,ON_AC_CPU_GOV_CFG,USERSPACE))
-    {
-        g_critical("Cannot set value %s\n",ON_AC_CPU_GOV_CFG);
-    }
-}
-
-static void
 set_powersave_on_batt_cb(GtkWidget *widget,XfconfChannel *channel)
 {
     if(!xfconf_channel_set_uint(channel,ON_BATT_CPU_GOV_CFG,POWERSAVE))
@@ -379,14 +366,7 @@
     }
 
 }
-static void
-set_userspace_on_batt_cb(GtkWidget *widget,XfconfChannel *channel)
-{
-    if(!xfconf_channel_set_uint(channel,ON_BATT_CPU_GOV_CFG,USERSPACE))
-    {
-        g_critical("Cannot set value %s\n",ON_BATT_CPU_GOV_CFG);
-    }
-}
+
 /// End of Callback Setting Functions ///
 
 static XfpmActionRequest
@@ -535,24 +515,26 @@
     gtk_widget_show(vbox);
     gtk_container_add(GTK_CONTAINER(align),vbox);
     
-    performance_on_ac = gtk_radio_button_new_with_label(NULL,_("Performance"));
+    performance_on_ac = gtk_radio_button_new_with_label(NULL,_("Best performance"));
+	gtk_widget_set_tooltip_text(performance_on_ac,_("Set the CPU to its maximum frequency"));
     gtk_box_pack_start (GTK_BOX (vbox), performance_on_ac, FALSE, FALSE, 0);
     
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(performance_on_ac));
     
-    ondemand_on_ac = gtk_radio_button_new_with_label(list,_("Ondemand"));
+    ondemand_on_ac = gtk_radio_button_new_with_label(list,_("Ondemand performance"));
+	gtk_widget_set_tooltip_text(ondemand_on_ac,_("Set the CPU to its maximum speed when there is any load on it "\
+												"and to its minimum speed when the system is idle"));
     gtk_box_pack_start (GTK_BOX (vbox), ondemand_on_ac, FALSE, FALSE, 0);
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(ondemand_on_ac));
     
-    userspace_on_ac = gtk_radio_button_new_with_label(list,_("Userspace"));
-    gtk_box_pack_start (GTK_BOX (vbox), userspace_on_ac, FALSE, FALSE, 0);
-    list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(userspace_on_ac));
-    
-    powersave_on_ac = gtk_radio_button_new_with_label(list,_("Powersave"));
+    powersave_on_ac = gtk_radio_button_new_with_label(list,_("Best power savings"));
+	gtk_widget_set_tooltip_text(powersave_on_ac,_("Set the CPU to its minimum frequency"));
     gtk_box_pack_start (GTK_BOX (vbox), powersave_on_ac, FALSE, FALSE, 0); 
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(powersave_on_ac));
     
-    conservative_on_ac = gtk_radio_button_new_with_label(list,_("Conservative"));
+    conservative_on_ac = gtk_radio_button_new_with_label(list,_("Good power savings"));
+	gtk_widget_set_tooltip_text(conservative_on_ac,
+								_("gracefully increases and decreases the CPU speed depending on the current usage"));
     gtk_box_pack_start (GTK_BOX (vbox), conservative_on_ac, FALSE, FALSE, 0); 
     
     if ( govs & POWERSAVE ) 
@@ -595,16 +577,6 @@
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conservative_on_ac),TRUE);
         }
     }
-    if ( govs & USERSPACE ) 
-    {
-        gtk_widget_set_sensitive(userspace_on_ac,enable);
-        g_signal_connect(userspace_on_ac,"pressed",G_CALLBACK(set_userspace_on_ac_cb),channel);
-        gtk_widget_show(userspace_on_ac);
-        if ( current_governor == USERSPACE )
-        {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(userspace_on_ac),TRUE);
-        }
-    }
     
     return frame;
 }
@@ -620,7 +592,7 @@
     guint current_governor = xfconf_channel_get_uint(channel,ON_BATT_CPU_GOV_CFG,POWERSAVE);
     gboolean enable = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
     
-    frame = xfce_create_framebox(ups ? _("CPU governor settings on UPS power") : _("CPU governor settings on battery power"), &align);
+    frame = xfce_create_framebox(ups ? _("CPU frequency settings on UPS power") : _("CPU frequency settings on battery power"), &align);
     gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
     gtk_widget_show(frame);
     
@@ -628,24 +600,26 @@
     gtk_widget_show(vbox);
     gtk_container_add(GTK_CONTAINER(align),vbox);
     
-    performance_on_batt = gtk_radio_button_new_with_label(NULL,_("Performance"));
+    performance_on_batt = gtk_radio_button_new_with_label(NULL,_("Best performance"));
+	gtk_widget_set_tooltip_text(performance_on_batt,_("Set the CPU to its maximum frequency"));
     gtk_box_pack_start (GTK_BOX (vbox), performance_on_batt, FALSE, FALSE, 0);
     
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(performance_on_batt));
     
-    ondemand_on_batt = gtk_radio_button_new_with_label(list,_("Ondemand"));
+    ondemand_on_batt = gtk_radio_button_new_with_label(list,_("Ondemand performance"));
+	gtk_widget_set_tooltip_text(ondemand_on_batt,_("Set the CPU to its maximum speed when there is any load on it "\
+												"and to its minimum speed when the system is idle"));
     gtk_box_pack_start (GTK_BOX (vbox), ondemand_on_batt, FALSE, FALSE, 0);
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(ondemand_on_batt));
     
-    userspace_on_batt = gtk_radio_button_new_with_label(list,_("Userspace"));
-    gtk_box_pack_start (GTK_BOX (vbox), userspace_on_batt, FALSE, FALSE, 0);
-    list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(userspace_on_batt));
-    
-    powersave_on_batt = gtk_radio_button_new_with_label(list,_("Powersave"));
+    powersave_on_batt = gtk_radio_button_new_with_label(list,_("Best power savings"));
+	gtk_widget_set_tooltip_text(powersave_on_batt,_("Set the CPU to its minimum frequency"));
     gtk_box_pack_start (GTK_BOX (vbox), powersave_on_batt, FALSE, FALSE, 0); 
     list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(powersave_on_batt));
     
-    conservative_on_batt = gtk_radio_button_new_with_label(list,_("Conservative"));
+    conservative_on_batt = gtk_radio_button_new_with_label(list,_("Good power savings"));
+	gtk_widget_set_tooltip_text(conservative_on_batt,
+								_("gracefully increases and decreases the CPU speed depending on the current usage"));
     gtk_box_pack_start (GTK_BOX (vbox), conservative_on_batt, FALSE, FALSE, 0); 
     
     if ( govs & POWERSAVE ) 
@@ -688,19 +662,7 @@
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conservative_on_batt),TRUE);
         }
     }
-    if ( govs & USERSPACE ) 
-    {
-        gtk_widget_set_sensitive(userspace_on_batt,enable);
-        g_signal_connect(userspace_on_batt,"pressed",G_CALLBACK(set_userspace_on_batt_cb),channel);
-        gtk_widget_show(userspace_on_batt);
-        if ( current_governor == USERSPACE )
-        {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(userspace_on_batt),TRUE);
-        }
-    }
-    
     return frame;
-    
 }
 
 static GtkWidget *
@@ -745,7 +707,7 @@
         GtkWidget *frame;
         frame = xfpm_settings_cpu_on_ac_adapter(channel,
                                                 govs,
-                                                laptop || ups ? _("CPU freq settings on electric power") : _("CPU freq settings"));
+                                                laptop || ups ? _("CPU frequency settings on electric power") : _("CPU frequency settings"));
         gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
         
         if ( laptop || ups )
@@ -873,7 +835,6 @@
 xfpm_settings_monitor(XfconfChannel *channel,gboolean laptop,
                       gboolean dpms_capable,gboolean lcd,gboolean ups)
 {
-	GtkWidget *label;
     GtkWidget *ntbox;
 	ntbox = gtk_notebook_new();
     gtk_widget_show(ntbox);
@@ -882,6 +843,7 @@
     
     gtk_widget_show(vbox);
 #ifdef HAVE_DPMS
+	GtkWidget *label;
     GtkWidget *frame;
     frame = xfpm_settings_dpms_on_ac_adapter(channel,
                                             laptop || ups ? _("Monitor settings on electric power") : _("Monitor settings"));
@@ -1026,12 +988,13 @@
 }
 
 static GtkWidget *
-xfpm_settings_general(XfconfChannel *channel,gboolean battery_settings,gboolean ups)
+xfpm_settings_general(XfconfChannel *channel,gboolean battery_settings,gboolean ups,guint8 govs)
 {
     GtkWidget *table;
     GtkWidget *show_icon;
     GtkWidget *label;
     GtkWidget *frame,*align;
+	gint i = 0;
     
     frame = xfce_create_framebox(_("General Options"), &align);
     gtk_widget_show(frame);
@@ -1042,7 +1005,7 @@
     /* Systray icon */
     label = gtk_label_new(_("System tray icon"));
     gtk_widget_show(label);
-    gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
+    gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
     
     guint icon_cfg = xfconf_channel_get_uint(channel,SHOW_TRAY_ICON_CFG,0);
     show_icon = gtk_combo_box_new_text();
@@ -1064,31 +1027,37 @@
     gtk_combo_box_set_active(GTK_COMBO_BOX(show_icon),icon_cfg);
     g_signal_connect(show_icon,"changed",G_CALLBACK(set_show_tray_icon_cb),channel);
     gtk_widget_show(show_icon);
-    gtk_table_attach(GTK_TABLE(table),show_icon,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
-    gboolean cpu_gov_enabled;
-    label = gtk_label_new(_("Enable CPU freq scaling control"));
-    gtk_widget_show(label);
-    gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
-    cpu_gov = gtk_check_button_new();
-    gtk_widget_show(cpu_gov);
-    cpu_gov_enabled = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_gov),
-                                 cpu_gov_enabled);                    
-    g_signal_connect(cpu_gov,"toggled",G_CALLBACK(set_cpu_freq_scaling_cb),channel);      
-    gtk_table_attach(GTK_TABLE(table),cpu_gov,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0); 
+    gtk_table_attach(GTK_TABLE(table),show_icon,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+	i++;
+	
+	cpu_gov = gtk_check_button_new();
+	if ( govs )
+	{
+		gboolean cpu_gov_enabled;
+		label = gtk_label_new(_("Enable CPU frequency scaling control"));
+		gtk_widget_show(label);
+		gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+		gtk_widget_show(cpu_gov);
+		cpu_gov_enabled = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_gov),
+									cpu_gov_enabled);                    
+		g_signal_connect(cpu_gov,"toggled",G_CALLBACK(set_cpu_freq_scaling_cb),channel);      
+		gtk_table_attach(GTK_TABLE(table),cpu_gov,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0); 
+		i++;
+	}
     
 #ifdef HAVE_DPMS
     gboolean dpms_enabled;
     label = gtk_label_new(_("Enable monitor power management control"));
     gtk_widget_show(label);
-    gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);	
+    gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);	
     dpms_op = gtk_check_button_new();
     gtk_widget_show(dpms_op);
     dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dpms_op),
                                  dpms_enabled);                    
     g_signal_connect(dpms_op,"toggled",G_CALLBACK(set_dpms_cb),channel);      
-    gtk_table_attach(GTK_TABLE(table),dpms_op,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0); 
+    gtk_table_attach(GTK_TABLE(table),dpms_op,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0); 
 #endif    
     return frame;
 }
@@ -1116,14 +1085,10 @@
     {
         gtk_notebook_set_current_page(GTK_NOTEBOOK(nt),int_data);
     }
-    else
-    {
-        gtk_notebook_set_current_page(GTK_NOTEBOOK(nt),0);
-    }
 }
 
 static GtkWidget *
-xfpm_settings_tree_view(gboolean is_laptop,gboolean ups)
+xfpm_settings_tree_view(gboolean is_laptop,gboolean ups,guint8 govs)
 {
     GdkPixbuf *pix;
     GtkWidget *view;
@@ -1149,17 +1114,20 @@
     gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
 
     /// CPU Settings
-    pix = xfpm_load_icon("xfpm-cpu",38);      
-    gtk_list_store_append(list_store,&iter);
-    if ( pix )
-    {
-        gtk_list_store_set(list_store,&iter,0,pix,1,_("CPU settings"),2,0,-1);
-        g_object_unref(pix);
-    }
-    else
-    {
-        gtk_list_store_set(list_store,&iter,1,_("CPU settings"),2,0,-1);
-    }
+	if ( govs )
+	{
+		pix = xfpm_load_icon("xfpm-cpu",38);      
+		gtk_list_store_append(list_store,&iter);
+		if ( pix )
+		{
+			gtk_list_store_set(list_store,&iter,0,pix,1,_("CPU settings"),2,0,-1);
+			g_object_unref(pix);
+		}
+		else
+		{
+			gtk_list_store_set(list_store,&iter,1,_("CPU settings"),2,0,-1);
+		}
+	}
     
     /// Battery Settings
     if ( is_laptop || ups )
@@ -1259,37 +1227,66 @@
     ups = is_laptop ? FALSE : ups_found;
         
     /// General Options Frame
-    box = xfpm_settings_general(channel,is_laptop,ups);
+    box = xfpm_settings_general(channel,is_laptop,ups,govs);
     gtk_box_pack_start (GTK_BOX (allbox), box, FALSE, FALSE, 0);
     
     /// Notebook container
     nt = gtk_notebook_new();
-    gtk_widget_show(nt);
+    
     gtk_notebook_set_show_tabs(GTK_NOTEBOOK(nt),FALSE);
     table = gtk_table_new(1,2,FALSE);
     gtk_widget_show(table);
     gtk_box_pack_start (GTK_BOX (allbox), table, FALSE, FALSE, 0);
-    view = xfpm_settings_tree_view(is_laptop,ups_found);
-    gtk_table_attach_defaults(GTK_TABLE(table),view,0,1,0,1);  
-    gtk_widget_show(view);  
-    gtk_table_attach_defaults(GTK_TABLE(table),nt,1,2,0,1); 
+	
+    view = xfpm_settings_tree_view(is_laptop,ups_found,govs);
+
+#ifndef HAVE_DPMS	
+	if ( is_laptop || ups_found || govs )
+	{
+		gtk_table_attach_defaults(GTK_TABLE(table),view,0,1,0,1);  
+		gtk_widget_show(view);  
+		gtk_table_attach_defaults(GTK_TABLE(table),nt,1,2,0,1); 
+		gtk_widget_show(nt);
+	}
+#else
+	gtk_table_attach_defaults(GTK_TABLE(table),view,0,1,0,1);  
+	gtk_widget_show(view);  
+	gtk_table_attach_defaults(GTK_TABLE(table),nt,1,2,0,1); 
+	gtk_widget_show(nt);
+#endif
     
     /// Cpu freq settings
-    box = xfpm_settings_cpu_freq(channel,govs,is_laptop,ups);
-    gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+	if ( govs )
+	{
+		box = xfpm_settings_cpu_freq(channel,govs,is_laptop,ups);
+		gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+	}
 
-  
     /// Battery settings
-    box = xfpm_settings_battery(channel,power_management,ups);
-    gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+	if ( is_laptop || ups )
+	{
+		box = xfpm_settings_battery(channel,power_management,ups);
+		gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+	}
 
     /// Keyboard buttons settings
-    box = xfpm_settings_keys(channel,is_laptop,power_management,switch_buttons);
-    gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL); 
+	if ( switch_buttons)
+	{
+		box = xfpm_settings_keys(channel,is_laptop,power_management,switch_buttons);
+		gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL); 
+	}
     
     /// Dpms settings && LCD brightness settings DPMS existence is checked above
+#ifdef HAVE_DPMS	
     box = xfpm_settings_monitor(channel,is_laptop,dpms_capable,lcd,ups);
     gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+#else
+	if ( lcd )
+	{
+		box = xfpm_settings_monitor(channel,is_laptop,dpms_capable,lcd,ups);
+		gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
+	}
+#endif	
 
 	GtkWidget *plug;    
     if ( socket_id != 0 )




More information about the Goodies-commits mailing list