[Goodies-commits] r7620 - in xfce4-power-manager/trunk: . po settings src

Ali Abdallah aliov at xfce.org
Sat Jun 20 18:40:44 CEST 2009


Author: aliov
Date: 2009-06-20 16:40:44 +0000 (Sat, 20 Jun 2009)
New Revision: 7620

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/po/ca.po
   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/el.po
   xfce4-power-manager/trunk/po/es.po
   xfce4-power-manager/trunk/po/et.po
   xfce4-power-manager/trunk/po/eu.po
   xfce4-power-manager/trunk/po/fi.po
   xfce4-power-manager/trunk/po/fr.po
   xfce4-power-manager/trunk/po/gl.po
   xfce4-power-manager/trunk/po/id.po
   xfce4-power-manager/trunk/po/it.po
   xfce4-power-manager/trunk/po/ja.po
   xfce4-power-manager/trunk/po/nb.po
   xfce4-power-manager/trunk/po/nl.po
   xfce4-power-manager/trunk/po/pt.po
   xfce4-power-manager/trunk/po/pt_BR.po
   xfce4-power-manager/trunk/po/ru.po
   xfce4-power-manager/trunk/po/sv.po
   xfce4-power-manager/trunk/po/tr.po
   xfce4-power-manager/trunk/po/uk.po
   xfce4-power-manager/trunk/po/ur.po
   xfce4-power-manager/trunk/po/ur_PK.po
   xfce4-power-manager/trunk/po/xfce4-power-manager.pot
   xfce4-power-manager/trunk/po/zh_CN.po
   xfce4-power-manager/trunk/settings/Makefile.am
   xfce4-power-manager/trunk/settings/xfpm-settings.c
   xfce4-power-manager/trunk/src/xfpm-battery.c
   xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
   xfce4-power-manager/trunk/src/xfpm-config.h
   xfce4-power-manager/trunk/src/xfpm-cpu.c
   xfce4-power-manager/trunk/src/xfpm-dpms.c
   xfce4-power-manager/trunk/src/xfpm-engine.c
   xfce4-power-manager/trunk/src/xfpm-enum-glib.h
   xfce4-power-manager/trunk/src/xfpm-enum.h
   xfce4-power-manager/trunk/src/xfpm-supply.c
   xfce4-power-manager/trunk/src/xfpm-tray-icon.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.h
Log:
	* settings/xfpm-settings.c
	Get a pointer to the notebook before connecting signals.
	* src/xfpm-xfconf.c Store Configurations in GValues instead of 
	individual variables.
	* src/xfpm-xfconf.c All configurations now are properties, this gives us
	configuration change signals for FREE.
	* settings/xfpm-settings.c Make it compatible with the new configuration
	changes.
	* src/xfpm-supply.c Allow suspend as a critical action.
	* src/xfpm-engine.c Provide lock screen option for LID events.
	* po/xfce4-power-manager.pot update for new strings.
	* po/* Updates all the po files.

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/ChangeLog	2009-06-20 16:40:44 UTC (rev 7620)
@@ -1,3 +1,17 @@
+2009-06-20: 16:30  Ali aliov at xfce.org
+	* settings/xfpm-settings.c
+	Get a pointer to the notebook before connecting signals.
+	* src/xfpm-xfconf.c Store Configurations in GValues instead of 
+	individual variables.
+	* src/xfpm-xfconf.c All configurations now are properties, this gives us
+	configuration change signals for FREE.
+	* settings/xfpm-settings.c Make it compatible with the new configuration
+	changes.
+	* src/xfpm-supply.c Allow suspend as a critical action.
+	* src/xfpm-engine.c Provide lock screen option for LID events.
+	* po/xfce4-power-manager.pot update for new strings.
+	* po/* Updates all the po files.
+
 2009-06-15: 15:40 Ali aliov at xfce.org
 	* Remove libglade and use GtkBuilder instead.
 

Modified: xfce4-power-manager/trunk/po/ca.po
===================================================================
--- xfce4-power-manager/trunk/po/ca.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/ca.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-22 10:43+0100\n"
 "Last-Translator: Harald Servat <redcrash at gmail.com>\n"
 "Language-Team: Catalan\n"
@@ -18,227 +18,101 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Accions</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Opcions avançades</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Brillantor</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Opcions generals</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Pantalla</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "Accions"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avançat"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Mostra sempre la icona"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Considera que el nivell de baixa energia comença a:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Habilita el controlador d'escalat de freqüència de la CPU"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Habilita el controlador de pantalla del gestor d'energia"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Habilita la notificació"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "General"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hiberna"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Bloca la pantalla quan es vulgui suspendre o hibernar"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Pantalla"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Res"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Amb xarxa elèctrica"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Amb bateria"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Ajustament del gestor d'energia"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Millor estalvi d'energia que rendiment"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Deixa la pantalla adormida quan l'ordinador està inactiu durant:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Deixa l'ordinador adormit quan l'ordinador està inactiu durant:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Disminueix la brillantor de la pantalla quan estigui inactiva durant:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Ajusta el mode d'adormiment de l'ordinador:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Ajusta el mode d'adormiment de la pantalla:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "En espera"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspèn"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Apaga la pantalla quan l'ordinador estigui inactiu durant:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Icona d'estat:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Quan el nivell de càrrega és crític:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Quan es pitja el botó d'hivernar:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Quan es tanca la tapa del portàtil:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Quan es pitja el botó d'encesa:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Quan es pitja el botó d'adormiment:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Gestor d'energia de Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Mai"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Un minut"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minuts"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Una hora"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "un minut"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minuts"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "hores"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Segons"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "No es permet ni hibernar ni suspendre el sistema"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "No es permet ni apagar ni hibernar el sistema"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Res"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspèn"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hiberna"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Atura"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Preguntar"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Mostra sempre la icona"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Quan hi ha alguna bateria"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Quan s'està carregant o descarregant la bateria"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
@@ -246,33 +120,41 @@
 "Desactivar DPMS (Display Power Management Signaling). No permet apagar ni "
 "adormir la pantalla."
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Preguntar"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "No es permet suspendre el sistema"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "No es permet hivernar el sistema"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 "Quan totes les fonts d'energia de l'ordinador assoleixin aquest valor de "
 "càrrega"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "General"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Amb xarxa elèctrica"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Amb Bateria"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Estès"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "No s'està executant cap gestor d'energia"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Sòcol del gestor d'ajustaments"
@@ -281,37 +163,43 @@
 msgid "SOCKET ID"
 msgstr "SÒCOL ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Feu «%s --help» per veure l'ús."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Gestor d'energia de Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "No es pot carregar la configuració del gestor d'energia, emprant els valors "
 "per defecte"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Ajustaments del gestor d'energia de Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "No s'ha pogut connectar al gestor d'energia de Xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "No s'està executant el gestor d'energia de Xfce"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "El gestor d'energia de Xfce4 no s'està executant, veleu tornar a executar-lo?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Executa"
 
@@ -343,8 +231,8 @@
 msgid "Your battery is discharging"
 msgstr "S'ha descarregat la bateria"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "El sistema està funcionant amb l'energia de la bateria"
 
@@ -356,97 +244,97 @@
 msgid "System is running on low power"
 msgstr "El sistema està funcionant amb un nivell baix de càrrega"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Gestor d'energia de Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "El SAI"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "La bateria del ratolí"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "La bateria del teclat"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "La bateria de la càmera"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "La bateria de la PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "La bateria"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "és buida"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "Totalment carregada"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "Nivell de càrrega"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "S'està carregant"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "S'està descarregant"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "La càrrega és baixa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "Està gaire bé descarregada"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "no hi és"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "No hi ha cap bateria"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Bateria"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "El sistema està funcionant endollat a la corrent elèctrica"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Temps restant previst"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Temps de càrrega previst"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minut"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Bateria"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "El sistema està funcionant endollat a la corrent elèctrica"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unitat no reconeguda"
 
@@ -495,61 +383,61 @@
 "Amb llicència GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "No en facis un dimoni"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Reinicia el gestor d'energia de Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostra el diàleg de configuració"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Surt de tots els gestors d'energia de Xfce en execució"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informació de la versió"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Masses arguments"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "No es pot connectar a la sessió de missatges de bus"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "S'està executant un altre gestor d'energia"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "El gestor d'energia de Xfce ja s'està executant"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adaptador trobat"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Adaptador no trobat"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Apaga el sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hiberna el sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -561,13 +449,13 @@
 "malmetre l'aplicació. Tanqueu aquesta aplicació abans de deixar l'ordinador "
 "en mode d'adormiment or connecteu-lo a la xarxa elèctrica"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "El sistema està funcionant amb un nivell de càrrega baix. Deseu el que "
 "estigueu fent per no perdre les dades"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -577,11 +465,11 @@
 "malmetre l'estat d'aquesta aplicació, esteu segur que voleu hibernar el "
 "sistema?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Voleu continuar?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -591,23 +479,23 @@
 "malmetre l'estat d'aquesta aplicació, esteu segur que voleu suspendre el "
 "sistema?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Surt del gestor d'energia de Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Surt"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Netejar inhibir"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Inhibir"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
@@ -617,21 +505,21 @@
 "la pantalla es podrà apagar a petició del gestor i, per exemple, dificultar-"
 "vos el visionat d'una pel·lícula."
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "No hi ha informació disponible"
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "La hibernació no és compatible"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "La suspensió no és compatible"
@@ -640,46 +528,46 @@
 msgid "HAL daemon is not running"
 msgstr "El dimoni HAL no s'està executant"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Arguments no vàlids"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "La galeta no és vàlida"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "No hi ha compatibilitat per vostre sistema operatiu"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "No s'ha trobat l'script de hibernació"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "No s'ha trobat l'script de suspensió"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "No s'ha trobat el mètode de suspensió"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "No s'ha trobat el mètode d'hibernació"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Memòria esgotada"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "No s'ha pogut adormir el sistema"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "El dimoni HAL no està actiu"
@@ -688,35 +576,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Gestor d'energia per l'escriptori Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Ió liti"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Plom i àcid"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Liti-polímer"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Níquel i Hidrur metàŀlic"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Carles Muñoz Gorriz <carlesmu at internautas.org>"
 
@@ -734,12 +622,97 @@
 msgid "Brightness plugin"
 msgstr "Connector de brillantor"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accions</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Opcions avançades</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Brillantor</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Opcions generals</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Pantalla</b>"
+
+#~ msgid "Actions"
+#~ msgstr "Accions"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançat"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Considera que el nivell de baixa energia comença a:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Habilita el controlador d'escalat de freqüència de la CPU"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Habilita el controlador de pantalla del gestor d'energia"
+
+#~ msgid "Enable notification"
+#~ msgstr "Habilita la notificació"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Bloca la pantalla quan es vulgui suspendre o hibernar"
+
+#~ msgid "Monitor"
+#~ msgstr "Pantalla"
+
+#~ msgid "On battery"
+#~ msgstr "Amb bateria"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Ajustament del gestor d'energia"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Millor estalvi d'energia que rendiment"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Deixa la pantalla adormida quan l'ordinador està inactiu durant:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Deixa l'ordinador adormit quan l'ordinador està inactiu durant:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr ""
+#~ "Disminueix la brillantor de la pantalla quan estigui inactiva durant:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Ajusta el mode d'adormiment de l'ordinador:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Ajusta el mode d'adormiment de la pantalla:"
+
+#~ msgid "Standby"
+#~ msgstr "En espera"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Apaga la pantalla quan l'ordinador estigui inactiu durant:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Icona d'estat:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Quan el nivell de càrrega és crític:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Quan es pitja el botó d'hivernar:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Quan es tanca la tapa del portàtil:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Quan es pitja el botó d'encesa:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Quan es pitja el botó d'adormiment:"
+
 #~ msgid "Advance"
 #~ msgstr "Avança"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "No s'està executant cap gestor d'energia"
-
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Deshabilita l'adormiment automàtic"
 

Modified: xfce4-power-manager/trunk/po/cs.po
===================================================================
--- xfce4-power-manager/trunk/po/cs.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/cs.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-06-07 16:54+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
@@ -16,288 +16,141 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Akce</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Pokročilé volby</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Jas</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Obecné volby</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "Akce"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#: ../settings/xfpm-settings.glade.h:8
-#: ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Vždy zobrazovat ikonu"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Považovat baterii za vybitou při:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Povolit ovládání frekvence procesoru"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Povolit ovládání správy napájení monitoru"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Povolit oznámení"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Obecné"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689
-#: ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012
-#: ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147
-#: ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernovat"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Uzamknout obrazovku při přechodu do režimu spánku nebo hibernace"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Monitor"
-
-#: ../settings/xfpm-settings.glade.h:17
-#: ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678
-#: ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001
-#: ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nic"
-
-#: ../settings/xfpm-settings.glade.h:18
-#: ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Napájení ze sítě"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Napájení z baterie"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Nastavení správce napájení"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Upřednostnit úsporu energie před výkonem"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Přepnout displej do režimu spánku, pokud je počítač neaktivní:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Přepnout počítač do režimu spánku, pokud je neaktivní:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Snížit jak obrazovky, pokud je počítač neaktivní:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Uvést počítač do režimu spánku při nečinnosti:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Uvést monitor do režimu spánku:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Pohotovostní režim"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28
-#: ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840
-#: ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075
-#: ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201
-#: ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Režim spánku"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Vypnout displej, pokud je počítač neaktivní:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Ikona v oznamovací oblasti:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Je-li úroveň nabití baterie kritická:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Po stisknutí tlačítka hibernovat:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Při zavření laptopu:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Po stisknutí hlavního vypínače:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Po stisknutí tlačítka režim spánku:"
-
-#: ../settings/xfpm-settings.glade.h:36
-#: ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184
-#: ../src/xfpm-main.c:273
-#: ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Správce napájení pro Xfce"
-
-#: ../settings/xfpm-settings.c:370
-#: ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Jedna minuta"
 
-#: ../settings/xfpm-settings.c:375
-#: ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minut"
 
-#: ../settings/xfpm-settings.c:389
-#: ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Jedna hodina"
 
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "jedna minuta"
 
-#: ../settings/xfpm-settings.c:398
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minut"
 
-#: ../settings/xfpm-settings.c:400
-#: ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "hodin"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Sekund"
 
-#: ../settings/xfpm-settings.c:565
-#: ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829
-#: ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064
-#: ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Operace hibernovat a přejít do režimu spánku nejsou povoleny"
 
-#: ../settings/xfpm-settings.c:578
-#: ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Operace vypnout a hibernovat nejsou povoleny"
 
-#: ../settings/xfpm-settings.c:595
-#: ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nic"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Režim spánku"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernovat"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Zeptat se"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Vždy zobrazovat ikonu"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Pokud je přítomna baterie"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Pokud se baterie nabíjí nebo vybíjí"
 
-#: ../settings/xfpm-settings.c:977
-msgid "Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode."
-msgstr "Zakázat signál správy napájení displeje (DPMS), například nepokoušet se o vypnutí displeje nebo přechod do režimu spánku."
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+"Zakázat signál správy napájení displeje (DPMS), například nepokoušet se o "
+"vypnutí displeje nebo přechod do režimu spánku."
 
-#: ../settings/xfpm-settings.c:1019
-#: ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Zeptat se"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "Operace přechod do režimu spánku není povolena"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "Operace hibernace není povolena"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Po dosažení všech zdrojů napájení počítače této úrovně nabití"
 
-#: ../settings/xfpm-settings.c:1430
-#: ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Obecné"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Napájení ze sítě"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Napájení z baterie"
 
-#: ../settings/xfpm-settings.c:1444
-#: ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Rozšířené"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Správce napájení Xfce není spuštěn"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Soket správce nastavení"
@@ -306,36 +159,42 @@
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
-#: ../settings/xfpm-settings-main.c:83
-#: ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Informace o použití získáte příkazem '%s --help'."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Správce napájení pro Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 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í"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Nastavení správce napájení pro Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Nelze se připojit ke Správci napájení pro prostředí Xfce"
 
-#: ../settings/xfpm-settings-main.c:175
-#: ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Správce napájení Xfce není spuštěn"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Správce napájení pro Xfce neběží, chcete jej nyní spustit?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Spustit"
 
@@ -367,9 +226,8 @@
 msgid "Your battery is discharging"
 msgstr "Baterie se vybíjí"
 
-#: ../src/xfpm-battery.c:117
-#: ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Systém je napájen z baterie"
 
@@ -381,103 +239,97 @@
 msgid "System is running on low power"
 msgstr "Baterie je téměř vybitá"
 
-#: ../src/xfpm-battery.c:240
-#: ../src/xfpm-supply.c:281
-#: ../src/xfpm-supply.c:304
-#: ../src/xfpm-tray-icon.c:119
-#: ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Správce napájeni pro Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Záložní zdroj UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Baterie myši"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Baterie klávesnice"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Baterie fotoaparátu"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Baterie PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Baterie"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "je vybitá"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "je plně nabitá"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "úroveň nabití"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "se nabíjí"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "se vybíjí"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "úroveň nabití je nízká"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "je téměř vybitá"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "není přítomna"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Baterie není přítomná"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Baterie"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Systém je napájen ze sítě"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Odhad zbývajícího času"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Odhad času pro úplné nabití"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hodina"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuta"
 
-#: ../src/xfpm-battery.c:421
-#: ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Baterie"
-
-#: ../src/xfpm-battery.c:424
-#: ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Systém je napájen ze sítě"
-
-#: ../src/xfpm-battery-info.c:63
-#: ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Neznámá jednotka"
 
@@ -526,118 +378,141 @@
 "Vydáno pod licencí GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Nepřecházet do režimu démon"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Restartovat všechny běžící instance Správce napájení pro Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Zobrazit konfigurační dialogové okno"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Ukončit všechny běžící správce napájení"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informace o verzi"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Příliš mnoho argumentů"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Spojení se sběrnicí zpráv se nepodařilo navázat"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Již je spuštěn jiný správce napájení"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Správce napájení pro Xfce je již spuštěn"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adaptér je příomný"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Adaptér není přítomný"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Vypnout systém"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernovat systém"
 
-#: ../src/xfpm-supply.c:273
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "Baterie je téměř vybitá, ale aplikace zakazuje automatický přechod do režimu spánku, což znamená, že přechod do režimu spánku může poškodit data této aplikace. Zavřete tuto aplikaci před přechodem do režimu spánku nebo zapojte adaptér pro napájení ze sítě."
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"Baterie je téměř vybitá, ale aplikace zakazuje automatický přechod do režimu "
+"spánku, což znamená, že přechod do režimu spánku může poškodit data této "
+"aplikace. Zavřete tuto aplikaci před přechodem do režimu spánku nebo zapojte "
+"adaptér pro napájení ze sítě."
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. 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-tray-icon.c:162
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "Aplikace zakatuje funkci automatického přechozu do režimu spánku, tato akce může poškodit pracovní stav této aplikace. Opravdu chcete hibernovat systém?"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"Aplikace zakatuje funkci automatického přechozu do režimu spánku, tato akce "
+"může poškodit pracovní stav této aplikace. Opravdu chcete hibernovat systém?"
 
-#: ../src/xfpm-tray-icon.c:165
-#: ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Opravdu chcete pokračovat?"
 
-#: ../src/xfpm-tray-icon.c:193
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "Aplikace zakatuje funkci automatického přechozu do režimu spánku, tato akce může poškodit pracovní stav této aplikace. Opravdu chcete systém uvést do režimu spánku?"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"Aplikace zakatuje funkci automatického přechozu do režimu spánku, tato akce "
+"může poškodit pracovní stav této aplikace. Opravdu chcete systém uvést do "
+"režimu spánku?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Ukončit správce napájeni pro Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Ukončit"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Potlačit čistě"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Potlačit"
 
-#: ../src/xfpm-tray-icon.c:300
-msgid "Disable or enable automatic sleep, setting this will tell the power manager to disable backlight sleep, for example you could active the inhibit if you are watching a movie."
-msgstr "Zakázat nebo povolit automatický přechod do režimu spánku, nastavení této možnosti sdělí správci napájení, aby zakázal režim spánku, například při sledování filmu."
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+"Zakázat nebo povolit automatický přechod do režimu spánku, nastavení této "
+"možnosti sdělí správci napájení, aby zakázal režim spánku, například při "
+"sledování filmu."
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "Žádná data nejsou dostupná"
 
-#: ../src/xfpm-engine.c:646
-#: ../src/xfpm-engine.c:672
-#: ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Přístup zamítnut"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernace není podporována"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Režim spánku není podporován"
@@ -646,47 +521,46 @@
 msgid "HAL daemon is not running"
 msgstr "Démon vrstvy HAL není spuštěn"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Neplatná cookie"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Pro váš operační systém není přítomen back-end"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Nebyl nalezen skript pro hibernaci"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Nebyl nalezen skript pro režim spánku"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Nebyla nalezena metoda pro režim spánku"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Nebyla nalezena metoda pro hibernaci"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Nepodařilo se přejít do režimu spánku"
 
-#: ../src/xfpm-shutdown.c:401
-#: ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Démon vrstvy HAL není připojen"
@@ -695,35 +569,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Správa napájení pro prostředí Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Lithium ionové"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Olověný akumulátor"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Lithium polymerové"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Nikl metal hydridové"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Michal Várady <miko.vaji at gmail.com>"
 
@@ -741,17 +615,101 @@
 msgid "Brightness plugin"
 msgstr "Zásuvný modul Jas"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Akce</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Pokročilé volby</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Jas</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Obecné volby</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitor</b>"
+
+#~ msgid "Actions"
+#~ msgstr "Akce"
+
+#~ msgid "Advanced"
+#~ msgstr "Pokročilé"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Považovat baterii za vybitou při:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Povolit ovládání frekvence procesoru"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Povolit ovládání správy napájení monitoru"
+
+#~ msgid "Enable notification"
+#~ msgstr "Povolit oznámení"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Uzamknout obrazovku při přechodu do režimu spánku nebo hibernace"
+
+#~ msgid "Monitor"
+#~ msgstr "Monitor"
+
+#~ msgid "On battery"
+#~ msgstr "Napájení z baterie"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Nastavení správce napájení"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Upřednostnit úsporu energie před výkonem"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Přepnout displej do režimu spánku, pokud je počítač neaktivní:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Přepnout počítač do režimu spánku, pokud je neaktivní:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Snížit jak obrazovky, pokud je počítač neaktivní:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Uvést počítač do režimu spánku při nečinnosti:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Uvést monitor do režimu spánku:"
+
+#~ msgid "Standby"
+#~ msgstr "Pohotovostní režim"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Vypnout displej, pokud je počítač neaktivní:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Ikona v oznamovací oblasti:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Je-li úroveň nabití baterie kritická:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Po stisknutí tlačítka hibernovat:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Při zavření laptopu:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Po stisknutí hlavního vypínače:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Po stisknutí tlačítka režim spánku:"
+
 #, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Správce napájení Xfce není spuštěn"
+
 #~ msgid "Power"
 #~ msgstr "Napájení"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Správce napájení Xfce není spuštěn"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Tuto zprávu již nezobrazovat"
 
@@ -762,101 +720,141 @@
 #, fuzzy
 #~ msgid "Power manager is connected"
 #~ msgstr "Správce napájení Xfce není spuštěn"
+
 #~ 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ě"
+
 #~ msgid "Adapter is online"
 #~ msgstr "Adaptér je připojen"
+
 #~ msgid "Adapter is offline"
 #~ msgstr "Adaptér je odpojen"
+
 #~ msgid "Are you sure you want to hibernate the system?"
 #~ msgstr "Opravdu chcete hibernovat systém?"
+
 #~ msgid "UPS configuration"
 #~ msgstr "Konfigurace záložního zdroje"
+
 #~ msgid "Consider UPS charge critical"
 #~ msgstr "Kritický stav nabití záložního zdroje"
+
 #~ msgid "Consider battery charge critical"
 #~ msgstr "Kritický stav nabití baterie"
+
 #~ msgid "percent"
 #~ msgstr "procent"
+
 #~ msgid "Enable battery state notification"
 #~ msgstr "Povolit oznámení o nabíjení baterie"
+
 #~ msgid "Enable power save on UPS power"
 #~ msgstr "Povolit úsporný režim při napájení ze záložního zdroje"
+
 #~ msgid "Enable power save on battery power"
 #~ msgstr "Povolit úsporný režim při napájení z baterie"
+
 #~ msgid "Best performance"
 #~ msgstr "Nejvyšší výkon"
+
 #~ msgid "Set the CPU to its maximum frequency"
 #~ msgstr "Nastavit procesor na nejvyšší frekvenci"
+
 #~ msgid "Ondemand performance"
 #~ msgstr "Výkon na vyžádání"
+
 #~ 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 ""
 #~ "Nastavit procesor na nejvyšší frekvenci pokud je vytížen a na nejnižší "
 #~ "pokud je systém nečinný"
+
 #~ msgid "Best power savings"
 #~ msgstr "Nejlepší úspora napájení"
+
 #~ msgid "Set the CPU to its minimum frequency"
 #~ msgstr "Nastavit procesor na nejnižší frekvenci"
+
 #~ msgid "Good power savings"
 #~ msgstr "Dobrá úspora napájení"
+
 #~ msgid ""
 #~ "gracefully increases and decreases the CPU speed depending on the current "
 #~ "usage"
 #~ msgstr ""
 #~ "zvyšuje a snižuje rychlost procesoru v závislosti na aktuálním využití"
+
 #~ msgid "CPU frequency settings on UPS power"
 #~ msgstr "Nastavení frekvence procesoru při napájení ze záložního zdroje"
+
 #~ msgid "CPU frequency settings on battery power"
 #~ msgstr "Nastavení frekvence procesoru při napájení ze baterie"
+
 #~ msgid "CPU frequency control cannot be used"
 #~ msgstr "Ovládání frekvence procesoru nelze použít"
+
 #~ msgid "CPU frequency settings on AC power"
 #~ msgstr "Nastavení frekvence procesoru při napájení ze sítě"
+
 #~ msgid "CPU frequency settings"
 #~ msgstr "Nastavení frekvence procesoru"
+
 #~ msgid "Monitor settings on UPS power"
 #~ msgstr "Nastavení monitoru při napájení ze záložního zdroje"
+
 #~ msgid "Your monitor doesn't support DPMS control"
 #~ msgstr "Váš monitor nepodporuje ovládání DPMS"
+
 #~ msgid "Keyboard shortcuts"
 #~ msgstr "Klávesové zkratky"
+
 #~ msgid "No available keyboard shortcuts found"
 #~ msgstr "Nebyly nalezeny žádné dostupné klávesové zkratky"
+
 #~ msgid "CPU settings"
 #~ msgstr "Nastavení procesoru"
+
 #~ msgid "Shortcuts"
 #~ msgstr "Klávesové zkratky"
+
 #~ msgid "Monitor Settings"
 #~ msgstr "Nastavení monitoru"
+
 #~ msgid "Your battery is almost empty"
 #~ msgstr "Baterie je téměř vybitá"
+
 #~ msgid "%"
 #~ msgstr "%"
+
 #~ msgid "min"
 #~ msgstr "min"
+
 #~ msgid "Suspend after"
 #~ msgstr "Režim spánku po"
+
 #~ msgid "Turn off after"
 #~ msgstr "Vypnout po"
+
 #~ msgid "Xfce4 Power Manager"
 #~ msgstr "Správce napájení pro Xfce4"
+
 #~ 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 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 read AC adapter status, the power manager will not work "
 #~ "properly. Possible reasons: The AC adapter driver is not loaded, broken "
@@ -866,8 +864,10 @@
 #~ "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 "System failed to shutdown"
 #~ msgstr "Vypnutí systému se nezdařilo"
+
 #~ msgid ""
 #~ "Unable to use power management service, functionalities like hibernate "
 #~ "and suspend will not work. Possible reasons: you don't have enough "
@@ -877,59 +877,82 @@
 #~ "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 "Error monitoring HAL events"
 #~ msgstr "Chyba při monitorování událostí vrstvy HAL"
+
 #~ msgid "HAL is not running or not responding"
 #~ msgstr "Vrstva HAL neběží nebo neodpovídá"
+
 #~ msgid "Unable to watch device using HAL: %s"
 #~ msgstr "Nelze sledovat zařízení pomocí vrstvy HAL: %s"
+
 #~ msgid "Message hibernate didn't get a reply"
 #~ msgstr "Zpráva o hibernaci neobdržela odpověď"
+
 #~ msgid "System failed to hibernate"
 #~ msgstr "Hibernace systému se nezdařila"
+
 #~ msgid "Error occured while trying to suspend"
 #~ msgstr "Při pokusu o přejití do režimu spánku došlo k chybě"
+
 #~ msgid "Unknown reply from the message daemon"
 #~ msgstr "Neznámá odpověď démona zpráv"
+
 #~ msgid "Message suspend didn't get a reply"
 #~ msgstr "Zpráva o režimu spánku neobdržela odpověď"
+
 #~ msgid "No reply from HAL daemon to set monitor brightness level"
 #~ msgstr ""
 #~ "Žádná odpověď od démona vrstvy HAL pro nastavení úrovně jasu monitoru"
+
 #~ msgid "No reply from HAL daemon to get monitor brightness level"
 #~ msgstr "Žádná odpověď od démona vrstvy HAL pro získání úrovně jasu monitoru"
+
 #~ 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"
+
 #~ 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"
+
 #~ msgid "No reply from HAL daemon to set cpu governor"
 #~ msgstr ""
 #~ "Žádná odpověď od démona vrstvy HAL pro nastavení regulátoru procesoru"
+
 #~ 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"
+
 #~ msgid "Failed to create dbus message\n"
 #~ msgstr "Nepodařilo se vytvořit zprávu sběrnice dbus\n"
+
 #~ msgid "Failed to send message\n"
 #~ msgstr "Nepodařilo se odeslat zprávu\n"
+
 #~ msgid "Start xfce power manager"
 #~ msgstr "Spustit správce napájení pro Xfce"
+
 #~ msgid "On electric power"
 #~ msgstr "Při napájení z elektrické sítě"
+
 #~ msgid "CPU frequency settings on electric power"
 #~ msgstr "Nastavení frekvence procesoru při napájení z elektrické sítě"
+
 #~ msgid "Monitor settings on electric power"
 #~ msgstr "Nastavení monitoru při napájení z elektrické sítě"
+
 #~ 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	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/da.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager 0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-20 13:33+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -18,288 +18,141 @@
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Handlinger</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Avancerede indstillinger</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Lysstyrke</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Generelle indstillinger</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Skærm</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "Handlinger"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: ../settings/xfpm-settings.glade.h:8
-#: ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Vis altid ikon"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Betragt computeren på lav strøm ved:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Slå processorfrekvenskontrol til"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Aktivér strømstyring til skærm"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Slå påmindelse til"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Generel"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689
-#: ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012
-#: ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147
-#: ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Dvaletilstand"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Lås skærmen når systemet går i hvile-/dvaletilstand"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Skærm"
-
-#: ../settings/xfpm-settings.glade.h:17
-#: ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678
-#: ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001
-#: ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ingenting"
-
-#: ../settings/xfpm-settings.glade.h:18
-#: ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Vekselstrøm"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Batteristrøm"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Strømstyringsindstillinger"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Foretræk strømbesparelse fremfor ydelse"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Lad skærmen gå i hviletilstand når computer er inaktiv i:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Lad computeren gå i hviletilstand ved inaktivitet i:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Reducér skærmens lysstyrke når computeren er inaktiv i:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Indstil computerens inaktivitets hviletilstand:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Indstil skærmens hviletilstand:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Standby"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28
-#: ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840
-#: ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075
-#: ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201
-#: ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Hviletilstand"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Sluk for skærmen når computeren er inaktiv i:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Statusfeltikon:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Ved kritisk strømniveau på batteri:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Ved tryk på dvaleknap:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Når bærbarlåg er lukket:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Ved tryk på tænd-knap:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Ved tryk på hvile-knap:"
-
-#: ../settings/xfpm-settings.glade.h:36
-#: ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184
-#: ../src/xfpm-main.c:273
-#: ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Strømstyring til Xfce"
-
-#: ../settings/xfpm-settings.c:370
-#: ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Et minut"
 
-#: ../settings/xfpm-settings.c:375
-#: ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minutter"
 
-#: ../settings/xfpm-settings.c:389
-#: ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "En time"
 
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "et minut"
 
-#: ../settings/xfpm-settings.c:398
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutter"
 
-#: ../settings/xfpm-settings.c:400
-#: ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "timer"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: ../settings/xfpm-settings.c:565
-#: ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829
-#: ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064
-#: ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Handlinger dvale og hvile er ikke tilladte"
 
-#: ../settings/xfpm-settings.c:578
-#: ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Handlingerne luk ned og dvale er ikke tilladte"
 
-#: ../settings/xfpm-settings.c:595
-#: ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ingenting"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Hviletilstand"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Dvaletilstand"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Luk ned"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Spørg"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Vis altid ikon"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Når batteri er tilstede"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Når batteri oplader eller aflader"
 
-#: ../settings/xfpm-settings.c:977
-msgid "Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode."
-msgstr "Slå strømstyringssignal til skærm fra (DPMS), så skærmen ikke bliver slukket eller bragt i hviletilstand."
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+"Slå strømstyringssignal til skærm fra (DPMS), så skærmen ikke bliver slukket "
+"eller bragt i hviletilstand."
 
-#: ../settings/xfpm-settings.c:1019
-#: ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Spørg"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "Hvilehandlinger er ikke tilladte"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "Dvalehandlinger er ikke tilladte"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Når alle strømkilder på denne computer når til dette ladeniveau"
 
-#: ../settings/xfpm-settings.c:1430
-#: ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Generel"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Vekselstrøm"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Batteristrøm"
 
-#: ../settings/xfpm-settings.c:1444
-#: ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Udvidet"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Ingen strømstyringinstans kører"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Indstillingshåndteringssokkel"
@@ -308,36 +161,41 @@
 msgid "SOCKET ID"
 msgstr "SOKKEL-ID"
 
-#: ../settings/xfpm-settings-main.c:83
-#: ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Tast '%s --help' for brug."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Strømstyring til Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 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"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Strømstyringsindstillinger til Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Kunne ikke forbinde til strømstyring til Xfce"
 
-#: ../settings/xfpm-settings-main.c:175
-#: ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Strømstyring til Xfce kører ikke"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Strømstyring til Xfce4 kører ikke, ønsker du at starte den nu?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Kør"
 
@@ -369,9 +227,8 @@
 msgid "Your battery is discharging"
 msgstr "Dit batteri aflader"
 
-#: ../src/xfpm-battery.c:117
-#: ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "System kører på batteri"
 
@@ -383,103 +240,97 @@
 msgid "System is running on low power"
 msgstr "System kører med lavt strømniveau"
 
-#: ../src/xfpm-battery.c:240
-#: ../src/xfpm-supply.c:281
-#: ../src/xfpm-supply.c:304
-#: ../src/xfpm-tray-icon.c:119
-#: ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Strømstyring til Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Din UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Batteriet til din mus"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Batteriet til dit tastatur"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Batteriet til dit kamera"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Dit PDA-batteri"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Dit batteri"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "er tomt"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "er fuldt opladet"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "ladeniveau"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "oplader"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "aflader"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "ladeniveau er lavt"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "er næsten tomt"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "er ikke tilstede"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Batteri er ikke tilstede"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Batteri"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "System kører på vekselstrøm"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Forventet tid tilbage"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Forventet ladetid til fuld opladning"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "time"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minut"
 
-#: ../src/xfpm-battery.c:421
-#: ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Batteri"
-
-#: ../src/xfpm-battery.c:424
-#: ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "System kører på vekselstrøm"
-
-#: ../src/xfpm-battery-info.c:63
-#: ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Ukendt enhed"
 
@@ -528,118 +379,142 @@
 "Licenceret under GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Undlad at dæmonisere"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Genstart den kørende instans af strømstyring til Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Vis indstillingsvindue"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Afslut enhver kørende strømstyring til Xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versionsinformation"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "For mange argumenter"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Kunne ikke forbinde til beskedsbussessionen"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "En anden strømstyring kører allerede"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Strømstyring til Xfce kører allerede"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Vekselstrøm tilstede"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Vekselstrøm er ikke tilstede"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Luk systemet ned"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Sæt systemet i dvaletilstand"
 
-#: ../src/xfpm-supply.c:273
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "Systemet kører på lavt strømniveau, men et program forhindrer i øjeblikket den automatiske hviletilstand. Dette betyder at gennemførelse af sovetilstand nu kan være ødelæggende for data til dette program. Luk dette program før computeren går i sovetilstand eller tilslut til vekselstrøm"
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"Systemet kører på lavt strømniveau, men et program forhindrer i øjeblikket "
+"den automatiske hviletilstand. Dette betyder at gennemførelse af "
+"sovetilstand nu kan være ødelæggende for data til dette program. Luk dette "
+"program før computeren går i sovetilstand eller tilslut til vekselstrøm"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "Systemet kører på lavt strømniveau. Gem dine data for at undgå tab af data"
+msgstr ""
+"Systemet kører på lavt strømniveau. Gem dine data for at undgå tab af data"
 
-#: ../src/xfpm-tray-icon.c:162
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "Et program har for øjeblikket slået den automatiske hviletilstand fra. Udførelse af denne handling nu kan ødelægge tilstanden af programmet. Er du sikker på, at du ønsker at at bringe systemet i dvaletilstand?"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"Et program har for øjeblikket slået den automatiske hviletilstand fra. "
+"Udførelse af denne handling nu kan ødelægge tilstanden af programmet. Er du "
+"sikker på, at du ønsker at at bringe systemet i dvaletilstand?"
 
-#: ../src/xfpm-tray-icon.c:165
-#: ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Er du sikker på, at du vil fortsætte?"
 
-#: ../src/xfpm-tray-icon.c:193
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "Et program har for øjeblikket slået den automatiske hviletilstand fra. Udførelse af denne handling nu kan ødelægge tilstanden af programmet. Er du sikker på, at du ønsker at at bringe systemet i hviletilstand?"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"Et program har for øjeblikket slået den automatiske hviletilstand fra. "
+"Udførelse af denne handling nu kan ødelægge tilstanden af programmet. Er du "
+"sikker på, at du ønsker at at bringe systemet i hviletilstand?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Afslut strømstyring til Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Ryd forbud"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Forbyd"
 
-#: ../src/xfpm-tray-icon.c:300
-msgid "Disable or enable automatic sleep, setting this will tell the power manager to disable backlight sleep, for example you could active the inhibit if you are watching a movie."
-msgstr "Slå automatisk hviletilstand til eller fra. Indstillingen vil anmode strømstyringen om at slå baggrundslyshvilestilstand fra. Du kunne som eksempel slå forbuddet til hvis du ser en film."
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+"Slå automatisk hviletilstand til eller fra. Indstillingen vil anmode "
+"strømstyringen om at slå baggrundslyshvilestilstand fra. Du kunne som "
+"eksempel slå forbuddet til hvis du ser en film."
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "Ingen tilgængelige data"
 
-#: ../src/xfpm-engine.c:646
-#: ../src/xfpm-engine.c:672
-#: ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Tilladelse afvist"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Dvaletilstand er ikke understøttet"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Dvaletilstand er ikke understøttet"
@@ -648,47 +523,46 @@
 msgid "HAL daemon is not running"
 msgstr "HAL-dæmonen kører ikke"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Ugyldig cookie"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Ingen underliggende proces til dit operativsystem"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Intet dvale-skript fundet"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Intet hvile-skript fundet"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Ingen hvile-metode fundet"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Ingen hvile-metode fundet"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Er løbet tør for hukommelse"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "System kunne ikke gå i hviletilstand"
 
-#: ../src/xfpm-shutdown.c:401
-#: ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "HAL-dæmon er ikke forbundet i øjeblikket"
@@ -697,35 +571,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Strømstyring til skrivebordsmiljøet Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Lithium-ion"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Bly-syre"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Lithium-polymer"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Nikkel-metalhybrid"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Per Kongstad <p_kongstad at op.pl>\n"
@@ -747,28 +621,123 @@
 msgid "Brightness plugin"
 msgstr "Moduludvidelse for lysstyrke"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Handlinger</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Avancerede indstillinger</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Lysstyrke</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Generelle indstillinger</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Skærm</b>"
+
+#~ msgid "Actions"
+#~ msgstr "Handlinger"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanceret"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Betragt computeren på lav strøm ved:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Slå processorfrekvenskontrol til"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Aktivér strømstyring til skærm"
+
+#~ msgid "Enable notification"
+#~ msgstr "Slå påmindelse til"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Lås skærmen når systemet går i hvile-/dvaletilstand"
+
+#~ msgid "Monitor"
+#~ msgstr "Skærm"
+
+#~ msgid "On battery"
+#~ msgstr "Batteristrøm"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Strømstyringsindstillinger"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Foretræk strømbesparelse fremfor ydelse"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Lad skærmen gå i hviletilstand når computer er inaktiv i:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Lad computeren gå i hviletilstand ved inaktivitet i:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Reducér skærmens lysstyrke når computeren er inaktiv i:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Indstil computerens inaktivitets hviletilstand:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Indstil skærmens hviletilstand:"
+
+#~ msgid "Standby"
+#~ msgstr "Standby"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Sluk for skærmen når computeren er inaktiv i:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Statusfeltikon:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Ved kritisk strømniveau på batteri:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Ved tryk på dvaleknap:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Når bærbarlåg er lukket:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Ved tryk på tænd-knap:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Ved tryk på hvile-knap:"
+
 #~ msgid "Advance"
 #~ msgstr "Avanceret"
+
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
+
 #~ msgid "gtk-help"
 #~ msgstr "gtk-help"
-#~ msgid "No power manager instance running"
-#~ msgstr "Ingen strømstyringinstans kører"
+
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Forbud mod automatisk hviletilstand"
+
 #~ msgid "Another application is disabling the automatic sleep"
 #~ msgstr "Et andet program slår den automatiske hviletilstand fra"
+
 #~ msgid "Automatic sleep enabled"
 #~ msgstr "Automatisk hviletilstand er slået til"
+
 #~ msgid "Power manager automatic sleep is disabled"
 #~ msgstr "Strømstyrings automatiske hviletilstand er slået fra"
+
 #~ msgid "Power manager automatic sleep is enabled"
 #~ msgstr "Strømstyrings automatiske hviletilstand er slået til"
+
 #~ msgid "Don't show again"
 #~ msgstr "Vis ikke denne besked igen"
+
 #~ msgid "Power manager disconnected"
 #~ msgstr "Strømstyring er ikke forbundet"
+
 #~ msgid "Power manager is connected"
 #~ msgstr "Strømstyring er forbundet"
 
@@ -776,31 +745,42 @@
 #, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Strømstyring til Xfce kører ikke. Genstart den"
+
 #~ msgid "Power"
 #~ msgstr "Strøm"
+
 #~ 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"
+
 #~ msgid "Adapter is online"
 #~ msgstr "Tilslutning tændt"
+
 #~ msgid "Adapter is offline"
 #~ msgstr "Tilslutning slukket"
+
 #~ msgid "Are you sure you want to hibernate the system?"
 #~ msgstr "Er du sikker på, at du ønsker systemet i dvaletilstand?"
+
 #~ msgid "UPS configuration"
 #~ msgstr "Nødstrømsindstilling"
+
 #~ msgid "Consider UPS charge critical"
 #~ msgstr "Opfat nødstrømladning som kritisk"
+
 #~ msgid "Consider battery charge critical"
 #~ msgstr "Opfat batteriladning som kritisk"
+
 #~ msgid "percent"
 #~ msgstr "procent"
+
 #~ msgid "Enable battery state notification"
 #~ msgstr "Aktivér påmindelse af batteritilstand"
+
 #~ msgid "Enable power save on UPS power"
 #~ msgstr "Aktivér strømstyring ved nødstrømstrøm"
+
 #~ msgid "Enable power save on battery power"
 #~ msgstr "Aktivér strømstyring ved strøm fra batteri"
-

Modified: xfce4-power-manager/trunk/po/de.po
===================================================================
--- xfce4-power-manager/trunk/po/de.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/de.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-05 13:03+0200\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: German\n"
@@ -18,268 +18,144 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Aktionen</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Erweiterte Einstellungen</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Helligkeit</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Allgemeine Einstellungen</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Aktionen</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Immer ein Symbol zeigen"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Energiezustand als niedrig betrachten bei:"
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Skalierung der CPU-Geschwindigkeit aktivieren"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Energieverwaltung für Monitor aktivieren"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Benachrichtigung aktivieren"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Allgemein"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Ruhezustand"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Bildschirm sperren im Ruhezustand/Standby"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nichts"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Bei Netzversorgung"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Im Batteriebetrieb"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Einstellungen der Energieverwaltung"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Stromsparen gegenüber Leistung bevorzugen"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Anzeige schlafen legen, wenn der Computer inaktiv ist für:"
-
-#: ../settings/xfpm-settings.glade.h:23
-#, fuzzy
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Anzeige schlafen legen, wenn der Computer inaktiv ist für:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Bildschirmhelligkeit reduzieren, wenn der Computer inaktiv ist für:"
-
-#: ../settings/xfpm-settings.glade.h:25
-#, fuzzy
-msgid "Set computer inactivity sleep mode:"
-msgstr "Schlafmodus für den Monitor einstellen:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Schlafmodus für den Monitor einstellen:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Bereitschaft"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Standby"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Anzeige abschalten, wenn der Computer inaktiv ist für:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Symbol in der Systemleiste: "
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Bei kritischem Ladezustand der Batterie:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Beim Schließen der Bildschirmklappe:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Bei Betätigung der Taste für den Schlafmodus:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Energieverwaltung für Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Nie"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Eine Minute"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minuten"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "Stunde"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "Eine Minute"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "Stunden"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Sekunden"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Die Operationen für den Ruhezustand und Standby sind nicht erlaubt"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 "Die Operationen zum Herunterfahren und für den Ruhezustand sind nicht erlaubt"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nichts"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Standby"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Ruhezustand"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Immer ein Symbol zeigen"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Bei Batterieversorgung"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Beim Laden oder Entladen der Batterie"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 #, fuzzy
 msgid "Suspend operation not permitted"
 msgstr "Die Operationen für den Ruhezustand und Standby sind nicht erlaubt"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Die Operationen für den Ruhezustand und Standby sind nicht erlaubt"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Wenn alle Stromquellen des Computers diesen Level erreichen"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Allgemein"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Bei Netzversorgung"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Im Batteriebetrieb"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Erweitert"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Energieverwaltung läuft nicht"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Socket der Sitzungsverwaltung"
@@ -288,37 +164,43 @@
 msgid "SOCKET ID"
 msgstr "SOCKET-NR"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr ""
 "Geben Sie »%s --help« ein, um Informationen über die Verwendung zu erhalten"
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Energieverwaltung für Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Konnte Konfiguration der Energieverwaltung nicht laden; nehme Standardwerte"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Einstellungen der Energieverwaltung für Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Kann keine Verbindung mit der Energieverwaltung für Xfce herstellen"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Energieverwaltung für Xfce läuft nicht"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "Die Energieverwaltung für Xfce läuft nicht. Möchten Sie sie jetzt starten?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Starten"
 
@@ -351,8 +233,8 @@
 msgid "Your battery is discharging"
 msgstr "Ihre Batterie wird entladen"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "System läuft gerade im Batteriebetrieb"
 
@@ -364,98 +246,98 @@
 msgid "System is running on low power"
 msgstr "Das System befindet sich in einem niedrigen Energiezustand"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Energieverwaltung für Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Ihre USV"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Ihre Mausbatterie"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Ihre Tastaturbatterie"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Ihre Kamerabatterie"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Ihre PDA-Batterie"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Ihre Batterie"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "ist nahezu leer"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "ist vollständig geladen"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "Ladezustand"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "wird geladen"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "wird entladen"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "Ladezustand ist gering"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "ist nahezu leer"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "ist nicht vorhanden"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Batterie nicht verfügbar"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Batterie"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "System läuft mit Netzversorgung"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Geschätzte verbleibende Zeit"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Geschätzte Ladedauer"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "Stunde"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "Minute"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Batterie"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "System läuft mit Netzversorgung"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unbekannte Einheit"
 
@@ -504,61 +386,61 @@
 "Veröffentlicht unter der GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Nicht in den Dämonmodus gehen"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Die laufende Energieverwaltung für Xfce neustarten"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Einstellungsdialog anzeigen"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Energieverwaltung für Xfce beenden"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versionsinformation"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Zu viele Argumente"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Kann keine Verbindung zur Sitzung des Nachrichtenbusses erhalten"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Eine andere Energieverwaltung läuft bereits"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Energieverwaltung für Xfce läuft bereits"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Anschluss vorhanden"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Anschluss nicht vorhanden"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Das System herunterfahren"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Das System in den Ruhezustand versetzen"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -571,13 +453,13 @@
 "Anwendung, bevor Sie den Rechner in einen Schlafmodus versetzten, oder "
 "schließen Sie die Stromversorgung an."
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Ihre Batterie ist nahezu leer. Sichern Sie Ihre Arbeit, damit keine Daten "
 "verloren gehen"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -588,12 +470,12 @@
 "beschädigt werden. Sind Sie sicher, dass Sie Ihr System jetzt in den "
 "Ruhezustand versetzen wollen?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Möchten Sie wirklich fortfahren?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -604,45 +486,45 @@
 "beschädigt werden. Sind Sie sicher, dass Sie das System jetzt in den "
 "Standbymodus versetzen wollen?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Energieverwaltung für Xfce beenden"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 #, fuzzy
 msgid "Inhibit"
 msgstr "Verhinderungs-Plugin"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Ruhezustand wird nicht unterstützt"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Standbymodus wird nicht unterstützt"
@@ -651,46 +533,46 @@
 msgid "HAL daemon is not running"
 msgstr "Der HAL-Dienst läuft nicht"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Ungültiges Cookie"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Keine Unterstützung für Ihr Betriebssystem gefunden"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Kein Skript für den Ruhezustand gefunden"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Kein Skript für Standby gefunden"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Keine Methode für Standby gefunden"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Keine Methode für den Ruhezustand gefunden"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Kein Speicher verfügbar"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "System konnte nicht in den Schlafmodus versetzt werden"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Der HAL-Dienst ist derzeitig nicht verbunden"
@@ -699,35 +581,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Energieverwaltung für den Xfce Desktop"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Lithium-Ionen"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Bleisäure"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Lithium-Polymere"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Nickelmetallhydrid"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Fabian Nowak <timystery at arcor.de>\n"
@@ -748,6 +630,99 @@
 msgid "Brightness plugin"
 msgstr "Plugin zur Helligkeitsregelung"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Aktionen</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Erweiterte Einstellungen</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Helligkeit</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Allgemeine Einstellungen</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitor</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Aktionen</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Erweitert"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Energiezustand als niedrig betrachten bei:"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Skalierung der CPU-Geschwindigkeit aktivieren"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Energieverwaltung für Monitor aktivieren"
+
+#~ msgid "Enable notification"
+#~ msgstr "Benachrichtigung aktivieren"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Bildschirm sperren im Ruhezustand/Standby"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Monitor</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Im Batteriebetrieb"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Einstellungen der Energieverwaltung"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Stromsparen gegenüber Leistung bevorzugen"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Anzeige schlafen legen, wenn der Computer inaktiv ist für:"
+
+#, fuzzy
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Anzeige schlafen legen, wenn der Computer inaktiv ist für:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Bildschirmhelligkeit reduzieren, wenn der Computer inaktiv ist für:"
+
+#, fuzzy
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Schlafmodus für den Monitor einstellen:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Schlafmodus für den Monitor einstellen:"
+
+#~ msgid "Standby"
+#~ msgstr "Bereitschaft"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Anzeige abschalten, wenn der Computer inaktiv ist für:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Symbol in der Systemleiste: "
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Bei kritischem Ladezustand der Batterie:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Beim Schließen der Bildschirmklappe:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Bei Betätigung der Taste für den Schlafmodus:"
+
 #~ msgid "Advance"
 #~ msgstr "Weiter"
 
@@ -757,9 +732,6 @@
 #~ msgid "gtk-help"
 #~ msgstr "gtk-help"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Energieverwaltung läuft nicht"
-
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Automatisches Schlafen verhindert"
 

Modified: xfce4-power-manager/trunk/po/el.po
===================================================================
--- xfce4-power-manager/trunk/po/el.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/el.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-21 21:28+0200\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -17,272 +17,146 @@
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Ενέργειες</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Προχωρημένες ρυθμίσεις</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Φωτεινότητα</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Γενικές Ρυθμίσεις</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Οθόνη</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Ενέργειες</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Προχωρημένες"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Να εμφανίζεται πάντα το εικονίδιο"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Θεωρείστε τον υπολογιστή σε λίγο ρεύμα στο:"
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Ενεργοποίηση ελέγχου αυξομείωσης συχνότητας επεξεργαστή"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Ενεργοποίηση προβολής ελέγχου διαχείρισης ρεύματος"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Ενεργοποίηση ειδοποιήσεων"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Γενικά"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Αδρανοποίηση"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Κλείδωμα οθόνης όταν μεταβαίνει για αναστολή/αδρανοποίηση"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Οθόνη</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Τίποτα"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Σε AC"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Στην μπαταρία"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Ρυθμίσεις διαχειριστή ρεύματος"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Προτιμώμενες ρυθμίσεις ρεύματος έναντι απόδοσης"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Κλείσιμο οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
-
-#: ../settings/xfpm-settings.glade.h:23
-#, fuzzy
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Κλείσιμο οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-"Μείωση της φωτεινότητας της οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
-
-#: ../settings/xfpm-settings.glade.h:25
-#, fuzzy
-msgid "Set computer inactivity sleep mode:"
-msgstr "Κατάσταση κλεισίματος οθόνης:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Κατάσταση κλεισίματος οθόνης:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Σε αναμονή"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Αναστολή"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Απενεργοποίηση οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Εικονίδιο πλαισίου συστήματος:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Όταν το ρεύμα της μπαταρίας είναι κρίσιμο:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Όταν το κουμπί τερματισμού πατηθεί:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Όταν το καπάκι του φορητού είναι κλειστό:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Όταν το κουμπί τερματισμού πατηθεί:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Όταν το κουμπί κλεισίματος πατηθεί:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Διαχειριστής ρεύματος xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Ποτέ"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Ένα λεπτό"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Λεπτά"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "ώρα"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "Ένα λεπτό"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "λεπτά"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "ώρες"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Δευτερόλεπτα"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Οι λειτουργίες αδρανοποίηση και αναστολή δεν επιτρέπονται"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Οι λειτουργίες τερματισμός και αδρανοποίηση δεν επιτρέπονται"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Τίποτα"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Αναστολή"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Αδρανοποίηση"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Τερματισμός"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Να εμφανίζεται πάντα το εικονίδιο"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Όταν η μπαταρία είναι παρούσα"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Όταν η μπαταρία φορτίζει ή αποφορτίζει"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 #, fuzzy
 msgid "Suspend operation not permitted"
 msgstr "Οι λειτουργίες αδρανοποίηση και αναστολή δεν επιτρέπονται"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Οι λειτουργίες αδρανοποίηση και αναστολή δεν επιτρέπονται"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 #, fuzzy
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 "Όταν η κύρια πηγή ρεύματος στον υπολογιστή φτάσει την τιμή του ποσοστού "
 "φόρτωσης"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Γενικά"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Σε AC"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Σε μπαταρία"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Εκτεναμένες"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Κανένα στιγμιότυπο του διαχειριστή ρεύματος δεν εκτελείται"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Διαχειριστής ρυθμίσεων υποδοχής"
@@ -291,37 +165,43 @@
 msgid "SOCKET ID"
 msgstr "Ταυτότητα υποδοχής"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Πληκτρολόγησε '%s --help' για την χρήση."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Διαχειριστής ρεύματος xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Αποτυχία φόρτωσης των ρυθμίσεων του διαχειριστή ρεύματος, χρήση των "
 "προκαθορισμένων"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Ρυθμίσεις xfce διαχειριστή ρεύματος"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Αδυναμία σύνδεσης με τον διαχειριστή ρεύματος xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Ο διαχειριστής ρεύματος xfce δεν εκτελείται"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "Ο διαχειριστής ρεύματος xfce δεν εκτελείται, θέλετε να τον εκκινήσετε τώρα;"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Εκτέλεση"
 
@@ -354,8 +234,8 @@
 msgid "Your battery is discharging"
 msgstr "Η μπαταρία σας αποφορτίζει"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Το σύστημα τρέχει σε χαμηλή μπαταρία"
 
@@ -367,98 +247,98 @@
 msgid "System is running on low power"
 msgstr "Το σύστημα τρέχει σε λίγο ρεύμα"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Διαχειριστής ρεύματος xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Το UPS σας"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Η μπαταρία του ποντικιού σας"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Η μπαταρία του πληκτρολογίου σας"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Η μπαταρία της κάμερά σας"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Η μπαταρία του PDA σας"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Η μπαταρία σας"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "είναι σχεδόν άδεια"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "είναι πλήρως φορτισμένη"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "επίπεδο φόρτωσης"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "φορτίζει"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "αποφορτίζει"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "η φόρτιση είναι χαμηλή"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "είναι σχεδόν άδεια"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "δεν είναι παρούσα"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Η μπαταρία δεν είναι παρούσα"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Μπαταρία"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Το σύστημα λειτουργεί με ρεύμα AC"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Χρόνος που απομένει"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Χρόνος που απομένει για πλήρη φόρτιση"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "ώρα"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "λεπτό"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Μπαταρία"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Το σύστημα λειτουργεί με ρεύμα AC"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Άγνωστη μονάδα"
 
@@ -507,62 +387,62 @@
 "Αδειοδότηση κάτω από την GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Όχι ως δαίμονας"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Επανεκκίνηση του τρέχοντος στιγμιότυπου από τον διαχειριστή ρεύματος"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Εμφάνιση διαλόγου ρύθμισης"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Τερματισμός κάθε διαχειριστή ρεύματος xfce που εκτελείται"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Πληροφορίες έκδοσης"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Πάρα πολλά ορίσματα"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Αδυναμία να συνδεθεί με τον δίαυλο μηνυμάτων συνεδρίας"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Ένας άλλος διαχειριστής ρεύματος τρέχει ήδη"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Ο διαχειριστής ρεύματος xfce ήδη εκτελείται"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Δεν υπάρχει προσαρμογέας"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Ο προσαρμογέας δεν είναι παρόν"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Τερματισμός συστήματος"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Αδρανοποίηση του συστήματος"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -575,13 +455,13 @@
 "εφαρμογή πριν θέσετε τον υπολογιστή σαςσε κατάσταση κλεισίματος ή "
 "τοποθετήστε τον προσαρμογέα ρεύματος AC"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Το σύστημα λειτουργεί σε χαμηλό ρεύμα. Αποθηκεύστε την δουλειά σας για να "
 "αποφύγετε την απώλεια δεδομένων "
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -591,12 +471,12 @@
 "την ενέργεια τώρα μπορεί να καταστρέψετε την κατάσταση που λειτουργεί αυτή η "
 "εφαρμογή, είστε σίγουροι ότι θέλετε να απενεργοποιήσετε το σύστημα;"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Είστε σίγουροι ότι θέλετε να προχωρήσετε;"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -606,45 +486,45 @@
 "την ενέργεια μπορεί να καταστρέψετε την κατάσταση εργασίας της εφαρμογής, "
 "είστε σίγουροι ότι θέλετε να αναστείλετε το σύστημά σας;"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Διαχειριστής ρεύματος xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Απαγορεύεται η πρόσβαση"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Η αδρανοποιήση δεν υποστηρίζεται"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Η αναστολή δεν υποστήριζεται"
@@ -654,46 +534,46 @@
 msgid "HAL daemon is not running"
 msgstr "Ο δαίμονας HAL δεν εκτελείται"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Πάρα πολλά ορίσματα"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Άκυρο cookie"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Καμία υποστήριξη για το λειτουργικό σας σύστημα"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Δεν βρέθηκε δέσμη ενεργειών για αδρανοποίηση"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Δεν βρέθηκε δέσμη ενεργειών για αναστολή"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Δεν βρέθηκε μέθοδος αναστολής"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Δεν βρέθηκε μέθοδος αδρανοποίησης"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Εκτός μνήμης"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Το σύστημα απέτυχε κατά το κλείσιμο"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, fuzzy, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Ο δαίμονας hal δεν είναι συνδεδεμένος για τώρα"
@@ -702,35 +582,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Διαχείριση ρεύματος για την επιφάνεια εργασίας του xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Ιόντων λιθίου"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Οξύ μόλυβδου"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Πολυμερές λιθίου"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Υβριδικό νικελίου μετάλλου"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
@@ -751,6 +631,101 @@
 msgid "Brightness plugin"
 msgstr "Άρθρωμα φωτεινότητας"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Ενέργειες</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Προχωρημένες ρυθμίσεις</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Φωτεινότητα</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Γενικές Ρυθμίσεις</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Οθόνη</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Ενέργειες</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Προχωρημένες"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Θεωρείστε τον υπολογιστή σε λίγο ρεύμα στο:"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Ενεργοποίηση ελέγχου αυξομείωσης συχνότητας επεξεργαστή"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Ενεργοποίηση προβολής ελέγχου διαχείρισης ρεύματος"
+
+#~ msgid "Enable notification"
+#~ msgstr "Ενεργοποίηση ειδοποιήσεων"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Κλείδωμα οθόνης όταν μεταβαίνει για αναστολή/αδρανοποίηση"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Οθόνη</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Στην μπαταρία"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Ρυθμίσεις διαχειριστή ρεύματος"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Προτιμώμενες ρυθμίσεις ρεύματος έναντι απόδοσης"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Κλείσιμο οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
+
+#, fuzzy
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Κλείσιμο οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr ""
+#~ "Μείωση της φωτεινότητας της οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
+
+#, fuzzy
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Κατάσταση κλεισίματος οθόνης:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Κατάσταση κλεισίματος οθόνης:"
+
+#~ msgid "Standby"
+#~ msgstr "Σε αναμονή"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Απενεργοποίηση οθόνης όταν ο υπολογιστής είναι ανενεργός για:"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Εικονίδιο πλαισίου συστήματος:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Όταν το ρεύμα της μπαταρίας είναι κρίσιμο:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Όταν το κουμπί τερματισμού πατηθεί:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Όταν το καπάκι του φορητού είναι κλειστό:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Όταν το κουμπί τερματισμού πατηθεί:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Όταν το κουμπί κλεισίματος πατηθεί:"
+
 #~ msgid "Advance"
 #~ msgstr "Προχωρημένο"
 
@@ -767,9 +742,6 @@
 #~ msgid "gtk-help"
 #~ msgstr "βοήθεια"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Κανένα στιγμιότυπο του διαχειριστή ρεύματος δεν εκτελείται"
-
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Δεν επιτρέπεται το αυτόματο κλείσιμο"
 

Modified: xfce4-power-manager/trunk/po/es.po
===================================================================
--- xfce4-power-manager/trunk/po/es.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/es.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-06-13 01:45-0300\n"
 "Last-Translator: elega <elega at elega.com.ar>\n"
 "Language-Team: Spanish\n"
@@ -17,288 +17,142 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Acciones</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Opciones avanzadas</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Brillo</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Opciones generales</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "Acciones"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../settings/xfpm-settings.glade.h:8
-#: ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Siempre mostrar ícono"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Considerar al equipo con baja potencia al:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Activar el control del frecuencia del CPU"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Activar el control de gestión de energía del monitor"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Activar notificación"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "General"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689
-#: ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012
-#: ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147
-#: ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernar"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Bloquear la pantalla cuando se va a suspender/hibernar"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Monitor"
-
-#: ../settings/xfpm-settings.glade.h:17
-#: ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678
-#: ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001
-#: ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nada"
-
-#: ../settings/xfpm-settings.glade.h:18
-#: ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Con AC"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Con batería"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Configuración del administrador de energía"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Prefiero ahorrar energía por sobre el rendimiento"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Poner la pantalla en reposo cuando el ordenador está inactivo por:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Poner al equipo en reposo cuando está inactivo por:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Reducir el brillo de la pantalla cuando el ordenador está inactivo por:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Establecer el modo de inactividad del equipo:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Establecer el modo de reposo de la pantalla:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "En espera"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28
-#: ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840
-#: ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075
-#: ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201
-#: ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspender"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Apagar la pantalla cuando el ordenador está inactivo por:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Icono del área de notificaciones:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Cuando la carga de la batería es crítica:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Al pulsar el botón de hibernación:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Al cerrar la tapa del portátil:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Al pulsar el botón de encendido:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Al pulsar el botón de suspensión:"
-
-#: ../settings/xfpm-settings.glade.h:36
-#: ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184
-#: ../src/xfpm-main.c:273
-#: ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Administrador de energía de Xfce"
-
-#: ../settings/xfpm-settings.c:370
-#: ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Nunca"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Un minuto"
 
-#: ../settings/xfpm-settings.c:375
-#: ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minutos"
 
-#: ../settings/xfpm-settings.c:389
-#: ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Una hora"
 
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "un minuto"
 
-#: ../settings/xfpm-settings.c:398
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:400
-#: ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "horas"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Segundos"
 
-#: ../settings/xfpm-settings.c:565
-#: ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829
-#: ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064
-#: ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Las operaciones de hibernación y suspensión no están permitidas"
 
-#: ../settings/xfpm-settings.c:578
-#: ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Las operaciones de apagado e hibernación no están permitidas"
 
-#: ../settings/xfpm-settings.c:595
-#: ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nada"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspender"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Preguntar"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Siempre mostrar ícono"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Cuando la batería está presente"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Cuando la batería se está cargando o descargando"
 
-#: ../settings/xfpm-settings.c:977
-msgid "Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode."
-msgstr "Desactivar la pantalla de señalización del administrador de energía (DPMS), por ejemplo, no intente apagar la pantalla o poner en modo de reposo."
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+"Desactivar la pantalla de señalización del administrador de energía (DPMS), "
+"por ejemplo, no intente apagar la pantalla o poner en modo de reposo."
 
-#: ../settings/xfpm-settings.c:1019
-#: ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Preguntar"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "La suspensión no está permitida"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "La hibernación no está permitida"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
-msgstr "Cuando todas las fuentes de energía del equipo alcanzan éste nivel de carga"
+msgstr ""
+"Cuando todas las fuentes de energía del equipo alcanzan éste nivel de carga"
 
-#: ../settings/xfpm-settings.c:1430
-#: ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "General"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Con AC"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Con batería"
 
-#: ../settings/xfpm-settings.c:1444
-#: ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Extendido"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "El administrador de energía de Xfce no se está ejecutando"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Socket del administrador de energía"
@@ -307,36 +161,44 @@
 msgid "SOCKET ID"
 msgstr "ID de SOCKET"
 
-#: ../settings/xfpm-settings-main.c:83
-#: ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Escriba '%s --help' para opciones de uso."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Administrador de energía de Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "Fallo al cargar la configuración del administrador de energía, usando opciones predeterminadas"
+msgstr ""
+"Fallo al cargar la configuración del administrador de energía, usando "
+"opciones predeterminadas"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Configuración del administrador de energía de Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "No se puede conectar el administrador de energía de Xfce4"
 
-#: ../settings/xfpm-settings-main.c:175
-#: ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "El administrador de energía de Xfce no se está ejecutando"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
-msgstr "El administrador de energía de Xfce4 no está ejecutándose, ¿Desea lanzarlo ahora?"
+msgstr ""
+"El administrador de energía de Xfce4 no está ejecutándose, ¿Desea lanzarlo "
+"ahora?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Ejecutar"
 
@@ -368,9 +230,8 @@
 msgid "Your battery is discharging"
 msgstr "La batería se está descargando"
 
-#: ../src/xfpm-battery.c:117
-#: ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "El equipo está funcionando con la batería"
 
@@ -382,103 +243,97 @@
 msgid "System is running on low power"
 msgstr "El equipo está funcionando en baja potencia"
 
-#: ../src/xfpm-battery.c:240
-#: ../src/xfpm-supply.c:281
-#: ../src/xfpm-supply.c:304
-#: ../src/xfpm-tray-icon.c:119
-#: ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Administrador de energía de Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Batería del ratón"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "La batería del teclado"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Batería de la cámara"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "La batería del PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "La batería"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "está vacía"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "está completamente cargada"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "nivel de carga"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "se está cargando"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "se está descargando"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "carga es baja"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "está casi vacía"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "no está presente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "La batería no está presente"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "La batería"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "El equipo está funcionando con el adaptador de corriente"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Tiempo restante estimado"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Tiempo estimado para completar la carga"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/xfpm-battery.c:421
-#: ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "La batería"
-
-#: ../src/xfpm-battery.c:424
-#: ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "El equipo está funcionando con el adaptador de corriente"
-
-#: ../src/xfpm-battery-info.c:63
-#: ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unidad desconocida:"
 
@@ -527,118 +382,145 @@
 "Con licencia GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Sin demonio"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
-msgstr "Reiniciar la instancia en ejecución del administrador de energía de Xfce"
+msgstr ""
+"Reiniciar la instancia en ejecución del administrador de energía de Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostrar el diálogo de configuración"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Cerrar cualquier administrador de energía de Xfce en ejecución"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Información de versión"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Demasiados argumentos"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "No se puede obtener conexión con el bus de mensajes de sesiones"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Otro administrador de energía ya está ejecutándose"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "El administrador de energía de Xfce ya está ejecutándose"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "El adaptador está presente"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "El adaptador no está presente"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Apagar el sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernar el sistema"
 
-#: ../src/xfpm-supply.c:273
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "El equipo está funcionando en baja potencia, pero una aplicación está desactivando actualmente el reposo automático, ésto significa que hacer un reposo ahora puede dañar los datos de la aplicación. Cierre ésta aplicación antes de poner el equipo en el modo de reposo o enchufe en el adaptador de corriente"
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"El equipo está funcionando en baja potencia, pero una aplicación está "
+"desactivando actualmente el reposo automático, ésto significa que hacer un "
+"reposo ahora puede dañar los datos de la aplicación. Cierre ésta aplicación "
+"antes de poner el equipo en el modo de reposo o enchufe en el adaptador de "
+"corriente"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "El equipo está funcionando en baja potencia. Guarde su trabajo para evitar la pérdida de datos "
+msgstr ""
+"El equipo está funcionando en baja potencia. Guarde su trabajo para evitar "
+"la pérdida de datos "
 
-#: ../src/xfpm-tray-icon.c:162
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "Una aplicación está desactivando actualmente el reposo automático, hacer ésta acción ahora puede dañar el estado de funcionamiento de ésta aplicación, ¿ Está usted seguro de que desea hibernar el sistema?"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"Una aplicación está desactivando actualmente el reposo automático, hacer "
+"ésta acción ahora puede dañar el estado de funcionamiento de ésta "
+"aplicación, ¿ Está usted seguro de que desea hibernar el sistema?"
 
-#: ../src/xfpm-tray-icon.c:165
-#: ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "¿Estás seguro de que desea continuar?"
 
-#: ../src/xfpm-tray-icon.c:193
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "Una aplicación está desactivando actualmente el reposo automático, hacer ésta acción ahora puede dañar el estado de funcionamiento de ésta aplicación, ¿ Está usted seguro de que desea suspender el sistema?"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"Una aplicación está desactivando actualmente el reposo automático, hacer "
+"ésta acción ahora puede dañar el estado de funcionamiento de ésta "
+"aplicación, ¿ Está usted seguro de que desea suspender el sistema?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Salir del administrador de energía de Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Borrar inhibir"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Inhibir"
 
-#: ../src/xfpm-tray-icon.c:300
-msgid "Disable or enable automatic sleep, setting this will tell the power manager to disable backlight sleep, for example you could active the inhibit if you are watching a movie."
-msgstr "Desactivar o activar automáticamente el reposo, ésto le dirá al administrador de energía cuando desactivar el reposo de fondo, por ejemplo, puede activar inhibir si usted está viendo una película."
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+"Desactivar o activar automáticamente el reposo, ésto le dirá al "
+"administrador de energía cuando desactivar el reposo de fondo, por ejemplo, "
+"puede activar inhibir si usted está viendo una película."
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "No hay datos disponibles"
 
-#: ../src/xfpm-engine.c:646
-#: ../src/xfpm-engine.c:672
-#: ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernar no está soportado"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Suspensión no está soportado"
@@ -647,47 +529,46 @@
 msgid "HAL daemon is not running"
 msgstr "El demonio HAL no se está ejecutando"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Argumentos no válidos"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Huella no válida"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "No hay motor para su sistema operativo"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "No se encontró ningún script de hibernación"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "No se encontró ningún script de suspensión"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "No se encontró ningún método de suspensión"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "No se encontró ningún método de hibernación"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Memoria agotada"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "El sistema falló al suspender"
 
-#: ../src/xfpm-shutdown.c:401
-#: ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "El demonio HAL no está conectado actualmente "
@@ -696,35 +577,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Administrador de energía para el escritorio Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Ion de litio"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Plomo y ácido"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Polímero de litio"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Híbrido de níquel metal"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Abel Martín <abel.martin.ruiz at gmail.com>, 2009\n"
@@ -744,17 +625,102 @@
 msgid "Brightness plugin"
 msgstr "Complemente de brillo"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Acciones</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Opciones avanzadas</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Brillo</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Opciones generales</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitor</b>"
+
+#~ msgid "Actions"
+#~ msgstr "Acciones"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Considerar al equipo con baja potencia al:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Activar el control del frecuencia del CPU"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Activar el control de gestión de energía del monitor"
+
+#~ msgid "Enable notification"
+#~ msgstr "Activar notificación"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Bloquear la pantalla cuando se va a suspender/hibernar"
+
+#~ msgid "Monitor"
+#~ msgstr "Monitor"
+
+#~ msgid "On battery"
+#~ msgstr "Con batería"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Configuración del administrador de energía"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Prefiero ahorrar energía por sobre el rendimiento"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Poner la pantalla en reposo cuando el ordenador está inactivo por:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Poner al equipo en reposo cuando está inactivo por:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr ""
+#~ "Reducir el brillo de la pantalla cuando el ordenador está inactivo por:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Establecer el modo de inactividad del equipo:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Establecer el modo de reposo de la pantalla:"
+
+#~ msgid "Standby"
+#~ msgstr "En espera"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Apagar la pantalla cuando el ordenador está inactivo por:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Icono del área de notificaciones:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Cuando la carga de la batería es crítica:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Al pulsar el botón de hibernación:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Al cerrar la tapa del portátil:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Al pulsar el botón de encendido:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Al pulsar el botón de suspensión:"
+
 #, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "El administrador de energía de Xfce no se está ejecutando"
+
 #~ msgid "Power"
 #~ msgstr "Energía"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "El administrador de energía de Xfce no se está ejecutando"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "No mostrar más este mensaje"
 
@@ -765,97 +731,136 @@
 #, fuzzy
 #~ msgid "Power manager is connected"
 #~ msgstr "El administrador de energía de Xfce no se está ejecutando"
+
 #~ msgid ""
 #~ "Unable to read adapter status, the power manager will not work properly"
 #~ msgstr ""
 #~ "Imposible leer el estado del adaptador. El gestor de energía no "
 #~ "funcionará adecuadamente."
+
 #~ msgid "Adapter is online"
 #~ msgstr "El adaptador está conectado"
+
 #~ msgid "Adapter is offline"
 #~ msgstr "El adaptador está desconectado"
+
 #~ msgid "Are you sure you want to hibernate the system?"
 #~ msgstr "¿Está seguro de que quiere hibernar el sistema?"
+
 #~ msgid "UPS configuration"
 #~ msgstr "Configuración de SAI"
+
 #~ msgid "Consider UPS charge critical"
 #~ msgstr "Considerar carga de SAI crítica"
+
 #~ msgid "Consider battery charge critical"
 #~ msgstr "Considerar cara de batería crítica"
+
 #~ msgid "percent"
 #~ msgstr "porcentaje"
+
 #~ msgid "Enable battery state notification"
 #~ msgstr "Activar notificación de estado de batería"
+
 #~ msgid "Enable power save on UPS power"
 #~ msgstr "Activar ahorro de energía al usar energía de UPS"
+
 #~ msgid "Enable power save on battery power"
 #~ msgstr "Activar ahorro de batería al usar energía de batería"
+
 #~ msgid "Best performance"
 #~ msgstr "Mejor rendimiento"
+
 #~ msgid "Set the CPU to its maximum frequency"
 #~ msgstr "Configura la CPU a su frecuencia máxima"
+
 #~ msgid "Ondemand performance"
 #~ msgstr "Rendimiento bajo demanda"
+
 #~ 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 ""
 #~ "Configura la CPU a velocidad máxima cuando hay alguna carga y a velocidad "
 #~ "mínima cuando el sistema está inactivo"
+
 #~ msgid "Best power savings"
 #~ msgstr "Ahorro de energía máximo"
+
 #~ msgid "Set the CPU to its minimum frequency"
 #~ msgstr "Configura la CPU a su frecuencia mínima"
+
 #~ msgid "Good power savings"
 #~ msgstr "Buen ahorro de energía"
+
 #~ msgid ""
 #~ "gracefully increases and decreases the CPU speed depending on the current "
 #~ "usage"
 #~ msgstr ""
 #~ "incrementa y decrementa adecuadamente la velocidad de CPU dependiendo del "
 #~ "uso actual"
+
 #~ msgid "CPU frequency settings on UPS power"
 #~ msgstr "Opciones de frecuencia de CPU al usar energía de SAI"
+
 #~ msgid "CPU frequency settings on battery power"
 #~ msgstr "Opciones de frecuencia de CPU al usar energía de batería"
+
 #~ msgid "CPU frequency control cannot be used"
 #~ msgstr "El control de frecuencia de CPU no puede ser usado"
+
 #~ msgid "CPU frequency settings on AC power"
 #~ msgstr "Opciones de frecuencia de CPU al estar enchufado"
+
 #~ msgid "CPU frequency settings"
 #~ msgstr "Opciones de frecuencia de CPU"
+
 #~ msgid "Monitor settings on UPS power"
 #~ msgstr "Opciones de monitor al usar energía de SAI"
+
 #~ msgid "Your monitor doesn't support DPMS control"
 #~ msgstr "El monitor no soporta control DPMS"
+
 #~ msgid "Keyboard shortcuts"
 #~ msgstr "Atajos de teclado"
+
 #~ msgid "No available keyboard shortcuts found"
 #~ msgstr "No se encontraron atajos de teclado disponibles"
+
 #~ msgid "CPU settings"
 #~ msgstr "Opciones de CPU"
+
 #~ msgid "Shortcuts"
 #~ msgstr "Atajos"
+
 #~ msgid "Monitor Settings"
 #~ msgstr "Opciones de monitor"
+
 #~ msgid "Your battery is almost empty"
 #~ msgstr "La batería está casi vacía"
+
 #~ msgid "%"
 #~ msgstr "%"
+
 #~ msgid "min"
 #~ msgstr "min"
+
 #~ msgid "Suspend after"
 #~ msgstr "Suspender después de"
+
 #~ msgid "Turn off after"
 #~ msgstr "Apagar después de"
+
 #~ msgid "Xfce4 Power Manager"
 #~ msgstr "Administrador de energía de Xfce4"
+
 #~ msgid ""
 #~ "Unable to read your home directory environment variable, autostart option "
 #~ "may not work"
 #~ msgstr ""
 #~ "Imposible leer la variable de entorno del directorio personal; la opción "
 #~ "de inicio automático puede no funcionar"
+
 #~ msgid ""
 #~ "Unable to run Xfce4 power manager, make sure the hardware abstract layer "
 #~ "and the message bus daemon are running"
@@ -863,6 +868,7 @@
 #~ "Imposible ejecutar el administrador de energía de Xfce. Asegúrese de que "
 #~ "la capa de abstracción de hardware y el demonio del bus de mensajes se "
 #~ "están ejecutando"
+
 #~ msgid ""
 #~ "Unable to read AC adapter status, the power manager will not work "
 #~ "properly. Possible reasons: The AC adapter driver is not loaded, broken "
@@ -873,56 +879,74 @@
 #~ "adaptador de corriente no está cargado, conexión con la capa de "
 #~ "abstracción de hardware rota o el demonio del bus de mensajes no está "
 #~ "ejecutándose"
+
 #~ msgid "System failed to shutdown"
 #~ msgstr "Falló el apagado del sistema"
+
 #~ 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 "Imp"
+
 #~ msgid "Error monitoring HAL events"
 #~ msgstr "Error monitorizando eventos HAL"
+
 #~ msgid "HAL is not running or not responding"
 #~ msgstr "HAL no está ejecutándose o respondiendo"
+
 #~ msgid "Unable to watch device using HAL: %s"
 #~ msgstr "Imposible inspeccionar dispositivo usando HAL: %s"
+
 #~ msgid "Message hibernate didn't get a reply"
 #~ msgstr "El mensaje hibernar no obtuvo ninguna respuesta"
+
 #~ msgid "System failed to hibernate"
 #~ msgstr "Falló la hibernación del sistema"
+
 #~ msgid "Error occured while trying to suspend"
 #~ msgstr "Ocurrió un error mientras se intentaba suspender"
+
 #~ msgid "Unknown reply from the message daemon"
 #~ msgstr "Respuesta desconocida del demonio de mensajes"
+
 #~ msgid "Message suspend didn't get a reply"
 #~ msgstr "El mensaje suspender no obtuvo ninguna respuesta"
+
 #~ msgid "No reply from HAL daemon to set monitor brightness level"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para configurar el nivel de brillo del "
 #~ "monitor"
+
 #~ msgid "No reply from HAL daemon to get monitor brightness level"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para obtener el nivel de brillo del "
 #~ "monitor"
+
 #~ msgid "No reply from HAL daemon to get available cpu governors"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para obtener los gobernadores de CPU "
 #~ "disponibles"
+
 #~ msgid "No reply from HAL daemon to get current cpu governor"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para obtener el gobernador de CPU actual"
+
 #~ msgid "No reply from HAL daemon to set cpu governor"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para configurar el gobernador de CPU"
+
 #~ msgid "No reply from HAL daemon to set power save profile"
 #~ msgstr ""
 #~ "No hubo respuesta del demonio HAL para configurar un perfil de ahorro de "
 #~ "energía"
+
 #~ msgid "Start xfce power manager"
 #~ msgstr "Iniciar administrador de energía de Xfce"
+
 #~ msgid "Failed to create dbus message\n"
 #~ msgstr "Faloo al crear mensaje DBus\n"
+
 #~ msgid "Failed to send message\n"
 #~ msgstr "Fallo al enviar mensaje\n"
-

Modified: xfce4-power-manager/trunk/po/et.po
===================================================================
--- xfce4-power-manager/trunk/po/et.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/et.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kristjan Siimson <kristjan.siimson at gmail.com>\n"
 "Language-Team: Estonian\n"
@@ -15,282 +15,149 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Laiendatud seadistused"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Üldvalikud"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Laiendatud seadistused"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Alati näita ekraani"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Luba protsessori kordaja reguleerimine"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Luba ekraani vooluhalduse reguleerimine"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Näita UPS-i laadungit"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Üldvalikud"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Puhkeseisund"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Kuvari seaded"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ära tee midagi"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Vahelduvvoolus"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Akuvoolus"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Vooluhaldur"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Muutmällu seisatakse pärast"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Seisata"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Programmisalve ikoon:"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Kui aku hakkab tühjaks saama:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Arvuti väljalülitamise nupule vajutamisel"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Sülearvuti kaane sulgemisel"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Arvuti väljalülitamise nupule vajutamisel"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Muutmällu peatamise nupule vajutamisel"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce vooluhaldur"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "mitte kunagi"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minut"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minutit"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "tund"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minut"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutit"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "tundi"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ära tee midagi"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Seisata"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Puhkeseisund"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Sulge"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Alati näita ekraani"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Aku olemasolul"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Aku laadimisel või tühjenemisel"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Arvuti puhkeseisundisse"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Üldvalikud"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Vahelduvvoolus"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Akuvoolus"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Laiendatud"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce vooluhaldur ei tööta"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Seadistushalduri pistik"
@@ -299,38 +166,44 @@
 msgid "SOCKET ID"
 msgstr "PISTIK"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Kirjuta '%s --help' kasutamise kohta teabe saamiseks"
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce vooluhaldur"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Vooluhaldusseadistuse laadimine ebaõnnestus, kasutatakse algupäraseid "
 "seadistusi"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce vooluhaldur"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Xfce4 vooluhalduri laadimine ebaõnnestus"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce vooluhaldur ei tööta"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce4 vooluhaldur ei tööta, kas soovite selle nüüd käivitada?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Käivita"
 
@@ -363,8 +236,8 @@
 msgid "Your battery is discharging"
 msgstr "Aku tühjeneb"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Kuvari seaded akuvoolu korral"
@@ -377,117 +250,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce vooluhaldur"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Töötab aku peal"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Arvuti töötab aku peal"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Arvuti töötab aku peal"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Aku on peaaegu tühi"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Aku täielikult laetud"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Aku täituvus"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Aku on laadimas"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Aku tühjeneb"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Aku täituvus on madal"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Aku on peaaegu tühi"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Pole olemas"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Aku olemasolul"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Aku seadistused"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Kuvari seaded vahelduvvoolu korral"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Hinnanguliselt aega jäänud"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Hinnanguline laadimisaeg"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "tund"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minut"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Aku seadistused"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Kuvari seaded vahelduvvoolu korral"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -537,66 +410,66 @@
 "GNU GPL litsentsi all.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Sulge kõik töötavad xfce vooluhaldurid"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Näita seadistusdialoogi"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Sulge kõik töötavad xfce vooluhaldurid"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versiooniteave"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Liiga palju argumente"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "DBus-iga ühendumine ebaõnnestus: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Xfce vooluhaldur töötab juba"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce vooluhaldur töötab juba"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Pole olemas"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Pole olemas"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Sulge arvuti"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Arvuti puhkeseisundisse"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -604,69 +477,69 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr "Aku on peaaegu tühi. Andmekadude vältimiseks salvestage oma töö"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Kas soovite kindlasti arvuti seisata?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Xfce vooluhaldur"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Arvuti puhkeseisundisse"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -676,47 +549,47 @@
 msgid "HAL daemon is not running"
 msgstr "Xfce vooluhaldur ei tööta"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Liiga palju argumente"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Sinu operatsioonisüsteemile ei leidu vajaliku taustprogrammi"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Kettale peatamise skripti ei leitud"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Muutmällu peatamise skripti ei leitud"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Muutmällu peatamise meetodit ei leitud"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Kettale peatamise meetodit ei leitud"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Mälu otsas"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Arvuti seiskamine ebaõnnestus"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -725,35 +598,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Kristjan Siimson <kristjan.siimson at gmail.com>"
 
@@ -774,6 +647,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Laiendatud seadistused"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Üldvalikud"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Laiendatud seadistused"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Luba protsessori kordaja reguleerimine"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Luba ekraani vooluhalduse reguleerimine"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Näita UPS-i laadungit"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Kuvari seaded"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Akuvoolus"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Vooluhaldur"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Muutmällu seisatakse pärast"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Programmisalve ikoon:"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Kui aku hakkab tühjaks saama:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Arvuti väljalülitamise nupule vajutamisel"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Sülearvuti kaane sulgemisel"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Arvuti väljalülitamise nupule vajutamisel"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Muutmällu peatamise nupule vajutamisel"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce vooluhaldur ei tööta"
 
@@ -781,10 +717,6 @@
 #~ msgstr "Vool"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce vooluhaldur ei tööta"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Seda sõnumit mitte enam näidata"
 

Modified: xfce4-power-manager/trunk/po/eu.po
===================================================================
--- xfce4-power-manager/trunk/po/eu.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/eu.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2008-12-08 23:22+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -18,282 +18,149 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Ezarpen aurreratuak"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Aukera orokorrak"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Ezarpen aurreratuak"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Beti bistarazi ikonoa"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Gaitu CPU maiztasun eskalatze kontrola"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Gaitu monitore indar kudeaketa kontrola"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Gaitu UPS karga berri-ematea"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Aukera orokorrak"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernatu"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Monitore ezarpenak"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ezer ez"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Bateriaz"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Bateriaz"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Energia kudeaketa"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Noiz itzali: "
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Eseki"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Sistema erretilu ikonoa"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Bateria karga maila kritikoa denean"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Power botoia sakatzean"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Eramangarri tapa ixtean"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Power botoia sakatzean"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Sleep botoia sakatzean"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce energia kudeatzailea"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "inoiz"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minutu"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minutu"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "ordu"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minutu"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutu"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "ordu"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ezer ez"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Eseki"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernatu"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Itzali"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Beti bistarazi ikonoa"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Bateria dagoenean"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Bateria kargatu edo deskargatzean"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Hibernatu sistema"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Aukera orokorrak"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Bateriaz"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Bateriaz"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr ""
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Ezarpen kudeatzaile socketa"
@@ -302,38 +169,44 @@
 msgid "SOCKET ID"
 msgstr "SOCKET IDa"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Idatzi '%s --help' erabilera laguntzarentzat."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce energia kudeatzailea"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Huts energia kudeatzaile konfigurazio kargatzean, hobetsiriko balioak "
 "erabiltzen"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce energia kudeatzailea"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Ezin da xfce4 energia kudeatzailea kargatu"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce energia kudeatzaile ez dago abiarazirik, abiarazi nahi al duzu?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Exekutatu"
 
@@ -366,8 +239,8 @@
 msgid "Your battery is discharging"
 msgstr "Zure bateria deskargatzen ari da"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Monitore ezarpenak bateria indarrez"
@@ -380,117 +253,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce argindar kudeatzailea"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Bateriaz lanean"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Bateriaz lanean ari zara"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Bateriaz lanean ari zara"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Bateria ia hutsik dago"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Bateria guztiz kargaturik dago"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Bateria karga maila"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Bateria kargatzen ari da"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Bateria deskargatzen ari da"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Bateria karga baxua da"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Bateria ia hutsik dago"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Ez dago"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Bateria dagoenean"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Bateria ezarpenak"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Monitore ezarpenak UPS indarrez"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Geratzen zaion denbora: "
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Kargatzeko falta den denbora: "
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "ordu"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minutu"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Bateria ezarpenak"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Monitore ezarpenak UPS indarrez"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -540,66 +413,66 @@
 "GNU GPL lizentziaz argitaratua.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Itxi abiarazitako edozein xfce energia kudeatzaile"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Ikusi konfigurazio leihoa"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Itxi abiarazitako edozein xfce energia kudeatzaile"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Bertsio argibideak"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Argumentu gehiegi"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Ezin da DBus-ekin konektatu: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Xfce energia kudeatzailea ez dago abiarazirik"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce energia kudeatzailea ez dago abiarazirik"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Ez dago"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Ez dago"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Itzali sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernatu sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -607,70 +480,70 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Zure bateria nahiko hutsik dago. Gorde zure lana datu galerak saihesteko"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Ziur zaude sistema eseki nahi duzula?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Xfce argindar kudeatzailea"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernatu sistema"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -680,47 +553,47 @@
 msgid "HAL daemon is not running"
 msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Argumentu gehiegi"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Ez dago zure sistema eragilerako interfazerik"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Ez da hibernatzeko scripta aurkitu"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Ez da esekitzeko scripta aurkitu"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Ez da esekitzeko metodorik aurkitu"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Ez da hibernatzeko metodorik aurkitu"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Memoriaz kanpo"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Sistemak huts egin du esekitzerakoan"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -729,35 +602,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Piarres Beobide <pi at beobide.net>"
 
@@ -778,6 +651,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Ezarpen aurreratuak"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Aukera orokorrak"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Ezarpen aurreratuak"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Gaitu CPU maiztasun eskalatze kontrola"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Gaitu monitore indar kudeaketa kontrola"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Gaitu UPS karga berri-ematea"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Monitore ezarpenak"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Bateriaz"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Energia kudeaketa"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Noiz itzali: "
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Sistema erretilu ikonoa"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Bateria karga maila kritikoa denean"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Power botoia sakatzean"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Eramangarri tapa ixtean"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Power botoia sakatzean"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Sleep botoia sakatzean"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
 
@@ -785,10 +721,6 @@
 #~ msgstr "Energia"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Ez erakutsi mezu hau berriz"
 

Modified: xfce4-power-manager/trunk/po/fi.po
===================================================================
--- xfce4-power-manager/trunk/po/fi.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/fi.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-03-03 22:59+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish\n"
@@ -16,282 +16,149 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Lisäasetukset"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Yleiset asetukset"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Lisäasetukset"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Näytä kuvake aina"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Hallitse suorittimen kellotaajuutta"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Hallitse näytön virransäästöä"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Ilmoita UPS-laitteen lataus"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Yleiset asetukset"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Lepotila"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Näyttö"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Älä tee mitään"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Käyttää verkkovirtaa"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Akkukäyttö"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Virranhallinta"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Virransäästötilaan viiveellä"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Keskeytystila"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Ilmoitusalueen kuvake:"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Kun akku on lähes tyhjä:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Painettaessa virtanäppäintä"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Kun kansi on suljettu"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Painettaessa virtanäppäintä"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Painettaessa lepotilanäppäintä"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce:n virranhallinta"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "ei koskaan"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minuutti"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minuuttia"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "tunti"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minuutti"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minuuttia"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "tuntia"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Älä tee mitään"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Keskeytystila"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Lepotila"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Sammuta"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Näytä kuvake aina"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Näytä, kun akku on liitetty"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Näytä, kun akku latautuu tai purkautuu"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Aseta järjestelmä lepotilaan"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Yleiset asetukset"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Käyttää verkkovirtaa"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Akkukäyttö"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Muut asetukset"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce:n virranhallinta ei ole käynnissä"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Asetustenhallinnan pistoke"
@@ -300,36 +167,42 @@
 msgid "SOCKET ID"
 msgstr "PISTOKE"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Saat ohjeita komennolla \"%s --help\"."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce:n virranhallinta"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "Virranhallinnan asetusten lataaminen epäonnistui, käytetään oletuksia"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce:n virranhallinta"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Xfce4 virranhallintaa ei voi käynnistää"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce:n virranhallinta ei ole käynnissä"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce4 virranhallinta ei ole käynnissä. Haluatko käynnistää sen?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Suorita"
 
@@ -362,8 +235,8 @@
 msgid "Your battery is discharging"
 msgstr "Akku purkautuu"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Näytön virransäästö akkuvirralla"
@@ -376,117 +249,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce:n virranhallinta"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Käytetään akkuvirtaa"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Käytetään akkuvirtaa"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Käytetään akkuvirtaa"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Akku on lähes tyhjä"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Akku täysin latautunut"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Akun lataustaso"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Akku latautuu"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Akku purkautuu"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Akussa on enää vähän virtaa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Akku on lähes tyhjä"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Ei liitetty"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Näytä, kun akku on liitetty"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Akkukäyttö"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Näytön virransäästö verkkovirran varassa"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Arvioitu akkukesto"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Arvioitu latausaika"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "tunti"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuutti"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Akkukäyttö"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Näytön virransäästö verkkovirran varassa"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -535,66 +408,66 @@
 "Lisensoitu GNU GPL:n mukaisesti\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Sammuta Xfce:n virranhallinta, jos se on käynnissä"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Näytä asetusdialogi"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Sammuta Xfce:n virranhallinta, jos se on käynnissä"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versiotiedot"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Liikaa valitsimia"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Ei voi yhdistää DBus-palveluun: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Xfce:n virranhallinta on jo käynnissä"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce:n virranhallinta on jo käynnissä"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Ei liitetty"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Ei liitetty"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Sammuta järjestelmä"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Aseta järjestelmä lepotilaan"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -602,69 +475,69 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr "Akku on lähes tyhjä. Varmista, että olet tallentanut tärkeät tiedot."
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Haluatko varmasti asettaa järjestelmän keskeytystilaan?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Xfce:n virranhallinta"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Aseta järjestelmä lepotilaan"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -674,47 +547,47 @@
 msgid "HAL daemon is not running"
 msgstr "Xfce:n virranhallinta ei ole käynnissä"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Liikaa valitsimia"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Käyttöjärjestelmällesi ei ole tukea"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Lepotila-komentotiedostoa ei löydy"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Keskeytystila-komentotiedostoa ei löydy"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Keskeytystilametodia ei löydy"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Lepotilametodia ei löydy"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Muisti ei riitä"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Keskeytystila epäonnistui"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -723,35 +596,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
 
@@ -772,6 +645,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Lisäasetukset"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Yleiset asetukset"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Lisäasetukset"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Hallitse suorittimen kellotaajuutta"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Hallitse näytön virransäästöä"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Ilmoita UPS-laitteen lataus"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Näyttö"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Akkukäyttö"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Virranhallinta"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Virransäästötilaan viiveellä"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Ilmoitusalueen kuvake:"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Kun akku on lähes tyhjä:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Painettaessa virtanäppäintä"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Kun kansi on suljettu"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Painettaessa virtanäppäintä"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Painettaessa lepotilanäppäintä"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce:n virranhallinta ei ole käynnissä"
 
@@ -779,10 +715,6 @@
 #~ msgstr "Virranhallinta"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce:n virranhallinta ei ole käynnissä"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Älä näytä tätä viestiä uudelleen"
 

Modified: xfce4-power-manager/trunk/po/fr.po
===================================================================
--- xfce4-power-manager/trunk/po/fr.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/fr.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-28 23:00+0200\n"
 "Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -18,229 +18,101 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Actions</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Options avancées</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Luminosité</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Options générales</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Moniteur</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Actions</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avancées"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Toujours afficher l'icône"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Niveau du seuil critique de la puissance :"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Activer le contrôle de fréquence du processeur"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Activer le contrôle d'alimentation de l'écran"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Activer les notifications"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Général"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Mettre en hibernation"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Activer l'écran de veille lors de la suspension/hibernation"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Moniteur</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Rien"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Secteur"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Sur batterie"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Configuration du gestionnaire"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Préférer une réduction de l'alimentation au lieu de la performance"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Mettre l'écran en veille si la machine est inactive depuis  :"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Mettre la machine en veille si inactive depuis :"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Réduire la luminosité de l'écran si la machine est inactive depuis :"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Mode de mise en veille pour l'inactivité de la machine :"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Mode de mise en veille de l'écran :"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Arrêt"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Mettre en veille"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Éteindre l'écran si la machine est inactive depuis :"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Icône de notification :"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Niveau de la batterie critique :"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Appuie sur le bouton de mise en hibernation :"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Fermeture du couvercle du portable :"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Appuie sur le bouton d'alimentation :"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Appuie sur le bouton de mise en veille :"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Gestionnaire d'alimentation"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Jamais"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Une minute"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minutes"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Une heure"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "une minute"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutes"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "heures"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Secondes"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Opérations d'hibernation et de mise en veille non autorisées"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Opérations d'extinction et d'hibernation non autorisées"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Rien"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Mettre en veille"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Mettre en hibernation"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Éteindre"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Demander"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Toujours afficher l'icône"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Quand la batterie est présente"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Quand la batterie se charge ou se décharge"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
@@ -248,32 +120,40 @@
 "Désactiver le DPMS, e.g. pour ne pas tenter l'extinction de l'écran ou sa "
 "mise en veille"
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Demander"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "Opération de mise en veille non autorisée"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "Opération de mise en hibernation non autorisée"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 "Lorsque toutes les sources de puissance de la machine atteignent ce niveau"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Général"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Secteur"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Batterie"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Avancée"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Le gestionnaire d'alimentation Xfce n'est pas lancé\n"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Socket du gestionnaire de paramètres"
@@ -282,38 +162,44 @@
 msgid "SOCKET ID"
 msgstr "ID SOCKET"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Exécuter '%s --help' pour l'usage."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Gestionnaire d'alimentation"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Impossible de charger la configuration, les paramètres par défauts seront "
 "utilisés"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Configuration du gestionnaire d'alimentation Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Échec au chargement du gestionnaire d'alimentation Xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Le gestionnaire d'alimentation Xfce n'est pas lancé"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "Le gestionnaire d'alimentation Xfce n'est pas lancé, voulez-vous le lancer "
 "maintenant ?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Éxecuter"
 
@@ -345,8 +231,8 @@
 msgid "Your battery is discharging"
 msgstr "Votre batterie se décharge"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Le système fonctionne sur batterie"
 
@@ -358,98 +244,98 @@
 msgid "System is running on low power"
 msgstr "Le système fonctionne sur faible puissance"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Gestionnaire d'alimentation"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Votre UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Votre souris"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Votre clavier"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Votre caméra"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Votre PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Votre batterie"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "est presque vide"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "est entièrement chargée"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "niveau de la charge"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "est en charge"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "est en décharge"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "charge est faible"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "est presque vide"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "est absente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "La batterie est absente"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Batterie"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Le système fonctionne sur secteur"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Estimation du temps restant"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Estimation du temps de charge restant"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "heure"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minute"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Batterie"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Le système fonctionne sur secteur"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unité inconnue"
 
@@ -498,61 +384,61 @@
 "Sous licence GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Ne pas lancer en arrière-plan"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Gestionnaire d'alimentation Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Afficher le dialogue de configuration"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Quitter toutes les instances de gestionnaire d'alimentation Xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Information sur la version"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Trop d'arguments"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Échec de connexion à une session au bus de message"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Un autre gestionnaire d'alimentation est déjà lancé"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Le gestionnaire d'alimentation Xfce est déjà lancé"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adaptateur présent"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Adaptateur absent"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Éteindre le système"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Mettre le système en hibernation"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -560,68 +446,68 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Le niveau de la batterie est critique. Enregistrez votre travail pour éviter "
 "des pertes de données"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Êtes-vous sûr de vouloir procéder ?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Quitter le gestionnaire d'alimentation Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Réactiver"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Désactiver"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernation non supportée"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Mise en veille non supportée"
@@ -630,46 +516,46 @@
 msgid "HAL daemon is not running"
 msgstr "Le démon HAL n'est pas lancé"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Paramètres invalides"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Cookie invalide"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Aucun backend pour votre système"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Aucun script d'hibernation trouvé"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Aucun script de mise en veille trouvé"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Aucune méthode de mise en veille trouvée"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Aucune méthode d'hibernation trouvée"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Plus de mémoire disponible"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Mise en veille du système échouée"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Le démon HAL n'est pas connecté"
@@ -678,35 +564,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Gestion d'alimentation pour l'environnement Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Maximilian Schleiss\n"
@@ -729,6 +615,96 @@
 msgid "Brightness plugin"
 msgstr ""
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Actions</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Options avancées</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Luminosité</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Options générales</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Moniteur</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Actions</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancées"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Niveau du seuil critique de la puissance :"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Activer le contrôle de fréquence du processeur"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Activer le contrôle d'alimentation de l'écran"
+
+#~ msgid "Enable notification"
+#~ msgstr "Activer les notifications"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Activer l'écran de veille lors de la suspension/hibernation"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Moniteur</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Sur batterie"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Configuration du gestionnaire"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Préférer une réduction de l'alimentation au lieu de la performance"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Mettre l'écran en veille si la machine est inactive depuis  :"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Mettre la machine en veille si inactive depuis :"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr ""
+#~ "Réduire la luminosité de l'écran si la machine est inactive depuis :"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Mode de mise en veille pour l'inactivité de la machine :"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Mode de mise en veille de l'écran :"
+
+#~ msgid "Standby"
+#~ msgstr "Arrêt"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Éteindre l'écran si la machine est inactive depuis :"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Icône de notification :"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Niveau de la batterie critique :"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Appuie sur le bouton de mise en hibernation :"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Fermeture du couvercle du portable :"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Appuie sur le bouton d'alimentation :"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Appuie sur le bouton de mise en veille :"
+
 #~ msgid "Advance"
 #~ msgstr "Avancée"
 
@@ -741,10 +717,6 @@
 #~ msgstr "Powersave (économie)"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Le gestionnaire d'alimentation Xfce n'est pas lancé\n"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Ne plus afficher ce message"
 

Modified: xfce4-power-manager/trunk/po/gl.po
===================================================================
--- xfce4-power-manager/trunk/po/gl.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/gl.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-17 22:18+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -19,270 +19,145 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Accións</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Opcións avanzadas</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Brillo</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Opcións xerais</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Accións</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Sempre mostrar a icona"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Considerar que a batería case está descargada cando:"
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Esta utilidade mostra a escala actual de frecuencia da CPU."
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Activar o control de xestión de enerxía do monitor"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Activar as notificacións"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Xeral"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernar"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Bloquear a pantalla ó suspender/hibernar"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nada"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Co adaptador de corrente"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Coa batería"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Configuración do xestor de enerxía"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Primar o aforro de enerxía sobre o rendemento"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Suspender a pantalla cando o ordenador leve inactivo:"
-
-#: ../settings/xfpm-settings.glade.h:23
-#, fuzzy
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Suspender a pantalla cando o ordenador leve inactivo:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Reducir o brillo da pantalla cando o ordenador leve inactivo:"
-
-#: ../settings/xfpm-settings.glade.h:25
-#, fuzzy
-msgid "Set computer inactivity sleep mode:"
-msgstr "Fallo ao definir o modo en `%s': %s"
-
-#: ../settings/xfpm-settings.glade.h:26
-#, fuzzy
-msgid "Set monitor sleep mode:"
-msgstr "Fallo ao definir o modo en `%s': %s"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "En espera"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspender"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Apagar a pantalla cando o ordenador leve inactivo:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Icona de estado:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Cando a _carga da batería é crítica:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Cando se preme o _botón de acendido:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Cando se _peche a tapa do portátil:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Cando se preme o _botón de acendido:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Cando se preme o botón de _suspensión:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xestor de enerxía de Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Nunca"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Un minuto"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minutos"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "hora"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "Un minuto"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "horas"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Segundos"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "As operacións de hibernación e suspensión non están permitidas"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "As operacións de apagado e hibernación non están permitidas"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nada"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspender"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Sempre mostrar a icona"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Cando haxa unha batería"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Cando a batería está cargando ou descargando"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 #, fuzzy
 msgid "Suspend operation not permitted"
 msgstr "As operacións de hibernación e suspensión non están permitidas"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "As operacións de hibernación e suspensión non están permitidas"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 "Cando tódalas fontes de enerxía do ordenador cheguen a este nivel de carga"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Xeral"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Co adaptador de corrente"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Coa batería"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 #, fuzzy
 msgid "Extended"
 msgstr "Extendido"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Non se está executando ningunha instancia do xestor de enerxía"
+
 #: ../settings/xfpm-settings-main.c:72
 #, fuzzy
 msgid "Settings manager socket"
@@ -293,37 +168,43 @@
 msgid "SOCKET ID"
 msgstr "O ID é incorrecto!"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Introduza '%s --help' para ver como se usa."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xestor de enerxía de Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Non foi posible cargar a configuración do xestor de enerxía, usando a "
 "configuración predeterminada"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Configuración do xestor de enerxía de Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Non é posible conectar co Xestor de enerxía de Xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Non se está executando o Xestor de enerxía de Xfce"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "O Xestor de Enerxía de Xfce4 non se está executando, desexa inicialo agora?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Executar"
 
@@ -356,8 +237,8 @@
 msgid "Your battery is discharging"
 msgstr "A súa batería estase descargando"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "O sistema está a funcionar ca enerxía da batería"
 
@@ -369,98 +250,98 @@
 msgid "System is running on low power"
 msgstr "A batería case está descargada"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xestor de enerxía de Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "O seu SAI"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "A batería do seu rato"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "A batería do seu teclado"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "A batería da súa cámara"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "A batería da súa PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "A súa batería"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "está case baleira"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "está totalmente cargada"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "nivel de carga"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "estase cargando"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "estase descargando"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "a carga é baixa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "está case baleira"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "non está presente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Non hai ningunha batería"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Batería"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "O sistema está a funcionar con enerxía de corrente alterna"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Tempo restante estimado"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Tempo estimado para completar a carga"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Batería"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "O sistema está a funcionar con enerxía de corrente alterna"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unidade descoñecida"
 
@@ -509,62 +390,62 @@
 "Licenciado baixo a GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Non converter en daemon"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr ""
 "Reiniciar a instancia do xestor de enerxía de Xfce que se estea executando"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostrar o diálogo de configuración"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Saír de calquera xestor de enerxía de Xfce que se estea executando"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Información da versión"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Demasiados argumentos"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Non foi posible conectarse á sesión do bus de mensaxes"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Xa está executando outro xestor de enerxía"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "O xestor de enerxía de Xfce xa se está executando"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adaptador presente"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Non hai ningún adaptador"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Apagar o sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -572,69 +453,69 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "A batería case está descargada. Garde o seu traballo para evitar a perda de "
 "datos"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Está seguro de que desexa continuar?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Saír do xestor de enerxía de Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Saír"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 #, fuzzy
 msgid "Inhibit"
 msgstr "Inhibir o engadido"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "A hibernación non está soportada"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "A suspensión non está soportada"
@@ -643,46 +524,46 @@
 msgid "HAL daemon is not running"
 msgstr "Non se está executando o daemon HAL"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Argumentos incorrectos"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Cookie incorrecta"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Non se atopou un script de hibernación"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Non se atopou un script de suspensión"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Non se atopou o método de suspensión"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Non se atopou o método de hibernación"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Fallo ó suspender o sistema"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "O daemon HAL non está conectado"
@@ -691,35 +572,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Xestión de enerxía para o escritorio Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Ión de litio"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Chumbo e ácido"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Polímero de litio"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Híbrido níquel metal"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro <leandro.regueiro at gmail.com>, 2008, 2009\n"
@@ -740,9 +621,100 @@
 msgid "Brightness plugin"
 msgstr "Engadido de brillo"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Non se está executando ningunha instancia do xestor de enerxía"
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Accións</b>"
 
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Opcións avanzadas</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Brillo</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Opcións xerais</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitor</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Accións</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Considerar que a batería case está descargada cando:"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Esta utilidade mostra a escala actual de frecuencia da CPU."
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Activar o control de xestión de enerxía do monitor"
+
+#~ msgid "Enable notification"
+#~ msgstr "Activar as notificacións"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Bloquear a pantalla ó suspender/hibernar"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Monitor</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Coa batería"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Configuración do xestor de enerxía"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Primar o aforro de enerxía sobre o rendemento"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Suspender a pantalla cando o ordenador leve inactivo:"
+
+#, fuzzy
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Suspender a pantalla cando o ordenador leve inactivo:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Reducir o brillo da pantalla cando o ordenador leve inactivo:"
+
+#, fuzzy
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Fallo ao definir o modo en `%s': %s"
+
+#, fuzzy
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Fallo ao definir o modo en `%s': %s"
+
+#~ msgid "Standby"
+#~ msgstr "En espera"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Apagar a pantalla cando o ordenador leve inactivo:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Icona de estado:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Cando a _carga da batería é crítica:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Cando se preme o _botón de acendido:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Cando se _peche a tapa do portátil:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Cando se preme o _botón de acendido:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Cando se preme o botón de _suspensión:"
+
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Suspensión automática inhibida"
 

Modified: xfce4-power-manager/trunk/po/id.po
===================================================================
--- xfce4-power-manager/trunk/po/id.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/id.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-11 21:49-0400\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian\n"
@@ -15,268 +15,144 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Aksi</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Pengaturan Mahir</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Kecerahan</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Opsi Umum</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Aksi</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Mahir"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Selalu tampilkan ikon"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Anggap komputer pada daya rendah di:"
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Aktifkan kendali skala frekuensi CPU"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Aktifkan monitor kendali manajemen daya"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Aktifkan notifikasi"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Umum"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernasi"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Kunci layar jika akan suspensi/hibernasi"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Monitor</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Tak ada"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Pada AC"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Pada baterai"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Pengaturan manajer daya"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Memilih penyimpanan daya dibanding performa"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Buat tampilan tertidur jika komputer tidak aktif selama:"
-
-#: ../settings/xfpm-settings.glade.h:23
-#, fuzzy
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Buat tampilan tertidur jika komputer tidak aktif selama:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Kurangi kecerahan jika komputer tidak aktif selama:"
-
-#: ../settings/xfpm-settings.glade.h:25
-#, fuzzy
-msgid "Set computer inactivity sleep mode:"
-msgstr "Atur mode tidur monitor:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Atur mode tidur monitor:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Siaga"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspensi"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Matikan tampilan jika komputer tidak aktif selama:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Ikon baki sistem: "
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Ketika level muatan baterai kritis:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Ketika tombol power ditekan:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Ketika tutup laptop ditutup:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Ketika tombol power ditekan:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Ketika tombol tidur ditekan:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Manajer Daya Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Tak pernah"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Satu menit"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Menit"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "jam"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "Satu menit"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "menit"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "jam"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Detik"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Operasi hibernasi dan suspensi tidak diizinkan"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Operasi matikan dan hibernasi tidak diizinkan"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Tak ada"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspensi"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernasi"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Matikan"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Selalu tampilkan ikon"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Ketika baterai hadir"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Ketika baterai diisi ulang atau tidak diisi"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 #, fuzzy
 msgid "Suspend operation not permitted"
 msgstr "Operasi hibernasi dan suspensi tidak diizinkan"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Operasi hibernasi dan suspensi tidak diizinkan"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 #, fuzzy
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Jika daya utama pada komputer mencapai nilai persentase pengisian ini"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Umum"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Pada AC"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Pada Baterai"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Diperluas"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Tak ada instansi Manajer daya yang berjalan"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Soket manajer pengaturan"
@@ -285,34 +161,40 @@
 msgid "SOCKET ID"
 msgstr "ID SOKET"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ketik '%s --help' untuk penggunaan."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Manajer Daya Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "Gagal memuat konfigurasi manajer daya, menggunakan standar"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Pengaturan Manajer Daya Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Tak dapat menyambung ke Manajer Daya Xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Manajer daya Xfce tak berjalan"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Manajer Daya Xfce4 tak berjalan, anda ingin meluncurkannya sekarang?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Jalankan"
 
@@ -345,8 +227,8 @@
 msgid "Your battery is discharging"
 msgstr "Baterai anda tidak diisi"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Sistem berjalan pada daya baterai"
 
@@ -358,98 +240,98 @@
 msgid "System is running on low power"
 msgstr "Sistem berjalan pada daya rendah"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Manajer daya Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "UPS anda"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Baterai Tetikus anda"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Baterai Papan Ketik anda"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Baterai Kamera anda"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Baterai PDA anda"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Baterai Anda"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "hampir kosong"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "telah penuh terisi"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "level pengisian"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "sedang mengisi"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "sedang tidak diisi"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "pengisian rendah"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "hampir kosong"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "tidak ada"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Baterai tidak ada"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Baterai"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Sistem berjalan pada daya AC"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Estimasi waktu tersisa"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Estimasi waktu sampai penuh terisi"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "jam"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "menit"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Baterai"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Sistem berjalan pada daya AC"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unit tak diketahui"
 
@@ -498,62 +380,62 @@
 "Dilisensikan di bawah GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Jangan jurikkan"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Start ulang instansi manajer daya xfce yang berjalan"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Tampilkan dialog konfigurasi"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Keluar manajer daya xfce yang berjalan"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informasi versi"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Terlalu banyak argumen"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Tak bisa mendapatkan koneksi ke sesi bus pesan"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Manajer daya lainnya telah berjalan"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Manajer daya Xfce telah berjalan"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adapter ada"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Adapter tak ada"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Matikan sistem"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernasi sistem"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -565,13 +447,13 @@
 "data dari aplikasi ini. Tutup aplikasi ini sebelum menempatkan komputer pada "
 "mode tidur atau mecolokkan adapter AC anda"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Sistem berjalan pada daya yang rendah. Simpan pekerjaan anda untuk "
 "menghindari hilangnya data"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -581,12 +463,12 @@
 "sekarang dapat merusak kondisi kerja dari aplikasi ini, apakah anda yakin "
 "ingin menghibernasi sistem?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Apakah anda yakin ingin melanjutkan?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -596,46 +478,46 @@
 "sekarang dapat merusak kondisi kerja dari aplikasi ini, apakah anda yakin "
 "ingin menyuspensi sistem?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Manajer daya Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 #, fuzzy
 msgid "Inhibit"
 msgstr "Plugin mencegah"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Hak akses ditolak"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernasi tak disokong"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Suspensi tak disokong"
@@ -645,46 +527,46 @@
 msgid "HAL daemon is not running"
 msgstr "Jurik Hal tak berjalan"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Terlalu banyak argumen"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Cookie tidak sah"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Tak ada ujung-belakang untuk sistem operasi anda"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Tak ada skrip hibernasi yang ditemukan"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Tak ada skrip suspensi yang ditemukan"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Tak ada metode suspensi yang ditemukan"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Tak ada metode hibernasi yang ditemukan"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Sistem gagal untuk tidur"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, fuzzy, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Jurik Hal saat ini tidak tersambung"
@@ -693,35 +575,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Manajemen daya untuk desktop Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Lithium ion"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Asam timbel"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Lithium polimer"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Nikel metal hibrida"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Tak diketahui"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Andhika Padmawan <andhika.padmawan at gmail.com>, 2009."
 
@@ -740,6 +622,99 @@
 msgid "Brightness plugin"
 msgstr "Plugin kecerahan"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Aksi</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Pengaturan Mahir</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Kecerahan</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Opsi Umum</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitor</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Aksi</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Mahir"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Anggap komputer pada daya rendah di:"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Aktifkan kendali skala frekuensi CPU"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Aktifkan monitor kendali manajemen daya"
+
+#~ msgid "Enable notification"
+#~ msgstr "Aktifkan notifikasi"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Kunci layar jika akan suspensi/hibernasi"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Monitor</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Pada baterai"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Pengaturan manajer daya"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Memilih penyimpanan daya dibanding performa"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Buat tampilan tertidur jika komputer tidak aktif selama:"
+
+#, fuzzy
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Buat tampilan tertidur jika komputer tidak aktif selama:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Kurangi kecerahan jika komputer tidak aktif selama:"
+
+#, fuzzy
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Atur mode tidur monitor:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Atur mode tidur monitor:"
+
+#~ msgid "Standby"
+#~ msgstr "Siaga"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Matikan tampilan jika komputer tidak aktif selama:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Ikon baki sistem: "
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Ketika level muatan baterai kritis:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Ketika tombol power ditekan:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Ketika tutup laptop ditutup:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Ketika tombol power ditekan:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Ketika tombol tidur ditekan:"
+
 #~ msgid "Advance"
 #~ msgstr "Mahir"
 
@@ -755,9 +730,6 @@
 #~ msgid "gtk-help"
 #~ msgstr "gtk-help"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Tak ada instansi Manajer daya yang berjalan"
-
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Tidur otomatis dicegah"
 

Modified: xfce4-power-manager/trunk/po/it.po
===================================================================
--- xfce4-power-manager/trunk/po/it.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/it.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-04-11 10:20+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
@@ -16,267 +16,145 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Azioni</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Opzioni avanzate</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Luminosità</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Opzioni generali</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Schermo</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-#, fuzzy
-msgid "Actions"
-msgstr "<b>Azioni</b>"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Mostra sempre l'icona"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Considera il computer con poca carica quando:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Abilita il controllo della gestione dell'energia dello schermo"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Abilita le notifiche"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Generali"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Iberna"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Blocca lo schermo se si avvia la sopsensione o ibernazione"
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "<b>Schermo</b>"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Niente"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Alimentazione da rete elettrica"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Alimentazione da batteria"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Impostazioni per il gestore di energia"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Preferisci il risparmio energetico alle prestazioni"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-#, fuzzy
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Spegni il monitor se il computer è inattivo per:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Riduci la luminosità dello schermo se il computer è inattivo per:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Standby"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Sospendi"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Spegni il monitor se il computer è inattivo per:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Icona del vassoio di sistema:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Quando il livello di carica della batteria è critico, fai:"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Alla pressione del tasto di accensione fai:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Quando il coperchio del portatile è chiuso:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Alla pressione del tasto di accensione fai:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Alla pressione del pulsante sleep fai:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Gestore di energia di Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Mai"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Un minuto"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Minuti"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "ora"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "Un minuto"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minuti"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "ore"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Secondi"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Operazioni di ibernazione e sospensione non permesse"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Operazioni di spegnimento e ibernazione non permesse"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Niente"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Sospendi"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Iberna"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Arresta"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Mostra sempre l'icona"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Quando la batteria è presente"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Quando la batteria si sta caricando o scaricando"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 #, fuzzy
 msgid "Suspend operation not permitted"
 msgstr "Operazioni di ibernazione e sospensione non permesse"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Operazioni di ibernazione e sospensione non permesse"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 "Quando tutte le fonti di energia del computer raggiungono questo livello di "
 "carica"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Generali"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Alimentazione da rete elettrica"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Alimentazione da batteria"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr ""
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Non è in esecuzione alcuna istanza del gestore di energia"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr ""
@@ -285,36 +163,42 @@
 msgid "SOCKET ID"
 msgstr ""
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digitare \"%s --help\" per le modalità d'uso"
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Gestore di energia di Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Impossibile caricare la configurazione del gestore di energia, utilizzo "
 "quelle predefinite"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Impostazioni per il gestore di energia di Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Impossibile connettersi al gestore di energia di Xfce"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Il gestore di energia di Xfce non è in esecuzione"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Il gestore di energia di Xfce4 non è in esecuzione; avviarlo ora?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Esegui"
 
@@ -347,8 +231,8 @@
 msgid "Your battery is discharging"
 msgstr "La batteria si sta scaricando"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Il sistema è alimentato dalla batteria"
 
@@ -360,98 +244,98 @@
 msgid "System is running on low power"
 msgstr "Il sistema ha poca carica"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Gestore di energia di Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "La batteria del mouse"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "La batteria della tastiera"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "La batteria della fotocamera"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "La batteria del PDA"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "La batteria"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "è quasi esaurita"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "è completamente carica"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "livello di carica"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "si sta caricando"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "si sta scaricando"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "la carica è bassa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "è quasi esaurita"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "non è presente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Batteria non presente"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Batteria"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Il sistema è alimentato dalla rete elettrica"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Tempo rimanente stimato"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Tempo stimato per il raggiungimento della carica completa"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "ora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Batteria"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Il sistema è alimentato dalla rete elettrica"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Unità sconosciuta"
 
@@ -500,62 +384,62 @@
 "Licenza GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Non demonizzare"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Riavvia l'istanza in esecuzione del gestore di energia di Xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostra la finestra di configurazione"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr ""
 "Interrompi qualsiasi istanza in esecuzione del gestore di energia di Xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informazioni sulla versione"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Troppi argomenti"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Impossibile connettersi alla sessione di messaggi del bus"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "È in esecuzione un altro gestore di energia"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Il gestore di energia di Xfce è già in esecuzione"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Adattatore presente"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Adattatore non presente"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Arresta il sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Iberna il sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -563,69 +447,69 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "La carica del sistema è bassa. Salvare il proprio lavore per evitare la "
 "perdita di dati"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Procedere veramente?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Esce dal gestore di energia di Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Esci"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 #, fuzzy
 msgid "Inhibit"
 msgstr "Inibisci il plugin"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Pemesso negato"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Ibernazione non supportata"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Sospensione non supportata"
@@ -634,46 +518,46 @@
 msgid "HAL daemon is not running"
 msgstr "Il demone di HAL non è in esecuzione"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Cookie non valido"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Nessun back-end per il proprio sistema operativo"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Nessuno script di ibernazione trovato"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Nessuno script di sospensione trovato"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Nessun metodo di sospensione trovato"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Nessun metodo di ibernazione trovato"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Il demone di HAL non è al momento connesso"
@@ -682,35 +566,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Gestione dell'energia per l'ambiente Xfce"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Ioni di litio"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Acido di piombo"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Polimeri di litio"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "lega metallo-nickel"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Roberto Pariset <robdebian at gmail.com>\n"
@@ -731,12 +615,88 @@
 msgid "Brightness plugin"
 msgstr "Plugin della luminosità"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Azioni</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Opzioni avanzate</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Luminosità</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Opzioni generali</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Schermo</b>"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "<b>Azioni</b>"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzate"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Considera il computer con poca carica quando:"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Abilita il controllo della gestione dell'energia dello schermo"
+
+#~ msgid "Enable notification"
+#~ msgstr "Abilita le notifiche"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Blocca lo schermo se si avvia la sopsensione o ibernazione"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "<b>Schermo</b>"
+
+#~ msgid "On battery"
+#~ msgstr "Alimentazione da batteria"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Impostazioni per il gestore di energia"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Preferisci il risparmio energetico alle prestazioni"
+
+#, fuzzy
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Spegni il monitor se il computer è inattivo per:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Riduci la luminosità dello schermo se il computer è inattivo per:"
+
+#~ msgid "Standby"
+#~ msgstr "Standby"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Spegni il monitor se il computer è inattivo per:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Icona del vassoio di sistema:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Quando il livello di carica della batteria è critico, fai:"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Alla pressione del tasto di accensione fai:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Quando il coperchio del portatile è chiuso:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Alla pressione del tasto di accensione fai:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Alla pressione del pulsante sleep fai:"
+
 #~ msgid "Advance"
 #~ msgstr "Avanza"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Non è in esecuzione alcuna istanza del gestore di energia"
-
 #~ msgid "Don't show again"
 #~ msgstr "Non mostrare di nuovo"
 

Modified: xfce4-power-manager/trunk/po/ja.po
===================================================================
--- xfce4-power-manager/trunk/po/ja.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/ja.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-18 00:45+0900\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-17 17:43+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -17,229 +17,101 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>アクション</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>拡張オプション</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>輝度</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>一般オプション</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>モニタ</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "アクション"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "拡張"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "常に表示する"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "コンピュータが低電力状態にあるとみなす充電率:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "CPU 周波数制御を有効にする"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "モニタ電源管理制御を有効にする"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "通知を有効にする"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1402
-#: ../settings/xfpm-settings.c:1407
-msgid "General"
-msgstr "一般"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "ハイバネート"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "サスペンド/ハイバネートへ遷移中に画面をロックする"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "モニタ"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "何もしない"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1416
-#: ../settings/xfpm-settings.c:1421
-msgid "On AC"
-msgstr "AC 電源"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "バッテリ電源"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "電源管理設定"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "性能より省電力を優先する"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-"コンピュータを操作していない状態でディスプレイをスリープするまでの時間:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "コンピュータを操作していない状態でスリープするまでの時間:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "コンピュータを操作していない状態で画面の輝度を下げるまでの時間:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "コンピュータを休止するときのスリープモード:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "モニタのスリープモード:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "スタンバイ"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "サスペンド"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-"コンピュータを操作していない状態でディスプレイの電源をオフにするまでの時間:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "システムトレイアイコン: "
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "バッテリ充電量が危機的状態になったとき:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "ハイバネートボタンが押されたとき:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "ラップトップの蓋が閉じられたとき:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "電源ボタンが押されたとき:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "スリープボタンが押されたとき:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce 電源管理"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "しない"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "1 分"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "分"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "1 時間"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "1 分"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "分"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "時間"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "秒"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "ハイバネートおよびサスペンド操作が許可されていません"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "シャットダウンおよびハイバネート操作が許可されていません"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "何もしない"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "サスペンド"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "ハイバネート"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "シャットダウン"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "問い合わせる"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "常に表示する"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "バッテリが存在するとき表示する"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "バッテリが充電中または使用中のとき表示する"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
@@ -247,31 +119,39 @@
 "DPMS (Display Power Management Signaling) を無効にすると、ディスプレイの電源"
 "オフやスリープモードへの移行を行いません。"
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "問い合わせる"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "サスペンド操作が許可されていません"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "ハイバネート操作が許可されていません"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "コンピュータのすべての電源の充電レベルがこの値に達したとき"
 
-#: ../settings/xfpm-settings.c:1431 ../settings/xfpm-settings.c:1436
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "一般"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "AC 電源"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "バッテリ電源"
 
-#: ../settings/xfpm-settings.c:1445 ../settings/xfpm-settings.c:1450
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "拡張"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "他の Xfce 電源管理がすでに動作しています"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "設定マネージャソケット"
@@ -280,34 +160,40 @@
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "'%s --help' で使用方法を表示します。"
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce 電源管理"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "電源管理設定の読み込みに失敗しました。デフォルト値を使用します。"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce 電源管理設定"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Xfce 電源管理に接続できません"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce 電源管理は動作していません"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce4 電源管理は動作していません。今起動しますか?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "起動"
 
@@ -339,8 +225,8 @@
 msgid "Your battery is discharging"
 msgstr "バッテリを使用しています"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "システムはバッテリ駆動で動作しています"
 
@@ -352,97 +238,97 @@
 msgid "System is running on low power"
 msgstr "システムは低電力下で動作しています"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce 電源管理"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "UPS"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "マウスのバッテリ"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "キーボードのバッテリ"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "カメラのバッテリ"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "PDA のバッテリ"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "バッテリ"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "は空です"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "はフル充電されています"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "充電レベル"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "は充電中です"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "を使用中です"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "の充電量が低くなっています"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "はほぼ空です"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "は存在しません"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "バッテリは存在しません"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "バッテリ"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "システムは AC 電源で動作しています"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "推定残り時間"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "フル充電までの推定時間"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "時間"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "分"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "バッテリ"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "システムは AC 電源で動作しています"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "未知のユニット"
 
@@ -491,61 +377,61 @@
 "Licensed under the GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "デーモンとして起動しない"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "動作中の Xfce 電源管理インスタンスを再起動する"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "設定ダイアログを表示します"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "動作中の Xfce 電源管理を終了します"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "バージョン情報"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "引数が多すぎます"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "メッセージバスセッションに接続できませんでした"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "他の Xfce 電源管理がすでに動作しています"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce 電源管理はすでに動作しています"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "アダプタが接続されています"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "アダプタは接続されていません"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "システムをシャットダウンします"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "システムをハイバネートします"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -557,13 +443,13 @@
 "されるかもしれないことを意味します。コンピュータがスリープする前にこのアプリ"
 "ケーションを終了するか、AC アダプタをつなげてください。"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "システムは低電力下で動作しています。作業中のデータを失ってしまわないよう保存"
 "してください。"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -573,11 +459,11 @@
 "うと、このアプリケーションの作業状態が破壊されるかもしれません。システムをハ"
 "イバネートしてもよろしいですか?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "続行してもよろしいですか?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
@@ -587,23 +473,23 @@
 "と、このアプリケーションの作業状態が破壊されるかもしれません。システムをサス"
 "ペンドしてもよろしいですか?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Xfce 電源管理を終了します"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "終了"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "抑止の解除"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "抑止"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
@@ -612,21 +498,21 @@
 "自動スリープの有効/無効を切り換えます。無効にすると電源管理はバックライトをス"
 "リープしません。例えば映画を観ているときなどに無効にするとよいでしょう。"
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "有効なデータがありません"
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "許可がありません"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "ハイバネートはサポートされていません"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "サスペンドはサポートされていません"
@@ -635,46 +521,46 @@
 msgid "HAL daemon is not running"
 msgstr "HAL デーモンが動作していません"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "不正な引数です"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "不正な Cookie です"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "あなたのオペレーティングシステム用のバックエンドはありません"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "ハイバネートスクリプトが見つかりませんでした"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "サスペンドスクリプトが見つかりませんでした"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "サスペンドメソッドが見つかりませんでした"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "ハイバネートメソッドが見つかりませんでした"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "メモリ不足です"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "システムはスリープに失敗しました"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "HAL デーモンに現在接続していません"
@@ -683,35 +569,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Xfce デスクトップ用電源管理"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "リチウムイオン"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "鉛酸"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "リチウムポリマー"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "ニッケル水素"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Masato Hashimoto <hashimoto at xfce.org>"
 
@@ -729,5 +615,95 @@
 msgid "Brightness plugin"
 msgstr "輝度プラグイン"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>アクション</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>拡張オプション</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>輝度</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>一般オプション</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>モニタ</b>"
+
+#~ msgid "Actions"
+#~ msgstr "アクション"
+
+#~ msgid "Advanced"
+#~ msgstr "拡張"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "コンピュータが低電力状態にあるとみなす充電率:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "CPU 周波数制御を有効にする"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "モニタ電源管理制御を有効にする"
+
+#~ msgid "Enable notification"
+#~ msgstr "通知を有効にする"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "サスペンド/ハイバネートへ遷移中に画面をロックする"
+
+#~ msgid "Monitor"
+#~ msgstr "モニタ"
+
+#~ msgid "On battery"
+#~ msgstr "バッテリ電源"
+
+#~ msgid "Power manager settings"
+#~ msgstr "電源管理設定"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "性能より省電力を優先する"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr ""
+#~ "コンピュータを操作していない状態でディスプレイをスリープするまでの時間:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "コンピュータを操作していない状態でスリープするまでの時間:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "コンピュータを操作していない状態で画面の輝度を下げるまでの時間:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "コンピュータを休止するときのスリープモード:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "モニタのスリープモード:"
+
+#~ msgid "Standby"
+#~ msgstr "スタンバイ"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr ""
+#~ "コンピュータを操作していない状態でディスプレイの電源をオフにするまでの時"
+#~ "間:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "システムトレイアイコン: "
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "バッテリ充電量が危機的状態になったとき:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "ハイバネートボタンが押されたとき:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "ラップトップの蓋が閉じられたとき:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "電源ボタンが押されたとき:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "スリープボタンが押されたとき:"
+
 #~ msgid "Advance"
 #~ msgstr "詳細"

Modified: xfce4-power-manager/trunk/po/nb.po
===================================================================
--- xfce4-power-manager/trunk/po/nb.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/nb.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-01-17 12:11+0100\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\n"
@@ -16,282 +16,149 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Avanserte innstillinger"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Generelle innstillinger"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Avanserte innstillinger"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Alltid vis ikon"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Slå på prosessorhastighetstyring"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Slå på skjermstyring"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Slå på UPS ladevarsling"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Generelle innstillinger"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Dvale"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Overvåk innstillinger"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ingenting"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Bruker nettdrift"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Bruker batteridrift"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Strømstyring"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Dvalemodus etter"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Hvilemodus"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Systemkurvikon:"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Når batteriets ladenivå er kritisk"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Når av/på-knappen trykkes"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Når skjermen på bærbar lukkes"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Når av/på-knappen trykkes"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Når hvilemodusknappen trykkes"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce Strømstyring"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "aldri"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minutt"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minutter"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "time"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minutt"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutter"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "timer"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ingenting"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Hvilemodus"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Dvale"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Avslutt"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Alltid vis ikon"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Når batteri er tilstede"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Når batteri lades eller utlades"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Sett systemet i dvalemodus"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Generelle innstillinger"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Bruker nettdrift"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Bruker batteridrift"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Utvidet"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce strømstyring er ikke startet"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Innstillingsbehandler sokkel"
@@ -300,36 +167,42 @@
 msgid "SOCKET ID"
 msgstr "SOKKEL ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Skriv '%s --help' for instruksjoner."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce Strømstyring"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "Klarte ikke laste strømstyringoppsett, bruker standard innstillinger"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce Strømstyring"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Klarte ikke laste Xfce strømstyring"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce strømstyring er ikke startet"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce strlmstyring er ikke startet, ønsker du å starte den?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Kjør"
 
@@ -362,8 +235,8 @@
 msgid "Your battery is discharging"
 msgstr "Batteriet utlades"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Overvåk innstillinger ved batteridrift"
@@ -376,117 +249,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce Strømstyring"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Benytter batteridrift"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Benytter batteridrift"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Benytter batteridrift"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Batteriet er snart utladet"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Batteri er fulladet"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Batteri ladenivå"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Batteriet lades"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Batteriet utlades"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Batteriet har lite strøm"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Batteriet er snart utladet"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Ikke tilgjegelig"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Når batteri er tilstede"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Batteriinnstillinger"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Overvåk innstillinger ved nettdrift"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Beregnet tid igjen"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Beregnet ladetid"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "time"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minutt"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Batteriinnstillinger"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Overvåk innstillinger ved nettdrift"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -536,66 +409,66 @@
 "Lisensiert under GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Avslutt Xfce strømstyring"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Vis innstillinger"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Avslutt Xfce strømstyring"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versjonsinformasjon"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "For mange argumenter"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Klarte ikke kontakte DBUS: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Xfce strømstyring"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce strømstyring"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Ikke tilgjegelig"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Ikke tilgjegelig"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Avslutt systemet"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Sett systemet i dvalemodus"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -603,69 +476,69 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr "Batteriet er snart tomt. Lagre arbeidet ditt for å unngå datatap"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Ønsker du å sette systemet i hvilemodus?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Xfce Strømstyring"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Sett systemet i dvalemodus"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -675,47 +548,47 @@
 msgid "HAL daemon is not running"
 msgstr "Xfce strømstyring er ikke startet"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "For mange argumenter"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Ingen støtte for dette operativsystemet"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Fant ikke skript for dvalemodus"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Fant ikke skript for hvilemodus"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Ingen hvilemodus mekanisme funnet"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Ingen dvalemodus mekanisme funnet"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Tomt for minne"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Systemet klarte ikke gå til hvilemodus"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -724,35 +597,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Terje Uriansrud <terje at uriansrud.net>"
 
@@ -773,6 +646,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Avanserte innstillinger"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Generelle innstillinger"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Avanserte innstillinger"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Slå på prosessorhastighetstyring"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Slå på skjermstyring"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Slå på UPS ladevarsling"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Overvåk innstillinger"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Bruker batteridrift"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Strømstyring"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Dvalemodus etter"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Systemkurvikon:"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Når batteriets ladenivå er kritisk"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Når av/på-knappen trykkes"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Når skjermen på bærbar lukkes"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Når av/på-knappen trykkes"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Når hvilemodusknappen trykkes"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce strømstyring er ikke startet"
 
@@ -780,10 +716,6 @@
 #~ msgstr "Strøm"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce strømstyring er ikke startet"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Ikke vis denne meldingen"
 

Modified: xfce4-power-manager/trunk/po/nl.po
===================================================================
--- xfce4-power-manager/trunk/po/nl.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/nl.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\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"
@@ -12,281 +12,149 @@
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Geavanceerde instellingen"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Algemene opties"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Geavanceerde instellingen"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Altijd een pictogram weergeven"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "LCD-helderheid-beheer inschakelen"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Ups-opladen notificatie inschakelen"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Algemene opties"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Slaapstand"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Niets doen"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Als er een batterij is"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Als er een batterij is"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Energiebeheer"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Standbij na"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Pauzestand"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Pictogram in systeemvak"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Als het energieniveau van de batterij kritiek is"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Als de aan/uit-knop wordt ingedrukt"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Als de aan/uit-knop wordt ingedrukt"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Als de slaapknop wordt ingedrukt"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-#, fuzzy
-msgid "Xfce Power Manager"
-msgstr "Energiebeheer"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "nooit"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minuut"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minuten"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "uur"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minuut"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minuten"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "uren"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Niets doen"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Pauzestand"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Slaapstand"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Afsluiten"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Altijd een pictogram weergeven"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Als er een batterij is"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Als de batterij aan het opladen of ontladen is"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Slaapstand"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Algemene opties"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Als er een batterij is"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Als er een batterij is"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr ""
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce energiebeheer"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr ""
@@ -295,38 +163,45 @@
 msgid "SOCKET ID"
 msgstr ""
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Type '%s --help' voor gebruiksinstructies."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
 #, fuzzy
+msgid "Xfce Power Manager"
+msgstr "Energiebeheer"
+
+#: ../settings/xfpm-settings-main.c:118
+#, fuzzy
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "Kan de voorkeuren niet laden; standaardwaarden worden gebruikt"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Energiebeheer"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Energiebeheer"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, fuzzy, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce energiebeheer"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 #, fuzzy
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Energiebeheer is niet actief, wilt u het activeren"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Uitvoeren"
 
@@ -362,8 +237,8 @@
 msgid "Your battery is discharging"
 msgstr "De batterij is aan het ontladen"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Energiebesparende modus op batterij inschakelen"
@@ -377,117 +252,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Aan het werken op de batterij"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "U werkt op de batterij"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "U werkt op de batterij"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "De batterij is volledig opgeladen"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Batterij volledig opgeladen"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Energie-niveau"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "De batterij is aan het opladen"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "De batterij is aan het ontladen"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Het energie-niveau van de batterij is laag"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "De batterij is volledig opgeladen"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Niet aanwezig"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Als er een batterij is"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Batterij-instellingen"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Energiebesparende modus op batterij inschakelen"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Geschatte resterende tijd"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Geschatte tijd om op te laden"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "uur"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuut"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Batterij-instellingen"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Energiebesparende modus op batterij inschakelen"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -537,67 +412,67 @@
 "De GNU GPL-licentie is van toepassing.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 #, fuzzy
 msgid "Show the configuration dialog"
 msgstr "Batterij-configuratie"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 #, fuzzy
 msgid "Quit any running xfce power manager"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versie-informatie"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Te veel argumenten"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr ""
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, fuzzy, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Niet aanwezig"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Niet aanwezig"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Afsluiten"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Slaapstand"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -605,71 +480,71 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Het energie-niveau van de batterij is kritiek - sla uw werk op om "
 "dataverlies te voorkomen"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Weet u zeker dat u het systeem in de pauzestand wilt brengen"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Slaapstand"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -679,47 +554,47 @@
 msgid "HAL daemon is not running"
 msgstr "Xfce energiebeheer"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Te veel argumenten"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Geen backend voor dit besturingssysteem beschikbaar"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Geen slaapstand-script gevonden"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Geen pauzestand-script gevonden"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Geen pauzestand-methode gevonden"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Geen slaapstand-methode gevonden"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Kon de pauzestand niet aanvangen"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -728,35 +603,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Vincent Tunru <projects at vinnl.nl>"
 
@@ -776,6 +651,58 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Geavanceerde instellingen"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Algemene opties"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Geavanceerde instellingen"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "LCD-helderheid-beheer inschakelen"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Ups-opladen notificatie inschakelen"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Als er een batterij is"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Energiebeheer"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Standbij na"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Pictogram in systeemvak"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Als het energieniveau van de batterij kritiek is"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Als de aan/uit-knop wordt ingedrukt"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Als de aan/uit-knop wordt ingedrukt"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Als de slaapknop wordt ingedrukt"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce energiebeheer"
 
@@ -784,10 +711,6 @@
 #~ msgstr "Energiebesparend"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce energiebeheer"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Niet meer weergeven"
 

Modified: xfce4-power-manager/trunk/po/pt.po
===================================================================
--- xfce4-power-manager/trunk/po/pt.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/pt.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-01-22 17:23+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
@@ -15,282 +15,149 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Configurações avançadas"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Opções Gerais"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Configurações avançadas"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Sempre mostrar um ícone"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Ligar controlo de escala de frequência do CPU"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Ligar controlo de gestão de energia do monitor"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Ligar notificação de carga UPS"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Opções Gerais"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernar"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Definições de monitor"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nada"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Ligado à corrente"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "A usar bateria"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Gestão de Energia"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Standby após"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspender"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Ícone de bandeja de sistema:"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Quando o nível da carga da bateria é crítico fazer"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Quando o botão desligar é pressionado fazer"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Quando a tampa do laptop é fechada"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Quando o botão desligar é pressionado fazer"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Quando o botão sleep é pressionado fazer"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Gestão de Energia Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "nunca"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minuto"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "hora"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minuto"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "horas"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nada"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspender"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Desligar"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Sempre mostrar um ícone"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Quando a bateria está presente"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Quando a bateria está a carregar ou a descarregar"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Hibernar o sistema"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Opções Gerais"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Ligado à corrente"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "A usar bateria"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Extensivo"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Gestão de energia Xfce não está em execução"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Socket de gestor de definições"
@@ -299,37 +166,43 @@
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digite '%s --help' para uso."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Gestão de Energia Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Falhou a carregar a configuração de gestão de energia, usando as omissões"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Gestão de Energia Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Incapaz de lançar a gestão de energia xfce4"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Gestão de energia Xfce não está em execução"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Gestão de Energia Xfce4 não está em execução, deseja lançá-lo agora?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Executar"
 
@@ -362,8 +235,8 @@
 msgid "Your battery is discharging"
 msgstr "A sua bateria está a descarregar"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Definições de monitor de bateria"
@@ -376,117 +249,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Gestão de energia Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "A usar bateria"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Está a usar a bateria"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Está a usar a bateria"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Bateria está quase vazia"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Bateria totalmente carregada"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Nível de carga da bateria"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Bateria a carregar"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Bateria a descarregar"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Carga da bateria baixa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Bateria está quase vazia"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Ausente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Quando a bateria está presente"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Definições de bateria"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Definições do monitor em corrente eléctrica"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Tempo estimado restante"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Tempo estimado para carregar"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Definições de bateria"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Definições do monitor em corrente eléctrica"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -536,66 +409,66 @@
 "Licenciado sob a GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Sair de qualquer gestão de energia xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostrar a janela de configuração"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Sair de qualquer gestão de energia xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informação de versão"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Demasiados argumentos"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Incapaz de ligar ao DBus: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Gestão de energia Xfce já em execução"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Gestão de energia Xfce já em execução"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Ausente"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Ausente"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Desligar o sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -603,70 +476,70 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "A sua bateria está quase vazia. Grave o seu trabalho para evitar perder dados"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Tem a certeza que deseja suspender o sistema?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Gestão de energia Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -676,47 +549,47 @@
 msgid "HAL daemon is not running"
 msgstr "Gestão de energia Xfce não está em execução"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Demasiados argumentos"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Nenhum suporte para o seu sistema operativo"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Script hibernar"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Script suspender não encontrado"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Método suspender não encontrado"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Método hibernação não encontrado "
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Sistema falhou a suspender"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -725,35 +598,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Nuno Miguel <nunis at netcabo.pt>"
 
@@ -774,6 +647,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Configurações avançadas"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Opções Gerais"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Configurações avançadas"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Ligar controlo de escala de frequência do CPU"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Ligar controlo de gestão de energia do monitor"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Ligar notificação de carga UPS"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Definições de monitor"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "A usar bateria"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Gestão de Energia"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Standby após"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Ícone de bandeja de sistema:"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Quando o nível da carga da bateria é crítico fazer"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Quando o botão desligar é pressionado fazer"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Quando a tampa do laptop é fechada"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Quando o botão desligar é pressionado fazer"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Quando o botão sleep é pressionado fazer"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Gestão de energia Xfce não está em execução"
 
@@ -781,10 +717,6 @@
 #~ msgstr "Energia"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Gestão de energia Xfce não está em execução"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Não mostrar esta mensagem novamente"
 

Modified: xfce4-power-manager/trunk/po/pt_BR.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_BR.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/pt_BR.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-02-16 08:12-0500\n"
 "Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -17,282 +17,149 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Configurações avançadas"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Opções gerais"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Configurações avançadas"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Sempre exibir um ícone"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Habilitar controle da escala de freqüência da CPU"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Habilitar controle do gerenciador de energia do monitor"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Habilitar notificação da carga de UPS"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Opções gerais"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hibernar"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "configurações do monitor"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Nada"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Usando a tomada"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Em energia da bateria"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Gerenciador de energia"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Standby após"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Suspender"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Ícone da bandeja do sistema"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Quando o nível da carga da bateria estiver crítico fazer"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Quando o botão desligar é pressionado, fazer"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Quando a tampa do laptop está fechada"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Quando o botão desligar é pressionado, fazer"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Quando o botão sleep é pressionado, fazer"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Gerenciador de energia do Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "nunca"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minuto"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "hora"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minuto"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minutos"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "horas"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Nada"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Suspender"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Desligar"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Sempre exibir um ícone"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Quando a bateria está presente"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Quando a bateria está carregando ou descarregando"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Hibernar o sistema"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Opções gerais"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Usando a tomada"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Em energia da bateria"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Estendido"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "O Gerenciador de energia do Xfce não está em execução"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Socket do Gerenciador de configurações"
@@ -301,39 +168,45 @@
 msgid "SOCKET ID"
 msgstr "SOCKET ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Digite \"%s --help\" para informações de uso."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Gerenciador de energia do Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Falha ao carregar a configuração do Gerenciador de energia, usando os padrões"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Gerenciador de energia do Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Não foi possível carregar o Gerenciador de energia do xfce4"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "O Gerenciador de energia do Xfce não está em execução"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr ""
 "O Gerenciador de energia do Xfce4 não está em execução, você deseja lançá-lo "
 "agora?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Executar"
 
@@ -366,8 +239,8 @@
 msgid "Your battery is discharging"
 msgstr "A sua bateria está descarregando"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Configurações do monitor quando usando energia da bateria"
@@ -380,117 +253,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Gerenciador de energia Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Usando bateria"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Usando bateria"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Usando bateria"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "A bateria está quase esgotada"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Bateria totalmente carregada"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Nível de carga da bateria"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "A bateria está carregando"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "A bateria está descarregando"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "A carga da bateria está baixa"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "A bateria está quase esgotada"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Ausente"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Quando a bateria está presente"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Configurações da bateria"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Configurações do monitor quando usando a tomada"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Tempo estimado restante"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Tempo estimado para carregar"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "hora"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Configurações da bateria"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Configurações do monitor quando usando a tomada"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -540,66 +413,66 @@
 "Licenciado sob a GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Sai do Gerenciador de energia xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Mostra o diálogo de configuração"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Sai do Gerenciador de energia xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Informações da versão"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Muitos argumentos"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Não foi possível conectar ao DBus %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "O Gerenciador de energia do Xfce já está em execução"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "O Gerenciador de energia do Xfce já está em execução"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Ausente"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Ausente"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Desligar o sistema"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -607,71 +480,71 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "A sua bateria está quase esgotada. Grave o seu trabalho para evitar perda de "
 "dados"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Você tem certeza que deseja suspender o sistema?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Gerenciador de energia Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Hibernar o sistema"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -681,47 +554,47 @@
 msgid "HAL daemon is not running"
 msgstr "O Gerenciador de energia do Xfce não está em execução"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Muitos argumentos"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Nenhum backend para o seu sistema operacional"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Nenhum script de hibernação foi localizado"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Nenhum script de suspender foi localizado"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Nenhum método de suspender foi localizado"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Nenhum método de hibernação foi localizado"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Não há memória suficiente"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Falha do sistema ao suspender"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -730,35 +603,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Vladimir Melo <vmelo at gnome.org>\n"
@@ -782,6 +655,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Configurações avançadas"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Opções gerais"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Configurações avançadas"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Habilitar controle da escala de freqüência da CPU"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Habilitar controle do gerenciador de energia do monitor"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Habilitar notificação da carga de UPS"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "configurações do monitor"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Em energia da bateria"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Gerenciador de energia"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Standby após"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Ícone da bandeja do sistema"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Quando o nível da carga da bateria estiver crítico fazer"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Quando o botão desligar é pressionado, fazer"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Quando a tampa do laptop está fechada"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Quando o botão desligar é pressionado, fazer"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Quando o botão sleep é pressionado, fazer"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "O Gerenciador de energia do Xfce não está em execução"
 
@@ -789,10 +725,6 @@
 #~ msgstr "Energia"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "O Gerenciador de energia do Xfce não está em execução"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Não mostrar esta mensagem novamente"
 

Modified: xfce4-power-manager/trunk/po/ru.po
===================================================================
--- xfce4-power-manager/trunk/po/ru.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/ru.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-20 15:00+0400\n"
 "Last-Translator: Denis Koryavov <dkoryavov at yandex.ru>\n"
 "Language-Team: Russian\n"
@@ -16,257 +16,141 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>Действия</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Дополнительные настройки</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Яркость</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Общие настройки</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Монитор</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "Действия "
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Дополнительно "
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Всегда отображать"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Считать заряд батареи низким при:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "Включить управление частотой центрального процессора"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Включить управление питанием"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Включить уведомления "
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Общие "
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Спящий режим "
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Блокировать экран при переходе в спящий/ждущий режимы"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Монитор "
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ничего не делать"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "От сети "
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "От батареи "
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Настройки менеджера питания "
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Использовать энергосберегающие функции"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Отключать питание экрана при отсутствии активности в течении:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Перевести компьютер в спящий режим при отсутствии активности в течении:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Уменьшать яркость экрана при отсутствии активности в течении:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "При отсутствии активности переходить в: "
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "При активации энергосберегающих функций переводить монитор в: "
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Дежурный режим "
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Ждущий режим "
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Выключать экран при отсутствии активности в течении:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Отображать значок в системном лотке:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "При критическом уровне заряда батареи:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Когда нажата клавиша перехода в спящий режим:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "При закрытии крышки ноутбука перейти в: "
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Когда нажата клавиша включения/выключения питания:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Когда нажата клавиша перехода в спящий режим: "
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Менеджер питания Xfce "
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Никогда "
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Одной минуты "
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Минут "
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Одного часа"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "одна минута"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "минут "
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "часов "
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Секунд "
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Спящий и ждущий режимы не поддерживаются "
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Операции выключения и спящего режима не поддерживаются "
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ничего не делать"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Ждущий режим "
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Спящий режим "
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Выключить компьютер"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Спрашивать "
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Всегда отображать"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Когда присутствует батарея "
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Когда батарея разряжается или заряжается "
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
-msgstr "Выключить автоматическое управление питанием монитора (DPMS), в этом случае, ваш монитор будет работать постоянно. "
+msgstr ""
+"Выключить автоматическое управление питанием монитора (DPMS), в этом случае, "
+"ваш монитор будет работать постоянно. "
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Спрашивать "
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "Операция перехода в ждущий режим запрещена "
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "Операция перехода в спящий режим запрещена "
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Когда заряд всех источников питания компьютера близок к заданному "
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Общие "
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "От сети "
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "От батареи "
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Расширенные"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Другой менеджер питания уже запущен "
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Сокет менеджера настроек "
@@ -275,34 +159,40 @@
 msgid "SOCKET ID"
 msgstr "ID сокета "
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Наберите '%s --help' для просмотра справки."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Менеджер питания Xfce "
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "Не удалось загрузить настройки питания, используются умалчиваемые "
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Настройки Менеджера питания Xfce "
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Невозможно подключиться к менеджеру питания Xfce "
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Менеджер питания Xfce не запущен "
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Менеджер питания Xfce не запущен, хотите запустить его сейчас? "
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Запустить "
 
@@ -334,8 +224,8 @@
 msgid "Your battery is discharging"
 msgstr "Батарея разряжается "
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Система работает от батареи "
 
@@ -347,97 +237,97 @@
 msgid "System is running on low power"
 msgstr "Система работает от батареи c низким зарядом "
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Менеджер питания Xfce "
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "Ваш ИБП "
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Батарея мыши "
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Батарея клавиатуры "
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Батарея камеры "
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "Батарея наладонника "
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Батарея "
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "пуста "
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "полностью заряжена "
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "уровень заряда "
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "зяряжается "
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "разряжается "
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "низкий заряд "
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "практически не осталось заряда "
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "отсуствует "
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Батарея отсутствует "
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Батарея "
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Система работает от сети "
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Осталось времени (приблизительно) "
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Примерное время зарядки "
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "час "
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "минута "
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Батарея "
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Система работает от сети "
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Неизвестное устройство "
 
@@ -486,131 +376,145 @@
 "Лицензия GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Не запускать в режиме службы "
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Перезапустить менеджер питания Xfce "
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Показать диалог настроек программы "
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Завершить работу менеджера питания Xfce "
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Информация о версии "
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Слишком много аргументов "
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "Невозможно соединиться с системной коммуникационной шиной DBus  "
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Другой менеджер питания уже запущен "
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Менеджер питания Xfce уже запущен "
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Адаптер присутствует "
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Адаптер отсуствует "
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Выключить систему "
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Перевести систему в спящий режим"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
 "of this application. Close this application before putting the computer on "
 "sleep mode or plug in your AC adapter"
-msgstr "Система работает от батарей с низким зарядом, однако одно из запущенных приложений препятствует автоматическому переходу в спящий режим. Это означает, что немедленный переход в спящий режим может повредить данные этого приложения. Сохраните данные и закройте блокирующую программу, либо подключите компьютер к источнику питания. "
+msgstr ""
+"Система работает от батарей с низким зарядом, однако одно из запущенных "
+"приложений препятствует автоматическому переходу в спящий режим. Это "
+"означает, что немедленный переход в спящий режим может повредить данные "
+"этого приложения. Сохраните данные и закройте блокирующую программу, либо "
+"подключите компьютер к источнику питания. "
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "Ваша батарея практически разряжена. Сохраните свою работу чтобы избежать потери данных. "
+msgstr ""
+"Ваша батарея практически разряжена. Сохраните свою работу чтобы избежать "
+"потери данных. "
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
-"Другое приложение блокирует автоматический переход в режим пониженного энергопотребления "
-"выполнение данного действия может повредить работе данного приложения, вы действительно желаете "
-" перевести систему в спящий режим?"
+"Другое приложение блокирует автоматический переход в режим пониженного "
+"энергопотребления выполнение данного действия может повредить работе данного "
+"приложения, вы действительно желаете  перевести систему в спящий режим?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "Вы действительно желаете продолжить?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
-msgstr "Одно из запущенных приложений блокирует автоматический переход в режим пониженного энергопотребления, принудительное выполнение данного действия может повредить работе этого приложения, вы действительно желаете перевести систему в ждущий режим?"
+msgstr ""
+"Одно из запущенных приложений блокирует автоматический переход в режим "
+"пониженного энергопотребления, принудительное выполнение данного действия "
+"может повредить работе этого приложения, вы действительно желаете перевести "
+"систему в ждущий режим?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Выключить менеджер питания Xfce?"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Выключить"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Отменить сдерживание"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Сдерживать"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
-msgstr "Включить или выключить автоматические действия управления энергопотреблением. Подобное действие вам может понадобиться, например, при просмотре фильма. "
+msgstr ""
+"Включить или выключить автоматические действия управления "
+"энергопотреблением. Подобное действие вам может понадобиться, например, при "
+"просмотре фильма. "
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "Данные отсутствуют "
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Доступ запрещен "
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Спящий режим не поддерживается  "
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Ждущий режим не поддерживается "
@@ -619,46 +523,46 @@
 msgid "HAL daemon is not running"
 msgstr "Системная служба HAL не запущена"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Неверные аргументы"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Неверные данные "
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Отсутствует графический интерфейс для вашей операционной системы "
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Не найдено программ для перевода систему в спящий режим "
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Не найдено программ для перевода систему в ждущий режим "
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Не найдено методов перевода системы в ждущий режим "
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Не найдено методов перевода системы в спящий режим "
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Выход за границы памяти "
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Не удалось перевести систему в ждущий режим "
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Системная служба HAL не подсоединена"
@@ -667,35 +571,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Управление питанием для окружения рабочего стола Xfce "
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Литий-ионная "
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Кислотно-щелочная"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Литий-полимерная "
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Никель-металлогидрид "
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Неизвестно "
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "мВч "
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "мАч "
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Denis Koryavov <dkoryavov at yandex.ru> "
 
@@ -713,3 +617,90 @@
 msgid "Brightness plugin"
 msgstr "Управление яркостью экрана"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>Действия</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Дополнительные настройки</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Яркость</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Общие настройки</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Монитор</b>"
+
+#~ msgid "Actions"
+#~ msgstr "Действия "
+
+#~ msgid "Advanced"
+#~ msgstr "Дополнительно "
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Считать заряд батареи низким при:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Включить управление частотой центрального процессора"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Включить управление питанием"
+
+#~ msgid "Enable notification"
+#~ msgstr "Включить уведомления "
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "Блокировать экран при переходе в спящий/ждущий режимы"
+
+#~ msgid "Monitor"
+#~ msgstr "Монитор "
+
+#~ msgid "On battery"
+#~ msgstr "От батареи "
+
+#~ msgid "Power manager settings"
+#~ msgstr "Настройки менеджера питания "
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Использовать энергосберегающие функции"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Отключать питание экрана при отсутствии активности в течении:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr ""
+#~ "Перевести компьютер в спящий режим при отсутствии активности в течении:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "Уменьшать яркость экрана при отсутствии активности в течении:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "При отсутствии активности переходить в: "
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "При активации энергосберегающих функций переводить монитор в: "
+
+#~ msgid "Standby"
+#~ msgstr "Дежурный режим "
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Выключать экран при отсутствии активности в течении:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Отображать значок в системном лотке:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "При критическом уровне заряда батареи:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Когда нажата клавиша перехода в спящий режим:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "При закрытии крышки ноутбука перейти в: "
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Когда нажата клавиша включения/выключения питания:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Когда нажата клавиша перехода в спящий режим: "

Modified: xfce4-power-manager/trunk/po/sv.po
===================================================================
--- xfce4-power-manager/trunk/po/sv.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/sv.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-01-18 22:55+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,280 +15,149 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Avancerade inställningar"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Allmänna alternativ"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Avancerade inställningar"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Visa alltid en ikon"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Aktivera notifiering för UPS-laddning"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Allmänna alternativ"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Viloläge"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Skärminställningar"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Ingenting"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "På extern ström"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "På batteriström"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Strömhanterare"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "Viloläge efter"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Vänteläge"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "När batteri är anslutet"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "När batteri är anslutet"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "När bärbara datorns lock stängs"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "När batteri är anslutet"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "När batteri är anslutet"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Strömhanterare för Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "aldrig"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "minut"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "minuter"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "timme"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "minut"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "minuter"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "timmar"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Ingenting"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Vänteläge"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Viloläge"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Stäng av"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Visa alltid en ikon"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "När batteri är anslutet"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "När batteri laddas upp eller laddas ur"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Försätt i viloläge"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Allmänna alternativ"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "På extern ström"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "På batteriström"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr ""
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Strömhanterare för Xfce är inte igång"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Uttag för inställningshanterare"
@@ -297,36 +166,42 @@
 msgid "SOCKET ID"
 msgstr "UTTAGS-ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Ange \"%s --help\" för användningsinformation."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Strömhanterare för Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Strömhanterare för Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Kunde inte läsa in Strömhanterare för Xfce4"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Strömhanterare för Xfce är inte igång"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Strömhanterare för Xfce4 är inte igång. Vill du starta den nu?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Kör"
 
@@ -359,8 +234,8 @@
 msgid "Your battery is discharging"
 msgstr "Ditt batteri laddar ur"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Kör på batteri"
@@ -373,116 +248,116 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Strömhanterare för Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Kör på batteri"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Du kör på batteridrift"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Du kör på batteridrift"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Batteriet är nästan tomt"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Batteriet är fullständigt uppladdat"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Laddningsnivå för batteri"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Batteriet laddar upp"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Batteriet laddar ur"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Batteriets laddning är låg"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Batteriet är nästan tomt"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Inte anslutet"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "När batteri är anslutet"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Batteriinställningar"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr ""
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Beräknad tid kvar"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Beräknad tid till uppladdat"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "timme"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "minut"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Batteriinställningar"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr ""
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -532,66 +407,66 @@
 "Licensierad under GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Avsluta alla körande xfce-strömhanterare"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Visa konfigurationsdialogen"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Avsluta alla körande xfce-strömhanterare"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Versionsinformation"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "För många argument"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Kunde inte ansluta till DBus: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Strömhanterare för Xfce är redan igång"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Strömhanterare för Xfce är redan igång"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Inte anslutet"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Inte anslutet"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Stäng av systemet"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Försätt i viloläge"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -599,71 +474,71 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Ditt batteri är nästan tomt. Spara ditt arbete för att förhindra att data "
 "förloras"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Är du säker på att du vill försätta systemet i vänteläge?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Strömhanterare för Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Försätt i viloläge"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -673,47 +548,47 @@
 msgid "HAL daemon is not running"
 msgstr "Strömhanterare för Xfce är inte igång"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "För många argument"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Ingen metod för viloläge hittades"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Försök att försätta systemet i vänteläge misslyckades"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -722,35 +597,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po at danielnylander.se>\n"
@@ -773,6 +648,58 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Avancerade inställningar"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Allmänna alternativ"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Avancerade inställningar"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Aktivera notifiering för UPS-laddning"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Skärminställningar"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "På batteriström"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Strömhanterare"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "Viloläge efter"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "När batteri är anslutet"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "När batteri är anslutet"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "När bärbara datorns lock stängs"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "När batteri är anslutet"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "När batteri är anslutet"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Strömhanterare för Xfce är inte igång"
 
@@ -780,10 +707,6 @@
 #~ msgstr "Ström"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Strömhanterare för Xfce är inte igång"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Visa inte detta meddelande igen"
 

Modified: xfce4-power-manager/trunk/po/tr.po
===================================================================
--- xfce4-power-manager/trunk/po/tr.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/tr.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -11,288 +11,141 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: TURKEY\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>İşlemler</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Gelişmiş ayarlar</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>Ekran Parlaklığı</b>"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>Genel Seçenekler</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>Monitör</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "İşlemler"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#: ../settings/xfpm-settings.glade.h:8
-#: ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "Her zaman simge göster"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "Kritik düşük güç seviyesini belirle:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "İşlemci frekansı kontrolünü etkinleştir"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Monitör güç yönetimi kontrolünü etkinleştir"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "Bildirimleri etkinleştir"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "Genel"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689
-#: ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012
-#: ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147
-#: ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Hazırda beklet"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "Askıya alınırken veya hazırda bekletme işlemi gerçekleştirilirken ekranı kilitle"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "Monitör"
-
-#: ../settings/xfpm-settings.glade.h:17
-#: ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678
-#: ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001
-#: ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Hiçbiri"
-
-#: ../settings/xfpm-settings.glade.h:18
-#: ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "Fişe takılı iken (AC)"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "Pil ile çalışırken"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "Güç yöneticisi ayarları"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "Tam performans yerine güç koruma kipinde çalıştır"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "Bilgisayar kullanılmadığında şu kadar süre sonra askıya al:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "Bilgisayar kullanılmadığı zaman şu kadar süre sonra askıya al:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "Bilgisayar kullanılmadığında ekran parlaklığı seviyesini şu kadar süre sonra düşür:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "Bilgisayar kullanılmadığında uygulanacak uyku kipi:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "Monitör için kullanılacak uyku kipi:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "Hazırda beklet"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28
-#: ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840
-#: ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075
-#: ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201
-#: ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Askıya Al"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "Bilgisayar kullanılmadığında şu kadar süre sonra ekranı kapat:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "Sistem çekmecesi simgesi:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "Pil seviyesi kritik ise şu işlemi gerçekleştir:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "Hazırda beklet düğmesine basıldığında yap:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "Dizüstü kapağı kapatıldığında yap:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "Kapatma düğmesine basıldığında yap:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "Uyku düğmesine basıldığında yap:"
-
-#: ../settings/xfpm-settings.glade.h:36
-#: ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184
-#: ../src/xfpm-main.c:273
-#: ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce Güç Yöneticisi"
-
-#: ../settings/xfpm-settings.c:370
-#: ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "Asla"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "Bir dakika"
 
-#: ../settings/xfpm-settings.c:375
-#: ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "Dakika"
 
-#: ../settings/xfpm-settings.c:389
-#: ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "Bir saat"
 
-#: ../settings/xfpm-settings.c:397
-#: ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "Bir dakika"
 
-#: ../settings/xfpm-settings.c:398
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "dakika"
 
-#: ../settings/xfpm-settings.c:400
-#: ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "saat"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "Saniye"
 
-#: ../settings/xfpm-settings.c:565
-#: ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829
-#: ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064
-#: ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "Askıya alma ve hazırda bekletme işlemlerine izin verilmedi"
 
-#: ../settings/xfpm-settings.c:578
-#: ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "Kapatma ve beklemeye alma işlemlerine izin verilmedi"
 
-#: ../settings/xfpm-settings.c:595
-#: ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Hiçbiri"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Hazırda beklet"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Kapat"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "Sor"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "Her zaman simge göster"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Pil takılı iken"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Pil şarj edilirken veya tükenirken"
 
-#: ../settings/xfpm-settings.c:977
-msgid "Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode."
-msgstr "Görüntü Güç Yönetimi Sinyalizasyonunu (DPMS) Devredışı bırak, ör. ekranı kapatma veya hazırda bekletme kipine alma."
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+"Görüntü Güç Yönetimi Sinyalizasyonunu (DPMS) Devredışı bırak, ör. ekranı "
+"kapatma veya hazırda bekletme kipine alma."
 
-#: ../settings/xfpm-settings.c:1019
-#: ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "Sor"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "Askıya alma işlemine izin verilmedi"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "Hazırda bekletme işlemine izin verilmedi"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "Bilgisayarın şarj seviyesi şu seviye yüzdesine geldiğinde"
 
-#: ../settings/xfpm-settings.c:1430
-#: ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "Genel"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "Fişe takılı iken (AC)"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "Pil ile çalışırken"
 
-#: ../settings/xfpm-settings.c:1444
-#: ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Genişletilmiş"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Herhangi bir güç yöneticisi çalışmıyor"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Ayar yöneticisi soketi "
@@ -301,36 +154,41 @@
 msgid "SOCKET ID"
 msgstr "Soket Kimliği"
 
-#: ../settings/xfpm-settings-main.c:83
-#: ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Kullanımı öğrenmek için '%s --help' yazınız."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce Güç Yöneticisi"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "Güç yöneticisi yapılandırması yüklenemedi, öntanımlı ayarlar kullanılacak"
+msgstr ""
+"Güç yöneticisi yapılandırması yüklenemedi, öntanımlı ayarlar kullanılacak"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce Güç Yöneticisi Ayarları"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Xfce Güç Yöneticisine bağlanılamadı"
 
-#: ../settings/xfpm-settings-main.c:175
-#: ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce güç yöneticisi çalışmıyor"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce4 Güç Yöneticisi çalışmıyor, çalıştırmak ister misiniz?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Çalıştır"
 
@@ -362,9 +220,8 @@
 msgid "Your battery is discharging"
 msgstr "Piliniz tükeniyor"
 
-#: ../src/xfpm-battery.c:117
-#: ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "Sistem pil gücü ile çalışıyor"
 
@@ -376,103 +233,97 @@
 msgid "System is running on low power"
 msgstr "Sistem düşük güçte çalışıyor"
 
-#: ../src/xfpm-battery.c:240
-#: ../src/xfpm-supply.c:281
-#: ../src/xfpm-supply.c:304
-#: ../src/xfpm-tray-icon.c:119
-#: ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce güç yöneticisi"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "UPS cihazınız"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "Fare piliniz"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "Klavye piliniz"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "Kamera piliniz"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "PDA piliniz"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "Piliniz"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "boş"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "tamamen şarj edildi"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "şarj seviyesi"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "şarj ediliyor"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "tükeniyor"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "şarj seviyesi düşük"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "bitmek üzere"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "mevcut değil"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "Pil mevcut değil"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "Pil"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "Sistem AC gücü (fişe takılı) üzerinde çalışıyor"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "Tahmini kalan süre"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "Tahmini şarj süresi"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "saat"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "dakika"
 
-#: ../src/xfpm-battery.c:421
-#: ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "Pil"
-
-#: ../src/xfpm-battery.c:424
-#: ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "Sistem AC gücü (fişe takılı) üzerinde çalışıyor"
-
-#: ../src/xfpm-battery-info.c:63
-#: ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "Bilinmeyen birim"
 
@@ -521,118 +372,142 @@
 "GNU GPL ile lisanslanmıştır.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "Servis olarak çalıştırma"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Çalışan tüm Xfce güç yöneticisi uygulamalarını yeniden başlat"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Yapılandırma menüsünü göster"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Çalışan tüm xfce güç yöneticisi uygulamalarını kapat"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Sürüm bilgisi"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Çok fazla değişken kullandınız"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "DBUS oturumu ile iletişim kurulamadı"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "Başka bir güç yöneticisi zaten çalışıyor"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce güç yöneticisi zaten çalışıyor"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "Bağdaştırıcı mevcut iken"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "Bağdaştırıcı mevcut değil iken"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Sistemi kapat"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Sistemi hazırda beklet moduna al"
 
-#: ../src/xfpm-supply.c:273
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "Sistem güç seviyesi düşük, fakat bir uygulama otomatik askıya alma işlemini engelliyor, bu durumda askıya alma işlemi veri kaybına yol açabilir. Lütfen askıya alma işlemini gerçekleştirmek için işlemi engelleyen uygulamayı kapatın veya sarj aletini takın "
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"Sistem güç seviyesi düşük, fakat bir uygulama otomatik askıya alma işlemini "
+"engelliyor, bu durumda askıya alma işlemi veri kaybına yol açabilir. Lütfen "
+"askıya alma işlemini gerçekleştirmek için işlemi engelleyen uygulamayı "
+"kapatın veya sarj aletini takın "
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "Güç seviyesi çok düşük. Veri kaybetmemek için lütfen işlerinizi kaydediniz"
+msgstr ""
+"Güç seviyesi çok düşük. Veri kaybetmemek için lütfen işlerinizi kaydediniz"
 
-#: ../src/xfpm-tray-icon.c:162
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "Bir uygulama otomatik askıya alma işlemini devre dışı bırakıyor. Bu işlemi şu an gerçekleştirirseniz çalışan uygulamaya zarar verebilirsiniz, buna rağmen sistemi hazırda bekletmek istediğinizden emin misiniz?"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"Bir uygulama otomatik askıya alma işlemini devre dışı bırakıyor. Bu işlemi "
+"şu an gerçekleştirirseniz çalışan uygulamaya zarar verebilirsiniz, buna "
+"rağmen sistemi hazırda bekletmek istediğinizden emin misiniz?"
 
-#: ../src/xfpm-tray-icon.c:165
-#: ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "İşlemi gerçekleştirmek istediğinizden emin misiniz?"
 
-#: ../src/xfpm-tray-icon.c:193
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "Bir uygulama şu an otomatik askıya alma işlemini devre dışı bırakıyor. Bu işlemi şu an gerçekleştirirseniz çalışan uygulamaya zarar verebilirsiniz, buna rağmen sistemi askıya almak istiyor musunuz?"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"Bir uygulama şu an otomatik askıya alma işlemini devre dışı bırakıyor. Bu "
+"işlemi şu an gerçekleştirirseniz çalışan uygulamaya zarar verebilirsiniz, "
+"buna rağmen sistemi askıya almak istiyor musunuz?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "Xfce güç yöneticisini kapat"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "Kapat"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "Engelleyiciyi temizle"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "Engelleyici Eklentisi"
 
-#: ../src/xfpm-tray-icon.c:300
-msgid "Disable or enable automatic sleep, setting this will tell the power manager to disable backlight sleep, for example you could active the inhibit if you are watching a movie."
-msgstr "Uyku kipine almayı etkinleştir/devredışı bırak. Bu seçeneği ayarlamak güç yöneticisinin ekranı karartmamasını sağlar, mesela film izlerken engelleyiciyi çalıştırabilirsiniz. "
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+"Uyku kipine almayı etkinleştir/devredışı bırak. Bu seçeneği ayarlamak güç "
+"yöneticisinin ekranı karartmamasını sağlar, mesela film izlerken "
+"engelleyiciyi çalıştırabilirsiniz. "
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "Veri bulunmamaktadır"
 
-#: ../src/xfpm-engine.c:646
-#: ../src/xfpm-engine.c:672
-#: ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "Erişim engellendi"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "Hazırda bekletme desteklenmiyor"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "Askıya alma desteklenmiyor"
@@ -641,47 +516,46 @@
 msgid "HAL daemon is not running"
 msgstr "Hal servisi çalışmıyor"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "Geçersiz argüman"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "Geçersiz çerez"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "İşletim sisteminiz için altyapı bulunamadı"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Hazırda beklet modu betiği bulunamadı"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Askıya alma betiği bulunamadı"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Askıya alma yöntemi bulunamadı"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Hazırda beklet modu yöntemi bulunamadı"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Yetersiz bellek"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "Sistem askıya alınamadı"
 
-#: ../src/xfpm-shutdown.c:401
-#: ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "Hal servisi bağlı durumda değil"
@@ -690,35 +564,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Xfce masaüstü için güç yönetimi"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "Lityum iyon"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "Kurşun asit"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "Lityum polimer"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "Nikel metal hibrit"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Samed Beyribey <ras0ir at eventualis.org>, 2009"
 
@@ -736,131 +610,273 @@
 msgid "Brightness plugin"
 msgstr "Ekran Parlaklığı eklentisi"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>İşlemler</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Gelişmiş ayarlar</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>Ekran Parlaklığı</b>"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>Genel Seçenekler</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>Monitör</b>"
+
+#~ msgid "Actions"
+#~ msgstr "İşlemler"
+
+#~ msgid "Advanced"
+#~ msgstr "Gelişmiş"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "Kritik düşük güç seviyesini belirle:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "İşlemci frekansı kontrolünü etkinleştir"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Monitör güç yönetimi kontrolünü etkinleştir"
+
+#~ msgid "Enable notification"
+#~ msgstr "Bildirimleri etkinleştir"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr ""
+#~ "Askıya alınırken veya hazırda bekletme işlemi gerçekleştirilirken ekranı "
+#~ "kilitle"
+
+#~ msgid "Monitor"
+#~ msgstr "Monitör"
+
+#~ msgid "On battery"
+#~ msgstr "Pil ile çalışırken"
+
+#~ msgid "Power manager settings"
+#~ msgstr "Güç yöneticisi ayarları"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "Tam performans yerine güç koruma kipinde çalıştır"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "Bilgisayar kullanılmadığında şu kadar süre sonra askıya al:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "Bilgisayar kullanılmadığı zaman şu kadar süre sonra askıya al:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr ""
+#~ "Bilgisayar kullanılmadığında ekran parlaklığı seviyesini şu kadar süre "
+#~ "sonra düşür:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "Bilgisayar kullanılmadığında uygulanacak uyku kipi:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "Monitör için kullanılacak uyku kipi:"
+
+#~ msgid "Standby"
+#~ msgstr "Hazırda beklet"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "Bilgisayar kullanılmadığında şu kadar süre sonra ekranı kapat:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "Sistem çekmecesi simgesi:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "Pil seviyesi kritik ise şu işlemi gerçekleştir:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Hazırda beklet düğmesine basıldığında yap:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Dizüstü kapağı kapatıldığında yap:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "Kapatma düğmesine basıldığında yap:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Uyku düğmesine basıldığında yap:"
+
 #~ msgid "Advance"
 #~ msgstr "Gelişmiş"
+
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce güç yöneticisi çalışmıyor, yeniden başlatılmaya çalışılacak"
+
 #~ msgid "Power"
 #~ msgstr "Güç"
+
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
+
 #~ msgid "gtk-help"
 #~ msgstr "gtk-help"
-#~ msgid "No power manager instance running"
-#~ msgstr "Herhangi bir güç yöneticisi çalışmıyor"
+
 #~ msgid "Automatic sleep inhibited"
 #~ msgstr "Otomatik askıya alma işlemi durduruldu"
+
 #~ msgid "Another application is disabling the automatic sleep"
 #~ msgstr "Başka bir uygulama, otomatik askıya işlemini devre dışı bıraktı"
+
 #~ msgid "Automatic sleep enabled"
 #~ msgstr "Otomatik askıya alma işlemi etkinleştirildi"
+
 #~ msgid "Power manager automatic sleep is disabled"
 #~ msgstr "Güç yöneticisi otomatik askıya alınma işlemi devre dışı"
+
 #~ msgid "Power manager automatic sleep is enabled"
 #~ msgstr "Güç yöneticisi otomatik askıya alınma işlemi etkinleştirildi"
+
 #~ msgid "Don't show again"
 #~ msgstr "Tekrar gösterme"
+
 #~ msgid "Power manager disconnected"
 #~ msgstr "Güç yöneticisi bağlantısı kesildi"
+
 #~ msgid "Power manager is connected"
 #~ msgstr "Güç yöneticisi bağlandı"
+
 #~ msgid ""
 #~ "Unable to read adapter status, the power manager will not work properly"
 #~ msgstr ""
 #~ "Güç bağdaştırıcısı durumu bilgisi okunamadı, güç yöneticisi düzgün "
 #~ "çalışmayabilir"
+
 #~ msgid "Adapter is online"
 #~ msgstr "Güç bağdaştırıcısı etkin"
+
 #~ msgid "Adapter is offline"
 #~ msgstr "Güç bağdaştırıcısı etkin değil"
+
 #~ msgid "Are you sure you want to hibernate the system?"
 #~ msgstr "Sistemi hazırda beklet moduna almak istediğinizden emin misiniz?"
+
 #~ msgid "UPS configuration"
 #~ msgstr "UPS yapılandırması"
+
 #~ msgid "Consider UPS charge critical"
 #~ msgstr "Kritik UPS şarjı seviyesi"
+
 #~ msgid "Consider battery charge critical"
 #~ msgstr "Kritik pil şarjı seviyesi"
+
 #~ msgid "percent"
 #~ msgstr "yüzde"
+
 #~ msgid "Enable battery state notification"
 #~ msgstr "Pil seviyesi bildirimini etkinleştir"
+
 #~ msgid "Enable power save on UPS power"
 #~ msgstr "UPS kaynaklı güç kullanılırken güç korumasını etkinleştir"
+
 #~ msgid "Enable power save on battery power"
 #~ msgstr "Pil kaynaklı güç kullanılırken güç korumasını etkinleştir"
+
 #~ msgid "Best performance"
 #~ msgstr "En iyi performans"
+
 #~ msgid "Set the CPU to its maximum frequency"
 #~ msgstr "İşlemciyi azami frekansta çalıştır"
+
 #~ msgid "Ondemand performance"
 #~ msgstr "Akustik performans"
+
 #~ 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 ""
 #~ "İşlemciyi yüklenme durumunda azami hızda, sistem boşta iken asgari hızda "
 #~ "çalıştır "
+
 #~ msgid "Best power savings"
 #~ msgstr "En iyi güç koruma"
+
 #~ msgid "Set the CPU to its minimum frequency"
 #~ msgstr "İşlemciyi asgari frekansta çalıştır"
+
 #~ msgid "Good power savings"
 #~ msgstr "Güç koruma"
+
 #~ msgid ""
 #~ "gracefully increases and decreases the CPU speed depending on the current "
 #~ "usage"
 #~ msgstr "mevcut kullanıma göre işlemci hızını nazikçe artırır veya azaltır"
+
 #~ msgid "CPU frequency settings on UPS power"
 #~ msgstr "UPS kaynaklı güç için işlemci frekansı ayarları"
+
 #~ msgid "CPU frequency settings on battery power"
 #~ msgstr "Pil kaynaklı güç için işlemci frekansı ayarları"
+
 #~ msgid "CPU frequency control cannot be used"
 #~ msgstr "İşlemci frekansı kontrolü kullanılamaz"
+
 #~ msgid "CPU frequency settings on AC power"
 #~ msgstr "AC kaynaklı güç için işlemci yöneticisi"
+
 #~ msgid "CPU frequency settings"
 #~ msgstr "İşlemci frekans ayarları"
+
 #~ msgid "Monitor settings on UPS power"
 #~ msgstr "UPS kaynaklı güç için monitör ayarları"
+
 #~ msgid "Monitor settings"
 #~ msgstr "Monitör ayarları"
+
 #~ msgid "Your monitor doesn't support DPMS control"
 #~ msgstr "Monitörünüz DPMS kontrolü desteği sunmamaktadır"
+
 #~ msgid "Keyboard shortcuts"
 #~ msgstr "Klavye kısayolları"
+
 #~ msgid "No available keyboard shortcuts found"
 #~ msgstr "Klavye kısayolu bulunamadı"
+
 #~ msgid "CPU settings"
 #~ msgstr "İşlemci ayarları"
+
 #~ msgid "Shortcuts"
 #~ msgstr "Kısayollar"
+
 #~ msgid "Monitor Settings"
 #~ msgstr "Monitör Ayarları"
+
 #~ msgid "Your battery is almost empty"
 #~ msgstr "Piliniz bitmek üzere"
+
 #~ msgid "%"
 #~ msgstr "%"
+
 #~ msgid "min"
 #~ msgstr "dk"
+
 #~ msgid "Suspend after"
 #~ msgstr "Askıya al"
+
 #~ msgid "Turn off after"
 #~ msgstr "Kapat"
+
 #~ msgid "Xfce4 Power Manager"
 #~ msgstr "Xfce4 Güç Yöneticisi"
+
 #~ msgid ""
 #~ "Unable to read your home directory environment variable, autostart option "
 #~ "may not work"
 #~ msgstr ""
 #~ "Ev dizini çevre değişkeni bilgileriniz okunamadı, otomatik başlangıç "
 #~ "seçeneği çalışmayabilir"
+
 #~ msgid ""
 #~ "Unable to run Xfce4 power manager, make sure the hardware abstract layer "
 #~ "and the message bus daemon are running"
 #~ msgstr ""
 #~ "Xfce4 güç yöneticisi çalıştırılamadı, donanım soyutlama katmanı (HAL) ve "
 #~ "haberleşme (bus) servislerinin çalıştığından emin olunuz"
+
 #~ msgid ""
 #~ "Unable to read AC adapter status, the power manager will not work "
 #~ "properly. Possible reasons: The AC adapter driver is not loaded, broken "
@@ -871,8 +887,10 @@
 #~ "çalışmayabilir. Muhtemel nedenler: AC güç bağdaştırıcısı sürücüsü "
 #~ "yüklenmemiş olabilir, HAL ile bağlantı kurulamıyor olabilir ve DBus "
 #~ "servisi çalışmıyor olabilir"
+
 #~ msgid "System failed to shutdown"
 #~ msgstr "Sistem kapatılamadı"
+
 #~ msgid ""
 #~ "Unable to use power management service, functionalities like hibernate "
 #~ "and suspend will not work. Possible reasons: you don't have enough "
@@ -883,59 +901,81 @@
 #~ "gibi bazı fonksiyonlar çalışmayabilir. Muhtemel nedenler: izin problemi "
 #~ "olabilir, HAL ile bağlantı kurulamıyor olabilir veya DBus servisi "
 #~ "çalışmıyor olabilir"
+
 #~ msgid "Error monitoring HAL events"
 #~ msgstr "HAL işlemleri izlenirken hata meydana geldi"
+
 #~ msgid "HAL is not running or not responding"
 #~ msgstr "HAL servisi çalışmıyor veya yanıt vermiyor"
+
 #~ msgid "Unable to watch device using HAL: %s"
 #~ msgstr "HAL servisi ile aygıt takip edilemiyor: %s"
+
 #~ msgid "Message hibernate didn't get a reply"
 #~ msgstr "Hazırda beklet modu işlemine yanıt gelmedi"
+
 #~ msgid "System failed to hibernate"
 #~ msgstr "Sistem hazırda beklet moduna alınamadı"
+
 #~ msgid "Error occured while trying to suspend"
 #~ msgstr "Askıya alma işlemi gerçekleştirilirken hata oluştu"
+
 #~ msgid "Unknown reply from the message daemon"
 #~ msgstr "Haberleşme servisinden (Bus) bilinmeyen bir yanıt geldi "
+
 #~ msgid "Message suspend didn't get a reply"
 #~ msgstr "Askıya alma işlemine yanıt gelmedi"
+
 #~ msgid "No reply from HAL daemon to set monitor brightness level"
 #~ msgstr "Monitör parlaklığı belirlemek için HAL servisinden yanıt gelmedi"
+
 #~ msgid "No reply from HAL daemon to get monitor brightness level"
 #~ msgstr ""
 #~ "Monitör parlıklığı seviyesinin alınması için HAL servisinden yanıt gelmedi"
+
 #~ msgid "No reply from HAL daemon to get available cpu governors"
 #~ msgstr ""
 #~ "Kullanılabilir işlemci yönetimi bilgilerinin alınması için HAL "
 #~ "servisinden yanıt gelmedi"
+
 #~ msgid "No reply from HAL daemon to get current cpu governor"
 #~ msgstr ""
 #~ "Mevcut işlemci yönetimi bilgilerinin alınması için HAL servisinden yanıt "
 #~ "gelmedi"
+
 #~ msgid "No reply from HAL daemon to set cpu governor"
 #~ msgstr "İşlemci yöneticisi belirlemek için HAL servisinden yanıt gelmedi"
+
 #~ msgid "No reply from HAL daemon to set power save profile"
 #~ msgstr "Güç koruma profili belirlemek için HAL servisinden yanıt gelmedi"
+
 #~ msgid "Failed to create dbus message\n"
 #~ msgstr "Dbus mesajı oluşturulamadı\n"
+
 #~ msgid "Failed to send message\n"
 #~ msgstr "Mesaj gönderilemedi\n"
+
 #~ msgid "Start xfce power manager"
 #~ msgstr "Xfce güç yöneticisini çalıştır"
+
 #~ msgid "On electric power"
 #~ msgstr "Fişe takılı"
 
 #, fuzzy
 #~ msgid "CPU frequency settings on electric power"
 #~ msgstr "Fişe takılı iken kullanılacak işlemci frekansı ayarları"
+
 #~ msgid "Monitor settings on electric power"
 #~ msgstr "Fişe takılı güç için monitör ayarları"
+
 #~ msgid "Ondemand"
 #~ msgstr "Dinamik"
+
 #~ msgid "Userspace"
 #~ msgstr "Kullanıcı tanımlı"
+
 #~ msgid "Powersave"
 #~ msgstr "Güç koruma"
+
 #~ msgid "Conservative"
 #~ msgstr "Sunum"
-

Modified: xfce4-power-manager/trunk/po/uk.po
===================================================================
--- xfce4-power-manager/trunk/po/uk.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/uk.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-01-26 17:30+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -18,282 +18,149 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:2
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 #, fuzzy
-msgid "<b>Advanced Options</b>"
-msgstr "Додаткові налаштування"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:4
-#, fuzzy
-msgid "<b>General Options</b>"
-msgstr "Основні параметри"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:7
-#, fuzzy
-msgid "Advanced"
-msgstr "Додаткові налаштування"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-#, fuzzy
-msgid "Always show icon"
-msgstr "Завжди відображати значок"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:10
-#, fuzzy
-msgid "Enable CPU frequency control"
-msgstr "Дозволити управління частотою процесора"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "Дозволити стеження за управлінням живленням"
-
-#: ../settings/xfpm-settings.glade.h:12
-#, fuzzy
-msgid "Enable notification"
-msgstr "Дозволити повідомлення зарядки UPS"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-#, fuzzy
-msgid "General"
-msgstr "Основні параметри"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "Сплячка"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:16
-#, fuzzy
-msgid "Monitor"
-msgstr "Властивості стеження"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "Нічого"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-#, fuzzy
-msgid "On AC"
-msgstr "Живлення від мережі"
-
-#: ../settings/xfpm-settings.glade.h:19
-#, fuzzy
-msgid "On battery"
-msgstr "Живлення від батареї"
-
-#: ../settings/xfpm-settings.glade.h:20
-#, fuzzy
-msgid "Power manager settings"
-msgstr "Менеджер живлення"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:27
-#, fuzzy
-msgid "Standby"
-msgstr "В режим очікування після"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "Призупинити"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr ""
-
-#: ../settings/xfpm-settings.glade.h:30
-#, fuzzy
-msgid "System tray icon: "
-msgstr "Значок в системному лотку:"
-
-#: ../settings/xfpm-settings.glade.h:31
-#, fuzzy
-msgid "When battery power is critical:"
-msgstr "Коли заряд батареї досягне критичного рівня зробити"
-
-#: ../settings/xfpm-settings.glade.h:32
-#, fuzzy
-msgid "When hibernate button is pressed:"
-msgstr "Коли натиснуто кнопку живлення зробити"
-
-#: ../settings/xfpm-settings.glade.h:33
-#, fuzzy
-msgid "When laptop lid is closed:"
-msgstr "Коли закрито кришку ноутбука"
-
-#: ../settings/xfpm-settings.glade.h:34
-#, fuzzy
-msgid "When power button is pressed:"
-msgstr "Коли натиснуто кнопку живлення зробити"
-
-#: ../settings/xfpm-settings.glade.h:35
-#, fuzzy
-msgid "When sleep button is pressed:"
-msgstr "Коли натиснуто кнопку заснути зробити"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Менеджер живлення Xfce"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
-#, fuzzy
 msgid "Never"
 msgstr "ніколи"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 #, fuzzy
 msgid "One minute"
 msgstr "хвилина"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 #, fuzzy
 msgid "Minutes"
 msgstr "хвилин"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 #, fuzzy
 msgid "One hour"
 msgstr "година"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 #, fuzzy
 msgid "one minute"
 msgstr "хвилина"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "хвилин"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "годин"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "Нічого"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "Призупинити"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "Сплячка"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "Вимкнути"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+#, fuzzy
+msgid "Always show icon"
+msgstr "Завжди відображати значок"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "Коли присутня батарея"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "Коли батарея заряджається або розряджається"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 #, fuzzy
 msgid "Hibernate operation not permitted"
 msgstr "Перевести систему в сплячку "
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 #, fuzzy
+msgid "General"
+msgstr "Основні параметри"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+#, fuzzy
+msgid "On AC"
+msgstr "Живлення від мережі"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
+#, fuzzy
 msgid "On Battery"
 msgstr "Живлення від батареї"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "Розширені"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Менеджер живлення Xfce не працює"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "Сокет менеджера властивостей"
@@ -302,38 +169,44 @@
 msgid "SOCKET ID"
 msgstr "ID сокета"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Наберіть '%s --help' для використання."
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Менеджер живлення Xfce"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr ""
 "Не вдалось завантажити конфігурацію менеджера живлення, використовується "
 "типова"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 #, fuzzy
 msgid "Xfce Power Manager Settings"
 msgstr "Менеджер живлення Xfce"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 #, fuzzy
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "Неможливо завантажити менеджер живлення xfce4"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Менеджер живлення Xfce не працює"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Менеджер живлення Xfce4 не працює, може хочете запустити його зараз?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "Запустити"
 
@@ -366,8 +239,8 @@
 msgid "Your battery is discharging"
 msgstr "Ваша батарея розряджається"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 #, fuzzy
 msgid "System is running on battery power"
 msgstr "Стежити за властивостями при живленні від батареї"
@@ -380,117 +253,117 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Менеджер живлення Xfce"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 #, fuzzy
 msgid "Your Mouse battery"
 msgstr "Працює від батареї"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 #, fuzzy
 msgid "Your Camera battery"
 msgstr "Ви працюєте на заряді від батареї"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 #, fuzzy
 msgid "Your Battery"
 msgstr "Ви працюєте на заряді від батареї"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 #, fuzzy
 msgid "is empty"
 msgstr "Заряд батареї майже вичерпано"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 #, fuzzy
 msgid "is fully charged"
 msgstr "Батарея повністю заряджена"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 #, fuzzy
 msgid "charge level"
 msgstr "Рівень заряду батареї"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 #, fuzzy
 msgid "is charging"
 msgstr "Батарея заряджається"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 #, fuzzy
 msgid "is discharging"
 msgstr "Батарея розряджається"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 #, fuzzy
 msgid "charge is low"
 msgstr "Заряд батареї низький"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 #, fuzzy
 msgid "is almost empty"
 msgstr "Заряд батареї майже вичерпано"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 #, fuzzy
 msgid "is not present"
 msgstr "Відсутня"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 #, fuzzy
 msgid "Battery not present"
 msgstr "Коли присутня батарея"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 #, fuzzy
+msgid "Battery"
+msgstr "Налаштування батареї"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+#, fuzzy
+msgid "System is running on AC power"
+msgstr "Стежити за властивостями при живленні від мережі"
+
+#: ../src/xfpm-battery.c:444
+#, fuzzy
 msgid "Estimated time left"
 msgstr ""
 "\n"
 "Приблизно залишилось часу"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 #, fuzzy
 msgid "Estimated time to be fully charged"
 msgstr ""
 "\n"
 "Приблизно часу для зарядки"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "година"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "хвилина"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-#, fuzzy
-msgid "Battery"
-msgstr "Налаштування батареї"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-#, fuzzy
-msgid "System is running on AC power"
-msgstr "Стежити за властивостями при живленні від мережі"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr ""
 
@@ -540,66 +413,66 @@
 "Ліцензовано під GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr ""
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 #, fuzzy
 msgid "Restart the running instance of Xfce power manager"
 msgstr "Завершити будь-який запущений менеджер живлення xfce"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "Показати діалог налаштування"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "Завершити будь-який запущений менеджер живлення xfce"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "Інформація про версію"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "Забагато параметрів"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 #, fuzzy
 msgid "Unable to get connection to the message bus session"
 msgstr "Не можливо з'єднатись з DBus: %s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 #, fuzzy
 msgid "Another power manager is already running"
 msgstr "Менеджер живлення Xfce вже працює"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Менеджер живлення Xfce вже працює"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 #, fuzzy
 msgid "Adapter present"
 msgstr "Відсутня"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 #, fuzzy
 msgid "Adapter not present"
 msgstr "Відсутня"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "Вимкнути систему"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "Перевести систему в сплячку "
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -607,70 +480,70 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 #, fuzzy
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 "Ваша батарея майже розряджена. Збережіть Вашу роботу щоб не втратити дані"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 #, fuzzy
 msgid "Are you sure you want to proceed?"
 msgstr "Ви впевнені, що бажаєте призупинити роботу системи?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 #, fuzzy
 msgid "Quit the Xfce power manager"
 msgstr "Менеджер живлення Xfce"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, fuzzy, c-format
 msgid "Hibernate not supported"
 msgstr "Перевести систему в сплячку "
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""
@@ -680,47 +553,47 @@
 msgid "HAL daemon is not running"
 msgstr "Менеджер живлення Xfce не працює"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, fuzzy, c-format
 msgid "Invalid arguments"
 msgstr "Забагато параметрів"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr ""
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "Немає підтримки для Вашої операційної системи"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "Не знайдено скрипт для сплячки"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "Не знайдено скрипт для призупинення"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "Не знайдено метод призупинення"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "Не знайдено метод сплячки"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "Переповнення пам'яті"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 #, fuzzy
 msgid "System failed to sleep"
 msgstr "Не вдалось призупинити систему"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr ""
@@ -729,35 +602,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr ""
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr ""
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "Dmitry Nikitin <luckas_fb at mail.ru>"
 
@@ -778,6 +651,69 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "Додаткові налаштування"
+
+#, fuzzy
+#~ msgid "<b>General Options</b>"
+#~ msgstr "Основні параметри"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Додаткові налаштування"
+
+#, fuzzy
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "Дозволити управління частотою процесора"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "Дозволити стеження за управлінням живленням"
+
+#, fuzzy
+#~ msgid "Enable notification"
+#~ msgstr "Дозволити повідомлення зарядки UPS"
+
+#, fuzzy
+#~ msgid "Monitor"
+#~ msgstr "Властивості стеження"
+
+#, fuzzy
+#~ msgid "On battery"
+#~ msgstr "Живлення від батареї"
+
+#, fuzzy
+#~ msgid "Power manager settings"
+#~ msgstr "Менеджер живлення"
+
+#, fuzzy
+#~ msgid "Standby"
+#~ msgstr "В режим очікування після"
+
+#, fuzzy
+#~ msgid "System tray icon: "
+#~ msgstr "Значок в системному лотку:"
+
+#, fuzzy
+#~ msgid "When battery power is critical:"
+#~ msgstr "Коли заряд батареї досягне критичного рівня зробити"
+
+#, fuzzy
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "Коли натиснуто кнопку живлення зробити"
+
+#, fuzzy
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "Коли закрито кришку ноутбука"
+
+#, fuzzy
+#~ msgid "When power button is pressed:"
+#~ msgstr "Коли натиснуто кнопку живлення зробити"
+
+#, fuzzy
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "Коли натиснуто кнопку заснути зробити"
+
+#, fuzzy
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Менеджер живлення Xfce не працює"
 
@@ -785,10 +721,6 @@
 #~ msgstr "Живлення"
 
 #, fuzzy
-#~ msgid "No power manager instance running"
-#~ msgstr "Менеджер живлення Xfce не працює"
-
-#, fuzzy
 #~ msgid "Don't show again"
 #~ msgstr "Не показувати це повідомлення знову"
 

Modified: xfce4-power-manager/trunk/po/ur.po
===================================================================
--- xfce4-power-manager/trunk/po/ur.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/ur.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-07 11:07+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-14 03:03+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,236 +19,186 @@
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>حرکات</b>"
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
+msgid "Never"
+msgstr "کبھی نہیں"
 
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>اعلی اختیارات</b>"
+#: ../settings/xfpm-settings.c:481
+msgid "One minute"
+msgstr "ایک منٹ"
 
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>چمک دمک</b>"
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
+msgid "Minutes"
+msgstr "منٹ"
 
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>عام اختیارات</b>"
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
+#, fuzzy
+msgid "One hour"
+msgstr "گھنٹہ"
 
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>مانیٹر</b>"
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
+#, fuzzy
+msgid "one minute"
+msgstr "ایک منٹ"
 
-#: ../settings/xfpm-settings.glade.h:6
-#: ../settings/xfpm-settings.c:1091
-msgid "Advanced"
-msgstr "اعلی"
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
+msgid "minutes"
+msgstr "منٹ"
 
-#: ../settings/xfpm-settings.glade.h:7
-#: ../settings/xfpm-settings.c:758
-msgid "Always show icon"
-msgstr "ہمیشہ آئکن دکھائیں"
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
+msgid "hours"
+msgstr "گھنٹے"
 
-#: ../settings/xfpm-settings.glade.h:8
-msgid "Consider the computer on low power at:"
-msgstr "اتنے پر کمپیوٹر کو کم توانائی پر سمجھیں:"
+#: ../settings/xfpm-settings.c:522
+msgid "Seconds"
+msgstr "سیکنڈ"
 
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Enable monitor power management control"
-msgstr "مانیٹر توانائی ادارت کنٹرول فعال کریں"
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
+msgid "Hibernate and suspend operations not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
 
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable notification"
-msgstr "اطلاع فعال کریں"
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
+msgid "Shutdown and hibernate operations not permitted"
+msgstr "بند کرنے (شٹ ڈاؤن) اور ہائبرنیٹ عمل کاریوں کی اجازت نہیں"
 
-#: ../settings/xfpm-settings.glade.h:11
-#: ../settings/xfpm-settings.c:1048
-#: ../settings/xfpm-settings.c:1053
-msgid "General"
-msgstr "عام"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "معطل/ہائبرنیٹ ہونے پر سکرین مقفل کریں"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:451
-#: ../settings/xfpm-settings.c:544
-#: ../settings/xfpm-settings.c:670
-#: ../settings/xfpm-settings.c:798
-#: ../settings/xfpm-settings.c:857
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
 msgid "Nothing"
 msgstr "کچھ نہیں"
 
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:1062
-#: ../settings/xfpm-settings.c:1067
-msgid "On AC"
-msgstr "اے سی پر"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "On battery"
-msgstr "بیٹری پر"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Power manager settings"
-msgstr "توانائی منیجر ترتیبات"
-
-#: ../settings/xfpm-settings.glade.h:17
-msgid "Prefer power savings over performance"
-msgstr "کارکردگی کی نسبت توانائی بچانے کو ترجیح دیں"
-
-#: ../settings/xfpm-settings.glade.h:18
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو ڈسپلے کو سلیپ کریں:"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو تو سکرین کی چمک دمک کم کریں:"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Set monitor sleep mode:"
-msgstr "مانیٹر سلیپ موڈ مرتب کریں:"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Standby"
-msgstr "تیار"
-
 #. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:22
-#: ../settings/xfpm-settings.c:549
-#: ../settings/xfpm-settings.c:675
-#: ../settings/xfpm-settings.c:803
-#: ../settings/xfpm-settings.c:862
-#: ../src/xfpm-tray-icon.c:198
-#: ../src/xfpm-tray-icon.c:262
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
 msgid "Suspend"
 msgstr "معطل"
 
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Switch off display when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر کے لی غیر فعال ہو تو ڈسپلے بند کردیں:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "System tray icon: "
-msgstr "نظام ٹرے آئکن:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "When battery power is critical:"
-msgstr "جب بیٹری کی توانائی خطرناک حد تک کم ہوجائے:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "When laptop lid is closed:"
-msgstr "جب لیپ ٹاپ کی ایل آئی ڈی lid بند کردی جائے:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "When power button is pressed:"
-msgstr "جب توانائی کا بٹن دبایا جائے:"
-
-#: ../settings/xfpm-settings.glade.h:28
-msgid "When sleep button is pressed:"
-msgstr "جب سلیپ کا بٹن دبایا جائے:"
-
-#: ../settings/xfpm-settings.glade.h:29
-#: ../settings/xfpm-settings-main.c:112
-#: ../src/xfpm-main.c:125
-#: ../src/xfpm-main.c:187
-#: ../src/xfpm-main.c:217
-#: ../src/xfpm-tray-icon.c:313
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "ایکسفس توانائی منیجر"
-
-#: ../settings/xfpm-settings.c:306
-#: ../settings/xfpm-settings.c:322
-msgid "Never"
-msgstr "کبھی نہیں"
-
-#: ../settings/xfpm-settings.c:309
-msgid "One minute"
-msgstr "ایک منٹ"
-
-#: ../settings/xfpm-settings.c:311
-msgid "Minutes"
-msgstr "منٹ"
-
-#: ../settings/xfpm-settings.c:324
-msgid "Seconds"
-msgstr "سیکنڈ"
-
-#: ../settings/xfpm-settings.c:443
-#: ../settings/xfpm-settings.c:536
-msgid "Shutdown and hibernate operations not permitted"
-msgstr "بند کرنے (شٹ ڈاؤن) اور ہائبرنیٹ عمل کاریوں کی اجازت نہیں"
-
 #. Hibernate menu option
-#: ../settings/xfpm-settings.c:456
-#: ../settings/xfpm-settings.c:555
-#: ../settings/xfpm-settings.c:681
-#: ../settings/xfpm-settings.c:809
-#: ../settings/xfpm-settings.c:868
-#: ../src/xfpm-tray-icon.c:167
-#: ../src/xfpm-tray-icon.c:247
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
 msgid "Hibernate"
 msgstr "ہائبرنیٹ"
 
-#: ../settings/xfpm-settings.c:460
-#: ../settings/xfpm-settings.c:813
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "بند کریں"
 
-#: ../settings/xfpm-settings.c:664
-#: ../settings/xfpm-settings.c:792
-#: ../settings/xfpm-settings.c:851
-#: ../settings/xfpm-settings.c:974
-msgid "Hibernate and suspend operations not permitted"
-msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
 
-#: ../settings/xfpm-settings.c:761
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "ہمیشہ آئکن دکھائیں"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "جب بیٹری موجود ہو"
 
-#: ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "جب بیٹری چارج یا خرچ ہو رہی ہو"
 
-#: ../settings/xfpm-settings.c:942
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1146
+#, fuzzy
+msgid "Suspend operation not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+
+#: ../settings/xfpm-settings.c:1152
+#, fuzzy
+msgid "Hibernate operation not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "جب کمپیوٹر کی توانائی کے تمام ذرائع اس چارج درجہ تک پہنچ جائیں"
 
-#: ../settings/xfpm-settings.c:1077
-#: ../settings/xfpm-settings.c:1082
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "عام"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "اے سی پر"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "بیٹری پر"
 
-#: ../settings/xfpm-settings.c:1096
-msgid "Advance"
-msgstr "اعلی"
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
+msgid "Extended"
+msgstr ""
 
-#: ../settings/xfpm-settings-main.c:112
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "کوئی چلتی ہوئی توانائی منیجر حالت نہیں"
+
+#: ../settings/xfpm-settings-main.c:72
+msgid "Settings manager socket"
+msgstr ""
+
+#: ../settings/xfpm-settings-main.c:72
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr "ہدایات کے لیے '%s --help' لکھیں."
+
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "ایکسفس توانائی منیجر"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "توانائی منیجر کی کوضع کاریاں لوڈ کرنے میں ناکامی، طے شدہ استعمال کیا جارہا ہے"
+msgstr ""
+"توانائی منیجر کی کوضع کاریاں لوڈ کرنے میں ناکامی، طے شدہ استعمال کیا جارہا ہے"
 
-#: ../settings/xfpm-settings-main.c:138
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "ایکسفس توانائی منیجر ترتیبات"
 
-#: ../settings/xfpm-settings-main.c:139
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "ایکسفس توانائی منیجر سے رابطہ نہیں ہوسکا"
 
-#: ../settings/xfpm-settings-main.c:158
-#: ../src/xfpm-main.c:141
-#: ../src/xfpm-main.c:188
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "ایکسفس توانائی منیجر نہیں چل رہا"
 
-#: ../settings/xfpm-settings-main.c:161
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "ایکسفس 4 توانائی منیجر نہیں چل رہا، کیا آپ اسے چلانا چاہتے ہیں؟"
 
-#: ../settings/xfpm-settings-main.c:163
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "چلائیں"
 
@@ -264,161 +214,156 @@
 msgid "Xfce 4 Power Manager"
 msgstr "ایکسفس 4 توانائی منیجر"
 
-#: ../src/xfpm-battery.c:106
+#: ../src/xfpm-battery.c:108
 msgid "Your battery is fully charged"
 msgstr "آپ کی بیٹری مکمل طور پر چارج ہے"
 
-#: ../src/xfpm-battery.c:109
+#: ../src/xfpm-battery.c:111
+#, fuzzy
+msgid "Your battery is charging"
+msgstr "آپ کی بیٹری خالی ہورہی ہے"
+
+#: ../src/xfpm-battery.c:114
 msgid "Battery is charging"
 msgstr "بیٹری چارج ہے"
 
-#: ../src/xfpm-battery.c:112
+#: ../src/xfpm-battery.c:117
 msgid "Your battery is discharging"
 msgstr "آپ کی بیٹری خالی ہورہی ہے"
 
-#: ../src/xfpm-battery.c:112
-#: ../src/xfpm-battery.c:378
-#: ../src/xfpm-battery.c:390
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "نظام بیٹری کی توانائی پر چل رہا ہے"
 
-#: ../src/xfpm-battery.c:115
+#: ../src/xfpm-battery.c:120
 msgid "Your battery charge is low"
 msgstr "آپ کی بیٹری کی چارجنگ کم ہے"
 
-#: ../src/xfpm-battery.c:115
+#: ../src/xfpm-battery.c:120
 msgid "System is running on low power"
 msgstr "نظام کم توانائی پر چل رہا ہے"
 
-#: ../src/xfpm-battery.c:219
-#: ../src/xfpm-supply.c:282
-#: ../src/xfpm-supply.c:305
-#: ../src/xfpm-tray-icon.c:115
-#: ../src/xfpm-tray-icon.c:139
-#: ../src/xfpm-manager.c:199
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "ایکسفس توانائی منیجر"
 
-#: ../src/xfpm-battery.c:237
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "آپ کا یو پی ایس"
 
-#: ../src/xfpm-battery.c:239
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "آپ کے ماؤس کی بیٹری"
 
-#: ../src/xfpm-battery.c:241
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "آپ کے کیبورڈ کی بیٹری"
 
-#: ../src/xfpm-battery.c:243
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "آپ کے کیمرے کی بیٹری"
 
-#: ../src/xfpm-battery.c:245
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "آپ کے پی ڈی اے کی بیٹری"
 
-#: ../src/xfpm-battery.c:247
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "آپ کی بیٹری"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:293
+#, fuzzy
+msgid "is empty"
+msgstr "تقریباً خالی ہے"
+
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "مکمل طور پر چارج ہے"
 
-#: ../src/xfpm-battery.c:267
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "چارج کا درجہ"
 
-#: ../src/xfpm-battery.c:272
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "چارج ہو رہا ہے"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "ڈس چارج ہو رہا ہے"
 
-#: ../src/xfpm-battery.c:284
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "چارج کم ہے"
 
-#: ../src/xfpm-battery.c:289
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "تقریباً خالی ہے"
 
-#: ../src/xfpm-battery.c:309
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "حاضر نہیں ہے"
 
-#: ../src/xfpm-battery.c:340
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "بیٹری موجود نہیں"
 
-#: ../src/xfpm-battery.c:362
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "بیٹری"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "نظام اے سی کی توانائی پر چل رہا ہے"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "اندازاً باقی وقت"
 
-#: ../src/xfpm-battery.c:366
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "مکمل طور پر چارج ہونے کا تقریبی وقت"
 
-#: ../src/xfpm-battery.c:369
-msgid "hours"
-msgstr "گھنٹے"
-
-#: ../src/xfpm-battery.c:369
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "گھنٹہ"
 
-#: ../src/xfpm-battery.c:370
-msgid "minutes"
-msgstr "منٹ"
-
-#: ../src/xfpm-battery.c:370
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "منٹ"
 
-#: ../src/xfpm-battery.c:374
-#: ../src/xfpm-battery.c:386
-msgid "Battery"
-msgstr "بیٹری"
-
-#: ../src/xfpm-battery.c:377
-#: ../src/xfpm-battery.c:389
-msgid "System is running on AC power"
-msgstr "نظام اے سی کی توانائی پر چل رہا ہے"
-
-#: ../src/xfpm-battery-info.c:62
-#: ../libxfpm/hal-battery.c:488
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "نامعلوم یونٹ"
 
-#: ../src/xfpm-battery-info.c:69
+#: ../src/xfpm-battery-info.c:70
 msgid "Technology:"
 msgstr "ٹیکنالوجی:"
 
-#: ../src/xfpm-battery-info.c:92
+#: ../src/xfpm-battery-info.c:93
 msgid "Design:"
 msgstr "ڈیزائن:"
 
-#: ../src/xfpm-battery-info.c:120
+#: ../src/xfpm-battery-info.c:121
 msgid "Last full:"
 msgstr "آخری بھرائی:"
 
-#: ../src/xfpm-battery-info.c:144
+#: ../src/xfpm-battery-info.c:145
 msgid "Vendor:"
 msgstr "فروخت کار:"
 
-#: ../src/xfpm-battery-info.c:168
+#: ../src/xfpm-battery-info.c:169
 msgid "Model:"
 msgstr "ماڈل:"
 
-#: ../src/xfpm-battery-info.c:201
+#: ../src/xfpm-battery-info.c:202
 msgid "Battery information"
 msgstr "بیٹری کی معلومات"
 
-#: ../src/xfpm-main.c:48
+#: ../src/xfpm-main.c:53
 #, c-format
 msgid ""
 "\n"
@@ -439,156 +384,187 @@
 "جو گنو جی پی ایل کے تحت لائسنس شدہ ہے\n"
 "\n"
 
-#: ../src/xfpm-main.c:73
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "ڈیمونائز مت کریں"
 
-#: ../src/xfpm-main.c:74
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "ایکسفس توانائی منیجر کی کسی بھی چلتی ہوئی حالت کو دوبارہ چلائیں"
 
-#: ../src/xfpm-main.c:75
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "وضع کاری کا ڈائیلاگ دیکھائیں"
 
-#: ../src/xfpm-main.c:76
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "کوئی بھی چلتا ہوا ایکسفس توانائی منیجر برخاست کریں"
 
-#: ../src/xfpm-main.c:77
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "ورژن معلومات"
 
-#: ../src/xfpm-main.c:86
-#: ../src/xfpm-main.c:108
+#: ../src/xfpm-main.c:168
 #, c-format
-msgid "Type '%s --help' for usage."
-msgstr "ہدایات کے لیے '%s --help' لکھیں."
-
-#: ../src/xfpm-main.c:106
-#, c-format
 msgid "Too many arguments"
 msgstr "بہت زیادہ آرگومینٹ"
 
-#: ../src/xfpm-main.c:122
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "پیغام بس bus نشست سے اتصال میں ناکامی"
 
-#: ../src/xfpm-main.c:218
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "دوسرا توانائی مینجر پہلے ہی چل رہا ہے"
 
-#: ../src/xfpm-main.c:223
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "ایکسفس توانائی منیجر پہلے ہی چل رہا ہے"
 
-#: ../src/xfpm-supply.c:171
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "اڈاپٹر موجود ہے"
 
-#: ../src/xfpm-supply.c:172
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "اڈاپٹر موجود نہیں"
 
-#: ../src/xfpm-supply.c:251
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "نظام کو بند کریں"
 
-#: ../src/xfpm-supply.c:262
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "نظام کو ہائبرنیٹ کریں"
 
-#: ../src/xfpm-supply.c:274
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "نظام کم توانائی پر چل رہا ہے، مگر کوئی اطلاقیہ اس وقت خودکار سلیپ معطل کر رہا ہے، اس کا مطلب ہے کہ اس وقت سلیپ کرنا اس اطلاقیہ کے ڈیٹا کو نقصان پہنچا سکتا ہے. کمپیوٹر کو سلیپ کرنے سے پہلے اس اطلاقیہ کو بند کردیں یا کمپیوٹر کو چارجنگ پر لگائیں"
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"نظام کم توانائی پر چل رہا ہے، مگر کوئی اطلاقیہ اس وقت خودکار سلیپ معطل کر "
+"رہا ہے، اس کا مطلب ہے کہ اس وقت سلیپ کرنا اس اطلاقیہ کے ڈیٹا کو نقصان پہنچا "
+"سکتا ہے. کمپیوٹر کو سلیپ کرنے سے پہلے اس اطلاقیہ کو بند کردیں یا کمپیوٹر کو "
+"چارجنگ پر لگائیں"
 
-#: ../src/xfpm-supply.c:300
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "نظام کم توانائی پر چل رہا ہے. ڈیٹا کے نقصان سے بچنے کے لیے اپنا کام محفوظ کر لیں"
+msgstr ""
+"نظام کم توانائی پر چل رہا ہے. ڈیٹا کے نقصان سے بچنے کے لیے اپنا کام محفوظ کر "
+"لیں"
 
-#: ../src/xfpm-tray-icon.c:159
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو ہائبرنیٹ کرنا چاہتے ہیں؟"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس "
+"اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو ہائبرنیٹ کرنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:162
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:190
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو معطل کرنا چاہتے ہیں؟"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس "
+"اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو معطل کرنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:220
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "ایکسفس توانائی منیجر کو برخاست کریں"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "برخاست"
 
-#: ../src/xfpm-engine.c:539
-#: ../src/xfpm-engine.c:568
+#: ../src/xfpm-tray-icon.c:297
+msgid "Clear inhibit"
+msgstr ""
+
+#: ../src/xfpm-tray-icon.c:297
+#, fuzzy
+msgid "Inhibit"
+msgstr "اینہبٹ پلگ ان"
+
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+
+#: ../src/xfpm-tray-icon.c:387
+msgid "No data available"
+msgstr ""
+
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "رسائی کی اجازت نہیں"
 
-#: ../src/xfpm-engine.c:546
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "ہائبرنیٹ کی معاونت نہیں ہے"
 
-#: ../src/xfpm-engine.c:575
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "معطلی کی معاونت نہیں ہے"
 
-#: ../src/xfpm-manager.c:199
+#: ../src/xfpm-manager.c:226
 msgid "HAL daemon is not running"
 msgstr "ہال HAL ڈیمن نہیں چل رہا"
 
-#: ../src/xfpm-inhibit.c:333
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "نا موزوں آرگومینٹ"
 
-#: ../src/xfpm-inhibit.c:359
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "نا موزوں کوکی"
 
-#: ../src/xfpm-shutdown.c:309
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "آپ کے خدمتگار نظام کا کوئی بیک-اینڈ نہیں ہے"
 
-#: ../src/xfpm-shutdown.c:313
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "کوئی ہائبرنیٹ سکرپٹ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:317
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "کوئی معطلی سکرپٹ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:321
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "کوئی معطلی میتھڈ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:325
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "کوئی ہائبرنیٹ میتھڈ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:329
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "خارج از یاداشت"
 
-#: ../src/xfpm-shutdown.c:333
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "نظام سلیپ میں ناکام"
 
-#: ../src/xfpm-shutdown.c:374
-#: ../src/xfpm-shutdown.c:391
-#: ../src/xfpm-shutdown.c:419
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "ہال HAL ڈیمن فی الوقت متصل نہیں ہے"
@@ -597,35 +573,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "توانائی منیجر پرائے ایکسفس ڈیسک ٹاپ"
 
-#: ../libxfpm/hal-battery.c:458
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "لیتھئم آئن"
 
-#: ../libxfpm/hal-battery.c:462
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "لیڈ ایسڈ"
 
-#: ../libxfpm/hal-battery.c:466
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "لیتھئم پالیمر"
 
-#: ../libxfpm/hal-battery.c:470
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "نیکل دھات ہائیڈرائڈ"
 
-#: ../libxfpm/hal-battery.c:473
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../libxfpm/hal-battery.c:481
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:485
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:171
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "محمد علی مکی\n"
@@ -635,77 +611,121 @@
 "مکی کا بلاگ\n"
 "http://makki.urducoder.com"
 
-#: ../panel-plugins/brightness/brightness-button.c:173
+#: ../panel-plugins/brightness/brightness-button.c:178
 #: ../panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in.h:2
 msgid "Control your LCD brightness"
 msgstr "اپنی ایل سی ڈی کی چمک کنٹرول کریں"
 
-#: ../panel-plugins/brightness/brightness-button.c:175
+#: ../panel-plugins/brightness/brightness-button.c:180
 msgid "No device found"
 msgstr "کوئی ڈیوائس نہیں پائی گئی"
 
-#: ../panel-plugins/brightness/brightness-button.c:585
+#: ../panel-plugins/brightness/brightness-button.c:643
 #: ../panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in.h:1
 msgid "Brightness plugin"
 msgstr "چمک دمک پلگ ان"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:223
-#: ../panel-plugins/inhibit/inhibit-plugin.c:423
-msgid "No power manager instance running"
-msgstr "کوئی چلتی ہوئی توانائی منیجر حالت نہیں"
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>حرکات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:226
-msgid "Automatic sleep inhibited"
-msgstr "خودکار سلیپ حساسیت"
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>اعلی اختیارات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:232
-msgid "Another application is disabling the automatic sleep"
-msgstr "دیگر اطلاقیہ خودکار سلیپ کو معطل کر رہا ہے"
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>چمک دمک</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:234
-msgid "Automatic sleep enabled"
-msgstr "خودکار سلیپ فعالیت"
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>عام اختیارات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:282
-msgid "Power manager automatic sleep is disabled"
-msgstr "توانائی منیجر خودکار سلیپ معطل ہے"
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>مانیٹر</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:283
-msgid "Power manager automatic sleep is enabled"
-msgstr "توانائی منیجر خودکار سلیپ فعال ہے"
+#~ msgid "Advanced"
+#~ msgstr "اعلی"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:286
-#: ../panel-plugins/inhibit/inhibit-plugin.c:322
-#: ../panel-plugins/inhibit/inhibit-plugin.c:664
-#: ../panel-plugins/inhibit/inhibit-plugin.c:723
-#: ../panel-plugins/inhibit/inhibit-plugin.c:829
-#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:2
-msgid "Inhibit plugin"
-msgstr "اینہبٹ پلگ ان"
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "اتنے پر کمپیوٹر کو کم توانائی پر سمجھیں:"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:296
-#: ../panel-plugins/inhibit/inhibit-plugin.c:332
-#: ../panel-plugins/inhibit/inhibit-plugin.c:733
-msgid "Don't show again"
-msgstr "دوبارہ مت دکھائیں"
+#~ msgid "Enable monitor power management control"
+#~ msgstr "مانیٹر توانائی ادارت کنٹرول فعال کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:323
-msgid "Power manager disconnected"
-msgstr "توانائی منیجر غیر متصل ہوگیا"
+#~ msgid "Enable notification"
+#~ msgstr "اطلاع فعال کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:673
-msgid "Enable backlight sleep"
-msgstr "بیک لائٹ سلیپ فعال کریں"
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "معطل/ہائبرنیٹ ہونے پر سکرین مقفل کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:680
-msgid "Enable automatic sleep"
-msgstr "خودکار سلیپ فعال کریں"
+#~ msgid "On battery"
+#~ msgstr "بیٹری پر"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:724
-msgid "Power manager is connected"
-msgstr "توانائی منیجر متصل ہے"
+#~ msgid "Power manager settings"
+#~ msgstr "توانائی منیجر ترتیبات"
 
-#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:1
-msgid "Inhibit automatic power savings"
-msgstr "خودکار توانائی محفوظگی روکیں"
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "کارکردگی کی نسبت توانائی بچانے کو ترجیح دیں"
 
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو ڈسپلے کو سلیپ کریں:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو تو سکرین کی چمک دمک کم کریں:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "مانیٹر سلیپ موڈ مرتب کریں:"
+
+#~ msgid "Standby"
+#~ msgstr "تیار"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر کے لی غیر فعال ہو تو ڈسپلے بند کردیں:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "نظام ٹرے آئکن:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "جب بیٹری کی توانائی خطرناک حد تک کم ہوجائے:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "جب لیپ ٹاپ کی ایل آئی ڈی lid بند کردی جائے:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "جب توانائی کا بٹن دبایا جائے:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "جب سلیپ کا بٹن دبایا جائے:"
+
+#~ msgid "Advance"
+#~ msgstr "اعلی"
+
+#~ msgid "Automatic sleep inhibited"
+#~ msgstr "خودکار سلیپ حساسیت"
+
+#~ msgid "Another application is disabling the automatic sleep"
+#~ msgstr "دیگر اطلاقیہ خودکار سلیپ کو معطل کر رہا ہے"
+
+#~ msgid "Automatic sleep enabled"
+#~ msgstr "خودکار سلیپ فعالیت"
+
+#~ msgid "Power manager automatic sleep is disabled"
+#~ msgstr "توانائی منیجر خودکار سلیپ معطل ہے"
+
+#~ msgid "Power manager automatic sleep is enabled"
+#~ msgstr "توانائی منیجر خودکار سلیپ فعال ہے"
+
+#~ msgid "Don't show again"
+#~ msgstr "دوبارہ مت دکھائیں"
+
+#~ msgid "Power manager disconnected"
+#~ msgstr "توانائی منیجر غیر متصل ہوگیا"
+
+#~ msgid "Enable backlight sleep"
+#~ msgstr "بیک لائٹ سلیپ فعال کریں"
+
+#~ msgid "Enable automatic sleep"
+#~ msgstr "خودکار سلیپ فعال کریں"
+
+#~ msgid "Power manager is connected"
+#~ msgstr "توانائی منیجر متصل ہے"
+
+#~ msgid "Inhibit automatic power savings"
+#~ msgstr "خودکار توانائی محفوظگی روکیں"

Modified: xfce4-power-manager/trunk/po/ur_PK.po
===================================================================
--- xfce4-power-manager/trunk/po/ur_PK.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/ur_PK.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-07 11:07+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-14 03:03+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,236 +19,186 @@
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>حرکات</b>"
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
+msgid "Never"
+msgstr "کبھی نہیں"
 
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>اعلی اختیارات</b>"
+#: ../settings/xfpm-settings.c:481
+msgid "One minute"
+msgstr "ایک منٹ"
 
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "<b>چمک دمک</b>"
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
+msgid "Minutes"
+msgstr "منٹ"
 
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>عام اختیارات</b>"
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
+#, fuzzy
+msgid "One hour"
+msgstr "گھنٹہ"
 
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>مانیٹر</b>"
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
+#, fuzzy
+msgid "one minute"
+msgstr "ایک منٹ"
 
-#: ../settings/xfpm-settings.glade.h:6
-#: ../settings/xfpm-settings.c:1091
-msgid "Advanced"
-msgstr "اعلی"
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
+msgid "minutes"
+msgstr "منٹ"
 
-#: ../settings/xfpm-settings.glade.h:7
-#: ../settings/xfpm-settings.c:758
-msgid "Always show icon"
-msgstr "ہمیشہ آئکن دکھائیں"
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
+msgid "hours"
+msgstr "گھنٹے"
 
-#: ../settings/xfpm-settings.glade.h:8
-msgid "Consider the computer on low power at:"
-msgstr "اتنے پر کمپیوٹر کو کم توانائی پر سمجھیں:"
+#: ../settings/xfpm-settings.c:522
+msgid "Seconds"
+msgstr "سیکنڈ"
 
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Enable monitor power management control"
-msgstr "مانیٹر توانائی ادارت کنٹرول فعال کریں"
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
+msgid "Hibernate and suspend operations not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
 
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable notification"
-msgstr "اطلاع فعال کریں"
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
+msgid "Shutdown and hibernate operations not permitted"
+msgstr "بند کرنے (شٹ ڈاؤن) اور ہائبرنیٹ عمل کاریوں کی اجازت نہیں"
 
-#: ../settings/xfpm-settings.glade.h:11
-#: ../settings/xfpm-settings.c:1048
-#: ../settings/xfpm-settings.c:1053
-msgid "General"
-msgstr "عام"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "معطل/ہائبرنیٹ ہونے پر سکرین مقفل کریں"
-
-#: ../settings/xfpm-settings.glade.h:13
-#: ../settings/xfpm-settings.c:451
-#: ../settings/xfpm-settings.c:544
-#: ../settings/xfpm-settings.c:670
-#: ../settings/xfpm-settings.c:798
-#: ../settings/xfpm-settings.c:857
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
 msgid "Nothing"
 msgstr "کچھ نہیں"
 
-#: ../settings/xfpm-settings.glade.h:14
-#: ../settings/xfpm-settings.c:1062
-#: ../settings/xfpm-settings.c:1067
-msgid "On AC"
-msgstr "اے سی پر"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "On battery"
-msgstr "بیٹری پر"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Power manager settings"
-msgstr "توانائی منیجر ترتیبات"
-
-#: ../settings/xfpm-settings.glade.h:17
-msgid "Prefer power savings over performance"
-msgstr "کارکردگی کی نسبت توانائی بچانے کو ترجیح دیں"
-
-#: ../settings/xfpm-settings.glade.h:18
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو ڈسپلے کو سلیپ کریں:"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو تو سکرین کی چمک دمک کم کریں:"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Set monitor sleep mode:"
-msgstr "مانیٹر سلیپ موڈ مرتب کریں:"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Standby"
-msgstr "تیار"
-
 #. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:22
-#: ../settings/xfpm-settings.c:549
-#: ../settings/xfpm-settings.c:675
-#: ../settings/xfpm-settings.c:803
-#: ../settings/xfpm-settings.c:862
-#: ../src/xfpm-tray-icon.c:198
-#: ../src/xfpm-tray-icon.c:262
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
 msgid "Suspend"
 msgstr "معطل"
 
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Switch off display when computer is inactive for:"
-msgstr "جب کمپیوٹر اتنی دیر کے لی غیر فعال ہو تو ڈسپلے بند کردیں:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "System tray icon: "
-msgstr "نظام ٹرے آئکن:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "When battery power is critical:"
-msgstr "جب بیٹری کی توانائی خطرناک حد تک کم ہوجائے:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "When laptop lid is closed:"
-msgstr "جب لیپ ٹاپ کی ایل آئی ڈی lid بند کردی جائے:"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "When power button is pressed:"
-msgstr "جب توانائی کا بٹن دبایا جائے:"
-
-#: ../settings/xfpm-settings.glade.h:28
-msgid "When sleep button is pressed:"
-msgstr "جب سلیپ کا بٹن دبایا جائے:"
-
-#: ../settings/xfpm-settings.glade.h:29
-#: ../settings/xfpm-settings-main.c:112
-#: ../src/xfpm-main.c:125
-#: ../src/xfpm-main.c:187
-#: ../src/xfpm-main.c:217
-#: ../src/xfpm-tray-icon.c:313
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "ایکسفس توانائی منیجر"
-
-#: ../settings/xfpm-settings.c:306
-#: ../settings/xfpm-settings.c:322
-msgid "Never"
-msgstr "کبھی نہیں"
-
-#: ../settings/xfpm-settings.c:309
-msgid "One minute"
-msgstr "ایک منٹ"
-
-#: ../settings/xfpm-settings.c:311
-msgid "Minutes"
-msgstr "منٹ"
-
-#: ../settings/xfpm-settings.c:324
-msgid "Seconds"
-msgstr "سیکنڈ"
-
-#: ../settings/xfpm-settings.c:443
-#: ../settings/xfpm-settings.c:536
-msgid "Shutdown and hibernate operations not permitted"
-msgstr "بند کرنے (شٹ ڈاؤن) اور ہائبرنیٹ عمل کاریوں کی اجازت نہیں"
-
 #. Hibernate menu option
-#: ../settings/xfpm-settings.c:456
-#: ../settings/xfpm-settings.c:555
-#: ../settings/xfpm-settings.c:681
-#: ../settings/xfpm-settings.c:809
-#: ../settings/xfpm-settings.c:868
-#: ../src/xfpm-tray-icon.c:167
-#: ../src/xfpm-tray-icon.c:247
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
 msgid "Hibernate"
 msgstr "ہائبرنیٹ"
 
-#: ../settings/xfpm-settings.c:460
-#: ../settings/xfpm-settings.c:813
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "بند کریں"
 
-#: ../settings/xfpm-settings.c:664
-#: ../settings/xfpm-settings.c:792
-#: ../settings/xfpm-settings.c:851
-#: ../settings/xfpm-settings.c:974
-msgid "Hibernate and suspend operations not permitted"
-msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr ""
 
-#: ../settings/xfpm-settings.c:761
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "ہمیشہ آئکن دکھائیں"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "جب بیٹری موجود ہو"
 
-#: ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "جب بیٹری چارج یا خرچ ہو رہی ہو"
 
-#: ../settings/xfpm-settings.c:942
+#: ../settings/xfpm-settings.c:974
+msgid ""
+"Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
+"switch off the display or put it in sleep mode."
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1146
+#, fuzzy
+msgid "Suspend operation not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+
+#: ../settings/xfpm-settings.c:1152
+#, fuzzy
+msgid "Hibernate operation not permitted"
+msgstr "ہائبرنیٹ اور معطلی کی عمل کاریوں کی اجازت نہیں"
+
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "جب کمپیوٹر کی توانائی کے تمام ذرائع اس چارج درجہ تک پہنچ جائیں"
 
-#: ../settings/xfpm-settings.c:1077
-#: ../settings/xfpm-settings.c:1082
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "عام"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "اے سی پر"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "بیٹری پر"
 
-#: ../settings/xfpm-settings.c:1096
-msgid "Advance"
-msgstr "اعلی"
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
+msgid "Extended"
+msgstr ""
 
-#: ../settings/xfpm-settings-main.c:112
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "کوئی چلتی ہوئی توانائی منیجر حالت نہیں"
+
+#: ../settings/xfpm-settings-main.c:72
+msgid "Settings manager socket"
+msgstr ""
+
+#: ../settings/xfpm-settings-main.c:72
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr "ہدایات کے لیے '%s --help' لکھیں."
+
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "ایکسفس توانائی منیجر"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
-msgstr "توانائی منیجر کی کوضع کاریاں لوڈ کرنے میں ناکامی، طے شدہ استعمال کیا جارہا ہے"
+msgstr ""
+"توانائی منیجر کی کوضع کاریاں لوڈ کرنے میں ناکامی، طے شدہ استعمال کیا جارہا ہے"
 
-#: ../settings/xfpm-settings-main.c:138
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "ایکسفس توانائی منیجر ترتیبات"
 
-#: ../settings/xfpm-settings-main.c:139
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "ایکسفس توانائی منیجر سے رابطہ نہیں ہوسکا"
 
-#: ../settings/xfpm-settings-main.c:158
-#: ../src/xfpm-main.c:141
-#: ../src/xfpm-main.c:188
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "ایکسفس توانائی منیجر نہیں چل رہا"
 
-#: ../settings/xfpm-settings-main.c:161
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "ایکسفس 4 توانائی منیجر نہیں چل رہا، کیا آپ اسے چلانا چاہتے ہیں؟"
 
-#: ../settings/xfpm-settings-main.c:163
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "چلائیں"
 
@@ -264,161 +214,156 @@
 msgid "Xfce 4 Power Manager"
 msgstr "ایکسفس 4 توانائی منیجر"
 
-#: ../src/xfpm-battery.c:106
+#: ../src/xfpm-battery.c:108
 msgid "Your battery is fully charged"
 msgstr "آپ کی بیٹری مکمل طور پر چارج ہے"
 
-#: ../src/xfpm-battery.c:109
+#: ../src/xfpm-battery.c:111
+#, fuzzy
+msgid "Your battery is charging"
+msgstr "آپ کی بیٹری خالی ہورہی ہے"
+
+#: ../src/xfpm-battery.c:114
 msgid "Battery is charging"
 msgstr "بیٹری چارج ہے"
 
-#: ../src/xfpm-battery.c:112
+#: ../src/xfpm-battery.c:117
 msgid "Your battery is discharging"
 msgstr "آپ کی بیٹری خالی ہورہی ہے"
 
-#: ../src/xfpm-battery.c:112
-#: ../src/xfpm-battery.c:378
-#: ../src/xfpm-battery.c:390
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "نظام بیٹری کی توانائی پر چل رہا ہے"
 
-#: ../src/xfpm-battery.c:115
+#: ../src/xfpm-battery.c:120
 msgid "Your battery charge is low"
 msgstr "آپ کی بیٹری کی چارجنگ کم ہے"
 
-#: ../src/xfpm-battery.c:115
+#: ../src/xfpm-battery.c:120
 msgid "System is running on low power"
 msgstr "نظام کم توانائی پر چل رہا ہے"
 
-#: ../src/xfpm-battery.c:219
-#: ../src/xfpm-supply.c:282
-#: ../src/xfpm-supply.c:305
-#: ../src/xfpm-tray-icon.c:115
-#: ../src/xfpm-tray-icon.c:139
-#: ../src/xfpm-manager.c:199
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
+#: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
+#: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "ایکسفس توانائی منیجر"
 
-#: ../src/xfpm-battery.c:237
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "آپ کا یو پی ایس"
 
-#: ../src/xfpm-battery.c:239
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "آپ کے ماؤس کی بیٹری"
 
-#: ../src/xfpm-battery.c:241
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "آپ کے کیبورڈ کی بیٹری"
 
-#: ../src/xfpm-battery.c:243
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "آپ کے کیمرے کی بیٹری"
 
-#: ../src/xfpm-battery.c:245
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "آپ کے پی ڈی اے کی بیٹری"
 
-#: ../src/xfpm-battery.c:247
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "آپ کی بیٹری"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:293
+#, fuzzy
+msgid "is empty"
+msgstr "تقریباً خالی ہے"
+
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "مکمل طور پر چارج ہے"
 
-#: ../src/xfpm-battery.c:267
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "چارج کا درجہ"
 
-#: ../src/xfpm-battery.c:272
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "چارج ہو رہا ہے"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "ڈس چارج ہو رہا ہے"
 
-#: ../src/xfpm-battery.c:284
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "چارج کم ہے"
 
-#: ../src/xfpm-battery.c:289
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "تقریباً خالی ہے"
 
-#: ../src/xfpm-battery.c:309
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "حاضر نہیں ہے"
 
-#: ../src/xfpm-battery.c:340
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "بیٹری موجود نہیں"
 
-#: ../src/xfpm-battery.c:362
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "بیٹری"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "نظام اے سی کی توانائی پر چل رہا ہے"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "اندازاً باقی وقت"
 
-#: ../src/xfpm-battery.c:366
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "مکمل طور پر چارج ہونے کا تقریبی وقت"
 
-#: ../src/xfpm-battery.c:369
-msgid "hours"
-msgstr "گھنٹے"
-
-#: ../src/xfpm-battery.c:369
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "گھنٹہ"
 
-#: ../src/xfpm-battery.c:370
-msgid "minutes"
-msgstr "منٹ"
-
-#: ../src/xfpm-battery.c:370
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "منٹ"
 
-#: ../src/xfpm-battery.c:374
-#: ../src/xfpm-battery.c:386
-msgid "Battery"
-msgstr "بیٹری"
-
-#: ../src/xfpm-battery.c:377
-#: ../src/xfpm-battery.c:389
-msgid "System is running on AC power"
-msgstr "نظام اے سی کی توانائی پر چل رہا ہے"
-
-#: ../src/xfpm-battery-info.c:62
-#: ../libxfpm/hal-battery.c:488
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "نامعلوم یونٹ"
 
-#: ../src/xfpm-battery-info.c:69
+#: ../src/xfpm-battery-info.c:70
 msgid "Technology:"
 msgstr "ٹیکنالوجی:"
 
-#: ../src/xfpm-battery-info.c:92
+#: ../src/xfpm-battery-info.c:93
 msgid "Design:"
 msgstr "ڈیزائن:"
 
-#: ../src/xfpm-battery-info.c:120
+#: ../src/xfpm-battery-info.c:121
 msgid "Last full:"
 msgstr "آخری بھرائی:"
 
-#: ../src/xfpm-battery-info.c:144
+#: ../src/xfpm-battery-info.c:145
 msgid "Vendor:"
 msgstr "فروخت کار:"
 
-#: ../src/xfpm-battery-info.c:168
+#: ../src/xfpm-battery-info.c:169
 msgid "Model:"
 msgstr "ماڈل:"
 
-#: ../src/xfpm-battery-info.c:201
+#: ../src/xfpm-battery-info.c:202
 msgid "Battery information"
 msgstr "بیٹری کی معلومات"
 
-#: ../src/xfpm-main.c:48
+#: ../src/xfpm-main.c:53
 #, c-format
 msgid ""
 "\n"
@@ -439,156 +384,187 @@
 "جو گنو جی پی ایل کے تحت لائسنس شدہ ہے\n"
 "\n"
 
-#: ../src/xfpm-main.c:73
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "ڈیمونائز مت کریں"
 
-#: ../src/xfpm-main.c:74
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "ایکسفس توانائی منیجر کی کسی بھی چلتی ہوئی حالت کو دوبارہ چلائیں"
 
-#: ../src/xfpm-main.c:75
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "وضع کاری کا ڈائیلاگ دیکھائیں"
 
-#: ../src/xfpm-main.c:76
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "کوئی بھی چلتا ہوا ایکسفس توانائی منیجر برخاست کریں"
 
-#: ../src/xfpm-main.c:77
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "ورژن معلومات"
 
-#: ../src/xfpm-main.c:86
-#: ../src/xfpm-main.c:108
+#: ../src/xfpm-main.c:168
 #, c-format
-msgid "Type '%s --help' for usage."
-msgstr "ہدایات کے لیے '%s --help' لکھیں."
-
-#: ../src/xfpm-main.c:106
-#, c-format
 msgid "Too many arguments"
 msgstr "بہت زیادہ آرگومینٹ"
 
-#: ../src/xfpm-main.c:122
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "پیغام بس bus نشست سے اتصال میں ناکامی"
 
-#: ../src/xfpm-main.c:218
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "دوسرا توانائی مینجر پہلے ہی چل رہا ہے"
 
-#: ../src/xfpm-main.c:223
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "ایکسفس توانائی منیجر پہلے ہی چل رہا ہے"
 
-#: ../src/xfpm-supply.c:171
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "اڈاپٹر موجود ہے"
 
-#: ../src/xfpm-supply.c:172
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "اڈاپٹر موجود نہیں"
 
-#: ../src/xfpm-supply.c:251
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "نظام کو بند کریں"
 
-#: ../src/xfpm-supply.c:262
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "نظام کو ہائبرنیٹ کریں"
 
-#: ../src/xfpm-supply.c:274
-msgid "System is running on low power, but an application is currently disabling the automatic sleep, this means that doing a sleep now may damage the data of this application. Close this application before putting the computer on sleep mode or plug in your AC adapter"
-msgstr "نظام کم توانائی پر چل رہا ہے، مگر کوئی اطلاقیہ اس وقت خودکار سلیپ معطل کر رہا ہے، اس کا مطلب ہے کہ اس وقت سلیپ کرنا اس اطلاقیہ کے ڈیٹا کو نقصان پہنچا سکتا ہے. کمپیوٹر کو سلیپ کرنے سے پہلے اس اطلاقیہ کو بند کردیں یا کمپیوٹر کو چارجنگ پر لگائیں"
+#: ../src/xfpm-supply.c:332
+msgid ""
+"System is running on low power, but an application is currently disabling "
+"the automatic sleep, this means that doing a sleep now may damage the data "
+"of this application. Close this application before putting the computer on "
+"sleep mode or plug in your AC adapter"
+msgstr ""
+"نظام کم توانائی پر چل رہا ہے، مگر کوئی اطلاقیہ اس وقت خودکار سلیپ معطل کر "
+"رہا ہے، اس کا مطلب ہے کہ اس وقت سلیپ کرنا اس اطلاقیہ کے ڈیٹا کو نقصان پہنچا "
+"سکتا ہے. کمپیوٹر کو سلیپ کرنے سے پہلے اس اطلاقیہ کو بند کردیں یا کمپیوٹر کو "
+"چارجنگ پر لگائیں"
 
-#: ../src/xfpm-supply.c:300
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
-msgstr "نظام کم توانائی پر چل رہا ہے. ڈیٹا کے نقصان سے بچنے کے لیے اپنا کام محفوظ کر لیں"
+msgstr ""
+"نظام کم توانائی پر چل رہا ہے. ڈیٹا کے نقصان سے بچنے کے لیے اپنا کام محفوظ کر "
+"لیں"
 
-#: ../src/xfpm-tray-icon.c:159
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to hibernate the system?"
-msgstr "اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو ہائبرنیٹ کرنا چاہتے ہیں؟"
+#: ../src/xfpm-tray-icon.c:166
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to hibernate the system?"
+msgstr ""
+"اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس "
+"اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو ہائبرنیٹ کرنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:162
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:190
-msgid "An application is currently disabling the automatic sleep, doing this action now may damage the working state of this application, are you sure you want to suspend the system?"
-msgstr "اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو معطل کرنا چاہتے ہیں؟"
+#: ../src/xfpm-tray-icon.c:197
+msgid ""
+"An application is currently disabling the automatic sleep, doing this action "
+"now may damage the working state of this application, are you sure you want "
+"to suspend the system?"
+msgstr ""
+"اس وقت کوئی اطلاقیہ خودکار سلیپ معطل کر رہا ہے، اس وقت یہ کاروائی کرنے سے اس "
+"اطلاقیہ کو نقصان پہنچ سکتا ہے، کیا آپ واقعی نظام کو معطل کرنا چاہتے ہیں؟"
 
-#: ../src/xfpm-tray-icon.c:220
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "ایکسفس توانائی منیجر کو برخاست کریں"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "برخاست"
 
-#: ../src/xfpm-engine.c:539
-#: ../src/xfpm-engine.c:568
+#: ../src/xfpm-tray-icon.c:297
+msgid "Clear inhibit"
+msgstr ""
+
+#: ../src/xfpm-tray-icon.c:297
+#, fuzzy
+msgid "Inhibit"
+msgstr "اینہبٹ پلگ ان"
+
+#: ../src/xfpm-tray-icon.c:299
+msgid ""
+"Disable or enable automatic sleep, setting this will tell the power manager "
+"to disable backlight sleep, for example you could active the inhibit if you "
+"are watching a movie."
+msgstr ""
+
+#: ../src/xfpm-tray-icon.c:387
+msgid "No data available"
+msgstr ""
+
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "رسائی کی اجازت نہیں"
 
-#: ../src/xfpm-engine.c:546
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "ہائبرنیٹ کی معاونت نہیں ہے"
 
-#: ../src/xfpm-engine.c:575
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "معطلی کی معاونت نہیں ہے"
 
-#: ../src/xfpm-manager.c:199
+#: ../src/xfpm-manager.c:226
 msgid "HAL daemon is not running"
 msgstr "ہال HAL ڈیمن نہیں چل رہا"
 
-#: ../src/xfpm-inhibit.c:333
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "نا موزوں آرگومینٹ"
 
-#: ../src/xfpm-inhibit.c:359
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "نا موزوں کوکی"
 
-#: ../src/xfpm-shutdown.c:309
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "آپ کے خدمتگار نظام کا کوئی بیک-اینڈ نہیں ہے"
 
-#: ../src/xfpm-shutdown.c:313
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "کوئی ہائبرنیٹ سکرپٹ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:317
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "کوئی معطلی سکرپٹ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:321
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "کوئی معطلی میتھڈ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:325
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "کوئی ہائبرنیٹ میتھڈ نہیں پایا گیا"
 
-#: ../src/xfpm-shutdown.c:329
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "خارج از یاداشت"
 
-#: ../src/xfpm-shutdown.c:333
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "نظام سلیپ میں ناکام"
 
-#: ../src/xfpm-shutdown.c:374
-#: ../src/xfpm-shutdown.c:391
-#: ../src/xfpm-shutdown.c:419
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "ہال HAL ڈیمن فی الوقت متصل نہیں ہے"
@@ -597,35 +573,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "توانائی منیجر پرائے ایکسفس ڈیسک ٹاپ"
 
-#: ../libxfpm/hal-battery.c:458
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "لیتھئم آئن"
 
-#: ../libxfpm/hal-battery.c:462
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "لیڈ ایسڈ"
 
-#: ../libxfpm/hal-battery.c:466
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "لیتھئم پالیمر"
 
-#: ../libxfpm/hal-battery.c:470
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "نیکل دھات ہائیڈرائڈ"
 
-#: ../libxfpm/hal-battery.c:473
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../libxfpm/hal-battery.c:481
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "mWh"
 
-#: ../libxfpm/hal-battery.c:485
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "mAh"
 
-#: ../libxfpm/xfpm-common.c:171
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr ""
 "محمد علی مکی\n"
@@ -635,77 +611,121 @@
 "مکی کا بلاگ\n"
 "http://makki.urducoder.com"
 
-#: ../panel-plugins/brightness/brightness-button.c:173
+#: ../panel-plugins/brightness/brightness-button.c:178
 #: ../panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in.h:2
 msgid "Control your LCD brightness"
 msgstr "اپنی ایل سی ڈی کی چمک کنٹرول کریں"
 
-#: ../panel-plugins/brightness/brightness-button.c:175
+#: ../panel-plugins/brightness/brightness-button.c:180
 msgid "No device found"
 msgstr "کوئی ڈیوائس نہیں پائی گئی"
 
-#: ../panel-plugins/brightness/brightness-button.c:585
+#: ../panel-plugins/brightness/brightness-button.c:643
 #: ../panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in.h:1
 msgid "Brightness plugin"
 msgstr "چمک دمک پلگ ان"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:223
-#: ../panel-plugins/inhibit/inhibit-plugin.c:423
-msgid "No power manager instance running"
-msgstr "کوئی چلتی ہوئی توانائی منیجر حالت نہیں"
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>حرکات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:226
-msgid "Automatic sleep inhibited"
-msgstr "خودکار سلیپ حساسیت"
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>اعلی اختیارات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:232
-msgid "Another application is disabling the automatic sleep"
-msgstr "دیگر اطلاقیہ خودکار سلیپ کو معطل کر رہا ہے"
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "<b>چمک دمک</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:234
-msgid "Automatic sleep enabled"
-msgstr "خودکار سلیپ فعالیت"
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>عام اختیارات</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:282
-msgid "Power manager automatic sleep is disabled"
-msgstr "توانائی منیجر خودکار سلیپ معطل ہے"
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>مانیٹر</b>"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:283
-msgid "Power manager automatic sleep is enabled"
-msgstr "توانائی منیجر خودکار سلیپ فعال ہے"
+#~ msgid "Advanced"
+#~ msgstr "اعلی"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:286
-#: ../panel-plugins/inhibit/inhibit-plugin.c:322
-#: ../panel-plugins/inhibit/inhibit-plugin.c:664
-#: ../panel-plugins/inhibit/inhibit-plugin.c:723
-#: ../panel-plugins/inhibit/inhibit-plugin.c:829
-#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:2
-msgid "Inhibit plugin"
-msgstr "اینہبٹ پلگ ان"
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "اتنے پر کمپیوٹر کو کم توانائی پر سمجھیں:"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:296
-#: ../panel-plugins/inhibit/inhibit-plugin.c:332
-#: ../panel-plugins/inhibit/inhibit-plugin.c:733
-msgid "Don't show again"
-msgstr "دوبارہ مت دکھائیں"
+#~ msgid "Enable monitor power management control"
+#~ msgstr "مانیٹر توانائی ادارت کنٹرول فعال کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:323
-msgid "Power manager disconnected"
-msgstr "توانائی منیجر غیر متصل ہوگیا"
+#~ msgid "Enable notification"
+#~ msgstr "اطلاع فعال کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:673
-msgid "Enable backlight sleep"
-msgstr "بیک لائٹ سلیپ فعال کریں"
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "معطل/ہائبرنیٹ ہونے پر سکرین مقفل کریں"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:680
-msgid "Enable automatic sleep"
-msgstr "خودکار سلیپ فعال کریں"
+#~ msgid "On battery"
+#~ msgstr "بیٹری پر"
 
-#: ../panel-plugins/inhibit/inhibit-plugin.c:724
-msgid "Power manager is connected"
-msgstr "توانائی منیجر متصل ہے"
+#~ msgid "Power manager settings"
+#~ msgstr "توانائی منیجر ترتیبات"
 
-#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:1
-msgid "Inhibit automatic power savings"
-msgstr "خودکار توانائی محفوظگی روکیں"
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "کارکردگی کی نسبت توانائی بچانے کو ترجیح دیں"
 
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو ڈسپلے کو سلیپ کریں:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر غیر فعال ہو تو سکرین کی چمک دمک کم کریں:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "مانیٹر سلیپ موڈ مرتب کریں:"
+
+#~ msgid "Standby"
+#~ msgstr "تیار"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "جب کمپیوٹر اتنی دیر کے لی غیر فعال ہو تو ڈسپلے بند کردیں:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "نظام ٹرے آئکن:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "جب بیٹری کی توانائی خطرناک حد تک کم ہوجائے:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "جب لیپ ٹاپ کی ایل آئی ڈی lid بند کردی جائے:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "جب توانائی کا بٹن دبایا جائے:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "جب سلیپ کا بٹن دبایا جائے:"
+
+#~ msgid "Advance"
+#~ msgstr "اعلی"
+
+#~ msgid "Automatic sleep inhibited"
+#~ msgstr "خودکار سلیپ حساسیت"
+
+#~ msgid "Another application is disabling the automatic sleep"
+#~ msgstr "دیگر اطلاقیہ خودکار سلیپ کو معطل کر رہا ہے"
+
+#~ msgid "Automatic sleep enabled"
+#~ msgstr "خودکار سلیپ فعالیت"
+
+#~ msgid "Power manager automatic sleep is disabled"
+#~ msgstr "توانائی منیجر خودکار سلیپ معطل ہے"
+
+#~ msgid "Power manager automatic sleep is enabled"
+#~ msgstr "توانائی منیجر خودکار سلیپ فعال ہے"
+
+#~ msgid "Don't show again"
+#~ msgstr "دوبارہ مت دکھائیں"
+
+#~ msgid "Power manager disconnected"
+#~ msgstr "توانائی منیجر غیر متصل ہوگیا"
+
+#~ msgid "Enable backlight sleep"
+#~ msgstr "بیک لائٹ سلیپ فعال کریں"
+
+#~ msgid "Enable automatic sleep"
+#~ msgstr "خودکار سلیپ فعال کریں"
+
+#~ msgid "Power manager is connected"
+#~ msgstr "توانائی منیجر متصل ہے"
+
+#~ msgid "Inhibit automatic power savings"
+#~ msgstr "خودکار توانائی محفوظگی روکیں"

Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot	2009-06-20 16:40:44 UTC (rev 7620)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 15:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\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"
@@ -16,131 +16,135 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.c:475 ../settings/xfpm-settings.c:490
-#: ../settings/xfpm-settings.c:517
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:478
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:480 ../settings/xfpm-settings.c:492
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:494 ../settings/xfpm-settings.c:501
-#: ../settings/xfpm-settings.c:502 ../settings/xfpm-settings.c:503
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:502 ../settings/xfpm-settings.c:506
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:503 ../settings/xfpm-settings.c:507
-#: ../src/xfpm-battery.c:441
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
-#: ../settings/xfpm-settings.c:507 ../src/xfpm-battery.c:440
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:519
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:668 ../settings/xfpm-settings.c:850
-#: ../settings/xfpm-settings.c:881 ../settings/xfpm-settings.c:1034
-#: ../settings/xfpm-settings.c:1100 ../settings/xfpm-settings.c:1163
-#: ../settings/xfpm-settings.c:1323
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:748
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:686 ../settings/xfpm-settings.c:756
-#: ../settings/xfpm-settings.c:887 ../settings/xfpm-settings.c:1040
-#: ../settings/xfpm-settings.c:1106 ../settings/xfpm-settings.c:1169
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
 msgid "Nothing"
 msgstr ""
 
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr ""
+
 #. Hibernate menu option
-#: ../settings/xfpm-settings.c:691 ../settings/xfpm-settings.c:767
-#: ../settings/xfpm-settings.c:898 ../settings/xfpm-settings.c:1051
-#: ../settings/xfpm-settings.c:1117 ../settings/xfpm-settings.c:1180
-#: ../src/xfpm-tray-icon.c:170 ../src/xfpm-tray-icon.c:264
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
 msgid "Hibernate"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:695 ../settings/xfpm-settings.c:1055
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr ""
 
-#. Suspend menu option
-#: ../settings/xfpm-settings.c:761 ../settings/xfpm-settings.c:892
-#: ../settings/xfpm-settings.c:1045 ../settings/xfpm-settings.c:1111
-#: ../settings/xfpm-settings.c:1174 ../src/xfpm-tray-icon.c:199
-#: ../src/xfpm-tray-icon.c:279
-msgid "Suspend"
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:996
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
 msgid "Always show icon"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:999
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1002
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1058 ../settings/xfpm-settings.c:1121
-#: ../settings/xfpm-settings.c:1184
-msgid "Ask"
-msgstr ""
-
-#: ../settings/xfpm-settings.c:1243
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1249
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1296
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1410 ../settings/xfpm-settings.c:1415
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
 msgid "General"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1424 ../settings/xfpm-settings.c:1429
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
 msgid "On AC"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1439 ../settings/xfpm-settings.c:1444
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1453 ../settings/xfpm-settings.c:1458
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1523
+#: ../settings/xfpm-settings.c:1425
 msgid "Check your power manager installation"
 msgstr ""
 
@@ -159,7 +163,7 @@
 msgstr ""
 
 #: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
-#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:344
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
 #: ../src/xfce4-power-manager.desktop.in.h:2
 msgid "Xfce Power Manager"
 msgstr ""
@@ -217,8 +221,8 @@
 msgid "Your battery is discharging"
 msgstr ""
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:426
-#: ../src/xfpm-battery.c:458
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr ""
 
@@ -230,93 +234,93 @@
 msgid "System is running on low power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:236 ../src/xfpm-supply.c:345 ../src/xfpm-supply.c:368
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr ""
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr ""
 
-#: ../src/xfpm-battery.c:266
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:268
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:270
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:272
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:274
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:289
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr ""
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr ""
 
-#: ../src/xfpm-battery.c:300
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr ""
 
-#: ../src/xfpm-battery.c:305
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr ""
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr ""
 
-#: ../src/xfpm-battery.c:317
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr ""
 
-#: ../src/xfpm-battery.c:322
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr ""
 
-#: ../src/xfpm-battery.c:363
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr ""
 
-#: ../src/xfpm-battery.c:398
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr ""
 
-#: ../src/xfpm-battery.c:422 ../src/xfpm-battery.c:454
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
 msgid "Battery"
 msgstr ""
 
-#: ../src/xfpm-battery.c:425 ../src/xfpm-battery.c:457
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
 msgid "System is running on AC power"
 msgstr ""
 
-#: ../src/xfpm-battery.c:432
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr ""
 
-#: ../src/xfpm-battery.c:436
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr ""
 
-#: ../src/xfpm-battery.c:440
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr ""
 
-#: ../src/xfpm-battery.c:441
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr ""
 
@@ -399,23 +403,23 @@
 msgid "Xfce power manager is already running"
 msgstr ""
 
-#: ../src/xfpm-supply.c:226
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr ""
 
-#: ../src/xfpm-supply.c:227
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr ""
 
-#: ../src/xfpm-supply.c:314
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr ""
 
-#: ../src/xfpm-supply.c:325
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr ""
 
-#: ../src/xfpm-supply.c:337
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
@@ -423,66 +427,66 @@
 "sleep mode or plug in your AC adapter"
 msgstr ""
 
-#: ../src/xfpm-supply.c:363
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:194
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:191
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:218
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:220
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:294
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:294
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:296
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
 
-#: ../src/xfpm-tray-icon.c:384
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr ""
 
-#: ../src/xfpm-engine.c:699 ../src/xfpm-engine.c:725 ../src/xfpm-engine.c:754
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: ../src/xfpm-engine.c:732
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr ""
 
-#: ../src/xfpm-engine.c:761
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr ""

Modified: xfce4-power-manager/trunk/po/zh_CN.po
===================================================================
--- xfce4-power-manager/trunk/po/zh_CN.po	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/po/zh_CN.po	2009-06-20 16:40:44 UTC (rev 7620)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 19:38+0200\n"
+"POT-Creation-Date: 2009-06-20 18:36+0200\n"
 "PO-Revision-Date: 2009-05-21 18:29+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -16,258 +16,139 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../settings/xfpm-settings.glade.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>动作</b>"
-
-#: ../settings/xfpm-settings.glade.h:2
-msgid "<b>Advanced Options</b>"
-msgstr "<b>高级设置</b>"
-
-#: ../settings/xfpm-settings.glade.h:3
-msgid "<b>Brightness</b>"
-msgstr "亮度"
-
-#: ../settings/xfpm-settings.glade.h:4
-msgid "<b>General Options</b>"
-msgstr "<b>一般设置</b>"
-
-#: ../settings/xfpm-settings.glade.h:5
-msgid "<b>Monitor</b>"
-msgstr "<b>显示器</b>"
-
-#: ../settings/xfpm-settings.glade.h:6
-msgid "Actions"
-msgstr "动作"
-
-#: ../settings/xfpm-settings.glade.h:7
-msgid "Advanced"
-msgstr "高级设置"
-
-#: ../settings/xfpm-settings.glade.h:8 ../settings/xfpm-settings.c:952
-msgid "Always show icon"
-msgstr "总是显示图标"
-
-#: ../settings/xfpm-settings.glade.h:9
-msgid "Consider the computer on low power at:"
-msgstr "当电量低于...时认为电脑处于低电力状态:"
-
-#: ../settings/xfpm-settings.glade.h:10
-msgid "Enable CPU frequency control"
-msgstr "启用 CPU 主频调节控制"
-
-#: ../settings/xfpm-settings.glade.h:11
-msgid "Enable monitor power management control"
-msgstr "启用显示器电源控制"
-
-#: ../settings/xfpm-settings.glade.h:12
-msgid "Enable notification"
-msgstr "打开通知"
-
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:1401
-#: ../settings/xfpm-settings.c:1406
-msgid "General"
-msgstr "一般设置"
-
-#. Hibernate menu option
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:591
-#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:846
-#: ../settings/xfpm-settings.c:1012 ../settings/xfpm-settings.c:1081
-#: ../settings/xfpm-settings.c:1147 ../src/xfpm-tray-icon.c:170
-#: ../src/xfpm-tray-icon.c:268
-msgid "Hibernate"
-msgstr "休眠"
-
-#: ../settings/xfpm-settings.glade.h:15
-msgid "Lock screen when going for suspend/hibernate"
-msgstr "当休眠/挂起时锁住屏幕"
-
-#: ../settings/xfpm-settings.glade.h:16
-msgid "Monitor"
-msgstr "显示器设置"
-
-#: ../settings/xfpm-settings.glade.h:17 ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:678 ../settings/xfpm-settings.c:835
-#: ../settings/xfpm-settings.c:1001 ../settings/xfpm-settings.c:1070
-#: ../settings/xfpm-settings.c:1136
-msgid "Nothing"
-msgstr "什么都不做"
-
-#: ../settings/xfpm-settings.glade.h:18 ../settings/xfpm-settings.c:1415
-#: ../settings/xfpm-settings.c:1420
-msgid "On AC"
-msgstr "使用交流电源"
-
-#: ../settings/xfpm-settings.glade.h:19
-msgid "On battery"
-msgstr "使用电池"
-
-#: ../settings/xfpm-settings.glade.h:20
-msgid "Power manager settings"
-msgstr "电源管理器设置"
-
-#: ../settings/xfpm-settings.glade.h:21
-msgid "Prefer power savings over performance"
-msgstr "节能优先于性能"
-
-#: ../settings/xfpm-settings.glade.h:22
-msgid "Put display to sleep when computer is inactive for:"
-msgstr "当电脑多久没有活动时关闭显示器:"
-
-#: ../settings/xfpm-settings.glade.h:23
-msgid "Put the computer to sleep when inactive for:"
-msgstr "当电脑多久没有活动时关闭电脑:"
-
-#: ../settings/xfpm-settings.glade.h:24
-msgid "Reduce screen brightness when computer is inactive for:"
-msgstr "当电脑多久没有活动时减弱屏幕亮度:"
-
-#: ../settings/xfpm-settings.glade.h:25
-msgid "Set computer inactivity sleep mode:"
-msgstr "设置电脑不活动时睡眠的方式:"
-
-#: ../settings/xfpm-settings.glade.h:26
-msgid "Set monitor sleep mode:"
-msgstr "设置显示器睡眠方式"
-
-#: ../settings/xfpm-settings.glade.h:27
-msgid "Standby"
-msgstr "等待"
-
-#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:28 ../settings/xfpm-settings.c:683
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1075 ../settings/xfpm-settings.c:1141
-#: ../src/xfpm-tray-icon.c:201 ../src/xfpm-tray-icon.c:283
-msgid "Suspend"
-msgstr "挂起"
-
-#: ../settings/xfpm-settings.glade.h:29
-msgid "Switch off display when computer is inactive for:"
-msgstr "当电脑多久没有活动时关闭显示器:"
-
-#: ../settings/xfpm-settings.glade.h:30
-msgid "System tray icon: "
-msgstr "系统通知区域图标:"
-
-#: ../settings/xfpm-settings.glade.h:31
-msgid "When battery power is critical:"
-msgstr "电池电量不足时:"
-
-#: ../settings/xfpm-settings.glade.h:32
-msgid "When hibernate button is pressed:"
-msgstr "按下电源按钮时:"
-
-#: ../settings/xfpm-settings.glade.h:33
-msgid "When laptop lid is closed:"
-msgstr "合上笔记本时:"
-
-#: ../settings/xfpm-settings.glade.h:34
-msgid "When power button is pressed:"
-msgstr "按下电源按钮时:"
-
-#: ../settings/xfpm-settings.glade.h:35
-msgid "When sleep button is pressed:"
-msgstr "按下睡眠按钮时执行:"
-
-#: ../settings/xfpm-settings.glade.h:36 ../settings/xfpm-settings-main.c:120
-#: ../src/xfpm-main.c:184 ../src/xfpm-main.c:273 ../src/xfpm-tray-icon.c:348
-#: ../src/xfce4-power-manager.desktop.in.h:2
-msgid "Xfce Power Manager"
-msgstr "Xfce 电源管理器"
-
-#: ../settings/xfpm-settings.c:370 ../settings/xfpm-settings.c:385
-#: ../settings/xfpm-settings.c:415
+#: ../settings/xfpm-settings.c:478 ../settings/xfpm-settings.c:493
+#: ../settings/xfpm-settings.c:520
 msgid "Never"
 msgstr "从不"
 
-#: ../settings/xfpm-settings.c:373
+#: ../settings/xfpm-settings.c:481
 msgid "One minute"
 msgstr "一分钟"
 
-#: ../settings/xfpm-settings.c:375 ../settings/xfpm-settings.c:387
-#: ../settings/xfpm-settings.c:405
+#: ../settings/xfpm-settings.c:483 ../settings/xfpm-settings.c:495
 msgid "Minutes"
 msgstr "分钟"
 
-#: ../settings/xfpm-settings.c:389 ../settings/xfpm-settings.c:396
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:398
+#: ../settings/xfpm-settings.c:497 ../settings/xfpm-settings.c:504
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:506
 msgid "One hour"
 msgstr "一小时"
 
-#: ../settings/xfpm-settings.c:397 ../settings/xfpm-settings.c:401
+#: ../settings/xfpm-settings.c:505 ../settings/xfpm-settings.c:509
 msgid "one minute"
 msgstr "一分钟"
 
-#: ../settings/xfpm-settings.c:398 ../settings/xfpm-settings.c:402
-#: ../src/xfpm-battery.c:417
+#: ../settings/xfpm-settings.c:506 ../settings/xfpm-settings.c:510
+#: ../src/xfpm-battery.c:453
 msgid "minutes"
 msgstr "分钟"
 
-#: ../settings/xfpm-settings.c:400 ../settings/xfpm-settings.c:401
-#: ../settings/xfpm-settings.c:402 ../src/xfpm-battery.c:416
+#: ../settings/xfpm-settings.c:508 ../settings/xfpm-settings.c:509
+#: ../settings/xfpm-settings.c:510 ../src/xfpm-battery.c:452
 msgid "hours"
 msgstr "小时"
 
-#: ../settings/xfpm-settings.c:417
+#: ../settings/xfpm-settings.c:522
 msgid "Seconds"
 msgstr "秒"
 
-#: ../settings/xfpm-settings.c:565 ../settings/xfpm-settings.c:780
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:995
-#: ../settings/xfpm-settings.c:1064 ../settings/xfpm-settings.c:1130
-#: ../settings/xfpm-settings.c:1311
+#: ../settings/xfpm-settings.c:671 ../settings/xfpm-settings.c:832
+#: ../settings/xfpm-settings.c:863 ../settings/xfpm-settings.c:992
+#: ../settings/xfpm-settings.c:1040 ../settings/xfpm-settings.c:1085
+#: ../settings/xfpm-settings.c:1226
 msgid "Hibernate and suspend operations not permitted"
 msgstr "没有权限进行休眠或挂起操作"
 
-#: ../settings/xfpm-settings.c:578 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:751
 msgid "Shutdown and hibernate operations not permitted"
 msgstr "没有权限进行休眠或关机操作"
 
-#: ../settings/xfpm-settings.c:595 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:689 ../settings/xfpm-settings.c:759
+#: ../settings/xfpm-settings.c:869 ../settings/xfpm-settings.c:998
+#: ../settings/xfpm-settings.c:1046 ../settings/xfpm-settings.c:1091
+msgid "Nothing"
+msgstr "什么都不做"
+
+#. Suspend menu option
+#: ../settings/xfpm-settings.c:694 ../settings/xfpm-settings.c:764
+#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1003
+#: ../settings/xfpm-settings.c:1051 ../settings/xfpm-settings.c:1096
+#: ../src/xfpm-tray-icon.c:205 ../src/xfpm-tray-icon.c:282
+msgid "Suspend"
+msgstr "挂起"
+
+#. Hibernate menu option
+#: ../settings/xfpm-settings.c:700 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:880 ../settings/xfpm-settings.c:1009
+#: ../settings/xfpm-settings.c:1057 ../settings/xfpm-settings.c:1102
+#: ../src/xfpm-tray-icon.c:174 ../src/xfpm-tray-icon.c:267
+msgid "Hibernate"
+msgstr "休眠"
+
+#: ../settings/xfpm-settings.c:704 ../settings/xfpm-settings.c:1013
 msgid "Shutdown"
 msgstr "关机"
 
-#: ../settings/xfpm-settings.c:955
+#: ../settings/xfpm-settings.c:707 ../settings/xfpm-settings.c:1016
+#: ../settings/xfpm-settings.c:1061 ../settings/xfpm-settings.c:1106
+msgid "Ask"
+msgstr "询问"
+
+#: ../settings/xfpm-settings.c:774 ../settings/xfpm-settings.c:884
+msgid "Lock screen"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:953
+msgid "Always show icon"
+msgstr "总是显示图标"
+
+#: ../settings/xfpm-settings.c:956
 msgid "When battery is present"
 msgstr "有电池时"
 
-#: ../settings/xfpm-settings.c:958
+#: ../settings/xfpm-settings.c:959
 msgid "When battery is charging or discharging"
 msgstr "电池充放电时"
 
-#: ../settings/xfpm-settings.c:977
+#: ../settings/xfpm-settings.c:974
 msgid ""
 "Disable Display Power Management Signaling (DPMS), e.g don't attempt to "
 "switch off the display or put it in sleep mode."
-msgstr ""
-"禁用显示器电源管理 (DPMS),如在睡眠模式时不关闭显示器"
+msgstr "禁用显示器电源管理 (DPMS),如在睡眠模式时不关闭显示器"
 
-#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1085
-#: ../settings/xfpm-settings.c:1151
-msgid "Ask"
-msgstr "询问"
-
-#: ../settings/xfpm-settings.c:1215
+#: ../settings/xfpm-settings.c:1146
 msgid "Suspend operation not permitted"
 msgstr "没有权限进行挂起操作"
 
-#: ../settings/xfpm-settings.c:1221
+#: ../settings/xfpm-settings.c:1152
 msgid "Hibernate operation not permitted"
 msgstr "没有权限休眠进行休眠操作"
 
-#: ../settings/xfpm-settings.c:1279
+#: ../settings/xfpm-settings.c:1199
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "当所有电源到达此电量级别"
 
-#: ../settings/xfpm-settings.c:1430 ../settings/xfpm-settings.c:1435
+#: ../settings/xfpm-settings.c:1312 ../settings/xfpm-settings.c:1317
+msgid "General"
+msgstr "一般设置"
+
+#: ../settings/xfpm-settings.c:1326 ../settings/xfpm-settings.c:1331
+msgid "On AC"
+msgstr "使用交流电源"
+
+#: ../settings/xfpm-settings.c:1341 ../settings/xfpm-settings.c:1346
 msgid "On Battery"
 msgstr "使用电池"
 
-#: ../settings/xfpm-settings.c:1444 ../settings/xfpm-settings.c:1449
+#: ../settings/xfpm-settings.c:1355 ../settings/xfpm-settings.c:1360
 msgid "Extended"
 msgstr "扩展"
 
+#: ../settings/xfpm-settings.c:1425
+#, fuzzy
+msgid "Check your power manager installation"
+msgstr "Xfce 电源管理器未运行"
+
 #: ../settings/xfpm-settings-main.c:72
 msgid "Settings manager socket"
 msgstr "设置管理器套接字"
@@ -276,34 +157,40 @@
 msgid "SOCKET ID"
 msgstr "套接字 ID"
 
-#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:145
-#: ../src/xfpm-main.c:167
+#: ../settings/xfpm-settings-main.c:83 ../src/xfpm-main.c:149
+#: ../src/xfpm-main.c:170
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "输入 '%s --help' 查看使用方式"
 
-#: ../settings/xfpm-settings-main.c:120
+#: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:187
+#: ../src/xfpm-main.c:271 ../src/xfpm-tray-icon.c:347
+#: ../src/xfce4-power-manager.desktop.in.h:2
+msgid "Xfce Power Manager"
+msgstr "Xfce 电源管理器"
+
+#: ../settings/xfpm-settings-main.c:118
 msgid "Failed to load power manager configuration, using defaults"
 msgstr "读取电源管理器配置时失败,使用默认设置"
 
-#: ../settings/xfpm-settings-main.c:146
+#: ../settings/xfpm-settings-main.c:144
 msgid "Xfce Power Manager Settings"
 msgstr "Xfce 电源管理器设置"
 
-#: ../settings/xfpm-settings-main.c:147
+#: ../settings/xfpm-settings-main.c:145
 msgid "Unable to connect to Xfce Power Manager"
 msgstr "无法连接至 xfce4 电源管理器"
 
-#: ../settings/xfpm-settings-main.c:175 ../src/xfpm-main.c:200
+#: ../settings/xfpm-settings-main.c:173 ../src/xfpm-main.c:198
 #, c-format
 msgid "Xfce power manager is not running"
 msgstr "Xfce 电源管理器未运行"
 
-#: ../settings/xfpm-settings-main.c:178
+#: ../settings/xfpm-settings-main.c:176
 msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
 msgstr "Xfce4 电源管理器未运行,您要现在启动它吗?"
 
-#: ../settings/xfpm-settings-main.c:180
+#: ../settings/xfpm-settings-main.c:178
 msgid "Run"
 msgstr "运行"
 
@@ -335,8 +222,8 @@
 msgid "Your battery is discharging"
 msgstr "电池正在放电中"
 
-#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:425
-#: ../src/xfpm-battery.c:437
+#: ../src/xfpm-battery.c:117 ../src/xfpm-battery.c:438
+#: ../src/xfpm-battery.c:470
 msgid "System is running on battery power"
 msgstr "系统正在使用电池供电"
 
@@ -348,97 +235,97 @@
 msgid "System is running on low power"
 msgstr "系统在低电量状态下运行"
 
-#: ../src/xfpm-battery.c:240 ../src/xfpm-supply.c:281 ../src/xfpm-supply.c:304
+#: ../src/xfpm-battery.c:238 ../src/xfpm-supply.c:340 ../src/xfpm-supply.c:363
 #: ../src/xfpm-tray-icon.c:119 ../src/xfpm-tray-icon.c:142
 #: ../src/xfpm-manager.c:226
 msgid "Xfce power manager"
 msgstr "Xfce 电源管理器"
 
-#: ../src/xfpm-battery.c:254
+#: ../src/xfpm-battery.c:268
 msgid "Your UPS"
 msgstr "不间断电源"
 
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:270
 msgid "Your Mouse battery"
 msgstr "鼠标电池"
 
-#: ../src/xfpm-battery.c:258
+#: ../src/xfpm-battery.c:272
 msgid "Your Keyboard battery"
 msgstr "键盘电池"
 
-#: ../src/xfpm-battery.c:260
+#: ../src/xfpm-battery.c:274
 msgid "Your Camera battery"
 msgstr "摄像头电池"
 
-#: ../src/xfpm-battery.c:262
+#: ../src/xfpm-battery.c:276
 msgid "Your PDA battery"
 msgstr "PDA电池"
 
-#: ../src/xfpm-battery.c:264
+#: ../src/xfpm-battery.c:278
 msgid "Your Battery"
 msgstr "电池"
 
-#: ../src/xfpm-battery.c:279
+#: ../src/xfpm-battery.c:293
 msgid "is empty"
 msgstr "电量即将耗尽"
 
-#: ../src/xfpm-battery.c:285
+#: ../src/xfpm-battery.c:299
 msgid "is fully charged"
 msgstr "电量满"
 
-#: ../src/xfpm-battery.c:290
+#: ../src/xfpm-battery.c:304
 msgid "charge level"
 msgstr "电池电量级别"
 
-#: ../src/xfpm-battery.c:295
+#: ../src/xfpm-battery.c:309
 msgid "is charging"
 msgstr "正在充电中"
 
-#: ../src/xfpm-battery.c:302
+#: ../src/xfpm-battery.c:316
 msgid "is discharging"
 msgstr "正在放电中"
 
-#: ../src/xfpm-battery.c:307
+#: ../src/xfpm-battery.c:321
 msgid "charge is low"
 msgstr "电量很低"
 
-#: ../src/xfpm-battery.c:312
+#: ../src/xfpm-battery.c:326
 msgid "is almost empty"
 msgstr "电量即将耗尽"
 
-#: ../src/xfpm-battery.c:352
+#: ../src/xfpm-battery.c:371
 msgid "is not present"
 msgstr "不存在"
 
-#: ../src/xfpm-battery.c:385
+#: ../src/xfpm-battery.c:410
 msgid "Battery not present"
 msgstr "电池不可用"
 
-#: ../src/xfpm-battery.c:408
+#: ../src/xfpm-battery.c:434 ../src/xfpm-battery.c:466
+msgid "Battery"
+msgstr "电池设置"
+
+#: ../src/xfpm-battery.c:437 ../src/xfpm-battery.c:469
+msgid "System is running on AC power"
+msgstr "系统正在使用交流电源"
+
+#: ../src/xfpm-battery.c:444
 msgid "Estimated time left"
 msgstr "估计剩余时间"
 
-#: ../src/xfpm-battery.c:412
+#: ../src/xfpm-battery.c:448
 msgid "Estimated time to be fully charged"
 msgstr "估计充电剩余时间"
 
-#: ../src/xfpm-battery.c:416
+#: ../src/xfpm-battery.c:452
 msgid "hour"
 msgstr "小时"
 
-#: ../src/xfpm-battery.c:417
+#: ../src/xfpm-battery.c:453
 msgid "minute"
 msgstr "分钟"
 
-#: ../src/xfpm-battery.c:421 ../src/xfpm-battery.c:433
-msgid "Battery"
-msgstr "电池设置"
-
-#: ../src/xfpm-battery.c:424 ../src/xfpm-battery.c:436
-msgid "System is running on AC power"
-msgstr "系统正在使用交流电源"
-
-#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:478
+#: ../src/xfpm-battery-info.c:63 ../libxfpm/hal-battery.c:476
 msgid "Unknown unit"
 msgstr "未知设备"
 
@@ -487,137 +374,137 @@
 "Licensed under the GNU GPL.\n"
 "\n"
 
-#: ../src/xfpm-main.c:129
+#: ../src/xfpm-main.c:128
 msgid "Do not daemonize"
 msgstr "不作为守护进程运行"
 
-#: ../src/xfpm-main.c:130
+#: ../src/xfpm-main.c:129
 msgid "Restart the running instance of Xfce power manager"
 msgstr "重启正在运行中的任何 xfce 电源管理器程序"
 
-#: ../src/xfpm-main.c:131
+#: ../src/xfpm-main.c:130
 msgid "Show the configuration dialog"
 msgstr "显示配置对话框"
 
-#: ../src/xfpm-main.c:132
+#: ../src/xfpm-main.c:131
 msgid "Quit any running xfce power manager"
 msgstr "退出正在运行中的任何 xfce 电源管理器程序"
 
-#: ../src/xfpm-main.c:133
+#: ../src/xfpm-main.c:132
 msgid "Version information"
 msgstr "版本信息"
 
-#: ../src/xfpm-main.c:165
+#: ../src/xfpm-main.c:168
 #, c-format
 msgid "Too many arguments"
 msgstr "太多参数"
 
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:184
 msgid "Unable to get connection to the message bus session"
 msgstr "无法连接至DBus:%s"
 
-#: ../src/xfpm-main.c:274
+#: ../src/xfpm-main.c:272
 msgid "Another power manager is already running"
 msgstr "另一个 Xfce 电源管理器已在运行中"
 
-#: ../src/xfpm-main.c:279
+#: ../src/xfpm-main.c:278
 #, c-format
 msgid "Xfce power manager is already running"
 msgstr "Xfce 电源管理器已在运行中"
 
-#: ../src/xfpm-supply.c:168
+#: ../src/xfpm-supply.c:231
 msgid "Adapter present"
 msgstr "电源适配器可用"
 
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:232
 msgid "Adapter not present"
 msgstr "电源适配器不可用"
 
-#: ../src/xfpm-supply.c:250
+#: ../src/xfpm-supply.c:309
 msgid "Shutdown the system"
 msgstr "关闭系统"
 
-#: ../src/xfpm-supply.c:261
+#: ../src/xfpm-supply.c:320
 msgid "Hibernate the system"
 msgstr "休眠"
 
-#: ../src/xfpm-supply.c:273
+#: ../src/xfpm-supply.c:332
 msgid ""
 "System is running on low power, but an application is currently disabling "
 "the automatic sleep, this means that doing a sleep now may damage the data "
 "of this application. Close this application before putting the computer on "
 "sleep mode or plug in your AC adapter"
 msgstr ""
-"系统正在低电量环境下工作,但一个程序禁用了自动睡眠,这意味着现在"
-"转入睡眠模式可能损坏该程序的数据。请在系统转入睡眠模式前关闭该程序"
-"或者插上您的电源适配器使用交流电源供电"
+"系统正在低电量环境下工作,但一个程序禁用了自动睡眠,这意味着现在转入睡眠模式"
+"可能损坏该程序的数据。请在系统转入睡眠模式前关闭该程序或者插上您的电源适配器"
+"使用交流电源供电"
 
-#: ../src/xfpm-supply.c:299
+#: ../src/xfpm-supply.c:358
 msgid "System is running on low power. Save your work to avoid losing data"
 msgstr "系统正在低电量环境下工作。保存工作以免丢失数据"
 
-#: ../src/xfpm-tray-icon.c:162
+#: ../src/xfpm-tray-icon.c:166
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to hibernate the system?"
 msgstr ""
-"一个程序禁用了自动睡眠,执行这个动作可能损坏该程序目前的工作状态,"
-"您确定要休眠系统?"
+"一个程序禁用了自动睡眠,执行这个动作可能损坏该程序目前的工作状态,您确定要休"
+"眠系统?"
 
-#: ../src/xfpm-tray-icon.c:165 ../src/xfpm-tray-icon.c:196
+#: ../src/xfpm-tray-icon.c:169 ../src/xfpm-tray-icon.c:200
 msgid "Are you sure you want to proceed?"
 msgstr "您确定执行该动作吗?"
 
-#: ../src/xfpm-tray-icon.c:193
+#: ../src/xfpm-tray-icon.c:197
 msgid ""
 "An application is currently disabling the automatic sleep, doing this action "
 "now may damage the working state of this application, are you sure you want "
 "to suspend the system?"
 msgstr ""
-"一个程序禁用了自动睡眠,执行这个动作可能损坏该程序目前的工作状态,"
-"您确定要挂起系统?"
+"一个程序禁用了自动睡眠,执行这个动作可能损坏该程序目前的工作状态,您确定要挂"
+"起系统?"
 
-#: ../src/xfpm-tray-icon.c:222
+#: ../src/xfpm-tray-icon.c:221
 msgid "Quit the Xfce power manager"
 msgstr "退出 Xfce 电源管理器"
 
-#: ../src/xfpm-tray-icon.c:224
+#: ../src/xfpm-tray-icon.c:223
 msgid "Quit"
 msgstr "退出"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Clear inhibit"
 msgstr "取消禁止"
 
-#: ../src/xfpm-tray-icon.c:298
+#: ../src/xfpm-tray-icon.c:297
 msgid "Inhibit"
 msgstr "禁止"
 
-#: ../src/xfpm-tray-icon.c:300
+#: ../src/xfpm-tray-icon.c:299
 msgid ""
 "Disable or enable automatic sleep, setting this will tell the power manager "
 "to disable backlight sleep, for example you could active the inhibit if you "
 "are watching a movie."
 msgstr ""
-"禁用或启用自动睡眠,设置该项将允许电源管理器不启用睡眠模式,"
-"例如当您在看电影时可以选择激活禁止。"
+"禁用或启用自动睡眠,设置该项将允许电源管理器不启用睡眠模式,例如当您在看电影"
+"时可以选择激活禁止。"
 
-#: ../src/xfpm-tray-icon.c:388
+#: ../src/xfpm-tray-icon.c:387
 msgid "No data available"
 msgstr "没有可用数据"
 
-#: ../src/xfpm-engine.c:646 ../src/xfpm-engine.c:672 ../src/xfpm-engine.c:701
+#: ../src/xfpm-engine.c:728 ../src/xfpm-engine.c:754 ../src/xfpm-engine.c:783
 #, c-format
 msgid "Permission denied"
 msgstr "操作被拒绝"
 
-#: ../src/xfpm-engine.c:679
+#: ../src/xfpm-engine.c:761
 #, c-format
 msgid "Hibernate not supported"
 msgstr "休眠操作未被支持"
 
-#: ../src/xfpm-engine.c:708
+#: ../src/xfpm-engine.c:790
 #, c-format
 msgid "Suspend not supported"
 msgstr "挂起操作未被支持"
@@ -626,46 +513,46 @@
 msgid "HAL daemon is not running"
 msgstr "HAL 守护进程未运行"
 
-#: ../src/xfpm-inhibit.c:330
+#: ../src/xfpm-inhibit.c:329
 #, c-format
 msgid "Invalid arguments"
 msgstr "无效参数"
 
-#: ../src/xfpm-inhibit.c:356
+#: ../src/xfpm-inhibit.c:355
 #, c-format
 msgid "Invalid cookie"
 msgstr "无效 cookie"
 
-#: ../src/xfpm-shutdown.c:335
+#: ../src/xfpm-shutdown.c:336
 msgid "No back-end for your operating system"
 msgstr "没有支持你的操作系统的后台程序"
 
-#: ../src/xfpm-shutdown.c:339
+#: ../src/xfpm-shutdown.c:340
 msgid "No hibernate script found"
 msgstr "找不到休眠脚本"
 
-#: ../src/xfpm-shutdown.c:343
+#: ../src/xfpm-shutdown.c:344
 msgid "No suspend script found"
 msgstr "找不到挂起脚本"
 
-#: ../src/xfpm-shutdown.c:347
+#: ../src/xfpm-shutdown.c:348
 msgid "No suspend method found"
 msgstr "找不到挂起方式"
 
-#: ../src/xfpm-shutdown.c:351
+#: ../src/xfpm-shutdown.c:352
 msgid "No hibernate method found"
 msgstr "找不到休眠方式"
 
-#: ../src/xfpm-shutdown.c:355
+#: ../src/xfpm-shutdown.c:356
 msgid "Out of memory"
 msgstr "内存不足"
 
-#: ../src/xfpm-shutdown.c:359
+#: ../src/xfpm-shutdown.c:360
 msgid "System failed to sleep"
 msgstr "系统转入睡眠模式失败"
 
-#: ../src/xfpm-shutdown.c:401 ../src/xfpm-shutdown.c:424
-#: ../src/xfpm-shutdown.c:458
+#: ../src/xfpm-shutdown.c:409 ../src/xfpm-shutdown.c:432
+#: ../src/xfpm-shutdown.c:466
 #, c-format
 msgid "HAL daemon is currently not connected"
 msgstr "未连接至 HAL 守护进程"
@@ -674,35 +561,35 @@
 msgid "Power management for the Xfce desktop"
 msgstr "Xfce 桌面的电源管理器"
 
-#: ../libxfpm/hal-battery.c:448
+#: ../libxfpm/hal-battery.c:446
 msgid "Lithium ion"
 msgstr "锂离子电池"
 
-#: ../libxfpm/hal-battery.c:452
+#: ../libxfpm/hal-battery.c:450
 msgid "Lead acid"
 msgstr "铅蓄电池"
 
-#: ../libxfpm/hal-battery.c:456
+#: ../libxfpm/hal-battery.c:454
 msgid "Lithium polymer"
 msgstr "锂离子聚合物电池"
 
-#: ../libxfpm/hal-battery.c:460
+#: ../libxfpm/hal-battery.c:458
 msgid "Nickel metal hydride"
 msgstr "镍氢电池"
 
-#: ../libxfpm/hal-battery.c:463
+#: ../libxfpm/hal-battery.c:461
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libxfpm/hal-battery.c:471
+#: ../libxfpm/hal-battery.c:469
 msgid "mWh"
 msgstr "毫瓦时"
 
-#: ../libxfpm/hal-battery.c:475
+#: ../libxfpm/hal-battery.c:473
 msgid "mAh"
 msgstr "毫安时"
 
-#: ../libxfpm/xfpm-common.c:175
+#: ../libxfpm/xfpm-common.c:188
 msgid "translator-credits"
 msgstr "HuntXu <huntxu at live.cn>"
 
@@ -720,15 +607,99 @@
 msgid "Brightness plugin"
 msgstr "亮度插件"
 
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>动作</b>"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>高级设置</b>"
+
+#~ msgid "<b>Brightness</b>"
+#~ msgstr "亮度"
+
+#~ msgid "<b>General Options</b>"
+#~ msgstr "<b>一般设置</b>"
+
+#~ msgid "<b>Monitor</b>"
+#~ msgstr "<b>显示器</b>"
+
+#~ msgid "Actions"
+#~ msgstr "动作"
+
+#~ msgid "Advanced"
+#~ msgstr "高级设置"
+
+#~ msgid "Consider the computer on low power at:"
+#~ msgstr "当电量低于...时认为电脑处于低电力状态:"
+
+#~ msgid "Enable CPU frequency control"
+#~ msgstr "启用 CPU 主频调节控制"
+
+#~ msgid "Enable monitor power management control"
+#~ msgstr "启用显示器电源控制"
+
+#~ msgid "Enable notification"
+#~ msgstr "打开通知"
+
+#~ msgid "Lock screen when going for suspend/hibernate"
+#~ msgstr "当休眠/挂起时锁住屏幕"
+
+#~ msgid "Monitor"
+#~ msgstr "显示器设置"
+
+#~ msgid "On battery"
+#~ msgstr "使用电池"
+
+#~ msgid "Power manager settings"
+#~ msgstr "电源管理器设置"
+
+#~ msgid "Prefer power savings over performance"
+#~ msgstr "节能优先于性能"
+
+#~ msgid "Put display to sleep when computer is inactive for:"
+#~ msgstr "当电脑多久没有活动时关闭显示器:"
+
+#~ msgid "Put the computer to sleep when inactive for:"
+#~ msgstr "当电脑多久没有活动时关闭电脑:"
+
+#~ msgid "Reduce screen brightness when computer is inactive for:"
+#~ msgstr "当电脑多久没有活动时减弱屏幕亮度:"
+
+#~ msgid "Set computer inactivity sleep mode:"
+#~ msgstr "设置电脑不活动时睡眠的方式:"
+
+#~ msgid "Set monitor sleep mode:"
+#~ msgstr "设置显示器睡眠方式"
+
+#~ msgid "Standby"
+#~ msgstr "等待"
+
+#~ msgid "Switch off display when computer is inactive for:"
+#~ msgstr "当电脑多久没有活动时关闭显示器:"
+
+#~ msgid "System tray icon: "
+#~ msgstr "系统通知区域图标:"
+
+#~ msgid "When battery power is critical:"
+#~ msgstr "电池电量不足时:"
+
+#~ msgid "When hibernate button is pressed:"
+#~ msgstr "按下电源按钮时:"
+
+#~ msgid "When laptop lid is closed:"
+#~ msgstr "合上笔记本时:"
+
+#~ msgid "When power button is pressed:"
+#~ msgstr "按下电源按钮时:"
+
+#~ msgid "When sleep button is pressed:"
+#~ msgstr "按下睡眠按钮时执行:"
+
 #~ msgid "Xfce power manager is not running to releod it"
 #~ msgstr "Xfce 电源管理器未运行"
 
 #~ msgid "Power"
 #~ msgstr "电源"
 
-#~ msgid "No power manager instance running"
-#~ msgstr "Xfce 电源管理器未运行"
-
 #~ msgid "Don't show again"
 #~ msgstr "不再显示此信息"
 

Modified: xfce4-power-manager/trunk/settings/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/settings/Makefile.am	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/settings/Makefile.am	2009-06-20 16:40:44 UTC (rev 7620)
@@ -5,9 +5,10 @@
 	xfpm-settings-main.c					\
 	xfpm-settings.c						\
 	xfpm-settings.h						\
-	$(top_srcdir)/src/xfpm-config.h
+	$(top_srcdir)/src/xfpm-config.h				\
+	$(top_srcdir)/src/xfpm-enum.h				\
+	$(top_srcdir)/src/xfpm-enum-glib.h
 
-
 xfce4_power_manager_settings_CFLAGS =				\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/src					\

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -39,10 +39,13 @@
 
 #include "xfpm-settings.h"
 #include "xfpm-config.h"
+#include "xfpm-enum-glib.h"
+#include "xfpm-enum.h"
 
 #define INTERFACE_FILE INTERFACES_DIR "/xfpm-settings.ui"
 
 static 	GtkBuilder *xml 			= NULL;
+static  GtkWidget  *nt				= NULL;
 
 #ifdef HAVE_DPMS
 static  GtkWidget *on_battery_dpms_sleep 	= NULL;
@@ -165,7 +168,7 @@
                        &value,
                        -1);
 		       
-    if (!xfconf_channel_set_string (channel, CRITICAL_BATT_ACTION_CFG, xfpm_int_to_shutdown_string(value)) )
+    if (!xfconf_channel_set_uint (channel, "/" CRITICAL_BATT_ACTION_CFG, value) )
     {
 	g_critical ("Cannot set value for property %s\n", CRITICAL_BATT_ACTION_CFG);
     }
@@ -189,7 +192,7 @@
                        &value,
                        -1);
     
-    if (!xfconf_channel_set_uint (channel, SHOW_TRAY_ICON_CFG, value) )
+    if (!xfconf_channel_set_uint (channel, "/" SHOW_TRAY_ICON_CFG, value) )
     {
 	g_critical ("Cannot set value for property %s\n", SHOW_TRAY_ICON_CFG);
     }
@@ -200,7 +203,7 @@
 {
     gint value    = (gint)gtk_range_get_value (GTK_RANGE (widget));
     
-    if (!xfconf_channel_set_uint (channel, ON_AC_INACTIVITY_TIMEOUT, value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_AC_INACTIVITY_TIMEOUT, value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_AC_INACTIVITY_TIMEOUT);
     }
@@ -211,7 +214,7 @@
 {
     gint value    = (gint)gtk_range_get_value (GTK_RANGE (widget));
     
-    if (!xfconf_channel_set_uint (channel, ON_BATTERY_INACTIVITY_TIMEOUT, value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_BATTERY_INACTIVITY_TIMEOUT, value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_BATTERY_INACTIVITY_TIMEOUT);
     }
@@ -235,7 +238,7 @@
                        &value,
                        -1);
     
-    if (!xfconf_channel_set_string (channel, SLEEP_SWITCH_CFG, xfpm_int_to_shutdown_string(value) ) )
+    if (!xfconf_channel_set_uint (channel, "/" SLEEP_SWITCH_CFG, value ) )
     {
 	g_critical ("Cannot set value for property %s\n", SLEEP_SWITCH_CFG);
     }
@@ -259,7 +262,7 @@
                        &value,
                        -1);
     
-    if (!xfconf_channel_set_string (channel, POWER_SWITCH_CFG, xfpm_int_to_shutdown_string(value) ) )
+    if (!xfconf_channel_set_uint (channel, "/" POWER_SWITCH_CFG, value) )
     {
 	g_critical ("Cannot set value for property %s\n", POWER_SWITCH_CFG);
     }
@@ -283,7 +286,7 @@
                        &value,
                        -1);
     
-    if (!xfconf_channel_set_string (channel, HIBERNATE_SWITCH_CFG, xfpm_int_to_shutdown_string(value) ) )
+    if (!xfconf_channel_set_uint (channel, "/" HIBERNATE_SWITCH_CFG, value ) )
     {
 	g_critical ("Cannot set value for property %s\n", HIBERNATE_SWITCH_CFG);
     }
@@ -294,7 +297,7 @@
 {
     gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
     
-    if (!xfconf_channel_set_bool (channel, POWER_SAVE_ON_BATTERY, val) )
+    if (!xfconf_channel_set_bool (channel, "/" POWER_SAVE_ON_BATTERY, val) )
     {
 	g_critical ("Cannot set value for property %s\n", POWER_SAVE_ON_BATTERY);
     }
@@ -305,7 +308,7 @@
 {
     gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
     
-    if (!xfconf_channel_set_bool (channel, GENERAL_NOTIFICATION_CFG, val) )
+    if (!xfconf_channel_set_bool (channel, "/" GENERAL_NOTIFICATION_CFG, val) )
     {
 	g_critical ("Cannot set value for property %s\n", GENERAL_NOTIFICATION_CFG);
     }
@@ -314,7 +317,7 @@
 void
 set_hibernate_inactivity (GtkWidget *w, XfconfChannel *channel)
 {
-    if (!xfconf_channel_set_string (channel, INACTIVITY_SLEEP_MODE, "Hibernate") )
+    if (!xfconf_channel_set_string (channel, "/" INACTIVITY_SLEEP_MODE, "Hibernate") )
     {
 	g_critical ("Cannot set value hibernate for property %s", INACTIVITY_SLEEP_MODE);
     }
@@ -323,7 +326,7 @@
 void
 set_suspend_inactivity (GtkWidget *w, XfconfChannel *channel)
 {
-    if (!xfconf_channel_set_string (channel, INACTIVITY_SLEEP_MODE, "Suspend") )
+    if (!xfconf_channel_set_string (channel, "/" INACTIVITY_SLEEP_MODE, "Suspend") )
     {
 	g_critical ("Cannot set value suspend for property %s", INACTIVITY_SLEEP_MODE);
     }
@@ -334,7 +337,7 @@
 set_dpms_standby_mode (GtkWidget *w, XfconfChannel *channel)
 {
 #ifdef HAVE_DPMS
-    if (!xfconf_channel_set_string (channel, DPMS_SLEEP_MODE, "sleep") )
+    if (!xfconf_channel_set_string (channel, "/" DPMS_SLEEP_MODE, "standby") )
     {
 	g_critical ("Cannot set value sleep for property %s\n", DPMS_SLEEP_MODE);
     }
@@ -345,7 +348,7 @@
 set_dpms_suspend_mode (GtkWidget *w, XfconfChannel *channel)
 {
 #ifdef HAVE_DPMS
-    if (!xfconf_channel_set_string (channel, DPMS_SLEEP_MODE, "suspend") )
+    if (!xfconf_channel_set_string (channel, "/" DPMS_SLEEP_MODE, "suspend") )
     {
 	g_critical ("Cannot set value sleep for property %s\n", DPMS_SLEEP_MODE);
     }
@@ -358,7 +361,7 @@
 #ifdef HAVE_DPMS
     gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
     
-    xfconf_channel_set_bool (channel, DPMS_ENABLED_CFG, val);
+    xfconf_channel_set_bool (channel, "/" DPMS_ENABLED_CFG, val);
     
     gtk_widget_set_sensitive (on_ac_dpms_off, val);
     gtk_widget_set_sensitive (on_ac_dpms_sleep, val);
@@ -386,7 +389,7 @@
 	}
     }
     
-    if (!xfconf_channel_set_uint (channel, ON_BATT_DPMS_SLEEP, sleep_value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_BATT_DPMS_SLEEP, sleep_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_SLEEP);
     }
@@ -408,7 +411,7 @@
 	}
     }
     
-    if (!xfconf_channel_set_uint (channel, ON_BATT_DPMS_OFF, off_value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_BATT_DPMS_OFF, off_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_OFF);
     }
@@ -433,7 +436,7 @@
 	}
     }
 
-    if (!xfconf_channel_set_uint (channel, ON_AC_DPMS_SLEEP, sleep_value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_AC_DPMS_SLEEP, sleep_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_SLEEP);
     }
@@ -458,7 +461,7 @@
 	}
     }
 
-    if (!xfconf_channel_set_uint (channel, ON_AC_DPMS_OFF, off_value))
+    if (!xfconf_channel_set_uint (channel, "/" ON_AC_DPMS_OFF, off_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_OFF);
     }
@@ -524,7 +527,7 @@
 {
     gint value    = (gint)gtk_range_get_value (GTK_RANGE(w));
     
-    if (!xfconf_channel_set_uint (channel, BRIGHTNESS_ON_BATTERY, value))
+    if (!xfconf_channel_set_uint (channel, "/" BRIGHTNESS_ON_BATTERY, value))
     {
 	g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_BATTERY);
     }
@@ -535,7 +538,7 @@
 {
     gint value    = (gint)gtk_range_get_value (GTK_RANGE(w));
     
-    if (!xfconf_channel_set_uint (channel, BRIGHTNESS_ON_AC, value))
+    if (!xfconf_channel_set_uint (channel, "/" BRIGHTNESS_ON_AC, value))
     {
 	g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_AC);
     }
@@ -571,7 +574,7 @@
                        &value,
                        -1);
     
-    if (!xfconf_channel_set_string (channel, LID_SWITCH_ON_BATTERY_CFG, xfpm_int_to_shutdown_string(value)) )
+    if (!xfconf_channel_set_uint (channel, "/" LID_SWITCH_ON_BATTERY_CFG, value) )
     {
 	g_critical ("Cannot set value for property %s\n", LID_SWITCH_ON_BATTERY_CFG);
     }
@@ -595,7 +598,7 @@
                        &value,
                        -1);
 		       
-    if (!xfconf_channel_set_string (channel, LID_SWITCH_ON_AC_CFG, xfpm_int_to_shutdown_string(value)) )
+    if (!xfconf_channel_set_uint (channel, "/" LID_SWITCH_ON_AC_CFG, value) )
     {
 	g_critical ("Cannot set value for property %s\n", LID_SWITCH_ON_AC_CFG);
     }
@@ -606,7 +609,7 @@
 {
     guint val = (guint) gtk_spin_button_get_value (w);
     
-    if (!xfconf_channel_set_uint (channel, CRITICAL_POWER_LEVEL, val) )
+    if (!xfconf_channel_set_uint (channel, "/" CRITICAL_POWER_LEVEL, val) )
     {
 	g_critical ("Unable to set value %d for property %s\n", val, CRITICAL_POWER_LEVEL);
     }
@@ -616,7 +619,8 @@
 lock_screen_toggled_cb (GtkWidget *w, XfconfChannel *channel)
 {
     gboolean val = (gint) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
-    if ( !xfconf_channel_set_bool (channel, LOCK_SCREEN_ON_SLEEP, val) )
+    
+    if ( !xfconf_channel_set_bool (channel, "/" LOCK_SCREEN_ON_SLEEP, val) )
     {
 	g_critical ("Unable to set value for property %s\n", LOCK_SCREEN_ON_SLEEP);
     }
@@ -628,7 +632,7 @@
 #ifdef SYSTEM_IS_LINUX
     gboolean val = (gint) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
     
-    if ( !xfconf_channel_set_bool (channel, CPU_FREQ_CONTROL, val) )
+    if ( !xfconf_channel_set_bool (channel, "/" CPU_FREQ_CONTROL, val) )
     {
 	g_critical ("Unable to set value for property %s\n", CPU_FREQ_CONTROL);
     }
@@ -644,7 +648,6 @@
     gint list_value;
     gint val;
     gboolean save_power;
-    gchar *str;
     GtkListStore *list_store;
     GtkTreeIter iter;
     GtkWidget *power_save;
@@ -668,7 +671,7 @@
 	gtk_widget_set_tooltip_text (inact, _("Hibernate and suspend operations not permitted"));
     }
     
-    val = xfconf_channel_get_uint (channel, ON_BATTERY_INACTIVITY_TIMEOUT, 30);
+    val = xfconf_channel_get_uint (channel, "/" ON_BATTERY_INACTIVITY_TIMEOUT, 30);
     gtk_range_set_value (GTK_RANGE (inact), val);
     
     
@@ -683,26 +686,28 @@
     gtk_combo_box_set_model (GTK_COMBO_BOX(battery_critical), GTK_TREE_MODEL(list_store));
     
     gtk_list_store_append(list_store, &iter);
-    gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+    gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, XFPM_DO_NOTHING, -1);
     
+    if ( can_suspend )
+    {
+	gtk_list_store_append(list_store, &iter);
+	gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
+    }
+    
     if ( can_hibernate )
     {
 	gtk_list_store_append(list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
     }
+
+    gtk_list_store_append(list_store, &iter);
+    gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
     
     gtk_list_store_append(list_store, &iter);
-    gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, 3, -1);
+    gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
     
-    str = xfconf_channel_get_string (channel, CRITICAL_BATT_ACTION_CFG, "Nothing");
+    val = xfconf_channel_get_uint (channel, "/" CRITICAL_BATT_ACTION_CFG, XFPM_DO_NOTHING);
     
-    val = xfpm_shutdown_string_to_int (str);
-    if ( G_UNLIKELY (val == -1 || val == 1) ) /* we don't do suspend */
-    {
-	g_warning ("Invalid value %s for property %s\n", str, CRITICAL_BATT_ACTION_CFG);
-	val = 0;
-    }
-    
     for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
 	  valid;
 	  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -716,10 +721,8 @@
 	}
     }
     
-    g_free (str);
-    
     power_save = GTK_WIDGET (gtk_builder_get_object (xml, "power-save"));
-    save_power = xfconf_channel_get_bool (channel, POWER_SAVE_ON_BATTERY, TRUE);
+    save_power = xfconf_channel_get_bool (channel, "/" POWER_SAVE_ON_BATTERY, TRUE);
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(power_save), save_power);
     
@@ -730,10 +733,10 @@
     dpms_frame_on_battery = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-on-battery-frame"));
     gtk_widget_show (GTK_WIDGET(dpms_frame_on_battery));
   
-    val = xfconf_channel_get_uint (channel, ON_BATT_DPMS_SLEEP, 3);
+    val = xfconf_channel_get_uint (channel, "/" ON_BATT_DPMS_SLEEP, 3);
     gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), val);
     
-    val = xfconf_channel_get_uint (channel, ON_BATT_DPMS_OFF, 5);
+    val = xfconf_channel_get_uint (channel, "/" ON_BATT_DPMS_OFF, 5);
 #endif
 
      /*
@@ -753,43 +756,25 @@
 	gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
 	
 	gtk_list_store_append(list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, LID_TRIGGER_NOTHING, -1);
 	
 	if ( can_suspend )
 	{
 	    gtk_list_store_append(list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, 1, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
 	}
 	
 	if ( can_hibernate)
 	{
 	    gtk_list_store_append(list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
 	}
 	
-	str = xfconf_channel_get_string (channel, LID_SWITCH_ON_BATTERY_CFG, "Nothing");
+	gtk_list_store_append(list_store, &iter);
+	gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
 	
-	val = xfpm_shutdown_string_to_int (str);
-	
-	if ( G_UNLIKELY ( val == -1 || val == 3 ) )/*we don't do shutdown here */
-	{
-	    g_warning ("Invalid value %s for property %s\n", str, LID_SWITCH_ON_BATTERY_CFG);
-	    val = 0;
-	}
-	
-	for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
-	      valid;
-	      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
-	{
-	    gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
-				1, &list_value, -1);
-	    if ( val == list_value )
-	    {
-		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
-		break;
-	    }
-	}
-	g_free (str);
+	val = xfconf_channel_get_uint (channel, "/" LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (lid), val);
     }
     else
     {
@@ -805,7 +790,7 @@
     brg = GTK_WIDGET (gtk_builder_get_object (xml ,"brg-on-battery"));
     if ( has_lcd_brightness )
     {
-	val = xfconf_channel_get_uint (channel, BRIGHTNESS_ON_BATTERY, 10);
+	val = xfconf_channel_get_uint (channel, "/" BRIGHTNESS_ON_BATTERY, 120);
 	
 	gtk_range_set_value (GTK_RANGE(brg), val);
 	
@@ -818,7 +803,7 @@
 #ifndef HAVE_DPMS
     if ( !has_lcd_brightness )
     {
-	gtk_notebook_remove_page (GTK_NOTEBOOK (GTK_WIDGET (gtk_builder_get_object (xml, "on-battery-notebook"))), 1);
+	gtk_notebook_remove_page (GTK_NOTEBOOK (nt), 1);
     }
 #endif
 }
@@ -833,10 +818,7 @@
     GtkWidget *brg;
     GtkListStore *list_store;
     GtkTreeIter iter;
-    gchar *str;
     gint val;
-    gboolean valid;
-    gint list_value;
     
 #ifdef HAVE_DPMS
     GtkWidget *dpms_frame_on_ac;
@@ -850,7 +832,7 @@
 	gtk_widget_set_tooltip_text (inact, _("Hibernate and suspend operations not permitted"));
     }
     
-    val = xfconf_channel_get_uint (channel, ON_AC_INACTIVITY_TIMEOUT, 30);
+    val = xfconf_channel_get_uint (channel, "/" ON_AC_INACTIVITY_TIMEOUT, 30);
     gtk_range_set_value (GTK_RANGE (inact), val);
    
 #ifdef HAVE_DPMS
@@ -860,10 +842,10 @@
     dpms_frame_on_ac = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-on-ac-frame"));
     gtk_widget_show (GTK_WIDGET(dpms_frame_on_ac));
     
-    val = xfconf_channel_get_uint (channel, ON_AC_DPMS_SLEEP, 10);
+    val = xfconf_channel_get_uint (channel, "/" ON_AC_DPMS_SLEEP, 10);
     gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), val);
     
-    val = xfconf_channel_get_uint (channel, ON_AC_DPMS_OFF, 15);
+    val = xfconf_channel_get_uint (channel, "/" ON_AC_DPMS_OFF, 15);
     gtk_range_set_value (GTK_RANGE(on_ac_dpms_off), val);
     
 #endif
@@ -884,43 +866,26 @@
 	gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
 	
 	gtk_list_store_append(list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, LID_TRIGGER_NOTHING, -1);
 	
 	if ( can_suspend )
 	{
 	    gtk_list_store_append(list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, 1, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
 	}
 	
 	if ( can_hibernate )
 	{
 	    gtk_list_store_append(list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
 	}
 	
-	str = xfconf_channel_get_string (channel, LID_SWITCH_ON_AC_CFG, "Nothing");
+	gtk_list_store_append(list_store, &iter);
+	gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
 	
-	val = xfpm_shutdown_string_to_int (str);
+	val = xfconf_channel_get_uint (channel, "/" LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
 	
-	if ( G_UNLIKELY (val == -1 || val == 3) ) /*we don't do shutdown here */
-	{
-	    g_warning ("Invalid value %s for property %s\n", str, LID_SWITCH_ON_AC_CFG);
-	    val = 0;
-	}
-	for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
-	      valid;
-	      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
-	{
-	    gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
-				1, &list_value, -1);
-	    if ( val == list_value )
-	    {
-		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
-		break;
-	    }
-	}
-	    
-	g_free (str);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (lid), val);
     }
     else
     {
@@ -935,7 +900,7 @@
     brg = GTK_WIDGET (gtk_builder_get_object (xml ,"brg-on-ac"));
     if ( has_lcd_brightness )
     {
-	val = xfconf_channel_get_uint (channel, BRIGHTNESS_ON_AC, 9);
+	val = xfconf_channel_get_uint (channel, "/" BRIGHTNESS_ON_AC, 9);
 	
 	gtk_range_set_value (GTK_RANGE(brg), val);
 	
@@ -968,15 +933,7 @@
     GtkWidget *sleep_label;
     GtkWidget *notify;
     
-    gchar *default_sleep_value;
-    gint   sleep_val_int;
-    gchar *default_hibernate_value;
-    gint   hibernate_val_int;
-    gboolean valid;
-    gchar *default_power_value;
-    gint   power_val_int;
-    gint list_value;
-    guint show_tray;
+    guint  value;
     gboolean val;
     
     GtkWidget *dpms;
@@ -993,16 +950,17 @@
     gtk_combo_box_set_model (GTK_COMBO_BOX(tray), GTK_TREE_MODEL(list_store));
 
     gtk_list_store_append(list_store, &iter);
-    gtk_list_store_set (list_store, &iter, 0, _("Always show icon"), 1, 0, -1);
+    gtk_list_store_set (list_store, &iter, 0, _("Always show icon"), 1, SHOW_ICON_ALWAYS, -1);
 
     gtk_list_store_append(list_store, &iter);
-    gtk_list_store_set (list_store, &iter, 0, _("When battery is present"), 1, 1, -1);
+    gtk_list_store_set (list_store, &iter, 0, _("When battery is present"), 1, SHOW_ICON_WHEN_BATTERY_PRESENT, -1);
     
     gtk_list_store_append(list_store, &iter);
-    gtk_list_store_set (list_store, &iter, 0, _("When battery is charging or discharging"), 1, 2, -1);
+    gtk_list_store_set (list_store, &iter, 0, _("When battery is charging or discharging"), 1, SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING, -1);
     
-    show_tray = xfconf_channel_get_uint (channel, SHOW_TRAY_ICON_CFG, 1);
-    gtk_combo_box_set_active (GTK_COMBO_BOX(tray), show_tray);
+    value = xfconf_channel_get_uint (channel, "/" SHOW_TRAY_ICON_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
+    
+    gtk_combo_box_set_active (GTK_COMBO_BOX (tray), value);
 		      
     dpms = GTK_WIDGET (gtk_builder_get_object (xml, "enable-dpms"));
 #ifdef HAVE_DPMS
@@ -1010,7 +968,7 @@
      * Global dpms settings (enable/disable)
      */
    
-    val = xfconf_channel_get_bool (channel, DPMS_ENABLED_CFG, TRUE);
+    val = xfconf_channel_get_bool (channel, "/" DPMS_ENABLED_CFG, TRUE);
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dpms), val);
     gtk_widget_set_tooltip_text (dpms, _("Disable Display Power Management Signaling (DPMS), "\
@@ -1037,48 +995,29 @@
 	gtk_combo_box_set_model (GTK_COMBO_BOX(power), GTK_TREE_MODEL(list_store));
 
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, XFPM_DO_NOTHING, -1);
 	
 	if ( can_suspend )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, 1, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
 	}
 	
 	if ( can_hibernate )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
 	}
 	
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, 3, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
 	
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, 4, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
 	
-	default_power_value = xfconf_channel_get_string (channel, POWER_SWITCH_CFG, "Nothing");
-	power_val_int = xfpm_shutdown_string_to_int (default_power_value );
+	value = xfconf_channel_get_uint (channel, "/" POWER_SWITCH_CFG, XFPM_DO_NOTHING);
 	
-	if ( G_UNLIKELY (power_val_int == -1) ) 
-	{
-	    g_warning ("Invalid value %s for property %s\n", default_power_value, POWER_SWITCH_CFG);
-	    power_val_int = 0;
-	}
-	for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
-		  valid;
-		  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
-	{
-	    gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
-				    1, &list_value, -1);
-	    if ( power_val_int == list_value )
-	    {
-		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (power), &iter);
-		break;
-	    }
-	}
-
-	g_free (default_power_value);
+	gtk_combo_box_set_active (GTK_COMBO_BOX(power), value);
     }
     else
     {
@@ -1092,6 +1031,7 @@
     list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
     hibernate = GTK_WIDGET (gtk_builder_get_object (xml, "hibernate-combox"));
     hibernate_label = GTK_WIDGET (gtk_builder_get_object (xml, "hibernate-label"));
+    
     if (has_hibernate_button )
     {
 	if (!user_privilege )
@@ -1103,49 +1043,30 @@
 	gtk_combo_box_set_model (GTK_COMBO_BOX(hibernate), GTK_TREE_MODEL(list_store));
 
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, XFPM_DO_NOTHING, -1);
 	
 	if ( can_suspend )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, 1, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
 	}
 	
 	if ( can_hibernate )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
 	}
 	
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, 4, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
 	
-	default_hibernate_value = xfconf_channel_get_string (channel, HIBERNATE_SWITCH_CFG, "Nothing");
-	hibernate_val_int = xfpm_shutdown_string_to_int (default_hibernate_value );
-	
-	if ( G_UNLIKELY (hibernate_val_int == -1) ) 
-	{
-	    g_warning ("Invalid value %s for property %s\n", default_hibernate_value, POWER_SWITCH_CFG);
-	    hibernate_val_int = 0;
-	}
-	for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
-		  valid;
-		  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
-	{
-	    gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
-				    1, &list_value, -1);
-	    if ( hibernate_val_int == list_value )
-	    {
-		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (hibernate), &iter);
-		break;
-	    }
-	}
+	value = xfconf_channel_get_uint (channel, "/" HIBERNATE_SWITCH_CFG, XFPM_DO_NOTHING);
 
-	g_free (default_hibernate_value);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (hibernate), value);
     }
     else
     {
-	gtk_widget_hide ( hibernate);
+	gtk_widget_hide (hibernate);
 	gtk_widget_hide (hibernate_label);
     }
 
@@ -1155,6 +1076,7 @@
     list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
     sleep_w = GTK_WIDGET (gtk_builder_get_object (xml, "sleep-combox"));
     sleep_label = GTK_WIDGET (gtk_builder_get_object (xml, "sleep-label"));
+    
     if ( has_sleep_button )
     {
 	if (!user_privilege )
@@ -1166,44 +1088,25 @@
 	gtk_combo_box_set_model (GTK_COMBO_BOX(sleep_w), GTK_TREE_MODEL(list_store));
 
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, 0, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Nothing"), 1, XFPM_DO_NOTHING, -1);
 	
 	if ( can_suspend )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, 1, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
 	}
 	
 	if ( can_hibernate )
 	{
 	    gtk_list_store_append (list_store, &iter);
-	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, 2, -1);
+	    gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
 	}
 	
 	gtk_list_store_append (list_store, &iter);
-	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, 4, -1);
+	gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
 	
-	default_sleep_value = xfconf_channel_get_string (channel, SLEEP_SWITCH_CFG, "Nothing");
-	sleep_val_int = xfpm_shutdown_string_to_int (default_sleep_value );
-	if ( G_UNLIKELY (sleep_val_int == -1 || sleep_val_int == 3) ) 
-	{
-	    g_warning ("Invalid value %s for property %s\n", default_sleep_value, SLEEP_SWITCH_CFG);
-	    sleep_val_int = 0;
-	}
-	for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
-		  valid;
-		  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
-	    {
-		gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter,
-				    1, &list_value, -1);
-		if ( sleep_val_int == list_value )
-		{
-		    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (sleep_w), &iter);
-		    break;
-		}
-	    }
-	
-	g_free (default_sleep_value);
+	value = xfconf_channel_get_uint (channel, "/" SLEEP_SWITCH_CFG, XFPM_DO_NOTHING);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (sleep_w), value);
     }
     else
     {
@@ -1215,7 +1118,7 @@
      */
     
     notify = GTK_WIDGET (gtk_builder_get_object (xml, "notification"));
-    val = xfconf_channel_get_bool (channel, GENERAL_NOTIFICATION_CFG, TRUE);
+    val = xfconf_channel_get_bool (channel, "/" GENERAL_NOTIFICATION_CFG, TRUE);
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(notify), val);
     
@@ -1249,7 +1152,7 @@
 	gtk_widget_set_tooltip_text (inact_hibernate, _("Hibernate operation not permitted"));
     }
    
-    str = xfconf_channel_get_string (channel, INACTIVITY_SLEEP_MODE, "Suspend");
+    str = xfconf_channel_get_string (channel, "/" INACTIVITY_SLEEP_MODE, "Suspend");
     if ( xfpm_strequal (str, "Suspend") )
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (inact_suspend), TRUE);
     else if ( xfpm_strequal (str, "Hibernate"))
@@ -1266,16 +1169,16 @@
     suspend_dpms_mode = GTK_WIDGET (gtk_builder_get_object (xml, "suspend-dpms-mode"));
     
 #ifdef HAVE_DPMS
-    str = xfconf_channel_get_string (channel, DPMS_SLEEP_MODE, "sleep");
+    str = xfconf_channel_get_string (channel, "/" DPMS_SLEEP_MODE, "sleep");
     
     if ( xfpm_strequal (str, "sleep" ) )
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(sleep_dpms_mode), TRUE);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sleep_dpms_mode), TRUE);
     else if ( xfpm_strequal (str, "suspend") )
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(suspend_dpms_mode), TRUE);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (suspend_dpms_mode), TRUE);
     else 
     {
-	g_critical ("Invalid value %s for property %s\n", str, DPMS_SLEEP_MODE );
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(sleep_dpms_mode), TRUE);
+	g_critical ("Invalid value %s for property %s\n", str, "/" DPMS_SLEEP_MODE );
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sleep_dpms_mode), TRUE);
     }
     
     g_free (str);
@@ -1295,7 +1198,7 @@
 	gtk_widget_set_tooltip_text (critical_level, 
 				     _("When all the power sources of the computer reach this charge level"));
     
-	val = xfconf_channel_get_uint (channel, CRITICAL_POWER_LEVEL, 10 );
+	val = xfconf_channel_get_uint (channel, "/" CRITICAL_POWER_LEVEL, 10 );
 
 	if ( val > 20 )
 	{
@@ -1323,7 +1226,7 @@
 	gtk_widget_set_tooltip_text (lock, _("Hibernate and suspend operations not permitted"));
     }
     
-    val = xfconf_channel_get_bool (channel, LOCK_SCREEN_ON_SLEEP, TRUE);
+    val = xfconf_channel_get_bool (channel, "/" LOCK_SCREEN_ON_SLEEP, TRUE);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lock), val);
  
     cpu = GTK_WIDGET (gtk_builder_get_object (xml, "cpu-freq"));
@@ -1331,7 +1234,7 @@
 #ifdef SYSTEM_IS_LINUX
     if ( system_laptop )
     {
-	val = xfconf_channel_get_bool (channel, CPU_FREQ_CONTROL, TRUE);
+	val = xfconf_channel_get_bool (channel, "/" CPU_FREQ_CONTROL, TRUE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(cpu), val);
     }
     else
@@ -1363,7 +1266,6 @@
 
     if ( G_LIKELY (int_data >= 0 && int_data <= 3) )
     {
-	GtkWidget *nt = GTK_WIDGET (gtk_builder_get_object (xml, "main-notebook"));
         gtk_notebook_set_current_page(GTK_NOTEBOOK(nt), int_data);
     }
 }
@@ -1531,9 +1433,10 @@
     on_ac_dpms_off = GTK_WIDGET (gtk_builder_get_object (xml, "off-dpms-on-ac"));
 #endif
 
-    gtk_builder_connect_signals (xml, channel);
-    
     dialog = GTK_WIDGET (gtk_builder_get_object (xml, "xfpm-settings-dialog"));
+    nt = GTK_WIDGET (gtk_builder_get_object (xml, "main-notebook"));
+    
+    gtk_builder_connect_signals (xml, channel);
 
     xfpm_settings_on_ac (channel, user_privilege, can_suspend, can_hibernate, has_lcd_brightness, has_lid );
     

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -130,8 +130,10 @@
     XfpmShowIcon show_icon;
     gboolean visible = TRUE;
     
-    show_icon = xfpm_xfconf_get_property_enum (battery->priv->conf, SHOW_TRAY_ICON_CFG);
-    
+    g_object_get (G_OBJECT (battery->priv->conf),
+		  SHOW_TRAY_ICON_CFG, &show_icon,
+		  NULL);
+		  
     if ( show_icon == SHOW_ICON_ALWAYS )
     	visible = TRUE;
     else if ( show_icon == SHOW_ICON_WHEN_BATTERY_PRESENT )
@@ -248,9 +250,11 @@
 xfpm_battery_notify (XfpmBattery *battery)
 {
     gboolean notify;
-    
-    notify = xfpm_xfconf_get_property_bool (battery->priv->conf, GENERAL_NOTIFICATION_CFG);
-    
+
+    g_object_get (G_OBJECT (battery->priv->conf),
+		  GENERAL_NOTIFICATION_CFG, &notify,
+		  NULL);
+		  
     if ( notify )
     {
 	g_idle_add ((GSourceFunc) xfpm_battery_notify_idle, battery);
@@ -356,8 +360,12 @@
     gchar *tip;
     XfpmBatteryState state;
     const gchar *str;
-    guint critical_level = xfpm_xfconf_get_property_int (battery->priv->conf, CRITICAL_POWER_LEVEL );
+    guint critical_level;
     
+    g_object_get (G_OBJECT (battery->priv->conf),
+		  CRITICAL_POWER_LEVEL, &critical_level,
+		  NULL);
+    
     if ( !is_present )
     {
 	tip = g_strdup_printf ("%s %s", _get_battery_name(battery->priv->type), _("is not present"));
@@ -387,10 +395,14 @@
 {
     gchar *tip;
     const gchar *str;
-    guint critical_level = xfpm_xfconf_get_property_int (battery->priv->conf, CRITICAL_POWER_LEVEL );
-    
+    guint critical_level;
+
     XfpmBatteryState state = battery->priv->state;
     
+    g_object_get (G_OBJECT (battery->priv->conf),
+		  CRITICAL_POWER_LEVEL, &critical_level,
+		  NULL);
+    
     TRACE ("Start");
     
     if ( !is_present )
@@ -554,7 +566,7 @@
 }
 
 static void
-xfpm_battery_tray_icon_settings_changed (XfpmXfconf *conf, XfpmBattery *battery)
+xfpm_battery_tray_icon_settings_changed (GObject *obj, GParamSpec *spec, XfpmBattery *battery)
 {
     xfpm_battery_refresh_visible_icon (battery);
 }
@@ -661,7 +673,7 @@
     battery->priv->sig_3 = g_signal_connect (G_OBJECT(battery->priv->device), "battery-changed",
 					     G_CALLBACK(xfpm_battery_device_changed_cb), battery);
 		      
-    battery->priv->sig_2 = g_signal_connect (G_OBJECT(battery->priv->conf), "tray-icon-settings-changed",
+    battery->priv->sig_2 = g_signal_connect (G_OBJECT(battery->priv->conf), "notify::" SHOW_TRAY_ICON_CFG,
 					     G_CALLBACK(xfpm_battery_tray_icon_settings_changed), battery);
     
     return battery;

Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -200,8 +200,13 @@
 {
     GError *error = NULL;
     gboolean show_popup;
-    gboolean enable_brightness = xfpm_xfconf_get_property_bool (brg->priv->conf, ENABLE_BRIGHTNESS_CONTROL);
+    gboolean enable_brightness;
     
+    g_object_get (G_OBJECT (brg->priv->conf),
+		  ENABLE_BRIGHTNESS_CONTROL, &enable_brightness,
+		  SHOW_BRIGHTNESS_POPUP, &show_popup,
+		  NULL);
+    
     if ( enable_brightness == FALSE || brg->priv->brightness_in_hw)
 	goto signal;
 	
@@ -221,8 +226,6 @@
 	return;
     }
     
-    show_popup = xfpm_xfconf_get_property_bool (brg->priv->conf, SHOW_BRIGHTNESS_POPUP);
-    
     if ( show_popup )
 	g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
 }
@@ -232,8 +235,13 @@
 {
     GError *error = NULL;
     gboolean show_popup;
-    gboolean enable_brightness = xfpm_xfconf_get_property_bool (brg->priv->conf, ENABLE_BRIGHTNESS_CONTROL);
+    gboolean enable_brightness;
     
+    g_object_get (G_OBJECT (brg->priv->conf),
+		  ENABLE_BRIGHTNESS_CONTROL, &enable_brightness,
+		  SHOW_BRIGHTNESS_POPUP, &show_popup,
+		  NULL);
+    
     if ( enable_brightness == FALSE || brg->priv->brightness_in_hw)
 	goto signal;
 	
@@ -253,8 +261,6 @@
 	return;
     }
     
-    show_popup = xfpm_xfconf_get_property_bool (brg->priv->conf, SHOW_BRIGHTNESS_POPUP);
-    
     if ( show_popup )
 	g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
 }
@@ -381,8 +387,10 @@
 static void
 xfpm_brightness_get_user_timeouts (XfpmBrightnessHal *brg, guint16 *on_ac, guint16 *on_battery)
 {
-    *on_ac      = xfpm_xfconf_get_property_int (brg->priv->conf, BRIGHTNESS_ON_AC);
-    *on_battery = xfpm_xfconf_get_property_int (brg->priv->conf, BRIGHTNESS_ON_BATTERY);
+    g_object_get (G_OBJECT (brg->priv->conf),
+		  BRIGHTNESS_ON_AC, on_ac,
+		  BRIGHTNESS_ON_BATTERY, on_battery,
+		  NULL);
 }
 
 static void
@@ -414,10 +422,13 @@
 }
 
 static void
-xfpm_brightness_hal_settings_changed_cb (XfpmXfconf *conf, XfpmBrightnessHal *brg)
+xfpm_brightness_hal_settings_changed_cb (GObject *objm, GParamSpec *spec, XfpmBrightnessHal *brg)
 {
-    TRACE ("User settings changed");
-    xfpm_brightness_hal_set_timeouts (brg);
+    if ( g_str_has_prefix (spec->name, "brightness") )
+    {
+	TRACE ("User settings changed");
+	xfpm_brightness_hal_set_timeouts (brg);
+    }
 }
 
 static void
@@ -495,7 +506,7 @@
 			  G_CALLBACK(xfpm_brightness_hal_reset_cb), brg);
 			
 	brg->priv->sig[5] =
-	g_signal_connect (brg->priv->conf, "brightness-settings-changed", 
+	g_signal_connect (brg->priv->conf, "notify", 
 			  G_CALLBACK(xfpm_brightness_hal_settings_changed_cb), brg);
 			  
 	xfpm_brightness_hal_set_timeouts (brg);

Modified: xfce4-power-manager/trunk/src/xfpm-config.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-config.h	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-config.h	2009-06-20 16:40:44 UTC (rev 7620)
@@ -26,56 +26,49 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
+
 #if defined(__linux__)
 #define SYSTEM_IS_LINUX 1
 #endif
 
 G_BEGIN_DECLS
 
-/* Configuration */
-#define 	XFPM_CHANNEL_CFG            "xfce4-power-manager"
-#define 	CRITICAL_BATT_ACTION_CFG    "/xfce4-power-manager/critical-battery-action"
-#define         CRITICAL_POWER_LEVEL        "/xfce4-power-manager/critical-power-level"
+#define 	XFPM_CHANNEL_CFG             	"xfce4-power-manager"
 
-#define 	POWER_SAVE_ON_BATTERY       "/xfce4-power-manager/power-save-on-battery"
-#define         CPU_FREQ_CONTROL            "/xfce4-power-manager/cpu-freq-control"
-#define         LOCK_SCREEN_ON_SLEEP        "/xfce4-power-manager/lock-screen-suspend-hibernate"
+#define 	POWER_SAVE_ON_BATTERY        	"power-save-on-battery"
+#define         CPU_FREQ_CONTROL             	"enable-cpu-freq-control"
+#define         LOCK_SCREEN_ON_SLEEP         	"lock-screen-suspend-hibernate"
 
-#define 	LCD_BRIGHTNESS_CFG          "/xfce4-power-manager/lcd-brightness"
-#define         BRIGHTNESS_ON_AC            "/xfce4-power-manager/brightness-on-ac"
-#define         BRIGHTNESS_ON_BATTERY       "/xfce4-power-manager/brightness-on-battery"
+#define 	DPMS_ENABLED_CFG             	"dpms-enabled" 
+#define 	ON_AC_DPMS_SLEEP 	     	"dpms-on-ac-sleep"
+#define 	ON_AC_DPMS_OFF	     	     	"dpms-on-ac-off"
+#define 	ON_BATT_DPMS_SLEEP 	     	"dpms-on-battery-sleep"
+#define 	ON_BATT_DPMS_OFF	     	"dpms-on-battery-off"
+#define         DPMS_SLEEP_MODE		     	"dpms-sleep-mode"		
 
-#define 	LID_SWITCH_ON_AC_CFG        "/xfce4-power-manager/lid-action-on-ac"
-#define 	LID_SWITCH_ON_BATTERY_CFG   "/xfce4-power-manager/lid-action-on-battery"
-#define 	POWER_SWITCH_CFG            "/xfce4-power-manager/power-switch-action"
-#define         HIBERNATE_SWITCH_CFG        "/xfce4-power-manager/hibernate-switch-action"
-#define 	SLEEP_SWITCH_CFG            "/xfce4-power-manager/sleep-switch-action"
+#define 	GENERAL_NOTIFICATION_CFG     	"general-notification"
 
-#define         ON_AC_INACTIVITY_TIMEOUT    "/xfce4-power-manager/inactivity-on-ac"
-#define         ON_BATTERY_INACTIVITY_TIMEOUT "/xfce4-power-manager/inactivity-on-battery"
-#define         INACTIVITY_SLEEP_MODE       "/xfce4-power-manager/inactivity-sleep-mode"
+#define         ON_AC_INACTIVITY_TIMEOUT     	"inactivity-on-ac"
+#define         ON_BATTERY_INACTIVITY_TIMEOUT 	"inactivity-on-battery"
+#define         INACTIVITY_SLEEP_MODE        	"inactivity-sleep-mode"
 
-#define 	GENERAL_NOTIFICATION_CFG    "/xfce4-power-manager/general-notification"
+#define         BRIGHTNESS_ON_AC             	"brightness-on-ac"
+#define         BRIGHTNESS_ON_BATTERY        	"brightness-on-battery"
 
-#define 	BATT_STATE_NOTIFICATION_CFG "/xfce4-power-manager/battery-state-notification"  /* default TRUE */
+#define         CRITICAL_POWER_LEVEL        	"critical-power-level"
+#define         SHOW_BRIGHTNESS_POPUP        	"show-brightness-popup"
+#define         ENABLE_BRIGHTNESS_CONTROL       "change-brightness-on-key-events"
 
-#define 	SHOW_SLEEP_ERRORS_CFG       "/xfce4-power-manager/show-sleep-errors"
-#define 	SHOW_POWER_MANAGEMENT_ERROR "/xfce4-power-manager/show-power-management-error"
+#define 	SHOW_TRAY_ICON_CFG          	"show-tray-icon"
+#define 	CRITICAL_BATT_ACTION_CFG    	"critical-battery-action"
 
-#define 	SHOW_TRAY_ICON_CFG          "/xfce4-power-manager/show-tray-icon"              /* default 0 = always,1 = when charging or discharging, 2 = when battery is present */
+#define 	POWER_SWITCH_CFG            	"power-switch-action"
+#define         HIBERNATE_SWITCH_CFG        	"hibernate-switch-action"
+#define 	SLEEP_SWITCH_CFG            	"sleep-switch-action"
+#define 	LID_SWITCH_ON_AC_CFG        	"lid-action-on-ac"
+#define 	LID_SWITCH_ON_BATTERY_CFG   	"lid-action-on-battery"
 
-#ifdef HAVE_DPMS
-#define 	DPMS_ENABLED_CFG             "/xfce4-power-manager/dpms-enabled" 
-#define 	ON_BATT_DPMS_SLEEP 	     "/xfce4-power-manager/on-battery-dpms-sleep"
-#define 	ON_BATT_DPMS_OFF	     "/xfce4-power-manager/on-battery-dpms-off"
-#define 	ON_AC_DPMS_SLEEP 	     "/xfce4-power-manager/on-ac-dpms-sleep"
-#define 	ON_AC_DPMS_OFF	     	     "/xfce4-power-manager/on-ac-dpms-off"
-#define         DPMS_SLEEP_MODE		     "/xfce4-power-manager/dpms-sleep-mode"		/* 0= sleep, 1=suspend */
-#endif
-
-#define         ENABLE_BRIGHTNESS_CONTROL    "/xfce4-power-manager/change-brightness-on-key-events"
-#define         SHOW_BRIGHTNESS_POPUP        "/xfce4-power-manager/show-brightness-popup"
-
 G_END_DECLS
 
 #endif /* __XFPM_CONFIG_H */

Modified: xfce4-power-manager/trunk/src/xfpm-cpu.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-cpu.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-cpu.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -310,9 +310,16 @@
 static void
 xfpm_cpu_refresh (XfpmCpu *cpu)
 {
-    gboolean power_save = xfpm_xfconf_get_property_bool (cpu->priv->conf, POWER_SAVE_ON_BATTERY);
-    gboolean enable_cpu_freq = xfpm_xfconf_get_property_bool (cpu->priv->conf, CPU_FREQ_CONTROL);
+    gboolean power_save;
+    gboolean enable_cpu_freq;
+
+    TRACE ("start");
     
+    g_object_get (G_OBJECT (cpu->priv->conf),
+		  POWER_SAVE_ON_BATTERY, &power_save,
+		  CPU_FREQ_CONTROL, &enable_cpu_freq,
+		  NULL);
+    
     if ( enable_cpu_freq == FALSE )
 	return;
     
@@ -336,9 +343,10 @@
 }
 
 static void
-xfpm_cpu_power_save_settings_changed_cb (XfpmXfconf *conf, XfpmCpu *cpu)
+xfpm_cpu_settings_changed (GObject *obj, GParamSpec *spec, XfpmCpu *cpu)
 {
-    xfpm_cpu_refresh (cpu);
+    if ( !g_strcmp0 (spec->name, CPU_FREQ_CONTROL) || !g_strcmp0 (spec->name, POWER_SAVE_ON_BATTERY))
+	xfpm_cpu_refresh (cpu);
 }
 
 static void
@@ -369,10 +377,10 @@
 	
 	g_signal_connect (cpu->priv->adapter, "adapter-changed",
 			  G_CALLBACK(xfpm_cpu_adapter_changed_cb), cpu);
-			  
-	g_signal_connect (cpu->priv->conf, "power-save-settings-changed",
-			  G_CALLBACK(xfpm_cpu_power_save_settings_changed_cb), cpu);
 	
+	g_signal_connect (cpu->priv->conf, "notify",
+			  G_CALLBACK (xfpm_cpu_settings_changed), cpu);
+	
 	cpu->priv->on_battery = !xfpm_adapter_get_present (cpu->priv->adapter);
 	xfpm_cpu_refresh (cpu);
     }

Modified: xfce4-power-manager/trunk/src/xfpm-dpms.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-dpms.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -115,25 +115,40 @@
 static void
 xfpm_dpms_get_enabled (XfpmDpms *dpms, gboolean *dpms_enabled)
 {
-    *dpms_enabled = xfpm_xfconf_get_property_bool (dpms->priv->conf, DPMS_ENABLED_CFG);
+    g_object_get (G_OBJECT (dpms->priv->conf),
+		  DPMS_ENABLED_CFG, dpms_enabled,
+		  NULL);
 }
 
 static void
-xfpm_dpms_get_sleep_mode (XfpmDpms *dpms, gboolean *sleep_mode)
+xfpm_dpms_get_sleep_mode (XfpmDpms *dpms, gboolean *ret_standby_mode)
 {
-    *sleep_mode = xfpm_xfconf_get_property_bool (dpms->priv->conf, DPMS_SLEEP_MODE);
+    gchar *sleep_mode;
+    
+    g_object_get (G_OBJECT (dpms->priv->conf),
+		  DPMS_SLEEP_MODE, &sleep_mode,
+		  NULL);
+
+    if ( !g_strcmp0 (sleep_mode, "standby"))
+	*ret_standby_mode = TRUE;
+    else
+	*ret_standby_mode = FALSE;
+	
+    g_free (sleep_mode);
 }
 
 static void
-xfpm_dpms_get_configuration_timeouts (XfpmDpms *dpms, guint16 *sleep, guint16 *off )
+xfpm_dpms_get_configuration_timeouts (XfpmDpms *dpms, guint16 *ret_sleep, guint16 *ret_off )
 {
-    *sleep   = xfpm_xfconf_get_property_int  (dpms->priv->conf,
-					      dpms->priv->on_battery ? ON_BATT_DPMS_SLEEP :
-					      ON_AC_DPMS_SLEEP);
-					      
-    *off     = xfpm_xfconf_get_property_int  (dpms->priv->conf,
-					      dpms->priv->on_battery ? ON_BATT_DPMS_OFF :
-					      ON_AC_DPMS_OFF);
+    guint16 sleep, off;
+    
+    g_object_get (G_OBJECT (dpms->priv->conf),
+		  dpms->priv->on_battery ? ON_BATT_DPMS_SLEEP : ON_AC_DPMS_OFF, &sleep,
+		  dpms->priv->on_battery ? ON_BATT_DPMS_OFF : ON_AC_DPMS_OFF, &off,
+		  NULL);
+		  
+    *ret_sleep = sleep * 60;
+    *ret_off =  off * 60;
 }
 
 static void
@@ -179,10 +194,10 @@
 }
 
 static void
-xfpm_dpms_settings_changed_cb (XfpmXfconf *conf, XfpmDpms *dpms)
+xfpm_dpms_settings_changed_cb (GObject *obj, GParamSpec *spec, XfpmDpms *dpms)
 {
-    TRACE ("User settings changed");
-    xfpm_dpms_refresh (dpms);
+    if ( g_str_has_prefix (spec->name, "dpms"))
+	xfpm_dpms_refresh (dpms);
 }
 
 static void
@@ -233,7 +248,7 @@
 	g_signal_connect (dpms->priv->adapter, "adapter-changed",
 			  G_CALLBACK(xfpm_dpms_adapter_changed_cb), dpms);
 			  
-	g_signal_connect (dpms->priv->conf, "dpms-settings-changed",
+	g_signal_connect (dpms->priv->conf, "notify",
 			  G_CALLBACK (xfpm_dpms_settings_changed_cb), dpms);
 			  
 	dpms->priv->on_battery = !xfpm_adapter_get_present (dpms->priv->adapter);

Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -153,8 +153,9 @@
     gboolean lock_screen;
     const gchar *action = xfpm_int_to_shutdown_string (shutdown);
 
-    lock_screen =
-	xfpm_xfconf_get_property_bool (engine->priv->conf, LOCK_SCREEN_ON_SLEEP);
+    g_object_get (G_OBJECT (engine->priv->conf),
+		  LOCK_SCREEN_ON_SLEEP, &lock_screen,
+		  NULL);
 
     if (xfpm_strequal (action, "Nothing"))
     {
@@ -204,10 +205,29 @@
 }
 
 static void
+xfpm_engine_lid_event (XfpmEngine *engine)
+{
+    XfpmLidTriggerAction action;
+    
+    g_object_get (G_OBJECT (engine->priv->conf),
+		  engine->priv->on_battery ? LID_SWITCH_ON_BATTERY_CFG : LID_SWITCH_ON_AC_CFG, &action,
+		  NULL);
+		  
+    XFPM_DEBUG_ENUM ("LID close event", action, XFPM_TYPE_LID_TRIGGER_ACTION);
+    
+    if ( action == LID_TRIGGER_LOCK_SCREEN )
+	xfpm_lock_screen ();
+    else 
+	xfpm_engine_shutdown_request (engine, action, FALSE);
+}
+
+static void
 xfpm_engine_button_pressed_cb (XfpmButton *button,
 			       XfpmButtonKey type, XfpmEngine * engine)
 {
-    XfpmShutdownRequest shutdown;
+    XfpmShutdownRequest req = XFPM_DO_NOTHING;
+    
+    
     XFPM_DEBUG_ENUM ("Received button press event", type, XFPM_TYPE_BUTTON_KEY);
   
     if ( engine->priv->inhibited )
@@ -219,37 +239,41 @@
     if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
 	return;
     
+    if ( type == BUTTON_LID_CLOSED )
+    {
+	xfpm_engine_lid_event (engine);
+	return;
+    }
+    
     if ( type == BUTTON_POWER_OFF )
     {
-	shutdown = xfpm_xfconf_get_property_enum (engine->priv->conf,
-						  POWER_SWITCH_CFG);
+	g_object_get (G_OBJECT (engine->priv->conf),
+		      POWER_SWITCH_CFG, &req,
+		      NULL);
     }
     else if ( type == BUTTON_SLEEP )
     {
-	shutdown = xfpm_xfconf_get_property_enum (engine->priv->conf,
-						  SLEEP_SWITCH_CFG);
+	g_object_get (G_OBJECT (engine->priv->conf),
+		      POWER_SWITCH_CFG, &req,
+		      NULL);
     }
     else if ( type == BUTTON_HIBERNATE )
     {
-	shutdown = xfpm_xfconf_get_property_enum (engine->priv->conf,
-						  HIBERNATE_SWITCH_CFG);
+	g_object_get (G_OBJECT (engine->priv->conf),
+		      POWER_SWITCH_CFG, &req,
+		      NULL);
     }
-    else if ( type == BUTTON_LID_CLOSED )
-    {
-	shutdown = xfpm_xfconf_get_property_enum (engine->priv->conf,
-					          engine->priv->on_battery ?
-					          LID_SWITCH_ON_BATTERY_CFG :
-					          LID_SWITCH_ON_AC_CFG);
-    }
     else
     {
 	g_return_if_reached ();
     }
+
+    XFPM_DEBUG_ENUM ("Shutdown request : ", req, XFPM_TYPE_SHUTDOWN_REQUEST);
 	
-    if ( shutdown == XFPM_ASK )
+    if ( req == XFPM_ASK )
 	xfpm_shutdown_ask (engine->priv->shutdown);
     else
-	xfpm_engine_shutdown_request (engine, shutdown, FALSE);
+	xfpm_engine_shutdown_request (engine, req, FALSE);
 }
 
 static void
@@ -363,8 +387,10 @@
 {
     guint on_ac, on_battery;
     
-    on_ac = xfpm_xfconf_get_property_int (engine->priv->conf, ON_AC_INACTIVITY_TIMEOUT );
-    on_battery = xfpm_xfconf_get_property_int (engine->priv->conf, ON_BATTERY_INACTIVITY_TIMEOUT );
+    g_object_get (G_OBJECT (engine->priv->conf),
+		  ON_AC_INACTIVITY_TIMEOUT, &on_ac,
+		  ON_BATTERY_INACTIVITY_TIMEOUT, &on_battery,
+		  NULL);
     
 #ifdef DEBUG
     if ( on_ac == 30 )
@@ -399,7 +425,8 @@
 static void
 xfpm_engine_alarm_timeout_cb (XfpmIdle *idle, guint id, XfpmEngine *engine)
 {
-    gboolean sleep_mode;
+    XfpmShutdownRequest req = XFPM_DO_NOTHING;
+    gchar *sleep_mode;
     gboolean saver;
     
     TRACE ("Alarm inactivity timeout id %d", id);
@@ -418,21 +445,29 @@
 	return;
     }
     
-    sleep_mode = xfpm_xfconf_get_property_bool (engine->priv->conf, INACTIVITY_SLEEP_MODE);
+    g_object_get (G_OBJECT (engine->priv->conf),
+		  INACTIVITY_SLEEP_MODE, &sleep_mode,
+		  NULL);
+		  
+    if ( !g_strcmp0 (sleep_mode, "Suspend") )
+	req = XFPM_DO_SUSPEND;
+    else
+	req = XFPM_DO_HIBERNATE;
+	
+    g_free (sleep_mode);
 
     if ( id == TIMEOUT_INACTIVITY_ON_AC && engine->priv->on_battery == FALSE )
-	xfpm_engine_shutdown_request (engine, sleep_mode == TRUE ? XFPM_DO_SUSPEND : XFPM_DO_HIBERNATE, FALSE);
+	xfpm_engine_shutdown_request (engine, req, FALSE);
     else if ( id ==  TIMEOUT_INACTIVITY_ON_BATTERY && engine->priv->is_laptop && engine->priv->on_battery  )
-	xfpm_engine_shutdown_request (engine, sleep_mode == TRUE ? XFPM_DO_SUSPEND : XFPM_DO_HIBERNATE, FALSE);
+	xfpm_engine_shutdown_request (engine, req, FALSE);
     
 }
 
 static void
-xfpm_engine_inactivity_timeout_changed_cb (XfpmXfconf *conf, XfpmEngine *engine)
+xfpm_engine_settings_changed_cb (GObject *obj, GParamSpec *spec, XfpmEngine *engine)
 {
-    TRACE ("Timeouts alarm changed");
-    
-    xfpm_engine_set_inactivity_timeouts (engine);
+    if ( g_str_has_prefix (spec->name, "inactivity") )
+	xfpm_engine_set_inactivity_timeouts (engine);
 }
 
 static void
@@ -510,17 +545,11 @@
     g_signal_connect (engine->priv->idle, "alarm-timeout",
 		      G_CALLBACK (xfpm_engine_alarm_timeout_cb), engine);
 		      
-    g_signal_connect (engine->priv->conf, "inactivity-timeout-changed",
-		      G_CALLBACK (xfpm_engine_inactivity_timeout_changed_cb), engine);
+    g_signal_connect (engine->priv->conf, "notify",
+		      G_CALLBACK (xfpm_engine_settings_changed_cb), engine);
 		    
     xfpm_engine_set_inactivity_timeouts (engine);
     
-    /*
-     * We load other objects in idle, in princilpe we shouldn't do that
-     * but it turns out that some time for some reason the HAL brightness 
-     * object is failing to get correct brightness num_levels, and the idle
-     * seems to fix this.
-     */
     g_idle_add ((GSourceFunc)xfpm_engine_load_all, engine);
 }
 

Modified: xfce4-power-manager/trunk/src/xfpm-enum-glib.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-enum-glib.h	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-enum-glib.h	2009-06-20 16:40:44 UTC (rev 7620)
@@ -32,13 +32,22 @@
     XFPM_DO_NOTHING,
     XFPM_DO_SUSPEND,
     XFPM_DO_HIBERNATE,
-    XFPM_DO_SHUTDOWN,
-    XFPM_ASK
+    XFPM_ASK,
+    XFPM_DO_SHUTDOWN
     
 } XfpmShutdownRequest;
 
 typedef enum
 {
+    LID_TRIGGER_NOTHING,
+    LID_TRIGGER_SUSPEND,
+    LID_TRIGGER_HIBERNATE,
+    LID_TRIGGER_LOCK_SCREEN,
+    
+} XfpmLidTriggerAction;
+
+typedef enum
+{
     BATTERY_FULLY_CHARGED,
     BATTERY_NOT_FULLY_CHARGED,
     BATTERY_IS_CHARGING,
@@ -61,6 +70,15 @@
     
 } XfpmButtonKey;
 
+typedef enum
+{
+    SHOW_ICON_ALWAYS,
+    SHOW_ICON_WHEN_BATTERY_PRESENT,
+    SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING
+    
+} XfpmShowIcon;
+
+
 G_END_DECLS
 
 #endif /* __XFPM_ENUM_GLIB_H */

Modified: xfce4-power-manager/trunk/src/xfpm-enum.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-enum.h	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-enum.h	2009-06-20 16:40:44 UTC (rev 7620)
@@ -40,14 +40,6 @@
 
 typedef enum
 {
-    SHOW_ICON_ALWAYS,
-    SHOW_ICON_WHEN_BATTERY_PRESENT,
-    SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING
-    
-} XfpmShowIcon;
-
-typedef enum
-{
     LID_KEY   		= (1 << 0),
     BRIGHTNESS_KEY	= (1 << 1),
     SLEEP_KEY 		= (1 << 2),

Modified: xfce4-power-manager/trunk/src/xfpm-supply.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-supply.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-supply.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -45,6 +45,7 @@
 #include "xfpm-config.h"
 #include "xfpm-shutdown.h"
 #include "xfpm-inhibit.h"
+#include "xfpm-debug.h"
 #include "xfpm-marshal.h"
 
 static void xfpm_supply_finalize   (GObject *object);
@@ -119,9 +120,9 @@
 }
 
 static void 
-xfpm_supply_tray_settings_changed (XfpmSupply *supply)
+xfpm_supply_tray_settings_changed (GObject *obj, GParamSpec *spec, XfpmSupply *supply)
 {
-	xfpm_supply_refresh_tray_icon (supply);
+    xfpm_supply_refresh_tray_icon (supply);
 }
 
 static void
@@ -183,8 +184,8 @@
     g_signal_connect (supply->priv->inhibit, "has-inhibit-changed",
 		      G_CALLBACK (xfpm_supply_has_inhibit_changed_cb), supply);
 			  
-    g_signal_connect_swapped (supply->priv->conf, "tray_icon_settings_changed",
-			      G_CALLBACK (xfpm_supply_tray_settings_changed), supply);
+    g_signal_connect (supply->priv->conf, "notify::" SHOW_TRAY_ICON_CFG,
+		      G_CALLBACK (xfpm_supply_tray_settings_changed), supply);
 }
 
 static void
@@ -213,9 +214,13 @@
 static void
 xfpm_supply_refresh_tray_icon (XfpmSupply *supply)
 {
-    guint8 show_icon;
+    XfpmShowIcon show_icon;
     
-    show_icon = xfpm_xfconf_get_property_enum (supply->priv->conf, SHOW_TRAY_ICON_CFG);
+    g_object_get (G_OBJECT (supply->priv->conf),
+		  SHOW_TRAY_ICON_CFG, &show_icon,
+		  NULL);
+		  
+    XFPM_DEBUG_ENUM ("Tray icon configuration: ", show_icon, XFPM_TYPE_SHOW_ICON);
     
     if ( show_icon == SHOW_ICON_ALWAYS )
     {
@@ -256,8 +261,10 @@
     if ( !list)
 	return FALSE;
 	
-    low_power_level = xfpm_xfconf_get_property_int (supply->priv->conf, CRITICAL_POWER_LEVEL);
-     
+    g_object_get (G_OBJECT (supply->priv->conf),
+		  CRITICAL_POWER_LEVEL, &low_power_level,
+		  NULL);
+		  
     for ( i=0; i< g_list_length(list); i++)
     {
 	XfpmBattery *battery = NULL;
@@ -282,18 +289,6 @@
 }
 
 static void
-xfpm_supply_process_critical_action (XfpmSupply *supply)
-{
-     XfpmShutdownRequest critical_action = 
-	xfpm_xfconf_get_property_enum (supply->priv->conf, CRITICAL_BATT_ACTION_CFG);
-
-    if ( G_UNLIKELY (critical_action == XFPM_DO_SUSPEND ) )
-	return;
-	
-    g_signal_emit (G_OBJECT(supply ), signals[SHUTDOWN_REQUEST], 0, TRUE, critical_action);
-}
-
-static void
 _notify_action_callback (NotifyNotification *n, gchar *action, XfpmSupply *supply)
 {
     if ( xfpm_strequal(action, "shutdown") )
@@ -377,12 +372,32 @@
 }
 
 static void
+xfpm_supply_process_critical_action (XfpmSupply *supply, XfpmBattery *battery, XfpmShutdownRequest critical_action)
+{
+    if ( critical_action == XFPM_ASK )
+    {
+	if ( supply->priv->inhibited )
+	    xfpm_supply_show_critical_action_inhibited (supply, battery);
+	else
+	    xfpm_supply_show_critical_action (supply, battery);
+	    
+	return;
+    }
+	
+    g_signal_emit (G_OBJECT(supply ), signals[SHUTDOWN_REQUEST], 0, TRUE, critical_action);
+}
+
+static void
 xfpm_supply_handle_primary_critical (XfpmSupply *supply, XfpmBattery *battery)
 {
-    XfpmShutdownRequest critical_action = 
-	xfpm_xfconf_get_property_enum (supply->priv->conf, CRITICAL_BATT_ACTION_CFG);
+    XfpmShutdownRequest critical_action;
     
+    g_object_get (G_OBJECT (supply),
+	          CRITICAL_BATT_ACTION_CFG, &critical_action,
+		  NULL);
+
     TRACE ("System is running on low power");
+    XFPM_DEBUG_ENUM ("Critical battery action", critical_action, XFPM_TYPE_SHUTDOWN_REQUEST);
     
     if ( supply->priv->inhibited )
     {
@@ -394,7 +409,7 @@
     }
     else
     {
-	xfpm_supply_process_critical_action (supply);
+	xfpm_supply_process_critical_action (supply, battery, critical_action);
     }
 }
 
@@ -507,9 +522,11 @@
 xfpm_supply_save_power (XfpmSupply *supply)
 {
     gboolean save_power;
+
+    g_object_get (G_OBJECT (supply->priv->conf),
+		  POWER_SAVE_ON_BATTERY, &save_power,
+		  NULL);
     
-    save_power = xfpm_xfconf_get_property_bool (supply->priv->conf, POWER_SAVE_ON_BATTERY);
-    
     if ( save_power == FALSE )
 	hal_power_unset_power_save (supply->priv->power);
     else if ( supply->priv->adapter_present )

Modified: xfce4-power-manager/trunk/src/xfpm-tray-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-tray-icon.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-tray-icon.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -157,6 +157,10 @@
     const gchar *message;
     gboolean lock_screen;
     gboolean ret;
+
+    g_object_get (G_OBJECT (tray->priv->conf),
+		  LOCK_SCREEN_ON_SLEEP, &lock_screen,
+		  NULL);
     
     message = tray->priv->inhibited ? 
 	     _("An application is currently disabling the automatic sleep,"
@@ -171,8 +175,6 @@
     
     if ( ret ) 
     {
-	lock_screen = xfpm_xfconf_get_property_bool (tray->priv->conf, LOCK_SCREEN_ON_SLEEP);
-	    
 	xfpm_shutdown_add_callback (tray->priv->shutdown, 
 				    (GSourceFunc) xfpm_tray_icon_do_hibernate, 
 				    lock_screen,
@@ -187,6 +189,10 @@
     gboolean lock_screen;
     gboolean ret;
     
+    g_object_get (G_OBJECT (tray->priv->conf),
+		  LOCK_SCREEN_ON_SLEEP, &lock_screen,
+		  NULL);
+    
     message = tray->priv->inhibited ? 
 	     _("An application is currently disabling the automatic sleep,"
 	      " doing this action now may damage the working state of this application,"
@@ -200,13 +206,10 @@
     
     if ( ret ) 
     {
-	lock_screen = xfpm_xfconf_get_property_bool (tray->priv->conf, LOCK_SCREEN_ON_SLEEP);
-	
 	xfpm_shutdown_add_callback (tray->priv->shutdown, 
 				    (GSourceFunc) xfpm_tray_icon_do_suspend, 
 				    lock_screen,
 				    tray);
-				    
     }
 }
 

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-06-20 16:40:44 UTC (rev 7620)
@@ -38,6 +38,7 @@
 #include "xfpm-config.h"
 #include "xfpm-enum-glib.h"
 #include "xfpm-enum.h"
+#include "xfpm-enum-types.h"
 
 static void xfpm_xfconf_finalize   (GObject *object);
 
@@ -49,482 +50,133 @@
 struct XfpmXfconfPrivate
 {
     XfconfChannel 	*channel;
-    
-    XfpmShutdownRequest  power_button;
-    XfpmShutdownRequest  hibernate_button;
-    XfpmShutdownRequest  sleep_button;
-    XfpmShutdownRequest  lid_button_ac;
-    XfpmShutdownRequest  lid_button_battery;
-    XfpmShutdownRequest  critical_action;
-    
-    gboolean             lock_screen;
-#ifdef HAVE_DPMS
-    gboolean       	 dpms_enabled;
-    
-    guint16        	 dpms_sleep_on_battery;
-    guint16        	 dpms_off_on_battery;
-    guint16        	 dpms_sleep_on_ac;
-    guint16        	 dpms_off_on_ac;
-    
-    gboolean         	 sleep_dpms_mode; /*TRUE = standby FALSE = suspend*/
-#endif
-    gboolean             power_save_on_battery;
-#ifdef SYSTEM_IS_LINUX
-    gboolean             cpu_freq_control;
-#endif
-    
-    guint16              brightness_on_ac_timeout;
-    guint16              brightness_on_battery_timeout;
-    
-    XfpmShowIcon     	 show_icon;
-    guint                critical_level;
-    gboolean             general_notification;
-    
-    guint              	 inactivity_on_ac;
-    guint                inactivity_on_battery;
-    gboolean             sleep_inactivity; /* TRUE = suspend FALSE = hibernate*/
-    gboolean             enable_brightness;
-    gboolean		 show_brightness_popup;
+    GValue              *values;
 };
 
 enum
 {
-    DPMS_SETTINGS_CHANGED,
-    POWER_SAVE_SETTINGS_CHANGED,
-    BRIGHTNESS_SETTINGS_CHANGED,
-    TRAY_ICON_SETTINGS_CHANGED,
-    INACTIVITY_TIMEOUT_CHANGED,
-    LAST_SIGNAL
+    PROP_0,
+    PROP_GENERAL_NOTIFICATION,
+    PROP_LOCK_SCREEN_ON_SLEEP,
+    PROP_POWER_SAVE_ON_BATTERY,
+    PROP_ENABLE_CPU_FREQ,
+    PROP_CRITICAL_LEVEL,
+    PROP_SHOW_BRIGHTNESS_POPUP,
+    PROP_ENABLE_BRIGHTNESS,
+    PROP_TRAY_ICON,
+    PROP_CRITICAL_BATTERY_ACTION,
+    PROP_POWER_BUTTON,
+    PROP_HIBERNATE_BUTTON,
+    PROP_SLEEP_BUTTON,
+    PROP_LID_ACTION_ON_AC,
+    PROP_LID_ACTION_ON_BATTERY,
+#ifdef HAVE_DPMS
+    PROP_ENABLE_DPMS,
+    PROP_DPMS_SLEEP_ON_AC,
+    PROP_DPMS_OFF_ON_AC,
+    PROP_DPMS_SLEEP_ON_BATTERY,
+    PROP_DPMS_OFF_ON_BATTERY,
+    PROP_DPMS_SLEEP_MODE,
+#endif
+    PROP_IDLE_ON_AC,
+    PROP_IDLE_ON_BATTERY,
+    PROP_IDLE_SLEEP_MODE,
+    PROP_DIM_ON_AC_TIMEOUT,
+    PROP_DIM_ON_BATTERY_TIMEOUT,
+    N_PROPERTIES
 };
 
-static guint signals[LAST_SIGNAL] = { 0 };
-
 G_DEFINE_TYPE(XfpmXfconf, xfpm_xfconf, G_TYPE_OBJECT)
 
-static void
-xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
-				 GValue *value, XfpmXfconf *conf)
+static void 
+xfpm_xfconf_set_property (GObject *object,
+			  guint prop_id,
+			  const GValue *value,
+			  GParamSpec *pspec)
 {
-    const gchar *str;
-    gint val;
+    XfpmXfconf *conf;
+    GValue *dst;
     
-    if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
-        return;
-
-    TRACE("Property modified: %s\n", property);
+    conf = XFPM_XFCONF (object);
     
-    if ( xfpm_strequal (property, SLEEP_SWITCH_CFG) )
+    dst = conf->priv->values + prop_id;
+    
+    if ( !G_IS_VALUE (dst) )
     {
-	str = g_value_get_string (value);
- 	val = xfpm_shutdown_string_to_int (str); 
-
-	if ( G_UNLIKELY (val == 3) )
-	{
-	    g_warning ("Invalid value %s for property %s, using default\n", str, SLEEP_SWITCH_CFG);
-	    conf->priv->sleep_button = XFPM_DO_NOTHING;
-	}
-	else
-	    conf->priv->sleep_button = val;
+	g_value_init (dst, pspec->value_type);
+	g_param_value_set_default (pspec, dst);
     }
-    else if ( xfpm_strequal (property, GENERAL_NOTIFICATION_CFG) )
+    
+    if ( g_param_values_cmp (pspec, value, dst) != 0)
     {
-	conf->priv->general_notification = g_value_get_boolean (value);
+	g_value_copy (value, dst);
+	g_object_notify (object, pspec->name);
     }
-    else if ( xfpm_strequal (property, POWER_SWITCH_CFG ) )
+}
+
+static void 
+xfpm_xfconf_get_property (GObject *object,
+			  guint prop_id,
+			  GValue *value,
+			  GParamSpec *pspec)
+{
+    XfpmXfconf *conf;
+    GValue *src;
+    
+    conf = XFPM_XFCONF (object);
+    
+    src = conf->priv->values + prop_id;
+    
+    if ( G_VALUE_HOLDS (src, pspec->value_type) )
+	g_value_copy (src, value);
+    else
+	g_param_value_set_default (pspec, value);
+}
+
+static void
+xfpm_xfconf_load (XfpmXfconf *conf, gboolean channel_valid)
+{
+    GParamSpec **specs;
+    GValue value = { 0, };
+    guint nspecs;
+    guint i;
+    
+    specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (conf), &nspecs);
+    
+    for ( i = 0; i < nspecs; i++)
     {
-	str = g_value_get_string (value);
-	val = xfpm_shutdown_string_to_int (str);
-	if ( G_UNLIKELY (val == -1) )
-	{
-	    g_warning ("Invalid value %s fpr property %s, using default\n", str, POWER_SWITCH_CFG);
-	    conf->priv->power_button = XFPM_DO_NOTHING;
-	}
-	else
-	    conf->priv->power_button = xfpm_shutdown_string_to_int (str);
-    }
-    else if ( xfpm_strequal (property, HIBERNATE_SWITCH_CFG ) )
-    {
-	str = g_value_get_string (value);
-	val = xfpm_shutdown_string_to_int (str);
-	if ( G_UNLIKELY (val == -1) )
-	{
-	    g_warning ("Invalid value %s fpr property %s, using default\n", str, HIBERNATE_SWITCH_CFG);
-	    conf->priv->hibernate_button = XFPM_DO_NOTHING;
-	}
-	else
-	    conf->priv->hibernate_button = xfpm_shutdown_string_to_int (str);
-    }
-    else if ( xfpm_strequal (property, LID_SWITCH_ON_AC_CFG) )
-    {
-	str = g_value_get_string (value);
- 	val = xfpm_shutdown_string_to_int (str);
-	if ( G_UNLIKELY (val == -1 || val == 3) )
-	{
-	    g_warning ("Invalid value %s for property %s, using default\n", str, LID_SWITCH_ON_AC_CFG);
-	    conf->priv->lid_button_ac = XFPM_DO_NOTHING;
-	}
-	else
-	    conf->priv->lid_button_ac = val;
-    }
-    else if ( xfpm_strequal (property, LID_SWITCH_ON_BATTERY_CFG) )
-    {
-	str = g_value_get_string (value);
- 	val = xfpm_shutdown_string_to_int (str); 
-	if ( G_UNLIKELY (val == -1 || val == 3) )
-	{
-	    g_warning ("Invalid value %s for property %s, using default\n", str, LID_SWITCH_ON_BATTERY_CFG);
-	    conf->priv->lid_button_battery = XFPM_DO_NOTHING;
-	}
-	else
-	    conf->priv->lid_button_battery = val;
-    }
-    else if ( xfpm_strequal (property, LOCK_SCREEN_ON_SLEEP ) )
-    {
-	conf->priv->lock_screen = g_value_get_boolean (value);
-    }
-#ifdef HAVE_DPMS
-    else if ( xfpm_strequal (property, DPMS_ENABLED_CFG) )
-    {
-	conf->priv->dpms_enabled = g_value_get_boolean (value);
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, ON_AC_DPMS_SLEEP) )
-    {
-	conf->priv->dpms_sleep_on_ac = MIN(3600, g_value_get_uint (value) * 60);
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, ON_AC_DPMS_OFF) )
-    {
-	conf->priv->dpms_off_on_ac = MIN(3600, g_value_get_uint (value) * 60);
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, ON_BATT_DPMS_SLEEP) )
-    {
-	conf->priv->dpms_sleep_on_battery = MIN(3600, g_value_get_uint (value) * 60);
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, ON_BATT_DPMS_OFF) )
-    {
-	conf->priv->dpms_off_on_battery = MIN (3600, g_value_get_uint (value) * 60);
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, DPMS_SLEEP_MODE) )
-    {
-	str = g_value_get_string (value);
-	if ( xfpm_strequal (str, "sleep" ) )
-	{
-	    conf->priv->sleep_dpms_mode = TRUE;
-	}
-	else if ( xfpm_strequal (str, "suspend") )
-	{
-	    conf->priv->sleep_dpms_mode = FALSE;
-	}
-	else
-	{
-	    g_critical("Invalid value %s for property %s\n", str, DPMS_SLEEP_MODE);
-	    conf->priv->sleep_dpms_mode = TRUE;
-	}
-	g_signal_emit (G_OBJECT(conf), signals[DPMS_SETTINGS_CHANGED], 0);
-    }
-#endif /* HAVE_DPMS */
-    else if ( xfpm_strequal(property, POWER_SAVE_ON_BATTERY) )
-    {
-	conf->priv->power_save_on_battery = g_value_get_boolean (value);
-	g_signal_emit (G_OBJECT(conf), signals[POWER_SAVE_SETTINGS_CHANGED], 0);
-    }
-#ifdef SYSTEM_IS_LINUX
-    else if ( xfpm_strequal(property, CPU_FREQ_CONTROL) )
-    {
-	conf->priv->cpu_freq_control = g_value_get_boolean (value);
-	g_signal_emit (G_OBJECT(conf), signals[POWER_SAVE_SETTINGS_CHANGED], 0);
-    }
-#endif
-    else if ( xfpm_strequal (property, BRIGHTNESS_ON_AC ) )
-    {
-	conf->priv->brightness_on_ac_timeout = g_value_get_uint (value);
+	gchar *prop_name;
+	prop_name = g_strjoin ("/", specs[i]->name, NULL);
 	
-	if ( G_UNLIKELY (conf->priv->brightness_on_ac_timeout > 120 || conf->priv->brightness_on_ac_timeout < 9 ))
+	if (channel_valid )
 	{
-	    g_warning ("Value %d for %s is out of range", conf->priv->brightness_on_ac_timeout, BRIGHTNESS_ON_AC );
-	    conf->priv->brightness_on_ac_timeout = 9;
+	    if ( !xfconf_channel_get_property (conf->priv->channel, prop_name, &value) )
+	    {
+		g_value_init (&value, specs[i]->value_type);
+		g_param_value_set_default (specs[i], &value);
+	    }
 	}
-	g_signal_emit (G_OBJECT(conf), signals[BRIGHTNESS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, BRIGHTNESS_ON_BATTERY ) )
-    {
-	conf->priv->brightness_on_battery_timeout = g_value_get_uint (value);
-	
-	if ( G_UNLIKELY (conf->priv->brightness_on_battery_timeout > 120 || conf->priv->brightness_on_battery_timeout < 9 ))
-	{
-	    g_warning ("Value %d for %s is out of range", conf->priv->brightness_on_battery_timeout, BRIGHTNESS_ON_BATTERY );
-	    conf->priv->brightness_on_battery_timeout = 9;
-	}
-	g_signal_emit (G_OBJECT(conf), signals[BRIGHTNESS_SETTINGS_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, CRITICAL_BATT_ACTION_CFG) )
-    {
-	str = g_value_get_string (value);
-	val = xfpm_shutdown_string_to_int (str);
-	if ( G_UNLIKELY (val == -1 || val == 1 ))
-	{
-	    g_warning ("Invalid value %s for property %s, using default\n", str, CRITICAL_BATT_ACTION_CFG);
-	    conf->priv->critical_action = XFPM_DO_NOTHING;
-	}
 	else
-	    conf->priv->critical_action = val;
-    }
-    else if ( xfpm_strequal (property, SHOW_TRAY_ICON_CFG) )
-    {
-	conf->priv->show_icon = g_value_get_uint (value);
-	g_signal_emit (G_OBJECT(conf), signals[TRAY_ICON_SETTINGS_CHANGED], 0 );
-    }
-    else if ( xfpm_strequal( property, CRITICAL_POWER_LEVEL) )
-    {
-	val = g_value_get_uint (value);
-	if ( G_UNLIKELY (val > 20) )
 	{
-	    g_warning ("Value %d for property %s is out of range \n", val, CRITICAL_POWER_LEVEL);
-	    conf->priv->critical_level = 10;
+	    g_param_value_set_default (specs[i], &value);
 	}
-	else 
-	    conf->priv->critical_level = val;
+	g_free (prop_name);
+	g_object_set_property (G_OBJECT (conf), specs[i]->name, &value);
+	g_value_unset (&value);
     }
-    else if ( xfpm_strequal (property, ON_AC_INACTIVITY_TIMEOUT ) )
-    {
-	val = g_value_get_uint (value);
-	conf->priv->inactivity_on_ac = val;
-	if ( G_UNLIKELY (conf->priv->inactivity_on_ac < 30 ) )
-	{
-	    g_print ("Invalid value for property %s", ON_AC_INACTIVITY_TIMEOUT);
-	    conf->priv->inactivity_on_ac = 30;
-	}
-	g_signal_emit (G_OBJECT (conf), signals [INACTIVITY_TIMEOUT_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, ON_BATTERY_INACTIVITY_TIMEOUT ) )
-    {
-	val = g_value_get_uint (value);
-	conf->priv->inactivity_on_battery = val;
-	if ( G_UNLIKELY (conf->priv->inactivity_on_battery < 30 ) )
-	{
-	    g_print ("Invalid value for property %s", ON_BATTERY_INACTIVITY_TIMEOUT);
-	    conf->priv->inactivity_on_battery = 30;
-	}
-	g_signal_emit (G_OBJECT (conf), signals [INACTIVITY_TIMEOUT_CHANGED], 0);
-    }
-    else if ( xfpm_strequal (property, INACTIVITY_SLEEP_MODE ) )
-    {
-	str = g_value_get_string (value);
-	
-	if ( xfpm_strequal (str, "Suspend"))
-	{
-	    conf->priv->sleep_inactivity = TRUE;
-	}
-	else if ( xfpm_strequal (str, "Hibernate") )
-	{
-	    conf->priv->sleep_inactivity = FALSE;
-	}
-	else
-	{
-	    g_critical("Invalid value %s for property %s\n", str, INACTIVITY_SLEEP_MODE);
-	    conf->priv->sleep_inactivity = TRUE;
-	}
-    }
-    else if ( xfpm_strequal (property, ENABLE_BRIGHTNESS_CONTROL) )
-	conf->priv->enable_brightness = g_value_get_boolean (value);
-    else if ( xfpm_strequal (property, SHOW_BRIGHTNESS_POPUP ) )
-	conf->priv->show_brightness_popup = g_value_get_boolean (value);
-    else
-	g_warn_if_reached ();
 }
 
 static void
-xfpm_xfconf_load_configuration (XfpmXfconf *conf)
+xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
+				 GValue *value, XfpmXfconf *conf)
 {
-    gchar *str;
-    gint val;
-    
-    str = xfconf_channel_get_string (conf->priv->channel, SLEEP_SWITCH_CFG, "Nothing");
-    val = xfpm_shutdown_string_to_int (str);
-    
-    if ( G_UNLIKELY (val == -1 || val == 3) )
-    {
-	g_warning ("Invalid value %s for property %s, using default\n", str, SLEEP_SWITCH_CFG);
-	conf->priv->sleep_button = XFPM_DO_NOTHING;
-	xfconf_channel_set_string (conf->priv->channel, SLEEP_SWITCH_CFG, "Nothing");
-    }
-    else conf->priv->sleep_button = val;
-    
-    g_free (str);
-    
-    str = xfconf_channel_get_string (conf->priv->channel, POWER_SWITCH_CFG, "Nothing");
-    val = xfpm_shutdown_string_to_int (str);
-    
-    if ( G_UNLIKELY (val == -1 ) )
-    {
-	g_warning ("Invalid value %s for property %s, using default\n", str, SLEEP_SWITCH_CFG);
-	conf->priv->power_button = XFPM_DO_NOTHING;
-	xfconf_channel_set_string (conf->priv->channel, POWER_SWITCH_CFG, "Nothing");
-    }
-    else conf->priv->power_button = val;
-    
-    g_free (str);
-    
-    str = xfconf_channel_get_string (conf->priv->channel, HIBERNATE_SWITCH_CFG, "Nothing");
-    val = xfpm_shutdown_string_to_int (str);
-    
-    if ( G_UNLIKELY (val == -1 ) )
-    {
-	g_warning ("Invalid value %s for property %s, using default\n", str, HIBERNATE_SWITCH_CFG);
-	conf->priv->hibernate_button = XFPM_DO_NOTHING;
-	xfconf_channel_set_string (conf->priv->channel, HIBERNATE_SWITCH_CFG, "Nothing");
-    }
-    else conf->priv->hibernate_button = val;
-    
-    g_free (str);
-    
-    conf->priv->general_notification = xfconf_channel_get_bool (conf->priv->channel, GENERAL_NOTIFICATION_CFG, TRUE);
-    
-    str = xfconf_channel_get_string (conf->priv->channel, LID_SWITCH_ON_AC_CFG, "Nothing");
-    val = xfpm_shutdown_string_to_int (str);
+    /*FIXME: Set default for this key*/
+    if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
+        return;
 
-    if ( G_UNLIKELY (val == -1 || val == 3) )
-    {
-	g_warning ("Invalid value %s for property %s, using default\n", str, LID_SWITCH_ON_AC_CFG);
-	conf->priv->lid_button_ac = XFPM_DO_NOTHING;
-	xfconf_channel_set_string (conf->priv->channel, LID_SWITCH_ON_AC_CFG, "Nothing");
-    }
-    else conf->priv->lid_button_ac = val;
+    TRACE("Property modified: %s\n", property);
     
-    g_free (str);
-    
-    str = xfconf_channel_get_string (conf->priv->channel, LID_SWITCH_ON_BATTERY_CFG, "Nothing");
-    val = xfpm_shutdown_string_to_int (str);
-    
-    if ( G_UNLIKELY (val == -1 || val == 3) )
-    {
-	g_warning ("Invalid value %s for property %s, using default\n", str, LID_SWITCH_ON_BATTERY_CFG);
-	conf->priv->lid_button_battery = XFPM_DO_NOTHING;
-	xfconf_channel_set_string (conf->priv->channel, LID_SWITCH_ON_BATTERY_CFG, "Nothing");
-    }
-    else conf->priv->lid_button_battery = val;
-    
-    g_free (str);
-    
-    conf->priv->lock_screen = xfconf_channel_get_bool (conf->priv->channel, LOCK_SCREEN_ON_SLEEP, TRUE);
-    
-#ifdef HAVE_DPMS
-    conf->priv->dpms_enabled =
-    	xfconf_channel_get_bool (conf->priv->channel, DPMS_ENABLED_CFG, TRUE);
-    
-    conf->priv->dpms_sleep_on_battery = 
-    	MIN( xfconf_channel_get_uint( conf->priv->channel, ON_BATT_DPMS_SLEEP, 3) * 60, 3600);
-
-    conf->priv->dpms_off_on_battery = 
-    	MIN(xfconf_channel_get_uint( conf->priv->channel, ON_BATT_DPMS_OFF, 5) * 60, 3600);
-	
-    conf->priv->dpms_sleep_on_ac = 
-    	MIN(xfconf_channel_get_uint( conf->priv->channel, ON_AC_DPMS_SLEEP, 10) * 60, 3600);
-    
-    conf->priv->dpms_off_on_ac = 
-    	MIN(xfconf_channel_get_uint( conf->priv->channel, ON_AC_DPMS_OFF, 15) * 60, 3600);
-	
-    str = xfconf_channel_get_string (conf->priv->channel, DPMS_SLEEP_MODE, "sleep");
-    
-    if ( xfpm_strequal (str, "sleep" ) )
-    {
-	conf->priv->sleep_dpms_mode = 0;
-    }
-    else if ( xfpm_strequal (str, "suspend") )
-    {
-	conf->priv->sleep_dpms_mode = 1;
-    }
-    else
-    {
-	g_critical("Invalid value %s for property %s\n", str, DPMS_SLEEP_MODE);
-	conf->priv->sleep_dpms_mode = 0;
-    }
-    g_free (str);
-#endif /* HAVE_DPMS */
-    conf->priv->power_save_on_battery =
-    	xfconf_channel_get_bool (conf->priv->channel, POWER_SAVE_ON_BATTERY, TRUE);
-#ifdef SYSTEM_IS_LINUX
-    conf->priv->cpu_freq_control =
-	xfconf_channel_get_bool (conf->priv->channel, CPU_FREQ_CONTROL, TRUE);
-#endif
-    conf->priv->brightness_on_ac_timeout =
-	xfconf_channel_get_uint (conf->priv->channel, BRIGHTNESS_ON_AC, 9);
-	
-    if ( G_UNLIKELY (conf->priv->brightness_on_ac_timeout > 120 || conf->priv->brightness_on_ac_timeout < 9 ))
-    {
-	g_warning ("Value %d for %s is out of range", conf->priv->brightness_on_ac_timeout, BRIGHTNESS_ON_AC );
-	conf->priv->brightness_on_ac_timeout = 9;
-    }
-    
-    conf->priv->brightness_on_battery_timeout =
-	xfconf_channel_get_uint (conf->priv->channel, BRIGHTNESS_ON_BATTERY, 10);
-	
-    if ( G_UNLIKELY (conf->priv->brightness_on_battery_timeout > 120 || conf->priv->brightness_on_battery_timeout < 9) )
-    {
-	g_warning ("Value %d for %s is out of range", conf->priv->brightness_on_battery_timeout, BRIGHTNESS_ON_BATTERY );
-	conf->priv->brightness_on_battery_timeout = 10;
-    }
-    
-    //FIXME: check if valid
-    str = xfconf_channel_get_string (conf->priv->channel, CRITICAL_BATT_ACTION_CFG, "Nothing");
-    conf->priv->critical_action = xfpm_shutdown_string_to_int (str);
-    g_free (str);
-    
-    conf->priv->show_icon =
-    	xfconf_channel_get_uint (conf->priv->channel, SHOW_TRAY_ICON_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
-    if ( G_UNLIKELY ( conf->priv->show_icon > 3) )
-    {
-	g_warning ("Invalid value %d for property %s, using default\n", conf->priv->show_icon, SHOW_TRAY_ICON_CFG);
-	xfconf_channel_set_uint (conf->priv->channel, CRITICAL_BATT_ACTION_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
-    }
-    
-    conf->priv->critical_level =
-	xfconf_channel_get_uint (conf->priv->channel, CRITICAL_POWER_LEVEL, 0);
-	
-    if ( G_UNLIKELY ( conf->priv->critical_level > 20) )
-    {
-	g_warning ("Value %d for property %s is out of range \n", conf->priv->critical_level, CRITICAL_POWER_LEVEL);
-	conf->priv->critical_level = 10;
-    }
-    
-    conf->priv->inactivity_on_ac =
-	xfconf_channel_get_uint (conf->priv->channel, ON_AC_INACTIVITY_TIMEOUT, 30);
-    if ( G_UNLIKELY (conf->priv->inactivity_on_ac < 30 ) )
-    {
-	conf->priv->inactivity_on_ac = 30;
-    }
-    
-    conf->priv->inactivity_on_battery =
-	xfconf_channel_get_uint (conf->priv->channel, ON_BATTERY_INACTIVITY_TIMEOUT, 30);
-    if ( G_UNLIKELY (conf->priv->inactivity_on_battery < 30) )
-    {
-	conf->priv->inactivity_on_battery = 30;
-    }
-    
-    str = xfconf_channel_get_string (conf->priv->channel, INACTIVITY_SLEEP_MODE, "Suspend");
-
-    if ( xfpm_strequal (str, "Suspend"))
-    {
-	conf->priv->sleep_inactivity = TRUE;
-    }
-    else if ( xfpm_strequal (str, "Hibernate") )
-    {
-	conf->priv->sleep_inactivity = FALSE;
-    }
-    else
-    {
-	g_critical("Invalid value %s for property %s\n", str, INACTIVITY_SLEEP_MODE);
-	conf->priv->sleep_inactivity = TRUE;
-    }
-    
-    conf->priv->enable_brightness =
-	xfconf_channel_get_bool (conf->priv->channel, ENABLE_BRIGHTNESS_CONTROL, TRUE);
-    conf->priv->show_brightness_popup =
-	xfconf_channel_get_bool (conf->priv->channel, SHOW_BRIGHTNESS_POPUP, TRUE);
+    g_object_set_property (G_OBJECT (conf), strchr (property, '/') + 1, value);
 }
 
 static void
@@ -532,67 +184,301 @@
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
     
-    signals[DPMS_SETTINGS_CHANGED] =
-	    g_signal_new("dpms-settings-changed",
-			 XFPM_TYPE_XFCONF,
-			 G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET(XfpmXfconfClass, dpms_settings_changed),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE, 0, G_TYPE_NONE);
+    object_class->set_property = xfpm_xfconf_set_property;
+    object_class->get_property = xfpm_xfconf_get_property;
     
-     signals[POWER_SAVE_SETTINGS_CHANGED] =
-	    g_signal_new("power-save-settings-changed",
-			 XFPM_TYPE_XFCONF,
-			 G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET(XfpmXfconfClass, power_save_settings_changed),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE, 0, G_TYPE_NONE);
-			 
-     signals[BRIGHTNESS_SETTINGS_CHANGED] =
-	    g_signal_new("brightness-settings-changed",
-			 XFPM_TYPE_XFCONF,
-			 G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET(XfpmXfconfClass, brightness_settings_changed),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE, 0, G_TYPE_NONE);
+    object_class->finalize = xfpm_xfconf_finalize;
     
-    signals[TRAY_ICON_SETTINGS_CHANGED] =
-	    g_signal_new("tray-icon-settings-changed",
-			 XFPM_TYPE_XFCONF,
-			 G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET(XfpmXfconfClass, tray_icon_settings_changed),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE, 0, G_TYPE_NONE);
-			 
-     signals[INACTIVITY_TIMEOUT_CHANGED] =
-	    g_signal_new("inactivity-timeout-changed",
-			 XFPM_TYPE_XFCONF,
-			 G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET(XfpmXfconfClass, inactivity_timeout_changed),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE, 0, G_TYPE_NONE);
+    /**
+     * XfpmXfconf:general-notification:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_GENERAL_NOTIFICATION,
+                                     g_param_spec_boolean (GENERAL_NOTIFICATION_CFG,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:lock-screen-suspend-hibernate:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_LOCK_SCREEN_ON_SLEEP,
+                                     g_param_spec_boolean (LOCK_SCREEN_ON_SLEEP,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
     
-    object_class->finalize = xfpm_xfconf_finalize;
+    /**
+     * XfpmXfconf:power-save-on-battery:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_POWER_SAVE_ON_BATTERY,
+                                     g_param_spec_boolean (POWER_SAVE_ON_BATTERY,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:enable-cpu-freq-control:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_ENABLE_CPU_FREQ,
+                                     g_param_spec_boolean (CPU_FREQ_CONTROL,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:critical-power-level:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_CRITICAL_LEVEL,
+                                     g_param_spec_uint (CRITICAL_POWER_LEVEL,
+                                                        NULL, NULL,
+							0,
+							20,
+							10,
+                                                        G_PARAM_READWRITE));
+	
+    /**
+     * XfpmXfconf:show-brightness-popup:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_SHOW_BRIGHTNESS_POPUP,
+                                     g_param_spec_boolean (SHOW_BRIGHTNESS_POPUP,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
     
-    g_type_class_add_private (klass, sizeof(XfpmXfconfPrivate));
+    /**
+     * XfpmXfconf:show-brightness-popup:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_ENABLE_BRIGHTNESS,
+                                     g_param_spec_boolean (ENABLE_BRIGHTNESS_CONTROL,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:show-tray-icon:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_TRAY_ICON,
+                                     g_param_spec_uint (SHOW_TRAY_ICON_CFG,
+                                                        NULL, NULL,
+							SHOW_ICON_ALWAYS,
+							SHOW_ICON_WHEN_BATTERY_CHARGING_DISCHARGING,
+							SHOW_ICON_WHEN_BATTERY_PRESENT,
+                                                        G_PARAM_READWRITE));
+							
+    /**
+     * XfpmXfconf:critical-battery-action:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_CRITICAL_BATTERY_ACTION,
+                                     g_param_spec_uint (CRITICAL_BATT_ACTION_CFG,
+                                                        NULL, NULL,
+							XFPM_DO_NOTHING,
+							XFPM_DO_SHUTDOWN,
+							XFPM_DO_NOTHING,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:power-switch-action:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_POWER_BUTTON,
+                                     g_param_spec_uint (POWER_SWITCH_CFG,
+                                                        NULL, NULL,
+							XFPM_DO_NOTHING,
+							XFPM_DO_SHUTDOWN,
+							XFPM_DO_NOTHING,
+                                                        G_PARAM_READWRITE));
+							
+    /**
+     * XfpmXfconf:sleep-switch-action:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_SLEEP_BUTTON,
+                                     g_param_spec_uint (SLEEP_SWITCH_CFG,
+                                                        NULL, NULL,
+							XFPM_DO_NOTHING,
+							XFPM_DO_SHUTDOWN,
+							XFPM_DO_NOTHING,
+                                                        G_PARAM_READWRITE));
+							
+    /**
+     * XfpmXfconf:hibernate-switch-action:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_HIBERNATE_BUTTON,
+                                     g_param_spec_uint (HIBERNATE_SWITCH_CFG,
+                                                        NULL, NULL,
+							XFPM_DO_NOTHING,
+							XFPM_DO_SHUTDOWN,
+							XFPM_DO_NOTHING,
+                                                        G_PARAM_READWRITE));
+    
+    /**
+     * XfpmXfconf:lid-action-on-ac:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_LID_ACTION_ON_AC,
+                                     g_param_spec_uint (LID_SWITCH_ON_AC_CFG,
+                                                        NULL, NULL,
+							LID_TRIGGER_NOTHING,
+							LID_TRIGGER_LOCK_SCREEN,
+							LID_TRIGGER_LOCK_SCREEN,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:lid-action-on-battery:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_LID_ACTION_ON_BATTERY,
+                                     g_param_spec_uint (LID_SWITCH_ON_BATTERY_CFG,
+                                                        NULL, NULL,
+							LID_TRIGGER_NOTHING,
+							LID_TRIGGER_LOCK_SCREEN,
+							LID_TRIGGER_LOCK_SCREEN,
+                                                        G_PARAM_READWRITE));
+#ifdef HAVE_DPMS
+    /**
+     * XfpmXfconf:dpms-enabled:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_ENABLE_DPMS,
+                                     g_param_spec_boolean (DPMS_ENABLED_CFG,
+                                                           NULL, NULL,
+                                                           TRUE,
+                                                           G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:dpms-on-ac-sleep:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DPMS_SLEEP_ON_AC,
+                                     g_param_spec_uint (ON_AC_DPMS_SLEEP,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT16,
+							10,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:dpms-on-ac-off:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DPMS_OFF_ON_AC,
+                                     g_param_spec_uint (ON_AC_DPMS_OFF,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT16,
+							15,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:dpms-on-battery-sleep:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DPMS_SLEEP_ON_BATTERY,
+                                     g_param_spec_uint (ON_BATT_DPMS_SLEEP,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT16,
+							5,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:dpms-on-battery-off:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DPMS_OFF_ON_BATTERY,
+                                     g_param_spec_uint (ON_BATT_DPMS_OFF,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT16,
+							10,
+                                                        G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:dpms-sleep-mode:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DPMS_SLEEP_MODE,
+                                     g_param_spec_string  (DPMS_SLEEP_MODE,
+                                                           NULL, NULL,
+                                                           "standby",
+                                                           G_PARAM_READWRITE));
+#endif /* HAVE_DPMS */
+
+    /**
+     * XfpmXfconf:inactivity-on-ac:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_IDLE_ON_AC,
+                                     g_param_spec_uint (ON_AC_INACTIVITY_TIMEOUT,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT,
+							30,
+                                                        G_PARAM_READWRITE));
+
+    /**
+     * XfpmXfconf:inactivity-on-battery:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_IDLE_ON_BATTERY,
+                                     g_param_spec_uint (ON_BATTERY_INACTIVITY_TIMEOUT,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT,
+							30,
+                                                        G_PARAM_READWRITE));
+
+    
+     /**
+     * XfpmXfconf:inactivity-sleep-mode:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_IDLE_SLEEP_MODE,
+                                     g_param_spec_string (INACTIVITY_SLEEP_MODE,
+                                                          NULL, NULL,
+							  "Suspend",
+                                                          G_PARAM_READWRITE));
+    /**
+     * XfpmXfconf:brightness-on-ac:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DIM_ON_AC_TIMEOUT,
+                                     g_param_spec_uint (BRIGHTNESS_ON_AC,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT,
+							9,
+                                                        G_PARAM_READWRITE));
+
+    /**
+     * XfpmXfconf:brightness-on-battery:
+     **/
+    g_object_class_install_property (object_class,
+                                     PROP_DIM_ON_BATTERY_TIMEOUT,
+                                     g_param_spec_uint (BRIGHTNESS_ON_BATTERY,
+                                                        NULL, NULL,
+							0,
+							G_MAXUINT,
+							120,
+                                                        G_PARAM_READWRITE));
+
+    g_type_class_add_private (klass, sizeof (XfpmXfconfPrivate));
 }
 
 static void
 xfpm_xfconf_init (XfpmXfconf *conf)
 {
     GError *error = NULL;
+    gboolean channel_valid;
       
     conf->priv = XFPM_XFCONF_GET_PRIVATE (conf);
     
-    if ( !xfconf_init(&error) )
+    conf->priv->values = g_new0 (GValue, N_PROPERTIES);
+    
+    if ( !xfconf_init (&error) )
     {
     	g_critical ("xfconf_init failed: %s\n", error->message);
        	g_error_free (error);
+	channel_valid = FALSE;
     }	
     else
     {
@@ -600,17 +486,27 @@
 
 	g_signal_connect (conf->priv->channel, "property-changed",
 			  G_CALLBACK (xfpm_xfconf_property_changed_cb), conf);
-	xfpm_xfconf_load_configuration (conf);
+	channel_valid = TRUE;
     }
+    xfpm_xfconf_load (conf, channel_valid);
 }
 
 static void
 xfpm_xfconf_finalize(GObject *object)
 {
     XfpmXfconf *conf;
+    guint i;
     
     conf = XFPM_XFCONF(object);
     
+    for ( i = 0; i < N_PROPERTIES; i++)
+    {
+	if ( G_IS_VALUE (conf->priv->values + i) )
+	    g_value_unset (conf->priv->values + i);
+    }
+    
+    g_free (conf->priv->values);
+    
     if (conf->priv->channel )
 	g_object_unref (conf->priv->channel);
     
@@ -631,89 +527,3 @@
     }
     return XFPM_XFCONF (xfpm_xfconf_object);
 }
-
-gboolean xfpm_xfconf_get_property_bool (XfpmXfconf *conf, const gchar *property)
-{
-    g_return_val_if_fail (XFPM_IS_XFCONF(conf), FALSE);
-    
-    if ( xfpm_strequal (property, LOCK_SCREEN_ON_SLEEP))
-	return conf->priv->lock_screen;
-    else if ( xfpm_strequal (property, POWER_SAVE_ON_BATTERY ) )
-	return conf->priv->power_save_on_battery;
-#ifdef SYSTEM_IS_LINUX
-    else if ( xfpm_strequal (property, CPU_FREQ_CONTROL) )
-	return conf->priv->cpu_freq_control;
-#endif
-    else if ( xfpm_strequal (property, GENERAL_NOTIFICATION_CFG ) )
-	return conf->priv->general_notification;
-#ifdef HAVE_DPMS
-    else if ( xfpm_strequal (property, DPMS_SLEEP_MODE ))
-	return conf->priv->sleep_dpms_mode;
-    else if ( xfpm_strequal (property, DPMS_ENABLED_CFG) )
-	return conf->priv->dpms_enabled;
-#endif /* HAVE_DPMS */
-    else if ( xfpm_strequal (property, INACTIVITY_SLEEP_MODE) )
-	return conf->priv->sleep_inactivity;
-    else if ( xfpm_strequal (property, ENABLE_BRIGHTNESS_CONTROL) )
-	return conf->priv->enable_brightness;
-    else if ( xfpm_strequal (property, SHOW_BRIGHTNESS_POPUP) )
-	return conf->priv->show_brightness_popup;
-    
-    g_warn_if_reached ();
-
-    return FALSE;
-}
-
-guint8 xfpm_xfconf_get_property_enum (XfpmXfconf *conf, const gchar *property)
-{
-    g_return_val_if_fail (XFPM_IS_XFCONF(conf), 0);
-
-    if ( xfpm_strequal (property, LID_SWITCH_ON_AC_CFG) )
-	return conf->priv->lid_button_ac;
-    else if ( xfpm_strequal (property, LID_SWITCH_ON_BATTERY_CFG) )
-	return conf->priv->lid_button_battery;
-    else if ( xfpm_strequal (property, SLEEP_SWITCH_CFG) )
-	return conf->priv->sleep_button;
-    else if ( xfpm_strequal (property, CRITICAL_BATT_ACTION_CFG) )
-	return conf->priv->critical_action;
-    else if ( xfpm_strequal (property, SHOW_TRAY_ICON_CFG ) )
-	return conf->priv->show_icon;
-    else if ( xfpm_strequal (property, POWER_SWITCH_CFG) )
-	return conf->priv->power_button;
-    else if ( xfpm_strequal (property, HIBERNATE_SWITCH_CFG ) )
-	return conf->priv->hibernate_button;
-    
-    g_warn_if_reached ();
-
-    return 0;
-}
-
-gint xfpm_xfconf_get_property_int (XfpmXfconf *conf, const gchar *property)
-{
-    g_return_val_if_fail (XFPM_IS_XFCONF(conf), 0);
-
-    if ( xfpm_strequal (property, BRIGHTNESS_ON_AC ) )
-	return conf->priv->brightness_on_ac_timeout;
-#ifdef HAVE_DPMS
-    else if ( xfpm_strequal (property, ON_AC_DPMS_SLEEP))
-	return conf->priv->dpms_sleep_on_ac;
-    else if ( xfpm_strequal (property, ON_BATT_DPMS_SLEEP))
-	return conf->priv->dpms_sleep_on_battery;
-    else if ( xfpm_strequal (property, ON_AC_DPMS_OFF))
-	return conf->priv->dpms_off_on_ac;
-    else if ( xfpm_strequal (property, ON_BATT_DPMS_OFF))
-	return conf->priv->dpms_off_on_battery;
-#endif /* HAVE_DPMS */
-    else if ( xfpm_strequal (property, BRIGHTNESS_ON_BATTERY )) 
-	return conf->priv->brightness_on_battery_timeout;
-    else if ( xfpm_strequal (property, CRITICAL_POWER_LEVEL) )
-	return conf->priv->critical_level;
-    else if ( xfpm_strequal (property, ON_AC_INACTIVITY_TIMEOUT ) )
-	return conf->priv->inactivity_on_ac;
-    else if ( xfpm_strequal (property, ON_BATTERY_INACTIVITY_TIMEOUT ) )
-	return conf->priv->inactivity_on_battery;
-
-    g_warn_if_reached ();
-
-    return 0;
-}

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.h	2009-06-19 18:57:48 UTC (rev 7619)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.h	2009-06-20 16:40:44 UTC (rev 7620)
@@ -42,29 +42,12 @@
 {
     GObjectClass	  parent_class;
     
-    void                 (*dpms_settings_changed)		(XfpmXfconf *conf);
-    
-    void                 (*power_save_settings_changed)         (XfpmXfconf *conf);
-    
-    void                 (*brightness_settings_changed)		(XfpmXfconf *conf);
-    
-    void                 (*tray_icon_settings_changed)          (XfpmXfconf *conf);
-    
-    void                 (*inactivity_timeout_changed)		(XfpmXfconf *conf);
-    
 } XfpmXfconfClass;
 
 GType        		  xfpm_xfconf_get_type           	(void) G_GNUC_CONST;
+
 XfpmXfconf       	 *xfpm_xfconf_new                 	(void);
 
-gboolean                  xfpm_xfconf_get_property_bool 	(XfpmXfconf *conf,
-							         const gchar *property) G_GNUC_PURE;
-								 
-guint8                    xfpm_xfconf_get_property_enum         (XfpmXfconf *conf,
-								 const gchar *property) G_GNUC_PURE;
-								 
-gint                      xfpm_xfconf_get_property_int          (XfpmXfconf *conf,
-								 const gchar *property) G_GNUC_PURE;
 G_END_DECLS
 
 #endif /* __XFPM_XFCONF_H */




More information about the Goodies-commits mailing list