[Goodies-commits] r6438 - in xfce4-power-manager/trunk: doc/C/images po src
Ali Abdallah
aliov at xfce.org
Mon Jan 12 16:15:25 CET 2009
Author: aliov
Date: 2009-01-12 15:15:25 +0000 (Mon, 12 Jan 2009)
New Revision: 6438
Modified:
xfce4-power-manager/trunk/doc/C/images/battery-settings.png
xfce4-power-manager/trunk/doc/C/images/button-settings.png
xfce4-power-manager/trunk/doc/C/images/general-settings.png
xfce4-power-manager/trunk/doc/C/images/monitor-settings.png
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/eu.po
xfce4-power-manager/trunk/po/fi.po
xfce4-power-manager/trunk/po/fr.po
xfce4-power-manager/trunk/po/id.po
xfce4-power-manager/trunk/po/ja.po
xfce4-power-manager/trunk/po/nl.po
xfce4-power-manager/trunk/po/pt_BR.po
xfce4-power-manager/trunk/po/pt_PT.po
xfce4-power-manager/trunk/po/tr.po
xfce4-power-manager/trunk/po/uk.po
xfce4-power-manager/trunk/po/xfce4-power-manager.pot
xfce4-power-manager/trunk/po/zh_CN.po
xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Making better user interface
Modified: xfce4-power-manager/trunk/doc/C/images/battery-settings.png
===================================================================
(Binary files differ)
Modified: xfce4-power-manager/trunk/doc/C/images/button-settings.png
===================================================================
(Binary files differ)
Modified: xfce4-power-manager/trunk/doc/C/images/general-settings.png
===================================================================
(Binary files differ)
Modified: xfce4-power-manager/trunk/doc/C/images/monitor-settings.png
===================================================================
(Binary files differ)
Modified: xfce4-power-manager/trunk/po/cs.po
===================================================================
--- xfce4-power-manager/trunk/po/cs.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/cs.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-09 02:12+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech\n"
@@ -35,9 +35,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernovat"
@@ -48,8 +48,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Režim spánku"
@@ -72,54 +72,54 @@
msgid "Hibernate the system"
msgstr "Hibernovat systém"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Vypnout"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Konfigurace záložního zdroje"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Konfigurace baterie"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Kritický stav nabití záložního zdroje"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Kritický stav nabití baterie"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "procent"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Je-li úroveň nabití baterie kritická, provést tuto akci:"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Nic"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Povolit oznámení o nabíjení záložního zdroje"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Povolit oznámení o nabíjení baterie"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Povolit úsporný režim při napájení ze záložního zdroje"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Povolit úsporný režim při napájení z baterie"
@@ -177,7 +177,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Ovládání frekvence procesoru nelze použít"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Při napájení z elektrické sítě"
@@ -189,107 +189,115 @@
msgid "CPU frequency settings"
msgstr "Nastavení frekvence procesoru"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Při napájení z baterie"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Povolit ovládání jasu displeje LCD"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Nastavení monitoru při napájení ze záložního zdroje"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Nastavení monitoru při napájení z baterie"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Nastavení monitoru při napájení z elektrické sítě"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Nastavení monitoru"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Váš monitor nepodporuje ovládání DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Klávesové zkratky"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Stisknete-li hlavní vypínač, provést tuto akci:"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Stisknete-li tlačítko režimu spánku, provést tuto akci:"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Při zavření laptopu"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Nebyly nalezeny žádné dostupné klávesové zkratky"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Obecná nastavení"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Ikon v oznamovací oblasti"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Vždy zobrazovat ikonu"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Pokud je přítomna baterie"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Pokud se baterie nabíjí nebo vybíjí"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "Povolit ovládání změny frekvence procesoru"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Povolit ovládání správy napájení monitoru"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Pokročilá nastavení"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Nastavení procesoru"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Nastavení baterie"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Klávesové zkratky"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Nastavení monitoru"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Předvolby správce napájení"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Úroveň nabití baterie je nízká"
@@ -387,15 +395,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Pohotovostní režim po"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Režim spánku po"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Vypnout po"
Modified: xfce4-power-manager/trunk/po/da.po
===================================================================
--- xfce4-power-manager/trunk/po/da.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/da.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-06 20:44+0100\n"
"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -39,9 +39,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Dvaletilstand"
@@ -52,8 +52,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Hviletilstand"
@@ -76,54 +76,54 @@
msgid "Hibernate the system"
msgstr "Sæt systemet i dvaletilstand"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Luk ned"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Nødstrømsindstilling"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Batteriindstilling"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Opfat nødstrømladning som kritisk"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Opfat batteriladning som kritisk"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "procent"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Ved kritisk strømniveau for batteri udfør"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Ingenting"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Aktivér påmindelse af UPS-ladning"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Aktivér påmindelse af batteritilstand"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Aktivér strømstyring ved nødstrømstrøm"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Aktivér strømstyring ved strøm fra batteri"
@@ -186,7 +186,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Frekvenskontrol på processor kan ikke bruges"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Indstillinger ved vekselstrøm"
@@ -200,108 +200,116 @@
msgid "CPU frequency settings"
msgstr "Indstillinger for processorfrekvens"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Når batteristrøm"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Aktivér LCD-lysstyrkekontrol"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Skærmindstillinger ved nødstrøm"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Skærmindstillinger ved strøm fra batteri"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Skærmindstillinger ved netstrøm"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Skærmindstillinger"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Din skærm understøtter ikke DPMS-kontrol"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Tastaturgenveje"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Ved tryk på tænd-knap udfør"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Ved tryk på sove-knap udfør"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Når bærbarlåg er lukket"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Ingen tilgængelige tastaturgenveje fundet"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Generelle indstillinger"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Statusfeltikon"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Vis altid et ikon"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Når batteri er tilstede"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Når batteri oplader eller aflader"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "Aktivér kontrol af frekvensskalering til processor"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Aktivér strømstyring til skærm"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Avancerede indstillinger"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Processorindstillinger"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Batteriindstillinger"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Genveje"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Skærmindstillinger"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Indstillinger af strømstyring"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Dit batteris strømniveau er lavt"
@@ -399,15 +407,15 @@
msgid "min"
msgstr "min."
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Standby efter"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Hviletilstand efter"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Sluk efter"
Modified: xfce4-power-manager/trunk/po/de.po
===================================================================
--- xfce4-power-manager/trunk/po/de.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/de.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-10-27 22:38+0100\n"
"Last-Translator: Mark Trompell <mark at foresightlinux.org>\n"
"Language-Team: German\n"
@@ -41,9 +41,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Tiefschlaf"
@@ -55,8 +55,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Ruhezustand"
@@ -81,54 +81,54 @@
msgid "Hibernate the system"
msgstr "Das System in den Tiefschlaf versetzen"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Herunterfahren"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Konfiguration der USV"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Batteriekonfiguration"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Ladezustand der USV als kritisch betrachten bei"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Ladezustand der Batterie als kritisch betrachten bei"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "Prozent"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Bei kritischem Ladezustand der Batterie:"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Nichts"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Benachrichtigung über Ladezustand der USV aktivieren"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Benachrichtigung über Batteriezustand aktivieren"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Stromsparen bei Strom über USV aktivieren"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Stromsparen bei Batteristrom aktivieren"
@@ -189,7 +189,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Steuerung der CPU-Frequenz nicht möglich"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
#, fuzzy
msgid "On electric power"
msgstr "Monitoreinstellungen bei Netzversorgung"
@@ -204,109 +204,117 @@
msgid "CPU frequency settings"
msgstr "Einstellungen der CPU-Frequenz"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
#, fuzzy
msgid "On battery power"
msgstr "Wenn die Batterie verfügbar ist"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Helligkeitssteuerung erlauben"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Monitoreinstellungen bei Strom über USV"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Monitoreinstellungen bei Batteriestrom"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Monitoreinstellungen bei Netzversorgung"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Monitoreinstellungen"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Ihr Monitor unterstützt kein DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Tastenkürzel"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Bei Betätigung des Ein-/Aus-Schalters:"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Bei Betätigung der Taste für den Schlafmodus:"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Beim Schließen der Bildschirmklappe:"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Keine verfügbaren Tastenkürzel gefunden"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Allgemeine Einstellungen"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Symbol in der Systemleiste"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Immer ein Symbol zeigen"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Wenn die Batterie verfügbar ist"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Wenn sich die Batterie lädt oder entlädt"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "Skalierung der CPU-Frequenz aktivieren"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Energieverwaltung für Monitor aktivieren"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Erweitert"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "CPU-Einstellungen"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Batterieeinstellungen"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Tastenkürzel"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Monitoreinstellungen"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Einstellungen für die Energieverwaltung"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Ihr Batterieladezustand ist gering"
@@ -404,15 +412,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Standbymodus nach"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Ruhezustand nach"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Abschalten nach"
Modified: xfce4-power-manager/trunk/po/eu.po
===================================================================
--- xfce4-power-manager/trunk/po/eu.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/eu.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,20 +7,22 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 19:19+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\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"
-"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 1.1.0\n"
#: ../src/xfpm-ac-adapter.c:217
msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Ezin da moldagailu egoera irakurri, argindar kdueatzaileak ez du behar bezala funztionatuko"
+msgstr ""
+"Ezin da moldagailu egoera irakurri, argindar kdueatzaileak ez du behar "
+"bezala funztionatuko"
#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
msgid "Adapter is online"
@@ -30,249 +32,282 @@
msgid "Adapter is offline"
msgstr "Moldagailua desentxufatua dago"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:908
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
msgid "Are you sure you want to hibernate the system?"
msgstr "Ziur zaude sistema hibernatu nahi duzula?"
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
-#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
-#: ../src/xfpm-settings.c:1006
+#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernatu"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:923
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
msgid "Are you sure you want to suspend the system?"
msgstr "Ziur zaude sistema eseki nahi duzula?"
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
-#: ../src/xfpm-settings.c:1004
+#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Eseki"
-#: ../src/xfpm-battery.c:765
+#: ../src/xfpm-battery.c:769
msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Zure bateria nahiko hutsik dago. Gorde zure lana datu galerak saihesteko"
+msgstr ""
+"Zure bateria nahiko hutsik dago. Gorde zure lana datu galerak saihesteko"
-#: ../src/xfpm-battery.c:770 ../src/xfpm-battery.c:1271
+#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
msgid "Xfce power manager"
msgstr "Xfce argindar kudeatzailea"
-#: ../src/xfpm-battery.c:780
+#: ../src/xfpm-battery.c:784
msgid "Shutdown the system"
msgstr "Itzali sistema"
-#: ../src/xfpm-battery.c:788
+#: ../src/xfpm-battery.c:792
msgid "Hibernate the system"
msgstr "Hibernatu sistema"
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
-#: ../src/xfpm-settings.c:1008
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Itzali"
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "UPS konfigurazioa"
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Bateria konfigurazioa"
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "UPS karga maila kritikoa"
-#: ../src/xfpm-settings.c:442
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Bateria karga maila kritikoa"
-#: ../src/xfpm-settings.c:447
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "ehunekoa"
-#: ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Bateria karga maila kritikoa denean"
-#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
-#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Ezer ez"
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Gaitu UPS karga berri-ematea"
-#: ../src/xfpm-settings.c:484
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Gaitu UPS karga egoera berri-ematea"
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Gaitu indar aurrezpena UPS indarrean"
-#: ../src/xfpm-settings.c:498
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Gaitu indar aurrezpena bateria indarrean"
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
-msgid "Performance"
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
+#, fuzzy
+msgid "Best performance"
msgstr "Errendimendua"
-#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
-msgid "Ondemand"
-msgstr "Eskaripean"
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
+msgid "Set the CPU to its maximum frequency"
+msgstr ""
-#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
-msgid "Userspace"
-msgstr "Erabiltzaile-eremuan"
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
+#, fuzzy
+msgid "Ondemand performance"
+msgstr "Errendimendua"
-#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
-msgid "Powersave"
-msgstr "Aurreztea"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
+msgstr ""
-#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
-msgid "Conservative"
-msgstr "Kontserbadorea"
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
+#, fuzzy
+msgid "Best power savings"
+msgstr "Xfce argindar kudeatzailea"
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on UPS power"
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
+msgid "Set the CPU to its minimum frequency"
+msgstr ""
+
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
+msgid "Good power savings"
+msgstr ""
+
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on UPS power"
msgstr "CPU gobernu ezarpenak UPS argi-indarraz"
-#: ../src/xfpm-settings.c:623
-msgid "CPU governor settings on battery power"
+#: ../src/xfpm-settings.c:595
+#, fuzzy
+msgid "CPU frequency settings on battery power"
msgstr "CPU gobernu ezarpenak bateria argi-indarraz"
-#: ../src/xfpm-settings.c:723
+#: ../src/xfpm-settings.c:685
msgid "No CPU governor found"
msgstr "Ez da CPU gobernurik aurkitu"
-#: ../src/xfpm-settings.c:733
+#: ../src/xfpm-settings.c:695
msgid "CPU frequency control cannot be used"
msgstr "CPU maiztasun kontrola ezin da erabili"
-#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Sare-elektriko indarrez"
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings on electric power"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings on electric power"
msgstr "CPU maiztasun ezarpenak sare-elektriko indarraz"
-#: ../src/xfpm-settings.c:748
-msgid "CPU freq settings"
+#: ../src/xfpm-settings.c:710
+#, fuzzy
+msgid "CPU frequency settings"
msgstr "CPU maiztasun ezarpenak"
-#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Bateriaz"
-#: ../src/xfpm-settings.c:772
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Gaitu LCD distira kontrola"
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Monitore ezarpenak UPS indarrez"
-#: ../src/xfpm-settings.c:794
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Monitore ezarpenak bateria indarrez"
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Monitore ezarpenak sare-elektriko indarrez"
-#: ../src/xfpm-settings.c:887
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Monitore ezarpenak"
-#: ../src/xfpm-settings.c:904
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Zure monitoreak ez du DPMS kontrola onartzen"
-#: ../src/xfpm-settings.c:935
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Laster-teklak"
-#: ../src/xfpm-settings.c:945
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Power botoia sakatzean"
-#: ../src/xfpm-settings.c:971
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Sleep botoia sakatzean"
-#: ../src/xfpm-settings.c:996
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Eramangarri tapa ixtean"
-#: ../src/xfpm-settings.c:1020
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Ez da laster-tekla erabilgarririk aurkitu"
-#: ../src/xfpm-settings.c:1036
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Aukera orokorrak"
#. Systray icon
-#: ../src/xfpm-settings.c:1043
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Sistema erretilu ikonoa"
-#: ../src/xfpm-settings.c:1049
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Beti bistarazi ikonoa"
-#: ../src/xfpm-settings.c:1050
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Bateria dagoenean"
-#: ../src/xfpm-settings.c:1053
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Bateria kargatu edo deskargatzean"
-#: ../src/xfpm-settings.c:1069
-msgid "Enable CPU freq scaling control"
+#: ../src/xfpm-settings.c:1048
+#, fuzzy
+msgid "Enable CPU frequency scaling control"
msgstr "Gaitu CPU maiztasun eskalatze kontrola"
-#: ../src/xfpm-settings.c:1082
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Gaitu monitore indar kudeaketa kontrola"
-#: ../src/xfpm-settings.c:1139
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Ezarpen aurreratuak"
-#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "CPU ezarpenak"
-#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Bateria ezarpenak"
-#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Lasterbideak"
-#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Monitore ezarpenak"
-#: ../src/xfpm-settings.c:1241
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Energia kudeaketa hobespenak"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Bateria karga baxua da"
@@ -370,19 +405,19 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Noiz itzali: "
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Noiz eseki: "
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Noiz itzali: "
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1220
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
msgid "Xfce4 Power Manager"
msgstr "Xfce4 energia kudeatzailea"
@@ -518,7 +553,7 @@
msgid "Don't show this message again"
msgstr "Ez erakutsi mezu hau berriz"
-#: ../src/xfpm-driver.c:1220
+#: ../src/xfpm-driver.c:1243
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Huts energia kudeatzaile konfigurazio kargatzean, hobetsiriko balioak "
@@ -631,8 +666,17 @@
#: ../src/xfpm-hal.c:1127
#, c-format
msgid "No reply from HAL daemon to set power save profile"
-msgstr "Ez da HAL deabruaren erantzunik jaso energia aurrezte profila ezartzeko"
+msgstr ""
+"Ez da HAL deabruaren erantzunik jaso energia aurrezte profila ezartzeko"
+#: ../src/xfpm-dbus-messages.c:86
+msgid "Failed to create dbus message\n"
+msgstr ""
+
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
+msgid "Failed to send message\n"
+msgstr ""
+
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energia"
@@ -648,3 +692,15 @@
#: ../src/xfce4-power-manager.desktop.in.h:4
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 energia kudeaketa"
+
+#~ msgid "Ondemand"
+#~ msgstr "Eskaripean"
+
+#~ msgid "Userspace"
+#~ msgstr "Erabiltzaile-eremuan"
+
+#~ msgid "Powersave"
+#~ msgstr "Aurreztea"
+
+#~ msgid "Conservative"
+#~ msgstr "Kontserbadorea"
Modified: xfce4-power-manager/trunk/po/fi.po
===================================================================
--- xfce4-power-manager/trunk/po/fi.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/fi.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-27 14:12+0200\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-27 14:44+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish\n"
@@ -28,97 +28,97 @@
msgid "Adapter is offline"
msgstr "Käytetään akkuvirtaa"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:908
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
msgid "Are you sure you want to hibernate the system?"
msgstr "Haluatko varmasti asettaa järjestelmän lepotilaan?"
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Lepotila"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:923
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
msgid "Are you sure you want to suspend the system?"
msgstr "Haluatko varmasti asettaa järjestelmän keskeytystilaan?"
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Keskeytystila"
-#: ../src/xfpm-battery.c:765
+#: ../src/xfpm-battery.c:769
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr "Akku on lähes tyhjä. Varmista, että olet tallentanut tärkeät tiedot."
-#: ../src/xfpm-battery.c:770 ../src/xfpm-battery.c:1271
+#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
msgid "Xfce power manager"
msgstr "Xfce:n virranhallinta"
-#: ../src/xfpm-battery.c:780
+#: ../src/xfpm-battery.c:784
msgid "Shutdown the system"
msgstr "Sammuta järjestelmä"
-#: ../src/xfpm-battery.c:788
+#: ../src/xfpm-battery.c:792
msgid "Hibernate the system"
msgstr "Aseta järjestelmä lepotilaan"
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Sammuta"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "UPS-laite"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Akkuvirta"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "UPS on lähes tyhjä, kun virtaa on:"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Akku on lähes tyhjä, kun virtaa on:"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "prosenttia"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Kun akku on lähes tyhjä:"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Älä tee mitään"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Ilmoita UPS-laitteen lataus"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Ilmoita akun tila"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Virransäästö UPS-laitteen varassa"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Virransäästö käytettäessä akkuvirtaa"
@@ -178,7 +178,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Suorittimen kellotaajuutta ei voi hallita"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Verkkovirta"
@@ -190,107 +190,115 @@
msgid "CPU frequency settings"
msgstr "Suorittimen kellotaajuus"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Akkukäyttö"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Säädä LCD:n kirkkautta"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Näytön virransäästö UPS:n varassa"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Näytön virransäästö akkuvirralla"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Näytön virransäästö verkkovirralla"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Näyttö"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Näyttösi ei tue DPMS-virransäästöä"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Pikanäppäimet"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Painettaessa virtanäppäintä"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Painettaessa lepotilanäppäintä"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Kun kansi on suljettu"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Pikanäppäimiä ei käytettävissä"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Yleiset asetukset"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Järjestelmälokeron kuvake"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Näytä kuvake aina"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Näytä, kun akku on liitetty"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Näytä, kun akku latautuu tai purkautuu"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "Hallitse suorittimen kellotaajuutta"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Hallitse näytön virransäästöä"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Lisäasetukset"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Suoritinasetukset"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Akkukäyttö"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Pikanäppäimet"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Näytön asetukset"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Virranhallinnan asetukset"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Akussa on enää vähän virtaa"
@@ -388,15 +396,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Virransäästötilaan viiveellä"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Keskeytystilaan viiveellä"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Sammuta viiveellä"
Modified: xfce4-power-manager/trunk/po/fr.po
===================================================================
--- xfce4-power-manager/trunk/po/fr.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/fr.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-10-31 21:05+0100\n"
"Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
"Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -39,9 +39,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Mettre en hibernation"
@@ -53,8 +53,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Mettre en veille"
@@ -79,56 +79,56 @@
msgid "Hibernate the system"
msgstr "Mettre le système en hibernation"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Éteindre"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Configuration de l'onduleur"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Configuration de la batterie"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
#, fuzzy
msgid "Consider UPS charge critical"
msgstr "Niveau de la batterie critique"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Niveau de la batterie critique"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "pour cent"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Action pour le niveau de la batterie critique"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Rien"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Activer la notification du niveau de charge l'onduleur"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Activer la notification du niveau de la batterie"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr ""
"Activer le mode d'économie d'énergie quand le système fonctionne sur onduleur"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr ""
"Activer le mode d'économie d'énergie quand le système fonctionne sur batterie"
@@ -190,7 +190,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Le contrôle de fréquence du processeur est inutilisable"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Sur secteur"
@@ -204,109 +204,117 @@
msgid "CPU frequency settings"
msgstr "Contrôle de fréquence"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Sur batterie"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Activer le contrôle de la luminosité de l'écran"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Réglages de l'écran quand le système fonctionne sur onduleur"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Réglages de l'écran quand le système fonctionne sur batterie"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Réglages DPMS de l'écran quand le système fonctionne sur secteur"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Réglages DPMS de l'écran"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "L'écran ne supporte pas les réglages DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Raccourcis claviers"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Action pour le bouton d'alimentation"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Action pour le bouton de mise en veille"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr ""
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Aucun raccourci clavier disponible"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Options générales"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Icône dans la zone de notification"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Toujours afficher une icône"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Quand la batterie est présente"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Quand la batterie se charge ou se décharge"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "Activer le contrôle de fréquence du processeur"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
#, fuzzy
msgid "Enable monitor power management control"
msgstr "Activer le contrôle de fréquence du processeur"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Réglages avancés"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Processeur"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Batterie"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Raccourcis"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Écran"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Préférences du gestionnaire d'alimentation"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Le niveau de la batterie est faible"
@@ -404,15 +412,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Mettre en veille après"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Mettre en veille prolongée après"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Éteindre after"
Modified: xfce4-power-manager/trunk/po/id.po
===================================================================
--- xfce4-power-manager/trunk/po/id.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/id.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-10 22:46+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
"Language-Team: Indonesian\n"
@@ -35,9 +35,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernasi"
@@ -48,8 +48,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspensi"
@@ -73,54 +73,54 @@
msgid "Hibernate the system"
msgstr "Hibernasi sistem"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Matikan"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Konfigurasi UPS"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Konfigurasi baterai"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Anggap muatan UPS kritis"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Anggap muatan baterai kritis"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "persen"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Ketika level muatan baterai kritis maka lakukan"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Tak ada"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Aktifkan notifikasi muatan UPS"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Aktifkan notifikasi kondisi baterai"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Aktifkan penyimpan daya di tenaga UPS"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Aktifkan penyimpan daya di tenaga baterai"
@@ -180,7 +180,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Kendali frekuensi CPU tak dapat digunakan"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Pada daya listrik"
@@ -192,107 +192,115 @@
msgid "CPU frequency settings"
msgstr "Pengaturan frekuensi CPU"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Pada daya baterai"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Aktifkan kendali kecerahan LCD"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Pengaturan monitor pada daya UPS"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Pengaturan monitor pada daya baterai"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Pengaturan monitor pada daya listrik"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Pengaturan monitor"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Monitor anda tak mendukung kendali DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Jalan pintas papan ketik"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Ketika tombol power ditekan maka lakukan"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Ketika tombol sleep ditekan maka lakukan"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Ketika laptop ditutup"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Tak ada jalan pintas papan ketik yang ditemukan"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Opsi Umum"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Ikon baki sistem"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Selalu Tampilkan ikon"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Ketika baterai hadir"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Ketika baterai diisi ulang atau tidak diisi"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "Aktifkan kendali skala frekuensi CPU"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Aktifkan monitor kendali manajemen daya"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Pengaturan mahir"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Pengaturan CPU"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Pengaturan baterai"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Jalan pintas"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Pengaturan Monitor"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Pengaturan Manajer Daya"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Muatan baterai anda sedikit"
@@ -390,15 +398,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Siaga setelah"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Suspensi setelah"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Matikan setelah"
Modified: xfce4-power-manager/trunk/po/ja.po
===================================================================
--- xfce4-power-manager/trunk/po/ja.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/ja.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-10 19:47+0900\n"
"Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
"Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -37,9 +37,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "ハイバネート"
@@ -50,8 +50,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "サスペンド"
@@ -75,54 +75,54 @@
msgid "Hibernate the system"
msgstr "システムをハイバネートします"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "シャットダウン"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "UPS 設定"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "バッテリ設定"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "UPS 充電量が危機的とみなす割合"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "バッテリ充電量が危機的とみなす割合"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "パーセント"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "バッテリ充電量が危機的状態になった時"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "何もしない"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "UPS 充電通知を有効にする"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "バッテリの状態通知を有効にする"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "UPS 電源時のパワーセーブを有効にする"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "バッテリ駆動時のパワーセーブを有効にする"
@@ -180,7 +180,7 @@
msgid "CPU frequency control cannot be used"
msgstr "CPU 周波数制御は使用できません"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "通常電源時"
@@ -192,107 +192,115 @@
msgid "CPU frequency settings"
msgstr "CPU 周波数設定"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "バッテリ電源"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "LCD 輝度制御を有効にする"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "UPS 電源時のモニタ設定"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "バッテリ駆動時のモニタ設定"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "通常電源時のモニタ設定"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "モニタ設定"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "モニタは DPMS 制御をサポートしていません"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "キーボードショートカット"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "電源ボタンが押されたときに動作"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "スリープボタンが押されたときに動作"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "ラップトップの蓋が閉じられたとき"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "有効なキーボードショートカットが見つかりません"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "一般設定"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "システムトレイアイコン"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "常に表示する"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "バッテリが存在するとき"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "バッテリが充電中または放電中の時"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "CPU 周波数スケーリング制御を有効にする"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "モニタ電源管理制御を有効にする"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "拡張設定"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "CPU 設定"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "バッテリ設定"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "ショートカットキー"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "モニタ設定"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "電源管理設定"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "バッテリ充電量は低いです"
@@ -390,15 +398,15 @@
msgid "min"
msgstr "分"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "待機状態にするまでの時間"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "サスペンドするまでの時間"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "電源切断までの時間"
Modified: xfce4-power-manager/trunk/po/nl.po
===================================================================
--- xfce4-power-manager/trunk/po/nl.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/nl.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-07 14:21+0100\n"
"Last-Translator: Vincent Tunru <projects at vinnl.nl>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -36,9 +36,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Slaapstand"
@@ -50,8 +50,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Pauzestand"
@@ -76,58 +76,58 @@
msgid "Hibernate the system"
msgstr "Slaapstand"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Afsluiten"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
#, fuzzy
msgid "UPS configuration"
msgstr "Ups-configuratie"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Batterij-configuratie"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
#, fuzzy
msgid "Consider UPS charge critical"
msgstr "Beschouw de batterijlading als kritiek"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Beschouw de batterijlading als kritiek"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "procent"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Als het energieniveau van de batterij kritiek is"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Niets doen"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
#, fuzzy
msgid "Enable UPS charge notification"
msgstr "Ups-opladen notificatie inschakelen"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Batterij-status-notificatie inschakelen"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
#, fuzzy
msgid "Enable power save on UPS power"
msgstr "Energiebesparende modus op ups-energie inschakelen"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
#, fuzzy
msgid "Enable power save on battery power"
msgstr "Energiebesparende modus op batterij inschakelen"
@@ -189,7 +189,7 @@
msgid "CPU frequency control cannot be used"
msgstr ""
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr ""
@@ -203,113 +203,121 @@
msgid "CPU frequency settings"
msgstr "CPU-instellingen"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
#, fuzzy
msgid "On battery power"
msgstr "Als er een batterij is"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
#, fuzzy
msgid "Enable LCD brightness control"
msgstr "LCD-helderheid-beheer inschakelen"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
#, fuzzy
msgid "Monitor settings on battery power"
msgstr "Energiebesparende modus op batterij inschakelen"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr ""
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr ""
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr ""
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Sneltoetsen"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Als de aan/uit-knop wordt ingedrukt"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
#, fuzzy
msgid "When sleep button is pressed do"
msgstr "Als de slaapknop wordt ingedrukt"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr ""
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Geen beschikbare sneltoetsen gevonden"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Algemene opties"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Pictogram in systeemvak"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Altijd een pictogram weergeven"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Als er een batterij is"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Als de batterij aan het opladen of ontladen is"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "LCD-helderheid-beheer inschakelen"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr ""
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Geavanceerde instellingen"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
#, fuzzy
msgid "CPU settings"
msgstr "CPU-instellingen"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Batterij-instellingen"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Sneltoetsen"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr ""
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Voorkeuren energiebeheer"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
#, fuzzy
msgid "Your battery charge is low"
@@ -412,15 +420,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Standbij na"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Slaapstand na"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Afsluiten na"
Modified: xfce4-power-manager/trunk/po/pt_BR.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_BR.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/pt_BR.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-30 21:09-0300\n"
"Last-Translator: Henrique P Machado <zehrique at gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -38,9 +38,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernar"
@@ -51,8 +51,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspender"
@@ -76,54 +76,54 @@
msgid "Hibernate the system"
msgstr "Hibernar o sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Desligar"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Configuração de UPS"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Configuração da bateria"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Considerar carga de UPS crítica"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Considerar carga da bateria crítica"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "percentagem"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Quando o nível da carga da bateria estiver crítico fazer"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Nada"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Habilitar notificação da carga de UPS"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Habilitar notificação do estado da bateria"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Habilitar economia de energia de UPS"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Habilitar economia de energia da bateria"
@@ -143,8 +143,9 @@
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 a CPU para sua velocidade máxima quando há qualquer carga e "
-"para sua velocidade mínima quando o sistema estiver ocioso."
+msgstr ""
+"Configura a CPU para sua velocidade máxima quando há qualquer carga e para "
+"sua velocidade mínima quando o sistema estiver ocioso."
#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
msgid "Best power savings"
@@ -162,8 +163,8 @@
msgid ""
"gracefully increases and decreases the CPU speed depending on the current "
"usage"
-msgstr "Aumenta e diminui gradualmente a velocidade da CPU dependendo do uso "
-"atual"
+msgstr ""
+"Aumenta e diminui gradualmente a velocidade da CPU dependendo do uso atual"
#: ../src/xfpm-settings.c:595
msgid "CPU frequency settings on UPS power"
@@ -181,7 +182,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Controle de freqüência da CPU não pode ser usado"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Em energia elétrica"
@@ -193,107 +194,115 @@
msgid "CPU frequency settings"
msgstr "Configurações de freqüência da CPU"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Em energia da bateria"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Habilitar controle de brilho do LCD"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Configurações do monitor quando usando UPS"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Configurações do monitor quando usando energia da bateria"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Configurações do monitor quando usando energia elétrica"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "configurações do monitor"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "O seu monitor não tem suporte para controlar DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Atalhos de teclado"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Quando o botão desligar é pressionado, fazer"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Quando o botão sleep é pressionado, fazer"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Quando a tampa do laptop está fechada"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Nenhum atalho de teclado foi localizado"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Opções gerais"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Ícone de notificação do sistema"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Sempre exibir um ícone"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Quando a bateria está presente"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Quando a bateria está carregando ou descarregando"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "Habilitar controle da escala de freqüência da CPU"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Habilitar controle do gerenciador de energia do monitor"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Configurações avançadas"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Configurações da CPU"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Configurações da bateria"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Atalhos"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Configurações do monitor"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Preferências do Gerenciador de energia"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "A carga da sua bateria está baixa"
@@ -391,15 +400,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Standby após"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Suspender após"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Desligar após"
Modified: xfce4-power-manager/trunk/po/pt_PT.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_PT.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/pt_PT.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-11-01 20:07+0100\n"
"Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
"Language-Team: \n"
@@ -38,9 +38,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernar"
@@ -52,8 +52,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspender"
@@ -77,54 +77,54 @@
msgid "Hibernate the system"
msgstr "Hibernar o sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Desligar"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Configuração Ups"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Configuração de bateria"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Considerar carga UPS crítica"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Considerar carga da bateria crítica"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "percentagem"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Quando o nível da carga da bateria é crítico fazer"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Nada"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Ligar notificação de carga UPS"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Ligar notificação do estado da bateria"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Ligar poupança de energia do UPS"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Ligar poupança de energia em modo bateria"
@@ -185,7 +185,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Controlo de frequência do CPU não pode ser usado"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "A usar energia eléctrica"
@@ -199,108 +199,116 @@
msgid "CPU frequency settings"
msgstr "Definições de freq do cpu"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "A usar bateria"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Ligar controlo de brilho LCD"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Definições de monitor em UPS"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Definições de monitor de bateria"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Definições do monitor em energia eléctrica"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Definições de monitor"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "O seu monitor não suporta controlo DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Atalhos do teclado"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Quando o botão desligar é pressionado fazer"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Quando o botão sleep é pressionado fazer"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Quando a tampa do laptop é fechada"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Atalhos de teclado não encontrados"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Opções Gerais"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Ícone de bandeja de sistema"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Sempre mostrar um ícone"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Quando a bateria está presente"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Quando a bateria está a carregar ou a descarregar"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "Ligar controlo de escala de frequência do CPU"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Ligar controlo de gestão de energia do monitor"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Configurações avançadas"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Definições de cpu"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Definições de bateria"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Atalhos"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Definições do Monitor"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Preferências de Gestão de Energia"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "A carga da sua bateria está baixa"
@@ -398,15 +406,15 @@
msgid "min"
msgstr "min"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Standby após"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Suspender após"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Desligar após"
Modified: xfce4-power-manager/trunk/po/tr.po
===================================================================
--- xfce4-power-manager/trunk/po/tr.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/tr.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: xfce\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Samed Beyribey <archlinux at archlinuxtr.org>\n"
"Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -32,9 +32,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hazırda beklet"
@@ -45,8 +45,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Askıya Al"
@@ -69,54 +69,54 @@
msgid "Hibernate the system"
msgstr "Sistemi hazırda beklet moduna al"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Kapat"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "UPS yapılandırması"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Pil yapılandırması"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "UPS şarjını göz önünde bulundur"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Pil şarjını göz önünde bulundur"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "yüzde"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Pil seviyesi kritik ise şu işlemi gerçekleştir"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Hiçbiri"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "UPS şarjı bildirimini etkinleştir"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Pil seviyesi bildirimini etkinleştir"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "UPS kaynaklı güç kullanılırken güç korumasını etkinleştir"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Pil kaynaklı güç kullanılırken güç korumasını etkinleştir"
@@ -177,7 +177,7 @@
msgid "CPU frequency control cannot be used"
msgstr "İşlemci frekansı kontrolü kullanılamaz"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Fişe takılı"
@@ -191,108 +191,116 @@
msgid "CPU frequency settings"
msgstr "İşlemci frekansı ayarları"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Pil"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "LCD parlaklık kontrolünü etkinleştir"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "UPS kaynaklı güç için monitör ayarları"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Pil kaynaklı güç için monitör ayarları"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Fişe takılı güç için monitör ayarları"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Monitör ayarları"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Monitörünüz DPMS kontrolü desteği sunmamaktadır"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Klavye kısayolları"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Kapatma düğmesine basıldığında yap"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Uyku düğmesine basıldığında yap"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Dizüstü kapağı kapatıldığında"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Klavye kısayolu bulunamadı"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Genel Seçenekler"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Sistem çekmecesi simgesi"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Her zaman simge göster"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Pil takılı iken"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Pil şarj edilirken veya tükenirken"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
#, fuzzy
msgid "Enable CPU frequency scaling control"
msgstr "İşlemci frekansı ölçeklemesini etkinleştir"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Monitör güç yönetimi kontrolünü etkinleştir"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Gelişmiş ayarlar"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "İşlemci ayarları"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Pil ayarları"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Kısayollar"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Monitör Ayarları"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Güç Yöneticisi Tercihleri"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Pil seviyesi düşük"
@@ -390,15 +398,15 @@
msgid "min"
msgstr "dk"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "Hazırda beklet"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Askıya al"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Kapat"
Modified: xfce4-power-manager/trunk/po/uk.po
===================================================================
--- xfce4-power-manager/trunk/po/uk.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/uk.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-12-04 14:18+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
"Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -15,11 +15,13 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"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"
+"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"
#: ../src/xfpm-ac-adapter.c:217
msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Неможливо визначити стан адаптера, менеджер живлення не працює правильно"
+msgstr ""
+"Неможливо визначити стан адаптера, менеджер живлення не працює правильно"
#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
msgid "Adapter is online"
@@ -36,9 +38,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Сплячка"
@@ -49,14 +51,15 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Призупинити"
#: ../src/xfpm-battery.c:769
msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Ваша батарея майже розряджена. Збережіть Вашу роботу щоб не втратити дані"
+msgstr ""
+"Ваша батарея майже розряджена. Збережіть Вашу роботу щоб не втратити дані"
#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
@@ -72,54 +75,54 @@
msgid "Hibernate the system"
msgstr "Перевести систему в сплячку "
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Вимкнути"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "Налаштування при живленні від UPS"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "Налаштуванні при живленні від батареї"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr "Розглядати критичний заряд UPS"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr "Розглядати критичний розряд батареї"
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "відсоток"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr "Коли заряд батареї досягне критичного рівня зробити"
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Нічого"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "Дозволити повідомлення зарядки UPS"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "Дозволити повідомлення про стан батареї"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "Дозволити збереження заряду при живленні від UPS"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "Дозволити збереження заряду при живленні від батареї"
@@ -140,8 +143,8 @@
"Set the CPU to its maximum speed when there is any load on it and to its "
"minimum speed when the system is idle"
msgstr ""
-"Призначити процесору його максимальну швидкість коли в цьому є потреба "
-"і мінімальну коли система в режимі очікування"
+"Призначити процесору його максимальну швидкість коли в цьому є потреба і "
+"мінімальну коли система в режимі очікування"
#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
msgid "Best power savings"
@@ -179,7 +182,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Контроль частоти процесора не може бути використано"
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr "Живлення від мережі"
@@ -191,107 +194,115 @@
msgid "CPU frequency settings"
msgstr "Налаштування частоти процесора"
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Живлення від батареї"
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr "Увімкнути управління яскравістю рідкокристалічного дисплею"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr "Стежити за властивостями при живленні від UPS"
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr "Стежити за властивостями при живленні від батареї"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr "Стежити за властивостями при живленні від мережі"
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr "Властивості стеження"
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr "Ваш монітор не підтримує управління DPMS"
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "Швидкі клавіші клавіатури"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "Коли натиснуто кнопку живлення зробити"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "Коли натиснуто кнопку заснути зробити"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr "Коли закрито кришку ноутбука"
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "Не знайдено доступних скорочень клавіатури"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "Основні параметри"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "Значок в системному лотку"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "Завжди відображати значок"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr "Коли присутня батарея"
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr "Коли батарея заряджається або розряджається"
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr "Дозволити управління частотою процесора"
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr "Дозволити стеження за управлінням живленням"
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "Додаткові налаштування"
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "Налаштування процесора"
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "Налаштування батареї"
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "Швидкі клавіші клавіатури"
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "Налаштування стеження"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "Налаштування менеджера живлення"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr "Заряд Вашої батареї низький"
@@ -389,15 +400,15 @@
msgid "min"
msgstr "мін"
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr "В режим очікування після"
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr "Призупинити після"
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr "Вимкнути після"
@@ -463,8 +474,8 @@
"Unable to read your home directory environment variable, autostart option "
"may not work"
msgstr ""
-"Неможливо прочитати змінні середовища домашньої теки, опція автозапуску "
-"може не працювати"
+"Неможливо прочитати змінні середовища домашньої теки, опція автозапуску може "
+"не працювати"
#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
#, c-format
@@ -513,8 +524,8 @@
"with the hardware abstract layer or the message bus daemon is not running"
msgstr ""
"Неможливо визначити стан адаптера AC, менеджер живлення може працювати. "
-"неправильно. Можливі причини: драйвер адаптера AC не завантажено, "
-"відсутній зв'язок з HAL або не запущено службу повідомлень шини даних"
+"неправильно. Можливі причини: драйвер адаптера AC не завантажено, відсутній "
+"зв'язок з HAL або не запущено службу повідомлень шини даних"
#: ../src/xfpm-driver.c:728
msgid "System failed to shutdown"
@@ -537,7 +548,9 @@
#: ../src/xfpm-driver.c:1243
msgid "Failed to load power manager configuration, using defaults"
-msgstr "Не вдалось завантажити конфігурацію менеджера живлення, використовується типова"
+msgstr ""
+"Не вдалось завантажити конфігурацію менеджера живлення, використовується "
+"типова"
#: ../src/xfpm-hal.c:172
#, c-format
@@ -618,22 +631,26 @@
#: ../src/xfpm-hal.c:879
#, c-format
msgid "No reply from HAL daemon to set monitor brightness level"
-msgstr "Немає відповіді від служби HAL для встановлення рівня яскравості монітора"
+msgstr ""
+"Немає відповіді від служби HAL для встановлення рівня яскравості монітора"
#: ../src/xfpm-hal.c:926
#, c-format
msgid "No reply from HAL daemon to get monitor brightness level"
-msgstr "Немає відповіді від служби HAL для визначення рівня яскравості монітора"
+msgstr ""
+"Немає відповіді від служби HAL для визначення рівня яскравості монітора"
#: ../src/xfpm-hal.c:976
#, c-format
msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Немає відповіді від служби HAL для визначення наявного управління процесорами"
+msgstr ""
+"Немає відповіді від служби HAL для визначення наявного управління процесорами"
#: ../src/xfpm-hal.c:1028
#, c-format
msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "Немає відповіді від служби HAL для визначення наявного управління процесором"
+msgstr ""
+"Немає відповіді від служби HAL для визначення наявного управління процесором"
#: ../src/xfpm-hal.c:1081
#, c-format
@@ -643,7 +660,8 @@
#: ../src/xfpm-hal.c:1127
#, c-format
msgid "No reply from HAL daemon to set power save profile"
-msgstr "Немає відповіді від служби HAL для встановлення профілю збереження енергії"
+msgstr ""
+"Немає відповіді від служби HAL для встановлення профілю збереження енергії"
#: ../src/xfpm-dbus-messages.c:86
msgid "Failed to create dbus message\n"
@@ -668,4 +686,3 @@
#: ../src/xfce4-power-manager.desktop.in.h:4
msgid "Xfce 4 Power Manager"
msgstr "Менеджер живлення Xfce 4"
-
Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-01-12 15:15:25 UTC (rev 6438)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,9 +35,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr ""
@@ -48,8 +48,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914 ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr ""
@@ -71,54 +71,54 @@
msgid "Hibernate the system"
msgstr ""
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr ""
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr ""
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr ""
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr ""
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr ""
-#: ../src/xfpm-settings.c:443 ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941 ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr ""
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr ""
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr ""
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr ""
@@ -174,7 +174,7 @@
msgid "CPU frequency control cannot be used"
msgstr ""
-#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr ""
@@ -186,107 +186,114 @@
msgid "CPU frequency settings"
msgstr ""
-#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr ""
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr ""
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr ""
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr ""
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr ""
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr ""
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr ""
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr ""
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr ""
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr ""
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr ""
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr ""
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+msgid "System tray icon:"
msgstr ""
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr ""
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr ""
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr ""
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr ""
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr ""
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr ""
-#: ../src/xfpm-settings.c:1123 ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr ""
-#: ../src/xfpm-settings.c:1139 ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr ""
-#: ../src/xfpm-settings.c:1155 ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr ""
-#: ../src/xfpm-settings.c:1170 ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr ""
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr ""
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr ""
@@ -380,15 +387,15 @@
msgid "min"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr ""
Modified: xfce4-power-manager/trunk/po/zh_CN.po
===================================================================
--- xfce4-power-manager/trunk/po/zh_CN.po 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/po/zh_CN.po 2009-01-12 15:15:25 UTC (rev 6438)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 10:15+0100\n"
+"POT-Creation-Date: 2009-01-12 16:07+0100\n"
"PO-Revision-Date: 2008-12-06 16:32+0800\n"
"Last-Translator: Hunt Xu <huntxu at live.cn>\n"
"Language-Team: Chinese (simplified)\n"
@@ -19,47 +19,36 @@
msgid "Unable to read adapter status, the power manager will not work properly"
msgstr "无法读取电源状态，电源管理器可能无法正常工作"
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
msgid "Adapter is online"
msgstr "电源已连接"
-#: ../src/xfpm-ac-adapter.c:286
-#: ../src/xfpm-ac-adapter.c:308
+#: ../src/xfpm-ac-adapter.c:286 ../src/xfpm-ac-adapter.c:308
msgid "Adapter is offline"
msgstr "电源已断开"
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
msgid "Are you sure you want to hibernate the system?"
msgstr "您确定休眠系统吗？"
#. Hibernate menu option
-#: ../src/xfpm-ac-adapter.c:360
-#: ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:807
-#: ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949
-#: ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:916
-#: ../src/xfpm-settings.c:945
-#: ../src/xfpm-settings.c:968
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
+#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "休眠"
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
msgid "Are you sure you want to suspend the system?"
msgstr "您确定挂起系统吗？"
#. Suspend menu option
-#: ../src/xfpm-ac-adapter.c:374
-#: ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:929
-#: ../src/xfpm-battery.c:964
-#: ../src/xfpm-settings.c:914
-#: ../src/xfpm-settings.c:943
-#: ../src/xfpm-settings.c:966
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
+#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "挂起"
@@ -67,13 +56,9 @@
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr "您的电池电量即将耗尽。保存工作以免丢失数据"
-#: ../src/xfpm-battery.c:774
-#: ../src/xfpm-battery.c:1339
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:232
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:232
+#: ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317 ../src/xfpm-driver.c:912
msgid "Xfce power manager"
msgstr "Xfce 电源管理器"
@@ -85,99 +70,91 @@
msgid "Hibernate the system"
msgstr "休眠"
-#: ../src/xfpm-battery.c:814
-#: ../src/xfpm-settings.c:446
-#: ../src/xfpm-settings.c:918
-#: ../src/xfpm-settings.c:947
-#: ../src/xfpm-settings.c:970
+#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
+#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "关机"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "UPS configuration"
msgstr "交流电源配置"
-#: ../src/xfpm-settings.c:418
+#: ../src/xfpm-settings.c:417
msgid "Battery configuration"
msgstr "电池配置"
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider UPS charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:422
+#: ../src/xfpm-settings.c:424
msgid "Consider battery charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:427
+#: ../src/xfpm-settings.c:430
msgid "percent"
msgstr "百分比"
-#: ../src/xfpm-settings.c:437
+#: ../src/xfpm-settings.c:440
msgid "When battery charge level is critical do"
msgstr ""
-#: ../src/xfpm-settings.c:443
-#: ../src/xfpm-settings.c:912
-#: ../src/xfpm-settings.c:941
-#: ../src/xfpm-settings.c:964
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "什么都不做"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable UPS charge notification"
msgstr "打开交流电源充电通知"
-#: ../src/xfpm-settings.c:464
+#: ../src/xfpm-settings.c:471
msgid "Enable battery state notification"
msgstr "打开电池状态通知"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on UPS power"
msgstr "当使用交流电源供电时打开节能功能"
-#: ../src/xfpm-settings.c:478
+#: ../src/xfpm-settings.c:482
msgid "Enable power save on battery power"
msgstr "当使用电池供电时打开节能功能"
-#: ../src/xfpm-settings.c:518
-#: ../src/xfpm-settings.c:603
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
msgid "Best performance"
msgstr "最佳性能"
-#: ../src/xfpm-settings.c:519
-#: ../src/xfpm-settings.c:604
+#: ../src/xfpm-settings.c:519 ../src/xfpm-settings.c:604
msgid "Set the CPU to its maximum frequency"
msgstr "设置 CPU 至其最大主频"
-#: ../src/xfpm-settings.c:524
-#: ../src/xfpm-settings.c:609
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
msgid "Ondemand performance"
msgstr ""
-#: ../src/xfpm-settings.c:525
-#: ../src/xfpm-settings.c:610
-msgid "Set the CPU to its maximum speed when there is any load on it and to its minimum speed when the system is idle"
+#: ../src/xfpm-settings.c:525 ../src/xfpm-settings.c:610
+msgid ""
+"Set the CPU to its maximum speed when there is any load on it and to its "
+"minimum speed when the system is idle"
msgstr ""
-#: ../src/xfpm-settings.c:530
-#: ../src/xfpm-settings.c:615
+#: ../src/xfpm-settings.c:530 ../src/xfpm-settings.c:615
msgid "Best power savings"
msgstr "最节能"
-#: ../src/xfpm-settings.c:531
-#: ../src/xfpm-settings.c:616
+#: ../src/xfpm-settings.c:531 ../src/xfpm-settings.c:616
msgid "Set the CPU to its minimum frequency"
msgstr "设置 CPU 至其最小主频"
-#: ../src/xfpm-settings.c:535
-#: ../src/xfpm-settings.c:620
+#: ../src/xfpm-settings.c:535 ../src/xfpm-settings.c:620
msgid "Good power savings"
msgstr ""
-#: ../src/xfpm-settings.c:537
-#: ../src/xfpm-settings.c:622
-msgid "gracefully increases and decreases the CPU speed depending on the current usage"
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
msgstr ""
#: ../src/xfpm-settings.c:595
@@ -196,8 +173,7 @@
msgid "CPU frequency control cannot be used"
msgstr "CPU 主频控制无法使用"
-#: ../src/xfpm-settings.c:705
-#: ../src/xfpm-settings.c:850
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On electric power"
msgstr ""
@@ -209,112 +185,115 @@
msgid "CPU frequency settings"
msgstr "CPU 主频设置"
-#: ../src/xfpm-settings.c:715
-#: ../src/xfpm-settings.c:858
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr ""
-#: ../src/xfpm-settings.c:734
+#: ../src/xfpm-settings.c:735
msgid "Enable LCD brightness control"
msgstr ""
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:756
+#: ../src/xfpm-settings.c:751
msgid "Monitor settings on battery power"
msgstr ""
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings on electric power"
msgstr ""
-#: ../src/xfpm-settings.c:849
+#: ../src/xfpm-settings.c:846
msgid "Monitor settings"
msgstr ""
-#: ../src/xfpm-settings.c:866
+#: ../src/xfpm-settings.c:863
msgid "Your monitor doesn't support DPMS control"
msgstr ""
-#: ../src/xfpm-settings.c:897
+#: ../src/xfpm-settings.c:896
msgid "Keyboard shortcuts"
msgstr "快捷键"
-#: ../src/xfpm-settings.c:907
+#: ../src/xfpm-settings.c:908
msgid "When power button is pressed do"
msgstr "按下电源按钮时执行"
-#: ../src/xfpm-settings.c:933
+#: ../src/xfpm-settings.c:935
msgid "When sleep button is pressed do"
msgstr "按下睡眠按钮时执行"
-#: ../src/xfpm-settings.c:958
+#: ../src/xfpm-settings.c:963
msgid "When laptop lid is closed"
msgstr ""
-#: ../src/xfpm-settings.c:982
+#: ../src/xfpm-settings.c:990
msgid "No available keyboard shortcuts found"
msgstr "找不到可用的快捷键"
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1008
msgid "General Options"
msgstr "一般设置"
#. Systray icon
-#: ../src/xfpm-settings.c:1006
-msgid "System tray icon"
+#: ../src/xfpm-settings.c:1019
+#, fuzzy
+msgid "System tray icon:"
msgstr "系统通知区域图标"
-#: ../src/xfpm-settings.c:1012
+#: ../src/xfpm-settings.c:1026
msgid "Always Display an icon"
msgstr "总是显示图标"
-#: ../src/xfpm-settings.c:1013
+#: ../src/xfpm-settings.c:1027
msgid "When battery is present"
msgstr ""
-#: ../src/xfpm-settings.c:1016
+#: ../src/xfpm-settings.c:1030
msgid "When battery is charging or discharging"
msgstr ""
-#: ../src/xfpm-settings.c:1037
+#: ../src/xfpm-settings.c:1048
msgid "Enable CPU frequency scaling control"
msgstr ""
-#: ../src/xfpm-settings.c:1051
+#. label = gtk_label_new(_("Enable monitor power management control"));
+#. gtk_widget_show(label);
+#. gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+#: ../src/xfpm-settings.c:1070
msgid "Enable monitor power management control"
msgstr ""
-#: ../src/xfpm-settings.c:1104
+#: ../src/xfpm-settings.c:1125
msgid "Advanced settings"
msgstr "高级设置"
-#: ../src/xfpm-settings.c:1123
-#: ../src/xfpm-settings.c:1128
+#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
msgid "CPU settings"
msgstr "CPU 设置"
-#: ../src/xfpm-settings.c:1139
-#: ../src/xfpm-settings.c:1144
+#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
msgid "Battery settings"
msgstr "电池设置"
-#: ../src/xfpm-settings.c:1155
-#: ../src/xfpm-settings.c:1160
+#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
msgid "Shortcuts"
msgstr "快捷方式"
-#: ../src/xfpm-settings.c:1170
-#: ../src/xfpm-settings.c:1175
+#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
msgid "Monitor Settings"
msgstr "显示器设置"
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1231
msgid "Power Manager Preferences"
msgstr "电源管理器首选项"
+#: ../src/xfpm-settings.c:1262
+msgid "Extended"
+msgstr ""
+
#: ../src/xfpm-battery-icon.c:369
msgid "Your battery charge is low"
msgstr ""
@@ -327,8 +306,7 @@
msgid "You are running on Battery"
msgstr "正在使用电池供电"
-#: ../src/xfpm-battery-icon.c:385
-#: ../src/xfpm-battery-icon.c:567
+#: ../src/xfpm-battery-icon.c:385 ../src/xfpm-battery-icon.c:567
#: ../src/xfpm-battery-icon.c:571
msgid "Battery is discharging"
msgstr ""
@@ -337,8 +315,7 @@
msgid "Your battery is discharging"
msgstr ""
-#: ../src/xfpm-battery-icon.c:397
-#: ../src/xfpm-battery-icon.c:555
+#: ../src/xfpm-battery-icon.c:397 ../src/xfpm-battery-icon.c:555
msgid "Battery is charging"
msgstr "电池正在充电中"
@@ -414,20 +391,19 @@
msgid "min"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:129
+#: ../src/xfpm-dpms-spins.c:140
msgid "Standby after"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:137
+#: ../src/xfpm-dpms-spins.c:148
msgid "Suspend after"
msgstr ""
-#: ../src/xfpm-dpms-spins.c:145
+#: ../src/xfpm-dpms-spins.c:156
msgid "Turn off after"
msgstr ""
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
msgid "Xfce4 Power Manager"
msgstr "Xfce4 电源管理器"
@@ -485,11 +461,12 @@
msgstr "Xfce 电源管理器"
#: ../src/xfpm-main.c:88
-msgid "Unable to read your home directory environment variable, autostart option may not work"
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
msgstr "无法读取家目录环境变量，可能无法开机自动启动"
-#: ../src/xfpm-main.c:163
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
#, c-format
msgid "Type '%s --help' for usage."
msgstr "输入 '%s --help' 查看使用方式"
@@ -499,8 +476,7 @@
msgid "Too many arguments"
msgstr "太多擦数"
-#: ../src/xfpm-main.c:198
-#: ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce 电源管理器未运行"
@@ -519,7 +495,9 @@
msgstr "Xfce 电源管理器已在运行中"
#: ../src/xfpm-main.c:233
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
msgstr ""
#: ../src/xfpm-main.c:237
@@ -527,7 +505,10 @@
msgstr "无法载入 xfce4 电源管理器"
#: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
+msgid ""
+"Unable to read AC adapter status, the power manager will not work properly. "
+"Possible reasons: The AC adapter driver is not loaded, broken connection "
+"with the hardware abstract layer or the message bus daemon is not running"
msgstr ""
#: ../src/xfpm-driver.c:728
@@ -535,7 +516,11 @@
msgstr "关机失败"
#: ../src/xfpm-driver.c:907
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
+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 ""
#: ../src/xfpm-driver.c:920
@@ -551,8 +536,7 @@
msgid "Error monitoring HAL events"
msgstr ""
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
#, c-format
msgid "Unable to connect to DBus: %s"
msgstr "无法连接至DBus：%s"
@@ -586,14 +570,9 @@
msgid "No hibernate method found"
msgstr ""
-#: ../src/xfpm-hal.c:675
-#: ../src/xfpm-hal.c:765
-#: ../src/xfpm-hal.c:859
-#: ../src/xfpm-hal.c:908
-#: ../src/xfpm-hal.c:958
-#: ../src/xfpm-hal.c:1010
-#: ../src/xfpm-hal.c:1062
-#: ../src/xfpm-hal.c:1108
+#: ../src/xfpm-hal.c:675 ../src/xfpm-hal.c:765 ../src/xfpm-hal.c:859
+#: ../src/xfpm-hal.c:908 ../src/xfpm-hal.c:958 ../src/xfpm-hal.c:1010
+#: ../src/xfpm-hal.c:1062 ../src/xfpm-hal.c:1108
#, c-format
msgid "Out of memory"
msgstr ""
@@ -608,14 +587,12 @@
msgid "System failed to hibernate"
msgstr "休眠系统失败"
-#: ../src/xfpm-hal.c:734
-#: ../src/xfpm-hal.c:826
+#: ../src/xfpm-hal.c:734 ../src/xfpm-hal.c:826
#, c-format
msgid "Error occured while trying to suspend"
msgstr "尝试挂起时发生错误"
-#: ../src/xfpm-hal.c:737
-#: ../src/xfpm-hal.c:829
+#: ../src/xfpm-hal.c:737 ../src/xfpm-hal.c:829
#, c-format
msgid "Unknown reply from the message daemon"
msgstr ""
@@ -664,8 +641,7 @@
msgid "Failed to create dbus message\n"
msgstr "dbus消息创建失败\n"
-#: ../src/xfpm-dbus-messages.c:122
-#: ../src/xfpm-dbus-messages.c:223
+#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
msgid "Failed to send message\n"
msgstr "消息发送失败\n"
@@ -684,4 +660,3 @@
#: ../src/xfce4-power-manager.desktop.in.h:4
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 电源管理器"
-
Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2009-01-12 15:15:25 UTC (rev 6438)
@@ -52,6 +52,14 @@
#ifdef HAVE_DPMS
+#ifndef BORDER
+#define BORDER 8
+#endif
+
+#ifndef SPACING
+#define SPACING 2
+#endif
+
/* init */
static void xfpm_dpms_spins_init (XfpmDpmsSpins *dpms_spins);
static void xfpm_dpms_spins_class_init(XfpmDpmsSpinsClass *klass);
@@ -66,50 +74,50 @@
#define XFPM_DPMS_SPINS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o),XFPM_TYPE_DPMS_SPINS,XfpmDpmsSpinsPrivate))
-struct XfpmDpmsSpinsPrivate
+struct XfpmDpmsSpinsPrivate
{
GtkWidget *spin_1;
gint spin_value_1;
-
+
GtkWidget *spin_2;
gint spin_value_2;
-
+
GtkWidget *spin_3;
gint spin_value_3;
-
+
};
G_DEFINE_TYPE(XfpmDpmsSpins,xfpm_dpms_spins,GTK_TYPE_TABLE);
enum {
-
+
DPMS_VALUE_CHANGED,
LAST_SIGNAL
-
+
};
-static guint signals[LAST_SIGNAL] = { 0,};
+static guint signals[LAST_SIGNAL] = { 0,};
static void
-xfpm_dpms_spins_class_init(XfpmDpmsSpinsClass *klass)
+xfpm_dpms_spins_class_init(XfpmDpmsSpinsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
+
signals[DPMS_VALUE_CHANGED] = g_signal_new("dpms-value-changed",
- XFPM_TYPE_DPMS_SPINS,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmDpmsSpinsClass,dpms_value_changed),
- NULL,NULL,
- _xfpm_marshal_VOID__INT_INT_INT,
- G_TYPE_NONE,3,
- G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_INT);
-
+ XFPM_TYPE_DPMS_SPINS,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(XfpmDpmsSpinsClass,dpms_value_changed),
+ NULL,NULL,
+ _xfpm_marshal_VOID__INT_INT_INT,
+ G_TYPE_NONE,3,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_INT);
+
object_class->finalize = xfpm_dpms_spins_finalize;
-
+
g_type_class_add_private(klass,sizeof(XfpmDpmsSpinsClass));
-
+
}
static void
@@ -117,45 +125,48 @@
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(dpms_spins);
-
+
g_object_set(G_OBJECT(dpms_spins),
"homogeneous",FALSE,
"n-columns",2,
"n-rows",3,
NULL);
-
+
+ gtk_table_set_homogeneous(GTK_TABLE(dpms_spins), FALSE);
+
GtkWidget *label;
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
+ GtkWidget *align;
label = gtk_label_new(_("Standby after"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
+ align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_container_add(GTK_CONTAINER(align), label);
+ gtk_table_attach(GTK_TABLE(dpms_spins),align,0,1,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
priv->spin_1 = xfpm_spin_button_new_with_range(0,298,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_1),suffix);
- gtk_widget_show(priv->spin_1);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_1,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_1,1,2,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
label = gtk_label_new(_("Suspend after"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
+ align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_container_add(GTK_CONTAINER(align), label);
+ gtk_table_attach(GTK_TABLE(dpms_spins),align,0,1,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING);
priv->spin_2 = xfpm_spin_button_new_with_range(0,299,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_2),suffix);
- gtk_widget_show(priv->spin_2);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_2,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_2,1,2,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
label = gtk_label_new(_("Turn off after"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
+ align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_container_add(GTK_CONTAINER(align), label);
+ gtk_table_attach(GTK_TABLE(dpms_spins),align,0,1,2,3,GTK_FILL,GTK_FILL,BORDER,SPACING);
priv->spin_3 = xfpm_spin_button_new_with_range(0,300,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_3),suffix);
- gtk_widget_show(priv->spin_3);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_3,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
-
- gtk_widget_show(GTK_WIDGET(dpms_spins));
-
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_3,1,2,2,3,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
+ gtk_widget_show_all(GTK_WIDGET(dpms_spins));
+
g_signal_connect(priv->spin_1,"value-changed",G_CALLBACK(xfpm_dpms_spins_get_spin1_value_cb),dpms_spins);
g_signal_connect(priv->spin_2,"value-changed",G_CALLBACK(xfpm_dpms_spins_get_spin2_value_cb),dpms_spins);
g_signal_connect(priv->spin_3,"value-changed",G_CALLBACK(xfpm_dpms_spins_get_spin3_value_cb),dpms_spins);
- g_free(suffix);
+ g_free(suffix);
}
static void
@@ -163,7 +174,7 @@
{
XfpmDpmsSpins *spins;
spins = XFPM_DPMS_SPINS(object);
-
+
G_OBJECT_CLASS(xfpm_dpms_spins_parent_class)->finalize(object);
}
@@ -172,31 +183,31 @@
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(spins);
-
+
gint value1,value2,value3;
value1 = gtk_spin_button_get_value(spin_1);
value2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_2));
value3 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_3));
-
+
if ( value1 == 0 )
{
priv->spin_value_1 = 0;
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_1),suffix);
g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,
value1,value2,value3);
- g_free(suffix);
+ g_free(suffix);
return;
}
if ( priv->spin_value_1 == 0 )
{
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_1),suffix);
priv->spin_value_1 = value1;
- g_free(suffix);
+ g_free(suffix);
}
-
+
if ( value2 <= value1 && value2 != 0 )
{
value2 = value1 + 1;
@@ -206,7 +217,7 @@
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_2),value2);
g_signal_handlers_unblock_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
}
-
+
if ( value3 <= value2 && value3 != 0)
{
value3 = value2 + 1;
@@ -214,18 +225,18 @@
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
}
-
- if ( value3 <= value1 && value3 != 0)
+
+ if ( value3 <= value1 && value3 != 0)
{
value3 = value1 + 1;
g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
}
-
+
g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,
value1,value2,value3);
-
+
}
static void
@@ -233,31 +244,31 @@
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(spins);
-
+
gint value1,value2,value3;
value2 = gtk_spin_button_get_value(spin_2);
-
+
value1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_1));
-
+
value3 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_3));
if ( value2 == 0 )
{
priv->spin_value_2 = 0;
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_2),suffix);
g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
- g_free(suffix);
-
+ g_free(suffix);
+
return;
}
-
+
if ( priv->spin_value_2 == 0 )
{
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_2),suffix);
priv->spin_value_2 = value2;
- g_free(suffix);
+ g_free(suffix);
}
if ( value2 <= value1 && value2 != 0)
@@ -266,8 +277,8 @@
g_signal_handlers_block_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_2),value2);
g_signal_handlers_unblock_by_func(priv->spin_2,xfpm_dpms_spins_get_spin2_value_cb,spins);
- }
-
+ }
+
if ( value3 <= value2 && value3 != 0)
{
value3 = value2 + 1;
@@ -275,9 +286,9 @@
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
}
-
- g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
-
+
+ g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
+
}
static void
@@ -285,30 +296,30 @@
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(spins);
-
+
gint value1,value2,value3;
value3 = gtk_spin_button_get_value(spin_3);
-
+
value1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_1));
-
+
value2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->spin_2));
if ( value3 == 0 )
{
priv->spin_value_3 = 0;
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_3),suffix);
g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
g_free(suffix);
return;
}
-
+
if ( priv->spin_value_3 == 0 )
{
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(spin_3),suffix);
priv->spin_value_3 = value3;
- g_free(suffix);
+ g_free(suffix);
}
if ( value3 <= value2 && value3 != 0 )
@@ -318,15 +329,15 @@
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
}
-
- if ( value3 <= value1 && value3 != 0 )
+
+ if ( value3 <= value1 && value3 != 0 )
{
value3 = value1 + 1;
g_signal_handlers_block_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),value3);
g_signal_handlers_unblock_by_func(priv->spin_3,xfpm_dpms_spins_get_spin3_value_cb,spins);
}
-
+
g_signal_emit(G_OBJECT(spins),signals[DPMS_VALUE_CHANGED],0,value1,value2,value3);
}
@@ -344,31 +355,31 @@
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(spins);
- gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
-
+ gchar *suffix = g_strdup_printf(" %s",SUFFIX_NEVER);
+
if ( spin_1 == 0) xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_1),suffix);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_1),spin_1);
-
+
if ( spin_2 == 0) xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_2),suffix);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_2),spin_2);
-
+
if ( spin_3 == 0) xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_3),suffix);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->spin_3),spin_3);
-
- g_free(suffix);
-}
-void
+ g_free(suffix);
+}
+
+void
xfpm_dpms_spins_set_active(XfpmDpmsSpins *spins,
gboolean active)
{
XfpmDpmsSpinsPrivate *priv;
priv = XFPM_DPMS_SPINS_GET_PRIVATE(spins);
-
+
gtk_widget_set_sensitive(GTK_WIDGET(priv->spin_1),active);
gtk_widget_set_sensitive(GTK_WIDGET(priv->spin_2),active);
gtk_widget_set_sensitive(GTK_WIDGET(priv->spin_3),active);
-
-}
-
+
+}
+
#endif /* HAVE_DPMS */
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2009-01-11 23:45:40 UTC (rev 6437)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2009-01-12 15:15:25 UTC (rev 6438)
@@ -52,6 +52,8 @@
#include "xfpm-dpms-spins.h"
#endif
+#define BORDER 8
+#define SPACING 2
/// Global Variable ///
static GtkWidget *nt;
@@ -78,7 +80,7 @@
set_show_tray_icon_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
if(!xfconf_channel_set_uint(channel,SHOW_TRAY_ICON_CFG,value))
{
g_critical("Cannot set value %s\n",SHOW_TRAY_ICON_CFG);
@@ -89,7 +91,7 @@
set_battery_critical_charge_cb(GtkWidget *widget,XfconfChannel *channel)
{
guint value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
-
+
if(!xfconf_channel_set_uint(channel,CRITICAL_BATT_CFG,value))
{
g_critical("Cannot set value %s\n",CRITICAL_BATT_CFG);
@@ -100,7 +102,7 @@
set_critical_action_cb(GtkWidget *widget,XfconfChannel *channel)
{
guint value = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
if(!xfconf_channel_set_uint(channel,CRITICAL_BATT_ACTION_CFG,value))
{
g_critical("Cannot set value %s\n",CRITICAL_BATT_ACTION_CFG);
@@ -111,7 +113,7 @@
set_power_button_action_cb(GtkWidget *widget,XfconfChannel *channel)
{
guint value = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
if(!xfconf_channel_set_uint(channel,POWER_SWITCH_CFG,value))
{
g_critical("Cannot set value %s\n",POWER_SWITCH_CFG);
@@ -122,7 +124,7 @@
set_sleep_button_action_cb(GtkWidget *widget,XfconfChannel *channel)
{
guint value = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
if(!xfconf_channel_set_uint(channel,SLEEP_SWITCH_CFG,value))
{
g_critical("Cannot set value %s\n",SLEEP_SWITCH_CFG);
@@ -133,7 +135,7 @@
set_lid_button_action_cb(GtkWidget *widget,XfconfChannel *channel)
{
guint value = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-
+
if(!xfconf_channel_set_uint(channel,LID_SWITCH_CFG,value))
{
g_critical("Cannot set value %s\n",LID_SWITCH_CFG);
@@ -144,7 +146,7 @@
set_power_save_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
+
if(!xfconf_channel_set_bool(channel,POWER_SAVE_CFG,value))
{
g_critical("Cannot set value %s\n",POWER_SAVE_CFG);
@@ -156,19 +158,19 @@
set_battery_state_notification_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
+
if(!xfconf_channel_set_bool(channel,BATT_STATE_NOTIFICATION_CFG,value))
{
g_critical("Cannot set value %s\n",BATT_STATE_NOTIFICATION_CFG);
}
-}
+}
#endif
static void
set_lcd_brightness_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
+
if(!xfconf_channel_set_bool(channel,LCD_BRIGHTNESS_CFG,value))
{
g_critical("Cannot set value %s\n",LCD_BRIGHTNESS_CFG);
@@ -180,17 +182,17 @@
set_dpms_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
+
if(!xfconf_channel_set_bool(channel,DPMS_ENABLE_CFG,value))
{
g_critical("Cannot set value %s\n",DPMS_ENABLE_CFG);
}
-
- xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_ac_dpms),value);
-
+
+ xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_ac_dpms),value);
+
if ( GTK_IS_WIDGET(on_batt_dpms) )
{
- xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_batt_dpms),value);
+ xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_batt_dpms),value);
}
}
@@ -200,26 +202,26 @@
{
GPtrArray *arr = g_ptr_array_sized_new(3);
GValue *val;
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value1);
g_ptr_array_add(arr, val);
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value2);
g_ptr_array_add(arr, val);
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value3);
g_ptr_array_add(arr, val);
-
+
if (!xfconf_channel_set_arrayv(channel,
ON_BATT_DPMS_TIMEOUTS_CFG,
arr) )
- {
+ {
g_critical("Cannot set value for %s \n",ON_BATT_DPMS_TIMEOUTS_CFG);
xfconf_array_free(arr);
return;
@@ -233,26 +235,26 @@
{
GPtrArray *arr = g_ptr_array_sized_new(3);
GValue *val;
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value1);
g_ptr_array_add(arr, val);
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value2);
g_ptr_array_add(arr, val);
-
+
val = g_new0(GValue, 1);
g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, value3);
g_ptr_array_add(arr, val);
-
+
if (!xfconf_channel_set_arrayv(channel,
ON_AC_DPMS_TIMEOUTS_CFG,
arr) )
- {
+ {
g_critical("Cannot set value %s \n",ON_AC_DPMS_TIMEOUTS_CFG);
xfconf_array_free(arr);
return;
@@ -265,7 +267,7 @@
set_cpu_freq_scaling_cb(GtkWidget *widget,XfconfChannel *channel)
{
gboolean value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
+
if(!xfconf_channel_set_bool(channel,CPU_FREQ_SCALING_CFG,value))
{
g_critical("Cannot set value %s\n",CPU_FREQ_SCALING_CFG);
@@ -277,8 +279,8 @@
gtk_widget_set_sensitive(powersave_on_ac,value);
gtk_widget_set_sensitive(conservative_on_ac,value);
}
-
- if ( GTK_IS_WIDGET(ondemand_on_batt) ) /* enough to check only one widget */
+
+ if ( GTK_IS_WIDGET(ondemand_on_batt) ) /* enough to check only one widget */
{
gtk_widget_set_sensitive(ondemand_on_batt,value);
gtk_widget_set_sensitive(performance_on_batt,value);
@@ -373,24 +375,24 @@
_combo_helper_function(XfconfChannel *channel,const gchar *config,
guint8 power_management,XfpmActionRequest action)
{
- if( power_management == 0 && action != XFPM_DO_NOTHING )
+ if( power_management == 0 && action != XFPM_DO_NOTHING )
{
xfconf_channel_set_uint(channel,config,XFPM_DO_NOTHING);
return XFPM_DO_NOTHING;
}
-
- if( !(power_management & SYSTEM_CAN_SUSPEND) && action == XFPM_DO_SUSPEND )
+
+ if( !(power_management & SYSTEM_CAN_SUSPEND) && action == XFPM_DO_SUSPEND )
{
xfconf_channel_set_uint(channel,config,XFPM_DO_NOTHING);
return XFPM_DO_NOTHING;
}
-
- if( !(power_management & SYSTEM_CAN_HIBERNATE) && action == XFPM_DO_HIBERNATE )
+
+ if( !(power_management & SYSTEM_CAN_HIBERNATE) && action == XFPM_DO_HIBERNATE )
{
xfconf_channel_set_uint(channel,config,XFPM_DO_NOTHING);
return XFPM_DO_NOTHING;
}
-
+
if ( action < XFPM_DO_NOTHING || action > XFPM_DO_SHUTDOWN )
{
xfconf_channel_set_uint(channel,config,XFPM_DO_NOTHING);
@@ -408,37 +410,42 @@
GtkWidget *label;
GtkWidget *critical_spin;
GtkWidget *action;
- GtkWidget *vbox;
+ GtkWidget *w_align;
- vbox = gtk_vbox_new(FALSE,0);
- gtk_widget_show(vbox);
-
table = gtk_table_new(4,2,FALSE);
gtk_widget_show(table);
frame = xfce_create_framebox(ups_found ? _("UPS configuration") :_("Battery configuration"), &align);
gtk_widget_show(frame);
gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
+
+ w_align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_widget_show(w_align);
label = gtk_label_new(ups_found ? _("Consider UPS charge critical"):_("Consider battery charge critical"));
gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ gtk_container_add(GTK_CONTAINER(w_align), label);
+ gtk_table_attach(GTK_TABLE(table),w_align,0,1,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
critical_spin = xfpm_spin_button_new_with_range(1,20,1);
- gchar *suffix = g_strdup_printf(" %s",_("percent"));
+ gchar *suffix = g_strdup_printf(" %s",_("percent"));
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(critical_spin),suffix);
- g_free(suffix);
+ g_free(suffix);
gtk_widget_show(critical_spin);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(critical_spin),
xfconf_channel_get_uint(channel,CRITICAL_BATT_CFG,10));
g_signal_connect(critical_spin,"value-changed",
G_CALLBACK(set_battery_critical_charge_cb),channel);
- gtk_table_attach(GTK_TABLE(table),critical_spin,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ gtk_table_attach(GTK_TABLE(table),critical_spin,1,2,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
label = gtk_label_new(_("When battery charge level is critical do"));
gtk_widget_show(label);
+ w_align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_widget_show(w_align);
+
+ gtk_container_add(GTK_CONTAINER(w_align), label);
if ( !ups_found )
- gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ gtk_table_attach(GTK_TABLE(table),w_align,0,1,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
action = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(action),_("Nothing"));
if ( power_management != 0 )
@@ -448,52 +455,45 @@
if ( power_management & SYSTEM_CAN_HIBERNATE )
{
gtk_combo_box_append_text(GTK_COMBO_BOX(action),_("Hibernate"));
- }
+ }
guint active = xfconf_channel_get_uint(channel,CRITICAL_BATT_ACTION_CFG,XFPM_DO_NOTHING);
active = _combo_helper_function(channel,CRITICAL_BATT_ACTION_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(action),active);
-
+
gtk_widget_show(action);
g_signal_connect(action,"changed",G_CALLBACK(set_critical_action_cb),channel);
-
- !ups_found ? gtk_table_attach(GTK_TABLE(table),action,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0) : gtk_widget_hide(action);
+ !ups_found ? gtk_table_attach(GTK_TABLE(table),action,1,2,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING) : gtk_widget_hide(action);
+
#ifdef HAVE_LIBNOTIFY
- GtkWidget *notify_bt;
- label = gtk_label_new(ups_found ? _("Enable UPS charge notification") :_("Enable battery state notification"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
- notify_bt = gtk_check_button_new();
+ GtkWidget *notify_bt;
+ notify_bt = gtk_check_button_new_with_label (ups_found ? _("Enable UPS charge notification") :_("Enable battery state notification") );
gtk_widget_show(notify_bt);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(notify_bt),
- xfconf_channel_get_bool(channel,BATT_STATE_NOTIFICATION_CFG,TRUE));
- g_signal_connect(notify_bt,"toggled",G_CALLBACK(set_battery_state_notification_cb),channel);
- gtk_table_attach(GTK_TABLE(table),notify_bt,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
-#endif
- if ( power_management & SYSTEM_CAN_POWER_SAVE )
- {
- // Power Save Profile
- GtkWidget *power_save;
- label = gtk_label_new(ups_found ? _("Enable power save on UPS power") : _("Enable power save on battery power"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
- power_save = gtk_check_button_new();
- gtk_widget_show(power_save);
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(power_save),
- power_management & SYSTEM_CAN_POWER_SAVE ?
- xfconf_channel_get_bool(channel,POWER_SAVE_CFG,FALSE)
- : FALSE);
-
- g_signal_connect(power_save,"toggled",G_CALLBACK(set_power_save_cb),channel);
- gtk_table_attach(GTK_TABLE(table),power_save,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
- }
-
- gtk_container_add(GTK_CONTAINER(align),vbox);
- gtk_box_pack_start(GTK_BOX(vbox),table,TRUE,TRUE,0);
+ xfconf_channel_get_bool(channel,BATT_STATE_NOTIFICATION_CFG,TRUE));
+ g_signal_connect(notify_bt,"toggled",G_CALLBACK(set_battery_state_notification_cb),channel);
+ gtk_table_attach(GTK_TABLE(table),notify_bt,0,2,2,3,GTK_FILL,GTK_FILL,BORDER,SPACING);
+#endif
+ if ( power_management & SYSTEM_CAN_POWER_SAVE )
+ {
+ // Power Save Profile
+ GtkWidget *power_save;
+ power_save = gtk_check_button_new_with_label(ups_found ? _("Enable power save on UPS power") : _("Enable power save on battery power"));
+ gtk_widget_show(power_save);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(power_save),
+ power_management & SYSTEM_CAN_POWER_SAVE ?
+ xfconf_channel_get_bool(channel,POWER_SAVE_CFG,FALSE)
+ : FALSE);
+
+ g_signal_connect(power_save,"toggled",G_CALLBACK(set_power_save_cb),channel);
+ gtk_table_attach(GTK_TABLE(table),power_save,0,2,2,3,GTK_SHRINK,GTK_SHRINK,SPACING, SPACING);
+ }
+
+ gtk_container_add(GTK_CONTAINER(align),table); //vbox);
return frame;
-
+
}
static GtkWidget *
@@ -547,7 +547,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(powersave_on_ac),TRUE);
}
}
- if ( govs & ONDEMAND )
+ if ( govs & ONDEMAND )
{
gtk_widget_set_sensitive(ondemand_on_ac,enable);
g_signal_connect(ondemand_on_ac,"pressed",G_CALLBACK(set_ondemand_on_ac_cb),channel);
@@ -557,7 +557,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ondemand_on_ac),TRUE);
}
}
- if ( govs & PERFORMANCE )
+ if ( govs & PERFORMANCE )
{
gtk_widget_set_sensitive(performance_on_ac,enable);
g_signal_connect(performance_on_ac,"pressed",G_CALLBACK(set_performance_on_ac_cb),channel);
@@ -567,7 +567,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(performance_on_ac),TRUE);
}
}
- if ( govs & CONSERVATIVE )
+ if ( govs & CONSERVATIVE )
{
gtk_widget_set_sensitive(conservative_on_ac,enable);
g_signal_connect(conservative_on_ac,"pressed",G_CALLBACK(set_conservative_on_ac_cb),channel);
@@ -577,7 +577,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conservative_on_ac),TRUE);
}
}
-
+
return frame;
}
@@ -632,7 +632,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(powersave_on_batt),TRUE);
}
}
- if ( govs & ONDEMAND )
+ if ( govs & ONDEMAND )
{
gtk_widget_set_sensitive(ondemand_on_batt,enable);
g_signal_connect(ondemand_on_batt,"pressed",G_CALLBACK(set_ondemand_on_batt_cb),channel);
@@ -642,7 +642,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ondemand_on_batt),TRUE);
}
}
- if ( govs & PERFORMANCE )
+ if ( govs & PERFORMANCE )
{
gtk_widget_set_sensitive(performance_on_batt,enable);
g_signal_connect(performance_on_batt,"pressed",G_CALLBACK(set_performance_on_batt_cb),channel);
@@ -652,7 +652,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(performance_on_batt),TRUE);
}
}
- if ( govs & CONSERVATIVE )
+ if ( govs & CONSERVATIVE )
{
gtk_widget_set_sensitive(conservative_on_batt,enable);
g_signal_connect(conservative_on_batt,"pressed",G_CALLBACK(set_conservative_on_batt_cb),channel);
@@ -726,25 +726,20 @@
xfpm_settings_lcd_brightness(XfconfChannel *channel,gboolean laptop,gboolean lcd)
{
GtkWidget *hbox;
- hbox = gtk_hbox_new(FALSE,2);
+ GtkWidget *brg;
- if ( laptop && lcd)
+ hbox = gtk_hbox_new(FALSE,SPACING);
+
+ if ( laptop && lcd)
{
- GtkWidget *label;
- label = gtk_label_new(_("Enable LCD brightness control"));
- gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
-
- GtkWidget *brg;
- brg = gtk_check_button_new();
- gtk_widget_show(brg);
+ brg = gtk_check_button_new_with_label(_("Enable LCD brightness control"));
gtk_box_pack_start(GTK_BOX(hbox),brg,FALSE,FALSE,0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(brg),
xfconf_channel_get_bool(channel,LCD_BRIGHTNESS_CFG,TRUE));
g_signal_connect(brg,"toggled",G_CALLBACK(set_lcd_brightness_cb),channel);
- gtk_widget_show(hbox);
}
-
+ gtk_widget_show_all(hbox);
+
return hbox;
}
@@ -752,12 +747,12 @@
static GtkWidget *
xfpm_settings_dpms_on_battery(XfconfChannel *channel,gboolean ups)
{
- GtkWidget *frame,*align;
+ GtkWidget *frame,*align;
frame = xfce_create_framebox(ups ? _("Monitor settings on UPS power") : _("Monitor settings on battery power"), &align);
gtk_widget_show(frame);
-
+
gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
-
+
on_batt_dpms = xfpm_dpms_spins_new();
gtk_widget_show(on_batt_dpms);
gtk_container_add(GTK_CONTAINER(align),on_batt_dpms);
@@ -765,26 +760,26 @@
GValue *value;
guint value1 = 3 ,value2 = 4 ,value3 = 5;
arr = xfconf_channel_get_arrayv(channel,ON_BATT_DPMS_TIMEOUTS_CFG);
- if ( arr )
+ if ( arr )
{
value = g_ptr_array_index(arr,0);
value1 = g_value_get_uint(value);
-
+
value = g_ptr_array_index(arr,1);
value2 = g_value_get_uint(value);
-
+
value = g_ptr_array_index(arr,2);
value3 = g_value_get_uint(value);
xfconf_array_free(arr);
- }
+ }
xfpm_dpms_spins_set_default_values(XFPM_DPMS_SPINS(on_batt_dpms),value1,value2,value3);
gboolean dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
- xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_batt_dpms),dpms_enabled);
+ xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_batt_dpms),dpms_enabled);
g_signal_connect(on_batt_dpms,"dpms-value-changed",
G_CALLBACK(set_dpms_on_battery_cb),channel);
-
+
return frame;
-
+
}
@@ -793,41 +788,43 @@
{
GtkWidget *frame;
GtkWidget *align;
- GtkWidget *vbox;
-
+ GtkWidget *vbox;
+
frame = xfce_create_framebox(label, &align);
gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
- gtk_widget_show(frame);
-
- vbox = gtk_vbox_new(FALSE,10);
- gtk_widget_show(vbox);
-
+ //gtk_widget_show(frame);
+
+ vbox = gtk_vbox_new(FALSE, SPACING);
+ //gtk_widget_show(vbox);
+
on_ac_dpms = xfpm_dpms_spins_new();
gtk_widget_show(on_ac_dpms);
GPtrArray *arr;
GValue *value;
guint value1 = 30 ,value2 = 45 ,value3 = 60;
arr = xfconf_channel_get_arrayv(channel,ON_AC_DPMS_TIMEOUTS_CFG);
- if ( arr )
+ if ( arr )
{
value = g_ptr_array_index(arr,0);
value1 = g_value_get_uint(value);
-
+
value = g_ptr_array_index(arr,1);
value2 = g_value_get_uint(value);
-
+
value = g_ptr_array_index(arr,2);
value3 = g_value_get_uint(value);
xfconf_array_free(arr);
- }
+ }
xfpm_dpms_spins_set_default_values(XFPM_DPMS_SPINS(on_ac_dpms),value1,value2,value3);
gboolean dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
- xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_ac_dpms),dpms_enabled);
+ xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_ac_dpms),dpms_enabled);
g_signal_connect(on_ac_dpms,"dpms-value-changed",
G_CALLBACK(set_dpms_on_ac_cb),channel);
- gtk_container_add(GTK_CONTAINER(align),vbox);
- gtk_box_pack_start(GTK_BOX(vbox),on_ac_dpms,TRUE,TRUE,0);
- return frame;
+ gtk_container_add(GTK_CONTAINER(align),vbox);
+ gtk_box_pack_start(GTK_BOX(vbox),on_ac_dpms,TRUE,TRUE,0);
+ gtk_widget_show_all(frame);
+
+ return frame;
}
#endif
@@ -850,7 +847,7 @@
label = gtk_label_new(_("On electric power"));
gtk_widget_show(label);
gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
- gtk_box_pack_start(GTK_BOX(vbox),ntbox,TRUE,TRUE,0);
+ gtk_box_pack_start(GTK_BOX(vbox),ntbox,TRUE,TRUE,0); // or FALSE, FALSE to not stretch window to bottom; would then also not move the brightness control onto the lower end
if ( laptop || ups )
{
@@ -876,7 +873,7 @@
}
#endif
GtkWidget *lcd_box = xfpm_settings_lcd_brightness(channel,laptop,lcd);
- gtk_box_pack_start(GTK_BOX(vbox),lcd_box,TRUE,TRUE,0);
+ gtk_box_pack_start(GTK_BOX(vbox),lcd_box,FALSE,FALSE,0);
return vbox;
}
@@ -891,91 +888,102 @@
GtkWidget *label;
GtkWidget *frame,*align;
GtkWidget *vbox;
+ GtkWidget *w_align;
+
vbox = gtk_vbox_new(FALSE,0);
gtk_widget_show(vbox);
-
+
frame = xfce_create_framebox(_("Keyboard shortcuts"), &align);
gtk_widget_show(frame);
- gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
table = gtk_table_new(3,2,FALSE);
gtk_widget_show(table);
-
+
guint active;
/// Power Button
if ( switch_buttons & POWER_SWITCH )
{
+ w_align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_widget_show(w_align);
label = gtk_label_new(_("When power button is pressed do"));
gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
+ gtk_container_add(GTK_CONTAINER(w_align), label);
+ gtk_table_attach(GTK_TABLE(table),w_align,0,1,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
GtkWidget *power_button;
power_button = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Nothing"));
- if ( power_management & SYSTEM_CAN_SUSPEND )
+ if ( power_management & SYSTEM_CAN_SUSPEND )
gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Suspend"));
if ( power_management & SYSTEM_CAN_HIBERNATE )
gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Hibernate"));
- if ( power_management & SYSTEM_CAN_SHUTDOWN )
- gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Shutdown"));
-
+ if ( power_management & SYSTEM_CAN_SHUTDOWN )
+ gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Shutdown"));
+
active = xfconf_channel_get_uint(channel,POWER_SWITCH_CFG,0);
- active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
-
+ active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
+
gtk_combo_box_set_active(GTK_COMBO_BOX(power_button),active);
- gtk_table_attach(GTK_TABLE(table),power_button,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
+ gtk_table_attach(GTK_TABLE(table),power_button,1,2,0,1,GTK_FILL,GTK_FILL,BORDER,SPACING);
g_signal_connect(power_button,"changed",G_CALLBACK(set_power_button_action_cb),channel);
-
+
gtk_widget_show(power_button);
}
-
+
/// Sleep Button
if ( switch_buttons & SLEEP_SWITCH )
- {
+ {
label = gtk_label_new(_("When sleep button is pressed do"));
gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
-
+ w_align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_widget_show(w_align);
+ gtk_container_add(GTK_CONTAINER(w_align), label);
+ gtk_table_attach(GTK_TABLE(table),w_align,0,1,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING);
+
GtkWidget *sleep_button;
active = xfconf_channel_get_uint(channel,SLEEP_SWITCH_CFG,0);
sleep_button = gtk_combo_box_new_text();
-
+
gtk_combo_box_append_text(GTK_COMBO_BOX(sleep_button),_("Nothing"));
- if ( power_management & SYSTEM_CAN_SUSPEND )
+ if ( power_management & SYSTEM_CAN_SUSPEND )
gtk_combo_box_append_text(GTK_COMBO_BOX(sleep_button),_("Suspend"));
if ( power_management & SYSTEM_CAN_HIBERNATE )
gtk_combo_box_append_text(GTK_COMBO_BOX(sleep_button),_("Hibernate"));
if ( power_management & SYSTEM_CAN_SHUTDOWN )
- gtk_combo_box_append_text(GTK_COMBO_BOX(sleep_button),_("Shutdown"));
- active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(sleep_button),_("Shutdown"));
+ active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(sleep_button),active);
gtk_widget_show(sleep_button);
- gtk_table_attach(GTK_TABLE(table),sleep_button,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
+ gtk_table_attach(GTK_TABLE(table),sleep_button,1,2,1,2,GTK_FILL,GTK_FILL,BORDER,SPACING);
g_signal_connect(sleep_button,"changed",G_CALLBACK(set_sleep_button_action_cb),channel);
}
-
+
/// Lid Button
if ( laptop && ( switch_buttons & LID_SWITCH ) )
{
label = gtk_label_new(_("When laptop lid is closed"));
gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
+ w_align = gtk_alignment_new (0.0, 0.5, 0, 0);
+ gtk_widget_show(w_align);
+ gtk_container_add(GTK_CONTAINER(w_align), label);
+ gtk_table_attach(GTK_TABLE(table),w_align,0,1,2,3,GTK_FILL,GTK_FILL,BORDER,SPACING);
GtkWidget *lid_button;
active = xfconf_channel_get_uint(channel,LID_SWITCH_CFG,0);
lid_button = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(lid_button),_("Nothing"));
- if ( power_management & SYSTEM_CAN_SUSPEND )
+ if ( power_management & SYSTEM_CAN_SUSPEND )
gtk_combo_box_append_text(GTK_COMBO_BOX(lid_button),_("Suspend"));
if ( power_management & SYSTEM_CAN_SUSPEND )
gtk_combo_box_append_text(GTK_COMBO_BOX(lid_button),_("Hibernate"));
- if ( power_management & SYSTEM_CAN_SHUTDOWN )
- gtk_combo_box_append_text(GTK_COMBO_BOX(lid_button),_("Shutdown"));
- active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
+ if ( power_management & SYSTEM_CAN_SHUTDOWN )
+ gtk_combo_box_append_text(GTK_COMBO_BOX(lid_button),_("Shutdown"));
+ active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(lid_button),active);
gtk_widget_show(lid_button);
- gtk_table_attach(GTK_TABLE(table),lid_button,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
+ gtk_table_attach(GTK_TABLE(table),lid_button,1,2,2,3,GTK_FILL,GTK_FILL,BORDER,SPACING);
g_signal_connect(lid_button,"changed",G_CALLBACK(set_lid_button_action_cb),channel);
}
-
- gtk_container_add(GTK_CONTAINER(align),vbox);
+
+ gtk_container_add(GTK_CONTAINER(align),vbox);
gtk_box_pack_start(GTK_BOX(vbox),table,TRUE,TRUE,0);
if ( !switch_buttons )
{
@@ -994,18 +1002,24 @@
GtkWidget *show_icon;
GtkWidget *label;
GtkWidget *frame,*align;
+ GtkWidget *hbox;
gint i = 0;
frame = xfce_create_framebox(_("General Options"), &align);
- gtk_widget_show(frame);
- table = gtk_table_new(4,2,FALSE);
- gtk_widget_show(table);
+ //gtk_widget_show(frame);
+ //table = gtk_table_new(4,2,FALSE);
+ table = gtk_vbox_new (FALSE, SPACING);
+ //gtk_widget_show(table);
gtk_container_add(GTK_CONTAINER(align),table);
+ hbox = gtk_hbox_new (FALSE, SPACING);
+ gtk_box_pack_start (GTK_BOX(table), hbox, FALSE, FALSE, SPACING);
+
/* Systray icon */
- label = gtk_label_new(_("System tray icon"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+ label = gtk_label_new(_("System tray icon:"));
+ //gtk_widget_show(label);
+ //gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,SPACING,SPACING);
+ gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, SPACING);
guint icon_cfg = xfconf_channel_get_uint(channel,SHOW_TRAY_ICON_CFG,0);
show_icon = gtk_combo_box_new_text();
@@ -1026,39 +1040,45 @@
}
gtk_combo_box_set_active(GTK_COMBO_BOX(show_icon),icon_cfg);
g_signal_connect(show_icon,"changed",G_CALLBACK(set_show_tray_icon_cb),channel);
- gtk_widget_show(show_icon);
- gtk_table_attach(GTK_TABLE(table),show_icon,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+ //gtk_widget_show(show_icon);
+ //gtk_table_attach(GTK_TABLE(table),show_icon,1,2,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+ gtk_box_pack_start (GTK_BOX(hbox), show_icon, FALSE, FALSE, SPACING);
i++;
- cpu_gov = gtk_check_button_new();
+ cpu_gov = gtk_check_button_new_with_label(_("Enable CPU frequency scaling control"));
if ( govs )
{
gboolean cpu_gov_enabled;
- label = gtk_label_new(_("Enable CPU frequency scaling control"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
- gtk_widget_show(cpu_gov);
+ //label = gtk_label_new(_("Enable CPU frequency scaling control"));
+ //gtk_widget_show(label);
+ //gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+ //gtk_widget_show(cpu_gov);
cpu_gov_enabled = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_gov),
cpu_gov_enabled);
g_signal_connect(cpu_gov,"toggled",G_CALLBACK(set_cpu_freq_scaling_cb),channel);
- gtk_table_attach(GTK_TABLE(table),cpu_gov,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+ //gtk_table_attach(GTK_TABLE(table),cpu_gov,0,2,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+ gtk_box_pack_start (GTK_BOX(table), cpu_gov, FALSE, FALSE, SPACING);
i++;
}
#ifdef HAVE_DPMS
gboolean dpms_enabled;
- label = gtk_label_new(_("Enable monitor power management control"));
- gtk_widget_show(label);
- gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
- dpms_op = gtk_check_button_new();
- gtk_widget_show(dpms_op);
+ //label = gtk_label_new(_("Enable monitor power management control"));
+ //gtk_widget_show(label);
+ //gtk_table_attach(GTK_TABLE(table),label,0,1,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+ dpms_op = gtk_check_button_new_with_label(_("Enable monitor power management control"));
+ //gtk_widget_show(dpms_op);
dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dpms_op),
dpms_enabled);
g_signal_connect(dpms_op,"toggled",G_CALLBACK(set_dpms_cb),channel);
- gtk_table_attach(GTK_TABLE(table),dpms_op,1,2,i,i+1,GTK_EXPAND,GTK_EXPAND,0,0);
+ //gtk_table_attach(GTK_TABLE(table),dpms_op,0,2,i,i+1,GTK_SHRINK,GTK_SHRINK,0,SPACING);
+ gtk_box_pack_start (GTK_BOX(table), dpms_op, FALSE, FALSE, SPACING);
+
#endif
+
+ gtk_widget_show_all (frame);
return frame;
}
@@ -1067,17 +1087,17 @@
_cursor_changed_cb(GtkIconView *view,gpointer data)
{
GtkTreeSelection *sel;
- GtkTreeModel *model;
- GtkTreeIter selected_row;
- gint int_data = 0;
-
- sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
-
- gtk_tree_selection_get_selected(sel,&model,&selected_row);
-
+ GtkTreeModel *model;
+ GtkTreeIter selected_row;
+ gint int_data = 0;
+
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+
+ gtk_tree_selection_get_selected(sel,&model,&selected_row);
+
gtk_tree_model_get(model,
&selected_row,
- 2,
+ 2,
&int_data,
-1);
@@ -1096,13 +1116,14 @@
GtkTreeIter iter;
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
-
+
list_store = gtk_list_store_new(3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_INT);
+
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store));
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view),TRUE);
col = gtk_tree_view_column_new();
gtk_tree_view_column_set_title(col,_("Advanced settings"));
-
+
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(col,renderer,FALSE);
gtk_tree_view_column_set_attributes(col,renderer,"pixbuf",0,NULL);
@@ -1144,7 +1165,7 @@
gtk_list_store_set(list_store,&iter,1,_("Battery settings"),2,1,-1);
}
}
-
+
/// Keyboard Settings
if ( is_laptop )
{
@@ -1175,7 +1196,7 @@
gtk_list_store_set(list_store,&iter,1,_("Monitor Settings"),2,3,-1);
}
#endif
-
+
GtkTreeSelection *sel;
GtkTreePath *path;
@@ -1184,7 +1205,7 @@
gtk_tree_selection_select_path(sel, path);
gtk_tree_path_free(path);
g_signal_connect(view,"cursor-changed",G_CALLBACK(_cursor_changed_cb),NULL);
-
+
return view;
}
@@ -1205,6 +1226,7 @@
GtkWidget *table;
GtkWidget *view;
GtkWidget *allbox;
+ GtkWidget *frame,*align;
Dialog = xfce_titled_dialog_new_with_buttons(_("Power Manager Preferences"),
NULL,
@@ -1221,38 +1243,41 @@
allbox = gtk_vbox_new(FALSE,0);
gtk_widget_show(allbox);
- gtk_box_pack_start(GTK_BOX(mainbox),allbox,FALSE,FALSE,0);
+ gtk_box_pack_start(GTK_BOX(mainbox),allbox,TRUE,TRUE,0);
gboolean ups;
ups = is_laptop ? FALSE : ups_found;
/// General Options Frame
box = xfpm_settings_general(channel,is_laptop,ups,govs);
- gtk_box_pack_start (GTK_BOX (allbox), box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (allbox), box, FALSE, FALSE, SPACING);
- /// Notebook container
+ /// Notebook container, comes into big table container
nt = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(nt),FALSE);
- table = gtk_table_new(1,2,FALSE);
+ table = gtk_hbox_new (FALSE, SPACING);
gtk_widget_show(table);
- gtk_box_pack_start (GTK_BOX (allbox), table, FALSE, FALSE, 0);
+
+ frame = xfce_create_framebox(_("Extended"), &align);
+ gtk_widget_show (frame);
+ gtk_container_add (GTK_CONTAINER(align), table);
+
+ gtk_box_pack_start (GTK_BOX (allbox), frame, TRUE, TRUE, SPACING);
view = xfpm_settings_tree_view(is_laptop,ups_found,govs);
#ifndef HAVE_DPMS
if ( is_laptop || ups_found || govs )
{
- gtk_table_attach_defaults(GTK_TABLE(table),view,0,1,0,1);
+#endif
+ gtk_box_pack_start (GTK_BOX(table), view, FALSE, FALSE, SPACING);
gtk_widget_show(view);
- gtk_table_attach_defaults(GTK_TABLE(table),nt,1,2,0,1);
+ gtk_box_pack_start (GTK_BOX(table), nt, TRUE, TRUE, 0); // spacing ain't nice here // SPACING);
gtk_widget_show(nt);
- }
-#else
- gtk_table_attach_defaults(GTK_TABLE(table),view,0,1,0,1);
- gtk_widget_show(view);
- gtk_table_attach_defaults(GTK_TABLE(table),nt,1,2,0,1);
- gtk_widget_show(nt);
+
+#ifndef HAVE_DPMS
+}
#endif
/// Cpu freq settings
More information about the Goodies-commits
mailing list