[Goodies-commits] r6827 - in xfce4-power-manager/trunk: . po src
Ali Abdallah
aliov at xfce.org
Mon Mar 2 10:59:30 CET 2009
Author: aliov
Date: 2009-03-02 09:59:29 +0000 (Mon, 02 Mar 2009)
New Revision: 6827
Added:
xfce4-power-manager/trunk/src/org.xfce.Power.Manager.xml
xfce4-power-manager/trunk/src/xfpm-settings-main.c
xfce4-power-manager/trunk/src/xfpm-string.c
xfce4-power-manager/trunk/src/xfpm-string.h
Modified:
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/po/POTFILES.in
xfce4-power-manager/trunk/po/ca.po
xfce4-power-manager/trunk/po/cs.po
xfce4-power-manager/trunk/po/da.po
xfce4-power-manager/trunk/po/de.po
xfce4-power-manager/trunk/po/el.po
xfce4-power-manager/trunk/po/es.po
xfce4-power-manager/trunk/po/et.po
xfce4-power-manager/trunk/po/eu.po
xfce4-power-manager/trunk/po/fi.po
xfce4-power-manager/trunk/po/fr.po
xfce4-power-manager/trunk/po/id.po
xfce4-power-manager/trunk/po/ja.po
xfce4-power-manager/trunk/po/nb.po
xfce4-power-manager/trunk/po/nl.po
xfce4-power-manager/trunk/po/pt_BR.po
xfce4-power-manager/trunk/po/pt_PT.po
xfce4-power-manager/trunk/po/sv.po
xfce4-power-manager/trunk/po/tr.po
xfce4-power-manager/trunk/po/uk.po
xfce4-power-manager/trunk/po/zh_CN.po
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in
xfce4-power-manager/trunk/src/xfpm-battery-icon.c
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-common.c
xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
xfce4-power-manager/trunk/src/xfpm-driver.c
xfce4-power-manager/trunk/src/xfpm-driver.h
xfce4-power-manager/trunk/src/xfpm-main.c
xfce4-power-manager/trunk/src/xfpm-settings.c
xfce4-power-manager/trunk/src/xfpm-settings.h
Log:
Make the settings dialog runs in another program
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-03-02 09:59:29 UTC (rev 6827)
@@ -1,7 +1,7 @@
m4_define([intltool_minimum_version], [0.31])
m4_define([xfpm_version_major], [0])
-m4_define([xfpm_version_minor], [9])
-m4_define([xfpm_version_micro], [0])
+m4_define([xfpm_version_minor], [6])
+m4_define([xfpm_version_micro], [4])
m4_define([xfpm_version_build], [r at REVISION@])
m4_define([xfpm_version_tag],[svn])
m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
Modified: xfce4-power-manager/trunk/po/POTFILES.in
===================================================================
--- xfce4-power-manager/trunk/po/POTFILES.in 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/POTFILES.in 2009-03-02 09:59:29 UTC (rev 6827)
@@ -8,5 +8,6 @@
src/xfpm-driver.c
src/xfpm-hal.c
src/xfpm-dbus-messages.c
+src/xfpm-settings-main.c
src/xfce4-power-manager.desktop.in
panel-plugins/brightness/main.c
Modified: xfce4-power-manager/trunk/po/ca.po
===================================================================
--- xfce4-power-manager/trunk/po/ca.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/ca.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 18:48+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-02-01 11:47+0100\n"
"Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
"Language-Team: Catalan\n"
@@ -32,52 +32,53 @@
msgid "Adapter is offline"
msgstr "L'adaptador no està endollat"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Voleu hibernar el sistema?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hiberna"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Voleu suspendre el sistema?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspèn"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"La vostra bateria està gaire bé buida. Deseu la vostra feina per evitar "
"perdre dades"
-#: ../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:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Gestor d'energia de Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Apaga el sistema"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hiberna el sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -274,31 +275,31 @@
msgid "Enable monitor power management control"
msgstr "Habilita el controlador de pantalla del gestor d'energia"
-#: ../src/xfpm-settings.c:1125
+#: ../src/xfpm-settings.c:1126
msgid "Advanced settings"
msgstr "Ajustaments avançats"
-#: ../src/xfpm-settings.c:1144 ../src/xfpm-settings.c:1149
+#: ../src/xfpm-settings.c:1145 ../src/xfpm-settings.c:1150
msgid "CPU settings"
msgstr "Ajustaments de la CPU"
-#: ../src/xfpm-settings.c:1160 ../src/xfpm-settings.c:1165
+#: ../src/xfpm-settings.c:1162 ../src/xfpm-settings.c:1167
msgid "Battery settings"
msgstr "Ajustaments de la bateria"
-#: ../src/xfpm-settings.c:1176 ../src/xfpm-settings.c:1181
+#: ../src/xfpm-settings.c:1179 ../src/xfpm-settings.c:1184
msgid "Shortcuts"
msgstr "Dreceres"
-#: ../src/xfpm-settings.c:1191 ../src/xfpm-settings.c:1196
+#: ../src/xfpm-settings.c:1204 ../src/xfpm-settings.c:1209
msgid "Monitor Settings"
msgstr "Ajustaments de la pantalla"
-#: ../src/xfpm-settings.c:1231
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Preferències del gestor d'energia"
-#: ../src/xfpm-settings.c:1262
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Estès"
@@ -411,7 +412,8 @@
msgid "Turn off after"
msgstr "Atura després de"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Gestor d'energia de Xfce4"
@@ -419,31 +421,19 @@
msgid "translator-credits"
msgstr "Carles Muñoz Gorriz <carlesmu at internautas.org>"
-#: ../src/xfpm-main.c:61
-msgid "Start xfce power manager"
-msgstr "Inicia el gestor d'energia de Xfce"
-
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Mostra el diàleg de configuració"
-#: ../src/xfpm-main.c:63
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Surt de tots els gestors d'energia de Xfce en execució"
-#: ../src/xfpm-main.c:64
-msgid "Settings manager socket"
-msgstr "Sòcol del gestor d'ajustaments"
-
-#: ../src/xfpm-main.c:64
-msgid "SOCKET ID"
-msgstr "SÒCOL ID"
-
-#: ../src/xfpm-main.c:65
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Informació de la versió"
-#: ../src/xfpm-main.c:73
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -464,11 +454,11 @@
"Amb llicència GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:87
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Gestor d'energia de Xfce"
-#: ../src/xfpm-main.c:88
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -476,49 +466,50 @@
"No s'ha pogut llegir la variable d'entorn del vostre directori d'usuari, "
"l'opció d'inici automàtic no funcionarà"
-#: ../src/xfpm-main.c:163 ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Feu «%s --help» per veure l'ús."
-#: ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Masses arguments"
-#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"No es por executar el gestor d'energia de Xfce4, comproveu que la capa del "
+"maquinari i el dimoni de missatges de bus s'estan executant"
+
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
+msgid "Unable to load xfce4 power manager"
+msgstr "No es pot carregat el gestor d'energia de xfce4"
+
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "No s'està executant el gestor d'energia de Xfce"
-#: ../src/xfpm-main.c:201
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr ""
"El gestor d'energia de Xfce4 no s'està executant, veleu tornar a executar-lo?"
-#: ../src/xfpm-main.c:203
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Executa"
-#: ../src/xfpm-main.c:224
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "El gestor d'energia de Xfce ja s'està executant"
-#: ../src/xfpm-main.c:233
+#: ../src/xfpm-driver.c:283
msgid ""
-"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
-"the message bus daemon are running"
-msgstr ""
-"No es por executar el gestor d'energia de Xfce4, comproveu que la capa del "
-"maquinari i el dimoni de missatges de bus s'estan executant"
-
-#: ../src/xfpm-main.c:237
-msgid "Unable to load xfce4 power manager"
-msgstr "No es pot carregat el gestor d'energia de 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"
@@ -529,11 +520,11 @@
"connexió amb la capa del maquinari no funciona o que el dimoni de missatges "
"de bus no s'està executant"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "El sistema no ha pogut apagar-se"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -545,11 +536,11 @@
"permisos adients, que la connexió amb la capa del maquinari no funciona o "
"que el dimoni de missatges de bus no s'està executant"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "No tornis a mostrar aquest missatge"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"No es pot carregar la configuració del gestor d'energia, emprant els valors "
@@ -668,14 +659,6 @@
msgstr ""
"El dimoni HAL no respon quan s'ha establert el perfil d'estalvi d'energia"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "No s'ha pogut crear el missatge dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "No s'ha pogut enviar el missatge\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energia"
@@ -692,6 +675,21 @@
msgid "Xfce 4 Power Manager"
msgstr "Gestor d'energia de Xfce 4"
+#~ msgid "Start xfce power manager"
+#~ msgstr "Inicia el gestor d'energia de Xfce"
+
+#~ msgid "Settings manager socket"
+#~ msgstr "Sòcol del gestor d'ajustaments"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SÒCOL ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "No s'ha pogut crear el missatge dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "No s'ha pogut enviar el missatge\n"
+
#~ msgid "On electric power"
#~ msgstr "Al endollar a la corrent"
Modified: xfce4-power-manager/trunk/po/cs.po
===================================================================
--- xfce4-power-manager/trunk/po/cs.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/cs.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-15 20:16+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech\n"
@@ -28,52 +28,52 @@
msgid "Adapter is offline"
msgstr "Adaptér je odpojen"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Opravdu chcete hibernovat systém?"
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernovat"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Opravdu chcete přejít do režimu spánku"
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Režim spánku"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Baterie je téměř vybitá. Uložte si svoji práci, abyste předešli ztrátě dat"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Správce napájeni pro Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Vypnout systém"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernovat systém"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -290,11 +290,11 @@
msgid "Monitor Settings"
msgstr "Nastavení monitoru"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Předvolby správce napájení"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Rozšířené"
@@ -407,7 +407,8 @@
msgid "Turn off after"
msgstr "Vypnout po"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Správce napájení pro Xfce4"
@@ -415,27 +416,19 @@
msgid "translator-credits"
msgstr "Michal Várady <miko.vaji at gmail.com>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Zobrazit konfigurační dialogové okno"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Ukončit všechny běžící správce napájení"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Soket správce nastavení"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOCKET ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Informace o verzi"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -456,11 +449,11 @@
"Vydáno pod licencí GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Správce napájení pro Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -468,17 +461,17 @@
"Nelze číst proměnnou prostředí domovského adresáře, funkce automatického "
"spuštění nemusí fungovat"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Informace o použití získáte příkazem '%s --help'."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Příliš mnoho argumentů"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -486,29 +479,30 @@
"Nelze spustit správce napájení pro Xfce, ujistěte se, že abstraktní vrstva "
"hardwaru a démon sběrnice zpráv běží"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Nelze zavést správce napájení pro xfce4"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Správce napájení Xfce není spuštěn"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Správce napájení pro Xfce neběží, chcete jej nyní spustit?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Spustit"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Správce napájení pro Xfce je již spuštěn"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -518,11 +512,11 @@
"důvody: Ovladač adaptéru AC není zaveden, přerušené spojení s abstraktní "
"hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Vypnutí systému se nezdařilo"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -533,11 +527,11 @@
"nebudou pracovat. Možné důvody: nemáte dostatečná oprávnění, přerušené "
"spojení s abstraktní hardwarovou vrstvou nebo démon sběrnice zpráv neběží"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Tuto zprávu již nezobrazovat"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Načtení konfigurace správce napájení se nezdařilo, používá se výchozí "
@@ -654,14 +648,6 @@
msgstr ""
"Žádná odpověď od démona vrstvy HAL pro nastavení profilu úsporného režimu"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Nepodařilo se vytvořit zprávu sběrnice dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Nepodařilo se odeslat zprávu\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Napájení"
@@ -678,6 +664,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Správce napájení pro Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Soket správce nastavení"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Nepodařilo se vytvořit zprávu sběrnice dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Nepodařilo se odeslat zprávu\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Spustit správce napájení pro Xfce"
Modified: xfce4-power-manager/trunk/po/da.po
===================================================================
--- xfce4-power-manager/trunk/po/da.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/da.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager 0.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-15 20:05+0100\n"
"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -32,53 +32,53 @@
msgid "Adapter is offline"
msgstr "Tilslutning slukket"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Er du sikker på, at du ønsker systemet i dvaletilstand?"
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Dvaletilstand"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Er du sikker på, at du ønsker systemet i hviletilstand?"
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Hviletilstand"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Strømniveauet på dit batteri er kritisk. Gem dine data for at undgå tab af "
"data"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Strømstyring til Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Luk systemet ned"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Sæt systemet i dvaletilstand"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -299,11 +299,11 @@
msgid "Monitor Settings"
msgstr "Skærmindstillinger"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Indstillinger af strømstyring"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Udvidet"
@@ -416,7 +416,8 @@
msgid "Turn off after"
msgstr "Sluk efter"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Strømstyring til Xfce4"
@@ -428,27 +429,19 @@
"Dansk-gruppen dansk at dansk-gruppen.dk\n"
"Mere info: http://www.dansk-gruppen.dk"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Vis indstillingsvindue"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Afslut enhver kørende strømstyring til Xfce"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Sokkel til indstillingshåndtering"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOKKEL ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versionsinformation"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -469,11 +462,11 @@
"Licenceret under GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Strømstyring til Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -481,17 +474,17 @@
"Kunne ikke læse din hjemmemappe-miljøvariabel, automatisk startvalg virker "
"måske ikke"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Tast '%s --help' for brug."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "For mange argumenter"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -499,29 +492,30 @@
"Kunne ikke køre strømstyring til Xfce4. Kontrollér at HAL og beskedsbus-"
"dæmonen kører"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Kunne ikke indlæse strømstyring til Xfce4"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Strømstyring til Xfce kører ikke"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Strømstyring til Xfce4 kører ikke, ønsker du at starte den nu?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Kør"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Strømstyring til Xfce kører allerede"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -531,11 +525,11 @@
"fungere korrekt. Mulige årsager: Drivprogrammet til strømstyring er ikke "
"indlæst, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Systemet kunne ikke lukke ned"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -546,11 +540,11 @@
"hviletilstand vil ikke virke. Mulige årsager: du har ikke tilstrækkelige "
"rettigheder, forbindelse til HAL afbrudt eller beskedbus-dæmonen kører ikke"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Vis ikke denne besked igen"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Kunne ikke indlæse indstillinger for strømstyring, bruger standardværdier"
@@ -664,14 +658,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Intet svar fra HAL-dæmon til indstilling af strømspareprofil"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Fejl ved oprettelse af dbusbesked\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Fejl ved afsendelse af besked\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Strøm"
@@ -688,5 +674,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Strømstyring til Xfce4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Sokkel til indstillingshåndtering"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOKKEL ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Fejl ved oprettelse af dbusbesked\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Fejl ved afsendelse af besked\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Start strømstyring til Xfce"
Modified: xfce4-power-manager/trunk/po/de.po
===================================================================
--- xfce4-power-manager/trunk/po/de.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/de.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-17 21:32+0100\n"
"Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
"Language-Team: German\n"
@@ -32,53 +32,53 @@
msgid "Adapter is offline"
msgstr "Stromversorgung getrennt"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Möchten Sie das System wirklich in den Ruhemodus versetzen?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Ruhemodus"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Möchten Sie das System wirklich in Standby versetzen?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Standby"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Ihre Batterie ist nahezu leer. Sichern Sie Ihre Arbeit, damit keine Daten "
"verloren gehen"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Energieverwaltung für Xfce4"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Das System herunterfahren"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Das System in den Ruhemodus versetzen"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -297,11 +297,11 @@
msgid "Monitor Settings"
msgstr "Monitoreinstellungen"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Einstellungen für die Energieverwaltung"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Erweitert"
@@ -414,7 +414,8 @@
msgid "Turn off after"
msgstr "Abschalten nach"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Energieverwaltung für Xfce4"
@@ -423,27 +424,19 @@
msgstr ""
"Fabian Nowak <timystery at arcor.de>Mark Trompell <mark at foresightlinux.org>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Einstellungsdialog anzeigen"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Energieverwaltung für Xfce4 beenden"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Socket der Sitzungsverwaltung"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOCKET-NR"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versionsinformation"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -464,11 +457,11 @@
"Veröffentlicht unter der GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Energieverwaltung für Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -476,18 +469,18 @@
"Kann die Umgebungsvariable »$HOME« nicht lesen, der Autostart funktioniert "
"daher eventuell nicht."
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr ""
"Geben Sie »%s --help« ein, um Informationen über die Verwendung zu erhalten"
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Zu viele Argumente"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -495,30 +488,31 @@
"Kann die Energieverwaltung für Xfce4 nicht starten. Stellen Sie sicher, dass "
"die Hardwareabstraktionsschicht und der Nachrichtendienst laufen."
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Kann die Energieverwaltung für Xfce4 nicht laden"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Energieverwaltung für Xfce4 läuft nicht"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr ""
"Die Energieverwaltung für Xfce4 läuft nicht. Möchten Sie sie jetzt starten?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Starten"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Energieverwaltung für Xfce4 läuft bereits"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -530,11 +524,11 @@
"Hardwareabstraktionsschicht ist unterbrochen oder der Nachrichtendienst "
"läuft nicht."
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "System konnte nicht heruntergefahren werden"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -546,11 +540,11 @@
"nötigen Berechtigungen, die Verbindung mit der Hardwareabstraktionsschicht "
"ist unterbrochen, oder der Nachrichtendienst läuft nicht."
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Diese Nachricht nicht mehr anzeigen"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Konnte Konfiguration der Energieverwaltung nicht laden; nehme Standardwerte"
@@ -664,14 +658,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Keine Antwort vom HAL-Daemon, das Energiesparprofil zu laden"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Konnte D-Bus-Nachricht nicht erzeugen\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Konnte Nachricht nicht senden\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energie"
@@ -688,6 +674,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Energieverwaltung für Xfce4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Socket der Sitzungsverwaltung"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET-NR"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Konnte D-Bus-Nachricht nicht erzeugen\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Konnte Nachricht nicht senden\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Energieverwaltung für Xfce4 starten"
Modified: xfce4-power-manager/trunk/po/el.po
===================================================================
--- xfce4-power-manager/trunk/po/el.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/el.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-02-22 00:57+0200\n"
"Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -31,53 +31,53 @@
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:935
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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:950
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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Αναστολή"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Διαχειριστής ρεύματος xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Τερματισμός συστήματος"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Αδρανοποίηση του συστήματος"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -164,7 +164,8 @@
msgid ""
"gracefully increases and decreases the CPU speed depending on the current "
"usage"
-msgstr "αυξομείωση της ταχύτητας του επεξεργαστή ανάλογα με την τρέχουσα κατάσταση"
+msgstr ""
+"αυξομείωση της ταχύτητας του επεξεργαστή ανάλογα με την τρέχουσα κατάσταση"
#: ../src/xfpm-settings.c:595
msgid "CPU frequency settings on UPS power"
@@ -294,11 +295,11 @@
msgid "Monitor Settings"
msgstr "Ρυθμίσεις οθόνης"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Προτιμήσεις διαχειριστή ρεύματος"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Εκτεναμένες"
@@ -411,7 +412,8 @@
msgid "Turn off after"
msgstr "Τερματισμός μετά"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Διαχειριστής ρεύματος xfce4"
@@ -421,27 +423,19 @@
"Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
"Stavros Giannouris <stavrosg at hellug.gr>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Εμφάνιση διαλόγου ρύθμισης"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Τερματισμός κάθε διαχειριστή ρεύματος xfce που εκτελείται"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Διαχειριστής ρυθμίσεων υποδοχής"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "Ταυτότητα υποδοχής"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Πληροφορίες έκδοσης"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -462,11 +456,11 @@
"Αδειοδότηση κάτω από την GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Διαχειριστής ρεύματος xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -474,17 +468,17 @@
"Αδυναμία ανάγνωσης των μεταβλητών περιβάλλοντος από τον αρχικό σας κατάλογο, "
"η επιλογή αυτόματης εκκίνησης δεν μπορεί να δουλέψει"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Πληκτρολόγησε '%s --help' για την χρήση."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Πάρα πολλά ορίσματα"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -492,29 +486,31 @@
"Αδυναμία εκτέλεσης του διαχειριστή ρεύματος xfce 4, σιγουρευτείται ότι το "
"επίπεδο αφαίρεσης υλικού και ο δαίμονας διαύλου μηνυμάτων εκτελούνται"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Αδυναμία φόρτωσης του διαχειριστή ρεύματος xfce4"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Ο διαχειριστής ρεύματος xfce δεν εκτελείται"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
-msgstr "Ο διαχειριστής ρεύματος xfce δεν εκτελείται, θέλετε να τον εκκινήσετε τώρα;"
+msgstr ""
+"Ο διαχειριστής ρεύματος xfce δεν εκτελείται, θέλετε να τον εκκινήσετε τώρα;"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Εκτέλεση"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Ο διαχειριστής ρεύματος xfce ήδη εκτελείται"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -525,11 +521,11 @@
"δεν είναι φορτωμένος, κομμένη σύνδεση με επίπεδο αφαίρεσης υλικού ή ο "
"δαίμονας του διαύλου μηνυμάτων δεν εκτελείται"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Αποτυχία τερματισμού του συστήματος"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -541,11 +537,11 @@
"αρκετά δικαιώματα, σπασμένη σύνδεση με το επίπεδο αφαίρεσης υλικού ή ο "
"δαίμονας διαύλου μηνυμάτων δεν εκτελείται"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Να μην ξανά εμφανιστεί αυτό το μήνυμα"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Αποτυχία φόρτωσης των ρυθμίσεων του διαχειριστή ρεύματος, χρήση των "
@@ -658,7 +654,8 @@
#: ../src/xfpm-hal.c:1081
#, c-format
msgid "No reply from HAL daemon to set cpu governor"
-msgstr "Καμία απάντηση του δαίμονα HAL για να ορίσει τον ρυθμιστή του επεξεργαστή"
+msgstr ""
+"Καμία απάντηση του δαίμονα HAL για να ορίσει τον ρυθμιστή του επεξεργαστή"
#: ../src/xfpm-hal.c:1127
#, c-format
@@ -667,14 +664,6 @@
"Καμία απάντηση από τον δαίμονα HAL για να ορίσει το προφίλ της αποθήκευσης "
"ρεύματος"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Αποτυχία δημιουργίας μηνύματος dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Αποτυχία αποστολής μηνύματος\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Ρεύμα"
@@ -691,6 +680,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Διαχειριστής ρεύματος xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Διαχειριστής ρυθμίσεων υποδοχής"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "Ταυτότητα υποδοχής"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Αποτυχία δημιουργίας μηνύματος dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Αποτυχία αποστολής μηνύματος\n"
+
#~ msgid "On electric power"
#~ msgstr "Στο ηλεκτρικό ρεύμα"
@@ -702,4 +703,3 @@
#~ msgid "Start xfce power manager"
#~ msgstr "Εκκίνηση διαχειριστή ρεύματος xfce"
-
Modified: xfce4-power-manager/trunk/po/es.po
===================================================================
--- xfce4-power-manager/trunk/po/es.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/es.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 18:48+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-02-10 19:57+0100\n"
"Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
"Language-Team: Spanish\n"
@@ -19,78 +19,64 @@
#: ../src/xfpm-ac-adapter.c:217
msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Imposible leer el estado del adaptador. El gestor de energía no funcionará adecuadamente."
+msgstr ""
+"Imposible leer el estado del adaptador. El gestor de energía no funcionará "
+"adecuadamente."
-#: ../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 "El adaptador está conectado"
-#: ../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 "El adaptador está desconectado"
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "¿Está seguro de que quiere hibernar el sistema?"
#. 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:457
-#: ../src/xfpm-settings.c:918
-#: ../src/xfpm-settings.c:950
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernar"
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "¿Está seguro de que quiere suspender el sistema?"
#. 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:916
-#: ../src/xfpm-settings.c:948
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspender"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr "La batería está casi vacía. Guarde su trabajo para evitar perder datos"
-#: ../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:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Administrador de energía de Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Apagar el sistema"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernar el sistema"
-#: ../src/xfpm-battery.c:814
-#: ../src/xfpm-settings.c:453
-#: ../src/xfpm-settings.c:920
-#: ../src/xfpm-settings.c:952
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Apagar"
@@ -119,10 +105,8 @@
msgid "When battery charge level is critical do"
msgstr "Cuando la carga de batería es crítica hacer"
-#: ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:914
-#: ../src/xfpm-settings.c:946
-#: ../src/xfpm-settings.c:972
+#: ../src/xfpm-settings.c:450 ../src/xfpm-settings.c:914
+#: ../src/xfpm-settings.c:946 ../src/xfpm-settings.c:972
msgid "Nothing"
msgstr "Nada"
@@ -142,45 +126,45 @@
msgid "Enable power save on battery power"
msgstr "Activar ahorro de batería al usar energía de batería"
-#: ../src/xfpm-settings.c:518
-#: ../src/xfpm-settings.c:603
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
msgid "Best performance"
msgstr "Mejor rendimiento"
-#: ../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 "Configura la CPU a su frecuencia máxima"
-#: ../src/xfpm-settings.c:524
-#: ../src/xfpm-settings.c:609
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
msgid "Ondemand performance"
msgstr "Rendimiento bajo demanda"
-#: ../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 "Configura la CPU a velocidad máxima cuando hay alguna carga y a velocidad mínima cuando el sistema está inactivo"
+#: ../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 ""
+"Configura la CPU a velocidad máxima cuando hay alguna carga y a velocidad "
+"mínima cuando el sistema está inactivo"
-#: ../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 "Ahorro de energía máximo"
-#: ../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 "Configura la CPU a su frecuencia mínima"
-#: ../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 "Buen ahorro de energía"
-#: ../src/xfpm-settings.c:537
-#: ../src/xfpm-settings.c:622
-msgid "gracefully increases and decreases the CPU speed depending on the current usage"
-msgstr "incrementa y decrementa adecuadamente la velocidad de CPU dependiendo del uso actual"
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+"incrementa y decrementa adecuadamente la velocidad de CPU dependiendo del "
+"uso actual"
#: ../src/xfpm-settings.c:595
msgid "CPU frequency settings on UPS power"
@@ -198,8 +182,7 @@
msgid "CPU frequency control cannot be used"
msgstr "El control de frecuencia de CPU no puede ser usado"
-#: ../src/xfpm-settings.c:705
-#: ../src/xfpm-settings.c:847
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On AC power"
msgstr "Al estar enchufado"
@@ -211,8 +194,7 @@
msgid "CPU frequency settings"
msgstr "Opciones de frecuencia de CPU"
-#: ../src/xfpm-settings.c:715
-#: ../src/xfpm-settings.c:855
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Al usar energía de batería"
@@ -292,35 +274,31 @@
msgid "Enable monitor power management control"
msgstr "Activar control de gestión de energía del monitor"
-#: ../src/xfpm-settings.c:1125
+#: ../src/xfpm-settings.c:1126
msgid "Advanced settings"
msgstr "Opciones avanzadas"
-#: ../src/xfpm-settings.c:1144
-#: ../src/xfpm-settings.c:1149
+#: ../src/xfpm-settings.c:1145 ../src/xfpm-settings.c:1150
msgid "CPU settings"
msgstr "Opciones de CPU"
-#: ../src/xfpm-settings.c:1160
-#: ../src/xfpm-settings.c:1165
+#: ../src/xfpm-settings.c:1162 ../src/xfpm-settings.c:1167
msgid "Battery settings"
msgstr "Opciones de batería"
-#: ../src/xfpm-settings.c:1176
-#: ../src/xfpm-settings.c:1181
+#: ../src/xfpm-settings.c:1179 ../src/xfpm-settings.c:1184
msgid "Shortcuts"
msgstr "Atajos"
-#: ../src/xfpm-settings.c:1191
-#: ../src/xfpm-settings.c:1196
+#: ../src/xfpm-settings.c:1204 ../src/xfpm-settings.c:1209
msgid "Monitor Settings"
msgstr "Opciones de monitor"
-#: ../src/xfpm-settings.c:1231
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Preferencias del administrador de energía"
-#: ../src/xfpm-settings.c:1262
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Extendidas"
@@ -336,8 +314,7 @@
msgid "You are running on Battery"
msgstr "La batería se está agotando"
-#: ../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 "La batería se está descargando"
@@ -346,8 +323,7 @@
msgid "Your battery is discharging"
msgstr "La batería se está descargando"
-#: ../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 "La batería se está cargando"
@@ -435,8 +411,8 @@
msgid "Turn off after"
msgstr "Apagar después de"
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Administrador de energía de Xfce4"
@@ -444,31 +420,19 @@
msgid "translator-credits"
msgstr "Abel Martín <abel.martin.ruiz at gmail.com>, 2009"
-#: ../src/xfpm-main.c:61
-msgid "Start xfce power manager"
-msgstr "Iniciar administrador de energía de Xfce"
-
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Mostrar el diálogo de configuración"
-#: ../src/xfpm-main.c:63
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Cerrar cualquier administrador de energía de Xfce en ejecución"
-#: ../src/xfpm-main.c:64
-msgid "Settings manager socket"
-msgstr "Socket del administrador de energía"
-
-#: ../src/xfpm-main.c:64
-msgid "SOCKET ID"
-msgstr "ID de SOCKET"
-
-#: ../src/xfpm-main.c:65
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Información de versión"
-#: ../src/xfpm-main.c:73
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -489,79 +453,100 @@
"Con licencia GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:87
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Administrador de energía de Xfce"
-#: ../src/xfpm-main.c:88
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Imposible leer la variable de entorno del directorio personal; la opción de inicio automático puede no funcionar"
+#: ../src/xfpm-main.c:89
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Imposible leer la variable de entorno del directorio personal; la opción de "
+"inicio automático puede no funcionar"
-#: ../src/xfpm-main.c:163
-#: ../src/xfpm-main.c:184
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Escriba '%s --help' para opciones de uso."
-#: ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Demasiados argumentos"
-#: ../src/xfpm-main.c:198
-#: ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Imposible ejecutar el administrador de energía de Xfce. Asegúrese de que la "
+"capa de abstracción de hardware y el demonio del bus de mensajes se están "
+"ejecutando"
+
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
+msgid "Unable to load xfce4 power manager"
+msgstr "Imposible cargar el administrador de energía de Xfce4"
+
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "El administrador de energía de Xfce no se está ejecutando"
-#: ../src/xfpm-main.c:201
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
-msgstr "El administrador de energía de Xfce4 no está ejecutándose, ¿desea lanzarlo ahora?"
+msgstr ""
+"El administrador de energía de Xfce4 no está ejecutándose, ¿desea lanzarlo "
+"ahora?"
-#: ../src/xfpm-main.c:203
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Ejecutar"
-#: ../src/xfpm-main.c:224
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "El administrador de energía de Xfce ya está ejecutándose"
-#: ../src/xfpm-main.c:233
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Imposible ejecutar el administrador de energía de Xfce. Asegúrese de que la capa de abstracción de hardware y el demonio del bus de mensajes se están ejecutando"
+#: ../src/xfpm-driver.c:283
+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 ""
+"Imposible leer el estado del adaptador de corriente. Posibles razones: el "
+"adaptador de corriente no está cargado, conexión con la capa de abstracción "
+"de hardware rota o el demonio del bus de mensajes no está ejecutándose"
-#: ../src/xfpm-main.c:237
-msgid "Unable to load xfce4 power manager"
-msgstr "Imposible cargar el administrador de energía de Xfce4"
-
-#: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Imposible leer el estado del adaptador de corriente. Posibles razones: el adaptador de corriente no está cargado, conexión con la capa de abstracción de hardware rota o el demonio del bus de mensajes no está ejecutándose"
-
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Falló el apagado del sistema"
-#: ../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"
+#: ../src/xfpm-driver.c:783
+msgid ""
+"Unable to use power management service, functionalities like hibernate and "
+"suspend will not work. Possible reasons: you don't have enough permission, "
+"broken connection with the hardware abstract layer or the message bus daemon "
+"is not running"
msgstr "Imp"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "No mostrar más este mensaje"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
-msgstr "Fallo al cargar la configuración del administrador de energía. Usando opciones predeterminadas"
+msgstr ""
+"Fallo al cargar la configuración del administrador de energía. Usando "
+"opciones predeterminadas"
#: ../src/xfpm-hal.c:172
#, c-format
msgid "Error monitoring HAL events"
msgstr "Error monitorizando eventos HAL"
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
#, c-format
msgid "Unable to connect to DBus: %s"
msgstr "Imposible conectar con DBus: %s"
@@ -595,14 +580,9 @@
msgid "No hibernate method found"
msgstr "No se encontró ningún método de hibernación"
-#: ../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 "Memoria agotada"
@@ -617,14 +597,12 @@
msgid "System failed to hibernate"
msgstr "Falló la hibernación del sistema"
-#: ../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 "Ocurrió un error mientras se intentaba suspender"
-#: ../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 "Respuesta desconocida del demonio de mensajes"
@@ -642,22 +620,28 @@
#: ../src/xfpm-hal.c:879
#, c-format
msgid "No reply from HAL daemon to set monitor brightness level"
-msgstr "No hubo respuesta del demonio HAL para configurar el nivel de brillo del monitor"
+msgstr ""
+"No hubo respuesta del demonio HAL para configurar el nivel de brillo del "
+"monitor"
#: ../src/xfpm-hal.c:926
#, c-format
msgid "No reply from HAL daemon to get monitor brightness level"
-msgstr "No hubo respuesta del demonio HAL para obtener el nivel de brillo del monitor"
+msgstr ""
+"No hubo respuesta del demonio HAL para obtener el nivel de brillo del monitor"
#: ../src/xfpm-hal.c:976
#, c-format
msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "No hubo respuesta del demonio HAL para obtener los gobernadores de CPU disponibles"
+msgstr ""
+"No hubo respuesta del demonio HAL para obtener los gobernadores de CPU "
+"disponibles"
#: ../src/xfpm-hal.c:1028
#, c-format
msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "No hubo respuesta del demonio HAL para obtener el gobernador de CPU actual"
+msgstr ""
+"No hubo respuesta del demonio HAL para obtener el gobernador de CPU actual"
#: ../src/xfpm-hal.c:1081
#, c-format
@@ -667,17 +651,10 @@
#: ../src/xfpm-hal.c:1127
#, c-format
msgid "No reply from HAL daemon to set power save profile"
-msgstr "No hubo respuesta del demonio HAL para configurar un perfil de ahorro de energía"
+msgstr ""
+"No hubo respuesta del demonio HAL para configurar un perfil de ahorro de "
+"energía"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Faloo al crear mensaje DBus\n"
-
-#: ../src/xfpm-dbus-messages.c:122
-#: ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Fallo al enviar mensaje\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energía"
@@ -694,3 +671,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Administrador de energía de Xfce 4"
+#~ msgid "Start xfce power manager"
+#~ msgstr "Iniciar administrador de energía de Xfce"
+
+#~ msgid "Settings manager socket"
+#~ msgstr "Socket del administrador de energía"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "ID de SOCKET"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Faloo al crear mensaje DBus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Fallo al enviar mensaje\n"
Modified: xfce4-power-manager/trunk/po/et.po
===================================================================
--- xfce4-power-manager/trunk/po/et.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/et.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Kristjan Siimson <kristjan.siimson at gmail.com>\n"
"Language-Team: Estonian\n"
@@ -27,51 +27,51 @@
msgid "Adapter is offline"
msgstr "Vooluvõrgust väljas"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Kas soovite kindlasti arvuti puhkeseisundisse asetada?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Puhkeseisund"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Kas soovite kindlasti arvuti seisata?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Seisata"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr "Aku on peaaegu tühi. Andmekadude vältimiseks salvestage oma töö"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce vooluhaldur"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Sulge arvuti"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Arvuti puhkeseisundisse"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -287,11 +287,11 @@
msgid "Monitor Settings"
msgstr "Kuvari seadistused"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Vooluhalduri eelistused"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Laiendatud"
@@ -404,7 +404,8 @@
msgid "Turn off after"
msgstr "Lülita välja pärast"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 vooluhaldur"
@@ -412,27 +413,19 @@
msgid "translator-credits"
msgstr "Kristjan Siimson <kristjan.siimson at gmail.com>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Näita seadistusdialoogi"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Sulge kõik töötavad xfce vooluhaldurid"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Seadistushalduri pistik"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "PISTIK"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versiooniteave"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -453,11 +446,11 @@
"GNU GPL litsentsi all.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce vooluhaldur"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -465,17 +458,17 @@
"Kodukataloogi keskkonnamuutujat ei saa lugeda, automaatkäivituse valik ei "
"pruugi töötada"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Kirjuta '%s --help' kasutamise kohta teabe saamiseks"
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Liiga palju argumente"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -483,29 +476,30 @@
"Xfce4 vooluhalduri käivitamine ebaõnnestus, veenduge et HAL ja sõnumisiini "
"deemon töötavad"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Xfce4 vooluhalduri laadimine ebaõnnestus"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce vooluhaldur ei tööta"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce4 vooluhaldur ei tööta, kas soovite selle nüüd käivitada?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Käivita"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce vooluhaldur töötab juba"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -515,11 +509,11 @@
"õigesti töötada. Võimalikud põhjused: Vahelduvvoolu adapteri draiver ei ole "
"laaditud, katkenud ühendus HAL-iga või sõnumisiini deemon ei tööta"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Arvuti väljalülitamine ebaõnnestus"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -530,11 +524,11 @@
"peatamine ei tööta. Võimalikud põhjused: teil pole vajalike õiguseid, "
"katkenud ühendus HAL-iga või sõnumisiini deemon ei tööta"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Seda sõnumit mitte enam näidata"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Vooluhaldusseadistuse laadimine ebaõnnestus, kasutatakse algupäraseid "
@@ -649,14 +643,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Voolusäästu profiili määramisel ei saadud HAL-deemonilt vastust"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Dbus-sõnumi loomine ebaõnnestus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Sõnumi saatmine ebaõnnestus\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Vool"
@@ -673,5 +659,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 vooluhaldur"
+#~ msgid "Settings manager socket"
+#~ msgstr "Seadistushalduri pistik"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "PISTIK"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Dbus-sõnumi loomine ebaõnnestus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Sõnumi saatmine ebaõnnestus\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Käivita xfce vooluhaldur"
Modified: xfce4-power-manager/trunk/po/eu.po
===================================================================
--- xfce4-power-manager/trunk/po/eu.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/eu.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+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"
@@ -32,52 +32,52 @@
msgid "Adapter is offline"
msgstr "Moldagailua desentxufatua dago"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
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:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
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:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Eseki"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce argindar kudeatzailea"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Itzali sistema"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernatu sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -303,11 +303,11 @@
msgid "Monitor Settings"
msgstr "Monitore ezarpenak"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Energia kudeaketa hobespenak"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr ""
@@ -420,7 +420,8 @@
msgid "Turn off after"
msgstr "Noiz itzali: "
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 energia kudeatzailea"
@@ -428,27 +429,19 @@
msgid "translator-credits"
msgstr "Piarres Beobide <pi at beobide.net>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Ikusi konfigurazio leihoa"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Itxi abiarazitako edozein xfce energia kudeatzaile"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Ezarpen kudeatzaile socketa"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOCKET IDa"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Bertsio argibideak"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -469,11 +462,11 @@
"GNU GPL lizentziaz argitaratua.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce energia kudeatzailea"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -481,17 +474,17 @@
"Ezin izan da zure etxe direktorioko ingurune-aldagaiak irakurri, "
"autoabiarazte aukerak ez du funtzionatuko"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Idatzi '%s --help' erabilera laguntzarentzat."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Argumentu gehiegi"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -499,29 +492,30 @@
"Ezin da Xfce energia kudeatzailea abiarazi, ziurtatu zaitez hardware "
"abstrakzio geruza (hal) eta mezu bus deabrua (dbus) martxan daudela"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Ezin da xfce4 energia kudeatzailea kargatu"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce energia kudeatzaile ez dago abiarazirik"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce energia kudeatzaile ez dago abiarazirik, abiarazi nahi al duzu?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Exekutatu"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce energia kudeatzailea ez dago abiarazirik"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -532,11 +526,11 @@
"ez dago kargaturik, hardware abstrakzio geruzarekin (hal) hondaturiko "
"konexioa eta mezu bus deabrua (dbus) ez dago martxan"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Sistemak huts egin du ixterakoan"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -548,11 +542,11 @@
"geruzarekin (hal) hondaturiko konexioa eta mezu bus deabrua (dbus) ez dago "
"martxan"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Ez erakutsi mezu hau berriz"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Huts energia kudeatzaile konfigurazio kargatzean, hobetsiriko balioak "
@@ -668,14 +662,6 @@
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"
@@ -692,6 +678,12 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 energia kudeaketa"
+#~ msgid "Settings manager socket"
+#~ msgstr "Ezarpen kudeatzaile socketa"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET IDa"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Abiarazi xfce energia kudeatzailea"
Modified: xfce4-power-manager/trunk/po/fi.po
===================================================================
--- xfce4-power-manager/trunk/po/fi.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/fi.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+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,51 +28,51 @@
msgid "Adapter is offline"
msgstr "Käytetään akkuvirtaa"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
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:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
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:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Keskeytystila"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce:n virranhallinta"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Sammuta järjestelmä"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Aseta järjestelmä lepotilaan"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -295,11 +295,11 @@
msgid "Monitor Settings"
msgstr "Näytön asetukset"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Virranhallinnan asetukset"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr ""
@@ -412,7 +412,8 @@
msgid "Turn off after"
msgstr "Sammuta viiveellä"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 virranhallinta"
@@ -420,27 +421,19 @@
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Näytä asetusdialogi"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Sammuta Xfce:n virranhallinta, jos se on käynnissä"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Asetustenhallinnan pistoke"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "PISTOKE"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versiotiedot"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -460,11 +453,11 @@
"Lisensoitu GNU GPL:n mukaisesti\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce:n virranhallinta"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -472,17 +465,17 @@
"Kotikansiosi sijaintia ei voi lukea ympäristömuuttujasta HOME, "
"automaattikäynnistys ei ehkä toimi"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Saat ohjeita komennolla \"%s --help\"."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Liikaa valitsimia"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -490,29 +483,30 @@
"Xfce4 virranhallintaa ei voi suorittaa. Varmista, että HAL ja DBUS ovat "
"käynnissä."
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Xfce4 virranhallintaa ei voi käynnistää"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce:n virranhallinta ei ole käynnissä"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce4 virranhallinta ei ole käynnissä. Haluatko käynnistää sen?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Suorita"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce:n virranhallinta on jo käynnissä"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -522,11 +516,11 @@
"Mahdollisia syitä ovat virtalähteen ajurin puuttuminen, katkennut HAL-yhteys "
"tai DBUS-taustaprosessin puuttuminen."
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Järjestelmän sammutus epäonnistui"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -537,11 +531,11 @@
"keskeytystilaa ei voi käyttää. Mahdollisia syitä ovat riittämättömät "
"käyttöoikeudet, katkennut HAL-yhteys tai DBUS-taustaprosessin puuttuminen."
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Älä näytä tätä viestiä uudelleen"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr "Virranhallinnan asetusten lataaminen epäonnistui, käytetään oletuksia"
@@ -651,14 +645,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "HAL-palvelu ei vastannut virransäästöprofiilin asettamiseen"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "DBus-viestin luominen epäonnistui\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Viestin lähetys epäonnistui\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Virranhallinta"
@@ -675,6 +661,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce4 virranhallinta"
+#~ msgid "Settings manager socket"
+#~ msgstr "Asetustenhallinnan pistoke"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "PISTOKE"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "DBus-viestin luominen epäonnistui\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Viestin lähetys epäonnistui\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Käynnistä Xfce:n virranhallinta"
Modified: xfce4-power-manager/trunk/po/fr.po
===================================================================
--- xfce4-power-manager/trunk/po/fr.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/fr.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+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"
@@ -31,56 +31,56 @@
msgid "Adapter is offline"
msgstr "L'alimentation est sur batterie"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
#, fuzzy
msgid "Are you sure you want to hibernate the system?"
msgstr "Êtes-vous sûr de vouloir mettre le système en hibernation ?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
#, fuzzy
msgid "Are you sure you want to suspend the system?"
msgstr "Êtes-vous sûr de vouloir mettre en veille le système ?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Mettre en veille"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
#, fuzzy
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Le niveau de la batterie est critique. Enregistrez votre travail pour éviter "
"des pertes de données"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Gestionnaire d'alimentation Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Éteindre le système"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Mettre le système en hibernation"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -310,11 +310,11 @@
msgid "Monitor Settings"
msgstr "Écran"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Préférences du gestionnaire d'alimentation"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr ""
@@ -427,7 +427,8 @@
msgid "Turn off after"
msgstr "Éteindre after"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Gestionnaire d'alimentation Xfce4"
@@ -435,29 +436,21 @@
msgid "translator-credits"
msgstr ""
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
#, fuzzy
msgid "Show the configuration dialog"
msgstr "Configuration de l'onduleur"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
#, fuzzy
msgid "Quit any running xfce power manager"
msgstr "Gestionnaire d'alimentation Xfce"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr ""
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr ""
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr ""
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -478,11 +471,11 @@
"Sous licence GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Gestionnaire d'alimentation Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -490,17 +483,17 @@
"Impossible de lire la variable d'environnement de votre répertoire "
"utilisateur, l'option de démarrage automatique peut ne pas fonctionner"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr ""
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr ""
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -508,33 +501,34 @@
"Impossible de lancer le gestionnaire d'alimentation, vérifiez que la couche "
"d'abstraction matérielle (hal) et le bus de messagerie (dbus) fonctionnent"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
#, fuzzy
msgid "Unable to load xfce4 power manager"
msgstr "Échec au chargement du gestionnaire d'alimentation Xfce\n"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, fuzzy, c-format
msgid "Xfce power manager is not running"
msgstr "Le gestionnaire d'alimentation Xfce n'est pas lancé\n"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
#, fuzzy
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr ""
"Le gestionnaire d'alimentation Xfce n'est pas lancé, voulez-vous le lancer "
"maintenant ?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Éxecuter"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, fuzzy, c-format
msgid "Xfce power manager is already running"
msgstr "Le gestionnaire d'alimentation Xfce est déjà lancé\n"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -545,11 +539,11 @@
"chargé, connexion impossible avec la couche d'abstraction matérielle (hal) "
"ou le démon du bus de messagerie n'est pas lancé"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Le système n'a pu s'arrêter"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
#, fuzzy
msgid ""
"Unable to use power management service, functionalities like hibernate and "
@@ -563,11 +557,11 @@
"la couche d'abstraction (hal), ou le démon du bus de messagerie n'est pas "
"lancé"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Ne plus afficher ce message"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
#, fuzzy
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
@@ -682,14 +676,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Pas de réponse du démon HAL pour régler le profil d'économie d'énergie"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr ""
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr ""
-
#: ../src/xfce4-power-manager.desktop.in.h:1
#, fuzzy
msgid "Power"
Modified: xfce4-power-manager/trunk/po/id.po
===================================================================
--- xfce4-power-manager/trunk/po/id.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/id.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-02-10 22:36+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
"Language-Team: Indonesian\n"
@@ -17,79 +17,65 @@
#: ../src/xfpm-ac-adapter.c:217
msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Tak dapat membaca status adapter, manajer daya tak akan bekerja dengan baik"
+msgstr ""
+"Tak dapat membaca status adapter, manajer daya tak akan bekerja dengan baik"
-#: ../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 "Adapter tersambung"
-#: ../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 "Adapter terputus"
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Apakah anda yakin ingin menghibernasi sistem?"
#. 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:457
-#: ../src/xfpm-settings.c:918
-#: ../src/xfpm-settings.c:950
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
+#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernasi"
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Apakah anda yakin ingin menyuspensi sistem?"
#. 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:916
-#: ../src/xfpm-settings.c:948
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspensi"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Baterai anda hampir kosong. Simpan pekerjaan anda untuk menghindari hilangnya data"
+msgstr ""
+"Baterai anda hampir kosong. Simpan pekerjaan anda untuk menghindari "
+"hilangnya data"
-#: ../src/xfpm-battery.c:774
-#: ../src/xfpm-battery.c:1339
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Manajer daya Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Matikan sistem"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernasi sistem"
-#: ../src/xfpm-battery.c:814
-#: ../src/xfpm-settings.c:453
-#: ../src/xfpm-settings.c:920
-#: ../src/xfpm-settings.c:952
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Matikan"
@@ -118,10 +104,8 @@
msgid "When battery charge level is critical do"
msgstr "Ketika level muatan baterai kritis maka lakukan"
-#: ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:914
-#: ../src/xfpm-settings.c:946
-#: ../src/xfpm-settings.c:972
+#: ../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"
@@ -141,45 +125,45 @@
msgid "Enable power save on battery power"
msgstr "Aktifkan penyimpan daya di tenaga baterai"
-#: ../src/xfpm-settings.c:518
-#: ../src/xfpm-settings.c:603
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
msgid "Best performance"
msgstr "Performa terbaik"
-#: ../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 "Atur CPU ke frekuensi maksimumnya"
-#: ../src/xfpm-settings.c:524
-#: ../src/xfpm-settings.c:609
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
msgid "Ondemand performance"
msgstr "Performa sesuai permintaan"
-#: ../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 "Atur CPU ke kecepatan maksimumnya ketika ada beban di dalamnya dan ke kecepatan minimum ketika sistem menganggur"
+#: ../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 ""
+"Atur CPU ke kecepatan maksimumnya ketika ada beban di dalamnya dan ke "
+"kecepatan minimum ketika sistem menganggur"
-#: ../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 "Penyimpan daya terbaik"
-#: ../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 "Atur CPU ke frekuensi minimumnya"
-#: ../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 "Penyimpan daya bagus"
-#: ../src/xfpm-settings.c:537
-#: ../src/xfpm-settings.c:622
-msgid "gracefully increases and decreases the CPU speed depending on the current usage"
-msgstr "dengan baik meningkatkan dan menurunkan kecepatan CPU tergantung penggunaan saat ini"
+#: ../src/xfpm-settings.c:537 ../src/xfpm-settings.c:622
+msgid ""
+"gracefully increases and decreases the CPU speed depending on the current "
+"usage"
+msgstr ""
+"dengan baik meningkatkan dan menurunkan kecepatan CPU tergantung penggunaan "
+"saat ini"
#: ../src/xfpm-settings.c:595
msgid "CPU frequency settings on UPS power"
@@ -197,8 +181,7 @@
msgid "CPU frequency control cannot be used"
msgstr "Kendali frekuensi CPU tak dapat digunakan"
-#: ../src/xfpm-settings.c:705
-#: ../src/xfpm-settings.c:847
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On AC power"
msgstr "Pada daya AC"
@@ -210,8 +193,7 @@
msgid "CPU frequency settings"
msgstr "Pengaturan frekuensi CPU"
-#: ../src/xfpm-settings.c:715
-#: ../src/xfpm-settings.c:855
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Pada daya baterai"
@@ -295,31 +277,27 @@
msgid "Advanced settings"
msgstr "Pengaturan mahir"
-#: ../src/xfpm-settings.c:1145
-#: ../src/xfpm-settings.c:1150
+#: ../src/xfpm-settings.c:1145 ../src/xfpm-settings.c:1150
msgid "CPU settings"
msgstr "Pengaturan CPU"
-#: ../src/xfpm-settings.c:1162
-#: ../src/xfpm-settings.c:1167
+#: ../src/xfpm-settings.c:1162 ../src/xfpm-settings.c:1167
msgid "Battery settings"
msgstr "Pengaturan baterai"
-#: ../src/xfpm-settings.c:1179
-#: ../src/xfpm-settings.c:1184
+#: ../src/xfpm-settings.c:1179 ../src/xfpm-settings.c:1184
msgid "Shortcuts"
msgstr "Jalan pintas"
-#: ../src/xfpm-settings.c:1204
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1204 ../src/xfpm-settings.c:1209
msgid "Monitor Settings"
msgstr "Pengaturan Monitor"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Pengaturan Manajer Daya"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Diperluas"
@@ -335,8 +313,7 @@
msgid "You are running on Battery"
msgstr "Anda berjalan menggunakan Baterai"
-#: ../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 "Baterai tidak diisi"
@@ -345,8 +322,7 @@
msgid "Your battery is discharging"
msgstr "Baterai anda tidak diisi"
-#: ../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 "Baterai sedang diisi"
@@ -434,8 +410,8 @@
msgid "Turn off after"
msgstr "Matikan setelah"
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Manajer Daya Xfce4"
@@ -443,27 +419,19 @@
msgid "translator-credits"
msgstr "Andhika Padmawan <andhika.padmawan at gmail.com>, 2008."
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Tampilkan dialog konfigurasi"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Keluar manajer daya xfce yang berjalan"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Soket manajer pengaturan"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "ID SOKET"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Informasi versi"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -484,71 +452,90 @@
"Dilisensikan di bawah GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Manajer Daya Xfce"
-#: ../src/xfpm-main.c:86
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Tak dapat membaca variabel lingkungan direktori rumah anda, opsi mulai otomatis mungkin tak akan bekerja"
+#: ../src/xfpm-main.c:89
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Tak dapat membaca variabel lingkungan direktori rumah anda, opsi mulai "
+"otomatis mungkin tak akan bekerja"
-#: ../src/xfpm-main.c:161
-#: ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Ketik '%s --help' untuk penggunaan."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Terlalu banyak argumen"
-#: ../src/xfpm-main.c:197
-#: ../src/xfpm-main.c:253
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Tak dapat menjalankan manajer daya Xfce4, pastikan lapisan abstrak perangkat keras dan jurik bus pesan berjalan"
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Tak dapat menjalankan manajer daya Xfce4, pastikan lapisan abstrak perangkat "
+"keras dan jurik bus pesan berjalan"
-#: ../src/xfpm-main.c:201
-#: ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Tak dapat memuat manajer daya xfce4"
-#: ../src/xfpm-main.c:211
-#: ../src/xfpm-main.c:234
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Manajer daya Xfce tak berjalan"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Manajer Daya Xfce4 tak berjalan, anda ingin meluncurkannya sekarang?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Jalankan"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Manajer daya Xfce telah berjalan"
-#: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Tak dapat membaca status adapter AC, manajer daya tak akan bekerja dengan benar. Kemungkinan penyebab: Driver adapter AC tidak dimuat, koneksi rusak dengan lapisan abstrak perangkat keras atau jurik bus pesan tidak berjalan"
+#: ../src/xfpm-driver.c:283
+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 ""
+"Tak dapat membaca status adapter AC, manajer daya tak akan bekerja dengan "
+"benar. Kemungkinan penyebab: Driver adapter AC tidak dimuat, koneksi rusak "
+"dengan lapisan abstrak perangkat keras atau jurik bus pesan tidak berjalan"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Sistem gagal untuk dimatikan"
-#: ../src/xfpm-driver.c:907
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Tak dapat menggunakan layanan manajemen daya, fungsionalitas seperti hibernasi dan suspensi tak akan bekerja. Kemungkinan penyebab: anda tak punya cukup hak akses, koneksi rusak dengan lapisan abstrak perangkat keras atau jurik bus pesan tak berjalan"
+#: ../src/xfpm-driver.c:783
+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 ""
+"Tak dapat menggunakan layanan manajemen daya, fungsionalitas seperti "
+"hibernasi dan suspensi tak akan bekerja. Kemungkinan penyebab: anda tak "
+"punya cukup hak akses, koneksi rusak dengan lapisan abstrak perangkat keras "
+"atau jurik bus pesan tak berjalan"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Jangan tampilkan pesan ini lagi"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr "Gagal memuat konfigurasi manajer daya, menggunakan standar"
@@ -557,8 +544,7 @@
msgid "Error monitoring HAL events"
msgstr "Galat memonitor peristiwa HAL"
-#: ../src/xfpm-hal.c:261
-#: ../src/xfpm-hal.c:280
+#: ../src/xfpm-hal.c:261 ../src/xfpm-hal.c:280
#, c-format
msgid "Unable to connect to DBus: %s"
msgstr "Tak dapat menyambung ke DBus: %s"
@@ -592,14 +578,9 @@
msgid "No hibernate method found"
msgstr "Tak ada metode hibernasi yang ditemukan"
-#: ../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 "Kehabisan memori"
@@ -614,14 +595,12 @@
msgid "System failed to hibernate"
msgstr "Sistem gagal untuk hibernasi"
-#: ../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 "Galat terjadi ketika mencoba suspensi"
-#: ../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 "Balasan tak diketahui dari jurik pesan"
@@ -644,12 +623,14 @@
#: ../src/xfpm-hal.c:926
#, c-format
msgid "No reply from HAL daemon to get monitor brightness level"
-msgstr "Tak ada balasan dari jurik HAL untuk mendapatkan level kecerahan monitor"
+msgstr ""
+"Tak ada balasan dari jurik HAL untuk mendapatkan level kecerahan monitor"
#: ../src/xfpm-hal.c:976
#, c-format
msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Tak ada balasan dari jurik HAL untuk mendapatkan governor cpu yang tersedia"
+msgstr ""
+"Tak ada balasan dari jurik HAL untuk mendapatkan governor cpu yang tersedia"
#: ../src/xfpm-hal.c:1028
#, c-format
@@ -666,15 +647,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Tak ada balasan dari jurik HAL untuk mengatur profil penyimpanan daya"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Gagal membuat pesan dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122
-#: ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Gagal mengirim pesan\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Daya"
@@ -691,24 +663,45 @@
msgid "Xfce 4 Power Manager"
msgstr "Manajer Daya Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Soket manajer pengaturan"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "ID SOKET"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Gagal membuat pesan dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Gagal mengirim pesan\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Jalankan manajer daya xfce"
+
#~ msgid "On electric power"
#~ msgstr "Pada daya listrik"
+
#~ msgid "CPU frequency settings on electric power"
#~ msgstr "Pengaturan frekuensi CPU pada daya listrik"
+
#~ msgid "Monitor settings on electric power"
#~ msgstr "Pengaturan monitor pada daya listrik"
+
#~ msgid "Ondemand"
#~ msgstr "Sesuaipermintaan"
+
#~ msgid "Userspace"
#~ msgstr "Ruangpengguna"
+
#~ msgid "Powersave"
#~ msgstr "Penyimpandaya"
+
#~ msgid "Conservative"
#~ msgstr "Konservatif"
+
#~ msgid "Part of the Xfce goodies project"
#~ msgstr "Bagian dari proyek goodies Xfce"
+
#~ msgid ""
#~ "\n"
#~ "Usage: xfce-power-manager [options] \n"
@@ -731,4 +724,3 @@
#~ "-c, --customize Tampilkan dialog konfigurasi\n"
#~ "-q, --quit Hentikan manajer daya xfce yang sedang berjalan\n"
#~ "\n"
-
Modified: xfce4-power-manager/trunk/po/ja.po
===================================================================
--- xfce4-power-manager/trunk/po/ja.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/ja.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager 0.6.0svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-19 22:28+0900\n"
"Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
"Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -30,53 +30,53 @@
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:935
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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:950
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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "サスペンド"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce 電源管理"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "システムをシャットダウンします"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "システムをハイバネートします"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -293,11 +293,11 @@
msgid "Monitor Settings"
msgstr "モニタ設定"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "電源管理設定"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "拡張"
@@ -410,7 +410,8 @@
msgid "Turn off after"
msgstr "電源切断までの時間"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 電源管理"
@@ -418,27 +419,19 @@
msgid "translator-credits"
msgstr "Masato Hashimoto <cabezon.hashimoto at gmail.com>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "設定ダイアログを表示します"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "動作中の Xfce 電源管理を終了します"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "設定マネージャソケット"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOCKET ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "バージョン情報"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -459,11 +452,11 @@
"Licensed under the GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce 電源管理"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -471,17 +464,17 @@
"ホームフォルダから環境変数を読み込むことができません。自動開始オプションは動"
"作しないかもしれません。"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "'%s --help' で使用方法を表示します。"
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "引数が多すぎます"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -489,29 +482,30 @@
"Xfce4 電源管理を実行できません。HAL および メッセージバスデーモンが起動されて"
"いることを確認してください。"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Xfce4 電源管理を読み込めません"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce 電源管理は動作していません"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce4 電源管理は動作していません。今起動しますか?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "起動"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce 電源管理はすでに動作しています"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -521,11 +515,11 @@
"考えられる理由: AC アダプタドライバがロードされていない、HAL との接続が切断さ"
"れている、あるいはメッセージバスデーモンが作動していない。"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "システムのシャットダウンに失敗しました"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -536,11 +530,11 @@
"しません。考えられる理由: 十分なアクセス権が与えられていない、HAL との接続が"
"切断されている、あるいはメッセージバスデーモンが作動していない。"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "今後このメッセージを表示しない"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr "電源管理設定の読み込みに失敗しました。デフォルト値を使用します。"
@@ -651,14 +645,6 @@
msgstr ""
"HAL デーモンからパワーセーブプロファイルを設定するための応答がありません"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "D-Bus メッセージの生成に失敗しました\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "メッセージの送信に失敗しました\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "電源"
@@ -675,5 +661,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 電源管理"
+#~ msgid "Settings manager socket"
+#~ msgstr "設定マネージャソケット"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "D-Bus メッセージの生成に失敗しました\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "メッセージの送信に失敗しました\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Xfce 電源管理を起動します"
Modified: xfce4-power-manager/trunk/po/nb.po
===================================================================
--- xfce4-power-manager/trunk/po/nb.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/nb.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-17 12:11+0100\n"
"Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
"Language-Team: Norwegian Bokmal\n"
@@ -28,51 +28,51 @@
msgid "Adapter is offline"
msgstr "Strøm er frakoblet"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Ønsker du å sette systemet i dvalemodus?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Dvale"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Ønsker du å sette systemet i hvilemodus?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Hvilemodus"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr "Batteriet er snart tomt. Lagre arbeidet ditt for å unngå datatap"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce Strømstyring"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Avslutt systemet"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Sett systemet i dvalemodus"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -289,11 +289,11 @@
msgid "Monitor Settings"
msgstr "Skjerminnstillinger"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Strømstyring Innstillinger"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Utvidet"
@@ -406,7 +406,8 @@
msgid "Turn off after"
msgstr "Skru av etter"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce Strømstyring"
@@ -414,27 +415,19 @@
msgid "translator-credits"
msgstr "Terje Uriansrud <terje at uriansrud.net>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Vis innstillinger"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Avslutt Xfce strømstyring"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Innstillingsbehandler sokkel"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOKKEL ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versjonsinformasjon"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -455,11 +448,11 @@
"Lisensiert under GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce Strømstyring"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -467,17 +460,17 @@
"Klarte ikke lese hvor hjemmemappen din er, autostarting funksjon vil kanskje "
"ikke fungere"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Skriv '%s --help' for instruksjoner."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "For mange argumenter"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -485,29 +478,30 @@
"Klarte ikke starte Xfce strømstyring, sørg for at hardware abstraksjonlaget "
"og meldingsbussprosessene er startet"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Klarte ikke laste Xfce strømstyring"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce strømstyring er ikke startet"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce strlmstyring er ikke startet, ønsker du å starte den?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Kjør"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce strømstyring"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -517,11 +511,11 @@
"Mulige årsaker: Adapterdriver er ikke lastet, ikke kontakt med hardware "
"abstraksjonslaget eller meldingsbussen kjører ikke"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Systemet klarte ikke å avslutte"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -533,11 +527,11 @@
"ikke kontakt med hardware abstraksjonslaget eller meldingsbussprosessen er "
"ikke startet"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Ikke vis denne meldingen"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr "Klarte ikke laste strømstyringoppsett, bruker standard innstillinger"
@@ -650,14 +644,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Fikk ikke svar fra HAL prosessen for å strømsparingsprofil"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Klarte ikke lage dbus melding\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Klarte ikke sende melding\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Strøm"
@@ -674,5 +660,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 Strømstyring"
+#~ msgid "Settings manager socket"
+#~ msgstr "Innstillingsbehandler sokkel"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOKKEL ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Klarte ikke lage dbus melding\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Klarte ikke sende melding\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Start Xfce strømstyring"
Modified: xfce4-power-manager/trunk/po/nl.po
===================================================================
--- xfce4-power-manager/trunk/po/nl.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/nl.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+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"
@@ -28,56 +28,56 @@
msgid "Adapter is offline"
msgstr "De adapter is offline"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
#, fuzzy
msgid "Are you sure you want to hibernate the system?"
msgstr "Weet u zeker dat u het systeem in de slaapstand wilt brengen"
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
-#: ../src/xfpm-battery.c:807 ../src/xfpm-battery.c:914
-#: ../src/xfpm-battery.c:949 ../src/xfpm-settings.c:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Slaapstand"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
#, fuzzy
msgid "Are you sure you want to suspend the system?"
msgstr "Weet u zeker dat u het systeem in de pauzestand wilt brengen"
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
-#: ../src/xfpm-battery.c:929 ../src/xfpm-battery.c:964
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Pauzestand"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
#, fuzzy
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Het energie-niveau van de batterij is kritiek - sla uw werk op om "
"dataverlies te voorkomen"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce energiebeheer"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Afsluiten"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Slaapstand"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -313,11 +313,11 @@
msgid "Monitor Settings"
msgstr ""
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Voorkeuren energiebeheer"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr ""
@@ -435,7 +435,8 @@
msgid "Turn off after"
msgstr "Afsluiten na"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Energiebeheer"
@@ -443,29 +444,21 @@
msgid "translator-credits"
msgstr "Vincent Tunru <projects at vinnl.nl>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
#, fuzzy
msgid "Show the configuration dialog"
msgstr "Batterij-configuratie"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
#, fuzzy
msgid "Quit any running xfce power manager"
msgstr "Xfce energiebeheer"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr ""
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr ""
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versie-informatie"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -486,12 +479,12 @@
"De GNU GPL-licentie is van toepassing.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
#, fuzzy
msgid "Xfce Power Manager"
msgstr "Energiebeheer"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -499,17 +492,17 @@
"Kan de locatie van uw persoonlijke map niet uitlezen, wellicht werkt "
"autostarten niet"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Type '%s --help' voor gebruiksinstructies."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Te veel argumenten"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
#, fuzzy
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
@@ -518,42 +511,43 @@
"Kan het energiebeheer niet uitvoeren, controlleer of HAL en de "
"berichtenserver draaien"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
#, fuzzy
msgid "Unable to load xfce4 power manager"
msgstr "Energiebeheer"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, fuzzy, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce energiebeheer"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
#, fuzzy
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Energiebeheer is niet actief, wilt u het activeren"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Uitvoeren"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, fuzzy, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce energiebeheer"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Kon niet afsluiten"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
#, fuzzy
msgid ""
"Unable to use power management service, functionalities like hibernate and "
@@ -565,11 +559,11 @@
"zullen niet werken. Mogelijke redenen: onvoldoende rechten, foutieve "
"verbinding met de hardware, of de berichtenserver is niet actief."
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Niet meer weergeven"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
#, fuzzy
msgid "Failed to load power manager configuration, using defaults"
msgstr "Kan de voorkeuren niet laden; standaardwaarden worden gebruikt"
@@ -685,14 +679,6 @@
msgstr ""
"Geen antwoord van HAL-daemon om een energiebesparend profiel op te slaan"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr ""
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr ""
-
#: ../src/xfce4-power-manager.desktop.in.h:1
#, fuzzy
msgid "Power"
Modified: xfce4-power-manager/trunk/po/pt_BR.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_BR.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/pt_BR.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-16 08:12-0500\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-02-16 08:12-0500\n"
"Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -31,53 +31,53 @@
msgid "Adapter is offline"
msgstr "O adaptador está desligado"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Você tem certeza que deseja hibernar o sistema?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernar"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Você tem certeza que deseja suspender o sistema?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspender"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"A sua bateria está quase esgotada. Grave o seu trabalho para evitar perda de "
"dados"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
-#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:197
-#: ../src/xfpm-main.c:253 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Gerenciador de energia Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Desligar o sistema"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernar o sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -295,11 +295,11 @@
msgid "Monitor Settings"
msgstr "Configurações do monitor"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Preferências do Gerenciador de energia"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Estendido"
@@ -412,7 +412,8 @@
msgid "Turn off after"
msgstr "Desligar após"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1236
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Gerenciador de energia do Xfce4"
@@ -423,27 +424,19 @@
"Og Maciel <ogmaciel at gnome.org>\n"
"Henrique P Machado <zehrique at gmail.com>"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Mostra o diálogo de configuração"
-#: ../src/xfpm-main.c:63
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Sai do Gerenciador de energia xfce"
-#: ../src/xfpm-main.c:64
-msgid "Settings manager socket"
-msgstr "Socket do Gerenciador de configurações"
-
-#: ../src/xfpm-main.c:64
-msgid "SOCKET ID"
-msgstr "SOCKET ID"
-
-#: ../src/xfpm-main.c:65
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Informações da versão"
-#: ../src/xfpm-main.c:72
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -464,11 +457,11 @@
"Licenciado sob a GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Gerenciador de energia do Xfce"
-#: ../src/xfpm-main.c:87
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -476,17 +469,17 @@
"Não foi possível ler a variável de ambiente do diretório home, a opção de "
"início automático pode não funcionar"
-#: ../src/xfpm-main.c:162 ../src/xfpm-main.c:183
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Digite \"%s --help\" para informações de uso."
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Muitos argumentos"
-#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -494,31 +487,32 @@
"Não foi possível executar o gerenciador de energia do Xfce4, certifique-se "
"que o hardware abstract layer e o daemon message bus estão em execução"
-#: ../src/xfpm-main.c:202 ../src/xfpm-main.c:258
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Não foi possível carregar o Gerenciador de energia do xfce4"
-#: ../src/xfpm-main.c:212 ../src/xfpm-main.c:235
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "O Gerenciador de energia do Xfce não está em execução"
-#: ../src/xfpm-main.c:215
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr ""
"O Gerenciador de energia do Xfce4 não está em execução, você deseja lançá-lo "
"agora?"
-#: ../src/xfpm-main.c:217
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Executar"
-#: ../src/xfpm-main.c:266
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "O Gerenciador de energia do Xfce já está em execução"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -529,11 +523,11 @@
"está carregado, conexão com o hardware abstract layer quebrada ou o daemon "
"message bus não está em execução"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Falha do sistema ao desligar"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -545,11 +539,11 @@
"permissão suficiente, conexão com o hardware abstract layer quebrada ou o "
"daemon message bus não está em execução"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Não mostrar esta mensagem novamente"
-#: ../src/xfpm-driver.c:1236
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Falha ao carregar a configuração do Gerenciador de energia, usando os padrões"
@@ -663,14 +657,6 @@
msgstr ""
"Nenhuma resposta do daemon HAL para definir o perfil de economia de energia"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Falhou ao criar mensagem dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Falhou ao enviar mensagem\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energia"
@@ -687,6 +673,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Gerenciador de energia do Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Socket do Gerenciador de configurações"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Falhou ao criar mensagem dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Falhou ao enviar mensagem\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Inicia o Gerenciador de energia do xfce"
Modified: xfce4-power-manager/trunk/po/pt_PT.po
===================================================================
--- xfce4-power-manager/trunk/po/pt_PT.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/pt_PT.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-22 17:23+0100\n"
"Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
"Language-Team: \n"
@@ -29,52 +29,52 @@
msgid "Adapter is offline"
msgstr "Adaptador desligado"
-#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Tem a certeza que deseja hibernar o sistema?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Hibernar"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Tem a certeza que deseja suspender o sistema?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Suspender"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"A sua bateria está quase vazia. Grave o seu trabalho para evitar perder dados"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Gestão de energia Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Desligar o sistema"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Hibernar o sistema"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -292,11 +292,11 @@
msgid "Monitor Settings"
msgstr "Definições do Monitor"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Preferências de Gestão de Energia"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Extensivo"
@@ -409,7 +409,8 @@
msgid "Turn off after"
msgstr "Desligar após"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Gestão de Energia Xfce4"
@@ -417,27 +418,19 @@
msgid "translator-credits"
msgstr "Nuno Miguel <nunis at netcabo.pt>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Mostrar a janela de configuração"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Sair de qualquer gestão de energia xfce"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Socket de gestor de definições"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "SOCKET ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Informação de versão"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -458,11 +451,11 @@
"Licenciado sob a GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Gestão de Energia Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -470,17 +463,17 @@
"Incapaz de ler a variável de ambiente directório home, opção início "
"automático pode não funcionar"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Digite '%s --help' para uso."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Demasiados argumentos"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -488,29 +481,30 @@
"Incapaz de executar a gestão de energia Xfce4, certifique-se que o hardware "
"abstract layer e o daemon message bus estão em execução"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Incapaz de lançar a gestão de energia xfce4"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Gestão de energia Xfce não está em execução"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Gestão de Energia Xfce4 não está em execução, deseja lançá-lo agora?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Executar"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Gestão de energia Xfce já em execução"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -521,11 +515,11 @@
"carregado, ligação defeituosa com o hardware abstract layer ou o daemon "
"message bus não está em execução"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Sistema falhou a desligar"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -537,11 +531,11 @@
"suficiente, ligação com o hardware abstract layer quebrada ou o daemon "
"message bus não está em execução"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Não mostrar esta mensagem novamente"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Falhou a carregar a configuração de gestão de energia, usando as omissões"
@@ -653,14 +647,6 @@
msgstr ""
"Sem resposta do daemon HAL para definir o perfil de poupança de energia"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Falhou a criar mensagem dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Falhou a enviar mensagem\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Energia"
@@ -677,6 +663,18 @@
msgid "Xfce 4 Power Manager"
msgstr "Gestão de Energia Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Socket de gestor de definições"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "SOCKET ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Falhou a criar mensagem dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Falhou a enviar mensagem\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Iniciar gestão de energia xfce"
Modified: xfce4-power-manager/trunk/po/sv.po
===================================================================
--- xfce4-power-manager/trunk/po/sv.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/sv.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-01 19:09+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-18 22:55+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -27,53 +27,53 @@
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:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Är du säker på att du vill försätta systemet i viloläge?"
#. 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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../src/xfpm-settings.c:457
#: ../src/xfpm-settings.c:918 ../src/xfpm-settings.c:950
#: ../src/xfpm-settings.c:976
msgid "Hibernate"
msgstr "Viloläge"
-#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Är du säker på att du vill försätta systemet i vänteläge?"
#. 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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Vänteläge"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
msgstr ""
"Ditt batteri är nästan tomt. Spara ditt arbete för att förhindra att data "
"förloras"
-#: ../src/xfpm-battery.c:774 ../src/xfpm-battery.c:1339
-#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:197
-#: ../src/xfpm-main.c:253 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Strömhanterare för Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Stäng av systemet"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Försätt i viloläge"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -288,11 +288,11 @@
msgid "Monitor Settings"
msgstr "Skärminställningar"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Inställningar för strömhanterare"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr ""
@@ -405,7 +405,8 @@
msgid "Turn off after"
msgstr "Stäng av efter"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1236
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Strömhanterare för Xfce4"
@@ -417,27 +418,19 @@
"Skicka synpunkter på översättningen till\n"
"<tp-sv at listor.tp-sv.se>"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Visa konfigurationsdialogen"
-#: ../src/xfpm-main.c:63
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Avsluta alla körande xfce-strömhanterare"
-#: ../src/xfpm-main.c:64
-msgid "Settings manager socket"
-msgstr "Uttag för inställningshanterare"
-
-#: ../src/xfpm-main.c:64
-msgid "SOCKET ID"
-msgstr "UTTAGS-ID"
-
-#: ../src/xfpm-main.c:65
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Versionsinformation"
-#: ../src/xfpm-main.c:72
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -458,66 +451,67 @@
"Licensierad under GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Strömhanterare för Xfce"
-#: ../src/xfpm-main.c:87
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
msgstr ""
-#: ../src/xfpm-main.c:162 ../src/xfpm-main.c:183
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Ange \"%s --help\" för användningsinformation."
-#: ../src/xfpm-main.c:181
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "För många argument"
-#: ../src/xfpm-main.c:198 ../src/xfpm-main.c:254
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
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:202 ../src/xfpm-main.c:258
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Kunde inte läsa in Strömhanterare för Xfce4"
-#: ../src/xfpm-main.c:212 ../src/xfpm-main.c:235
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Strömhanterare för Xfce är inte igång"
-#: ../src/xfpm-main.c:215
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Strömhanterare för Xfce4 är inte igång. Vill du starta den nu?"
-#: ../src/xfpm-main.c:217
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Kör"
-#: ../src/xfpm-main.c:266
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Strömhanterare för Xfce är redan igång"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Försök att stänga av systemet misslyckades "
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -525,11 +519,11 @@
"is not running"
msgstr ""
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Visa inte detta meddelande igen"
-#: ../src/xfpm-driver.c:1236
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
@@ -639,14 +633,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr ""
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Misslyckades med att skapa dbus-meddelande\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Misslyckades med att skicka meddelande\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Ström"
@@ -663,5 +649,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Strömhanterare för Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Uttag för inställningshanterare"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "UTTAGS-ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Misslyckades med att skapa dbus-meddelande\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Misslyckades med att skicka meddelande\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Starta Strömhanterare för Xfce"
Modified: xfce4-power-manager/trunk/po/tr.po
===================================================================
--- xfce4-power-manager/trunk/po/tr.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/tr.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: xfce\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
"Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -13,79 +13,65 @@
#: ../src/xfpm-ac-adapter.c:217
msgid "Unable to read adapter status, the power manager will not work properly"
-msgstr "Güç bağdaştırıcısı durumu bilgisi okunamadı, güç yöneticisi düzgün çalışmayabilir"
+msgstr ""
+"Güç bağdaştırıcısı durumu bilgisi okunamadı, güç yöneticisi düzgün "
+"çalışmayabilir"
-#: ../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 "Güç bağdaştırıcısı etkin"
-#: ../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 "Güç bağdaştırıcısı etkin değil"
-#: ../src/xfpm-ac-adapter.c:358
-#: ../src/xfpm-battery.c:912
+#: ../src/xfpm-ac-adapter.c:358 ../src/xfpm-battery.c:935
msgid "Are you sure you want to hibernate the system?"
msgstr "Sistemi hazırda beklet moduna almak istediğinizden emin misiniz?"
#. 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:457
-#: ../src/xfpm-settings.c:918
-#: ../src/xfpm-settings.c:950
+#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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"
-#: ../src/xfpm-ac-adapter.c:372
-#: ../src/xfpm-battery.c:927
+#: ../src/xfpm-ac-adapter.c:372 ../src/xfpm-battery.c:950
msgid "Are you sure you want to suspend the system?"
msgstr "Sistemi askıya almak istediğinizden emin misiniz?"
#. 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:916
-#: ../src/xfpm-settings.c:948
+#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
+#: ../src/xfpm-battery.c:952 ../src/xfpm-battery.c:987
+#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Askıya Al"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
msgid "Your battery is almost empty. Save your work to avoid losing data"
-msgstr "Pil seviyesi çok düşük. Veri kaybetmemek için lütfen işlerinizi kaydediniz"
+msgstr ""
+"Pil seviyesi çok düşük. Veri kaybetmemek için lütfen işlerinizi kaydediniz"
-#: ../src/xfpm-battery.c:774
-#: ../src/xfpm-battery.c:1339
-#: ../src/xfpm-battery-icon.c:426
-#: ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252
-#: ../src/xfpm-driver.c:304
-#: ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-battery.c:772 ../src/xfpm-battery.c:1362
+#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce güç yöneticisi"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Sistemi kapat"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Sistemi hazırda beklet moduna al"
-#: ../src/xfpm-battery.c:814
-#: ../src/xfpm-settings.c:453
-#: ../src/xfpm-settings.c:920
-#: ../src/xfpm-settings.c:952
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
msgstr "Kapat"
@@ -114,10 +100,8 @@
msgid "When battery charge level is critical do"
msgstr "Pil seviyesi kritik ise şu işlemi gerçekleştir"
-#: ../src/xfpm-settings.c:450
-#: ../src/xfpm-settings.c:914
-#: ../src/xfpm-settings.c:946
-#: ../src/xfpm-settings.c:972
+#: ../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"
@@ -137,44 +121,42 @@
msgid "Enable power save on battery power"
msgstr "Pil kaynaklı güç kullanılırken güç korumasını etkinleştir"
-#: ../src/xfpm-settings.c:518
-#: ../src/xfpm-settings.c:603
+#: ../src/xfpm-settings.c:518 ../src/xfpm-settings.c:603
msgid "Best performance"
msgstr "En iyi performans"
-#: ../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 "İşlemciyi azami frekansta çalıştır"
-#: ../src/xfpm-settings.c:524
-#: ../src/xfpm-settings.c:609
+#: ../src/xfpm-settings.c:524 ../src/xfpm-settings.c:609
msgid "Ondemand performance"
msgstr "Akustik performans"
-#: ../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 "İşlemciyi yüklenme durumunda azami hızda, sistem boşta iken asgari hızda çalıştır "
+#: ../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 ""
+"İşlemciyi yüklenme durumunda azami hızda, sistem boşta iken asgari hızda "
+"çalıştır "
-#: ../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 "En iyi güç koruma"
-#: ../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 "İşlemciyi asgari frekansta çalıştır"
-#: ../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 "Güç koruma"
-#: ../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 "mevcut kullanıma göre işlemci hızını nazikçe artırır veya azaltır"
#: ../src/xfpm-settings.c:595
@@ -193,8 +175,7 @@
msgid "CPU frequency control cannot be used"
msgstr "İşlemci frekansı kontrolü kullanılamaz"
-#: ../src/xfpm-settings.c:705
-#: ../src/xfpm-settings.c:847
+#: ../src/xfpm-settings.c:705 ../src/xfpm-settings.c:847
msgid "On AC power"
msgstr "Fişe takılı iken (AC)"
@@ -206,8 +187,7 @@
msgid "CPU frequency settings"
msgstr "İşlemci frekans ayarları"
-#: ../src/xfpm-settings.c:715
-#: ../src/xfpm-settings.c:855
+#: ../src/xfpm-settings.c:715 ../src/xfpm-settings.c:855
msgid "On battery power"
msgstr "Pil ile çalışırken"
@@ -291,31 +271,27 @@
msgid "Advanced settings"
msgstr "Gelişmiş ayarlar"
-#: ../src/xfpm-settings.c:1145
-#: ../src/xfpm-settings.c:1150
+#: ../src/xfpm-settings.c:1145 ../src/xfpm-settings.c:1150
msgid "CPU settings"
msgstr "İşlemci ayarları"
-#: ../src/xfpm-settings.c:1162
-#: ../src/xfpm-settings.c:1167
+#: ../src/xfpm-settings.c:1162 ../src/xfpm-settings.c:1167
msgid "Battery settings"
msgstr "Pil ayarları"
-#: ../src/xfpm-settings.c:1179
-#: ../src/xfpm-settings.c:1184
+#: ../src/xfpm-settings.c:1179 ../src/xfpm-settings.c:1184
msgid "Shortcuts"
msgstr "Kısayollar"
-#: ../src/xfpm-settings.c:1204
-#: ../src/xfpm-settings.c:1209
+#: ../src/xfpm-settings.c:1204 ../src/xfpm-settings.c:1209
msgid "Monitor Settings"
msgstr "Monitör Ayarları"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Güç Yöneticisi Tercihleri"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Genişletilmiş"
@@ -331,8 +307,7 @@
msgid "You are running on Battery"
msgstr "Pil ile çalışıyor"
-#: ../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 "Pil tükeniyor"
@@ -341,8 +316,7 @@
msgid "Your battery is discharging"
msgstr "Piliniz tükeniyor"
-#: ../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 "Pil şarj ediliyor"
@@ -430,8 +404,8 @@
msgid "Turn off after"
msgstr "Kapat"
-#: ../src/xfpm-common.c:146
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 Güç Yöneticisi"
@@ -439,27 +413,19 @@
msgid "translator-credits"
msgstr "Samed Beyribey <ras0ir at eventualis.org>, 2009"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Yapılandırma menüsünü göster"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Çalışan tüm xfce güç yöneticisi uygulamalarını kapat"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Ayar yöneticisi soketi "
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "Soket Kimliği"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Sürüm bilgisi"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -480,81 +446,100 @@
"GNU GPL ile lisanslanmıştır.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce Güç Yöneticisi"
-#: ../src/xfpm-main.c:86
-msgid "Unable to read your home directory environment variable, autostart option may not work"
-msgstr "Ev dizini çevre değişkeni bilgileriniz okunamadı, otomatik başlangıç seçeneği çalışmayabilir"
+#: ../src/xfpm-main.c:89
+msgid ""
+"Unable to read your home directory environment variable, autostart option "
+"may not work"
+msgstr ""
+"Ev dizini çevre değişkeni bilgileriniz okunamadı, otomatik başlangıç "
+"seçeneği çalışmayabilir"
-#: ../src/xfpm-main.c:161
-#: ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Kullanımı öğrenmek için '%s --help' yazınız."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Çok fazla değişken kullandınız"
-#: ../src/xfpm-main.c:197
-#: ../src/xfpm-main.c:253
-msgid "Unable to run Xfce4 power manager, make sure the hardware abstract layer and the message bus daemon are running"
-msgstr "Xfce4 güç yöneticisi çalıştırılamadı, donanım soyutlama katmanı (HAL) ve haberleşme (bus) servislerinin çalıştığından emin olunuz"
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
+msgid ""
+"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
+"the message bus daemon are running"
+msgstr ""
+"Xfce4 güç yöneticisi çalıştırılamadı, donanım soyutlama katmanı (HAL) ve "
+"haberleşme (bus) servislerinin çalıştığından emin olunuz"
-#: ../src/xfpm-main.c:201
-#: ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Xfce4 güç yöneticisi çalıştırılamadı"
-#: ../src/xfpm-main.c:211
-#: ../src/xfpm-main.c:234
+#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce güç yöneticisi çalışmıyor"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce4 Güç Yöneticisi çalışmıyor, çalıştırmak ister misiniz?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Çalıştır"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce güç yöneticisi zaten çalışıyor"
-#: ../src/xfpm-driver.c:291
-msgid "Unable to read AC adapter status, the power manager will not work properly. Possible reasons: The AC adapter driver is not loaded, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "AC güç bağdaştırıcısı durumu bilgisi okunamadı, güç yöneticisi düzgün çalışmayabilir. Muhtemel nedenler: AC güç bağdaştırıcısı sürücüsü yüklenmemiş olabilir, HAL ile bağlantı kurulamıyor olabilir ve DBus servisi çalışmıyor olabilir"
+#: ../src/xfpm-driver.c:283
+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 ""
+"AC güç bağdaştırıcısı durumu bilgisi okunamadı, güç yöneticisi düzgün "
+"çalışmayabilir. Muhtemel nedenler: AC güç bağdaştırıcısı sürücüsü "
+"yüklenmemiş olabilir, HAL ile bağlantı kurulamıyor olabilir ve DBus servisi "
+"çalışmıyor olabilir"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Sistem kapatılamadı"
-#: ../src/xfpm-driver.c:907
-msgid "Unable to use power management service, functionalities like hibernate and suspend will not work. Possible reasons: you don't have enough permission, broken connection with the hardware abstract layer or the message bus daemon is not running"
-msgstr "Güç yönetimi servisi kullanılamıyor, hazırda beklet modu ve askıya alma gibi bazı fonksiyonlar çalışmayabilir. Muhtemel nedenler: izin problemi olabilir, HAL ile bağlantı kurulamıyor olabilir veya DBus servisi çalışmıyor olabilir"
+#: ../src/xfpm-driver.c:783
+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 ""
+"Güç yönetimi servisi kullanılamıyor, hazırda beklet modu ve askıya alma gibi "
+"bazı fonksiyonlar çalışmayabilir. Muhtemel nedenler: izin problemi olabilir, "
+"HAL ile bağlantı kurulamıyor olabilir veya DBus servisi çalışmıyor olabilir"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Bu mesajı tekrar gösterme"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
-msgstr "Güç yöneticisi yapılandırması yüklenemedi, öntanımlı ayarlar kullanılacak"
+msgstr ""
+"Güç yöneticisi yapılandırması yüklenemedi, öntanımlı ayarlar kullanılacak"
#: ../src/xfpm-hal.c:172
#, c-format
msgid "Error monitoring HAL events"
msgstr "HAL işlemleri izlenirken hata meydana geldi"
-#: ../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 servisine bağlanılamadı: %s"
@@ -588,14 +573,9 @@
msgid "No hibernate method found"
msgstr "Hazırda beklet modu yöntemi bulunamadı"
-#: ../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 "Yetersiz bellek"
@@ -610,14 +590,12 @@
msgid "System failed to hibernate"
msgstr "Sistem hazırda beklet moduna alınamadı"
-#: ../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 "Askıya alma işlemi gerçekleştirilirken hata oluştu"
-#: ../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 "Haberleşme servisinden (Bus) bilinmeyen bir yanıt geldi "
@@ -640,17 +618,22 @@
#: ../src/xfpm-hal.c:926
#, c-format
msgid "No reply from HAL daemon to get monitor brightness level"
-msgstr "Monitör parlıklığı seviyesinin alınması için HAL servisinden yanıt gelmedi"
+msgstr ""
+"Monitör parlıklığı seviyesinin alınması için HAL servisinden yanıt gelmedi"
#: ../src/xfpm-hal.c:976
#, c-format
msgid "No reply from HAL daemon to get available cpu governors"
-msgstr "Kullanılabilir işlemci yönetimi bilgilerinin alınması için HAL servisinden yanıt gelmedi"
+msgstr ""
+"Kullanılabilir işlemci yönetimi bilgilerinin alınması için HAL servisinden "
+"yanıt gelmedi"
#: ../src/xfpm-hal.c:1028
#, c-format
msgid "No reply from HAL daemon to get current cpu governor"
-msgstr "Mevcut işlemci yönetimi bilgilerinin alınması için HAL servisinden yanıt gelmedi"
+msgstr ""
+"Mevcut işlemci yönetimi bilgilerinin alınması için HAL servisinden yanıt "
+"gelmedi"
#: ../src/xfpm-hal.c:1081
#, c-format
@@ -662,15 +645,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "Güç koruma profili belirlemek için HAL servisinden yanıt gelmedi"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Dbus mesajı oluşturulamadı\n"
-
-#: ../src/xfpm-dbus-messages.c:122
-#: ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Mesaj gönderilemedi\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Güç"
@@ -687,22 +661,39 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce4 Güç Yöneticisi"
+#~ msgid "Settings manager socket"
+#~ msgstr "Ayar yöneticisi soketi "
+
+#~ msgid "SOCKET ID"
+#~ msgstr "Soket Kimliği"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Dbus mesajı oluşturulamadı\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Mesaj gönderilemedi\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Xfce güç yöneticisini çalıştır"
+
#~ msgid "On electric power"
#~ msgstr "Fişe takılı"
#, fuzzy
#~ msgid "CPU frequency settings on electric power"
#~ msgstr "Fişe takılı iken kullanılacak işlemci frekansı ayarları"
+
#~ msgid "Monitor settings on electric power"
#~ msgstr "Fişe takılı güç için monitör ayarları"
+
#~ msgid "Ondemand"
#~ msgstr "Dinamik"
+
#~ msgid "Userspace"
#~ msgstr "Kullanıcı tanımlı"
+
#~ msgid "Powersave"
#~ msgstr "Güç koruma"
+
#~ msgid "Conservative"
#~ msgstr "Sunum"
-
Modified: xfce4-power-manager/trunk/po/uk.po
===================================================================
--- xfce4-power-manager/trunk/po/uk.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/uk.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-26 17:30+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
"Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -31,52 +31,52 @@
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:935
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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:950
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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "Призупинити"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Менеджер живлення Xfce"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "Вимкнути систему"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "Перевести систему в сплячку "
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -295,11 +295,11 @@
msgid "Monitor Settings"
msgstr "Налаштування стеження"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "Налаштування менеджера живлення"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "Розширені"
@@ -412,7 +412,8 @@
msgid "Turn off after"
msgstr "Вимкнути після"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Менеджер живлення для Xfce4"
@@ -420,27 +421,19 @@
msgid "translator-credits"
msgstr "Dmitry Nikitin <luckas_fb at mail.ru>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "Показати діалог налаштування"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "Завершити будь-який запущений менеджер живлення xfce"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "Сокет менеджера властивостей"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "ID сокета"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "Інформація про версію"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -461,11 +454,11 @@
"Ліцензовано під GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Менеджер живлення Xfce"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
@@ -473,17 +466,17 @@
"Неможливо прочитати змінні середовища домашньої теки, опція автозапуску може "
"не працювати"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "Наберіть '%s --help' для використання."
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "Забагато параметрів"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
@@ -491,29 +484,30 @@
"Неможливо запустити менеджер живлення Xfce4, впевніться, що працюють HAL і "
"служба повідомлень шини даних"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "Неможливо завантажити менеджер живлення xfce4"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Менеджер живлення Xfce не працює"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Менеджер живлення Xfce4 не працює, може хочете запустити його зараз?"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "Запустити"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Менеджер живлення Xfce вже працює"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -523,11 +517,11 @@
"неправильно. Можливі причини: драйвер адаптера AC не завантажено, відсутній "
"зв'язок з HAL або не запущено службу повідомлень шини даних"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "Не вдалось вимкнути систему"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -538,11 +532,11 @@
"призупинення не працюють. Можливі причини: Ви не маєте достатніх прав, "
"порушений зв'язок з HAL, або служба повідомлень шини даних не працює"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "Не показувати це повідомлення знову"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
"Не вдалось завантажити конфігурацію менеджера живлення, використовується "
@@ -659,14 +653,6 @@
msgstr ""
"Немає відповіді від служби HAL для встановлення профілю збереження енергії"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "Не вдалось створити повідомлення dbus\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "Не вдалось послати повідомлення\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "Живлення"
@@ -683,5 +669,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Менеджер живлення Xfce 4"
+#~ msgid "Settings manager socket"
+#~ msgstr "Сокет менеджера властивостей"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "ID сокета"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "Не вдалось створити повідомлення dbus\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "Не вдалось послати повідомлення\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "Запустити менеджер живлення xfce"
Modified: xfce4-power-manager/trunk/po/zh_CN.po
===================================================================
--- xfce4-power-manager/trunk/po/zh_CN.po 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/po/zh_CN.po 2009-03-02 09:59:29 UTC (rev 6827)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce 4-power-manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 12:03+0100\n"
+"POT-Creation-Date: 2009-03-02 10:58+0100\n"
"PO-Revision-Date: 2009-01-15 10:25-0800\n"
"Last-Translator: Chris K. Zhang <plutino at gmail.com>\n"
"Language-Team: Chinese (simplified)\n"
@@ -28,51 +28,51 @@
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:935
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:457
+#: ../src/xfpm-battery.c:805 ../src/xfpm-battery.c:937
+#: ../src/xfpm-battery.c:972 ../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:950
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-battery.c:952 ../src/xfpm-battery.c:987
#: ../src/xfpm-settings.c:916 ../src/xfpm-settings.c:948
#: ../src/xfpm-settings.c:974
msgid "Suspend"
msgstr "挂起"
-#: ../src/xfpm-battery.c:769
+#: ../src/xfpm-battery.c:767
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.c:772 ../src/xfpm-battery.c:1362
#: ../src/xfpm-battery-icon.c:426 ../src/xfpm-main.c:196
-#: ../src/xfpm-main.c:252 ../src/xfpm-driver.c:304 ../src/xfpm-driver.c:317
-#: ../src/xfpm-driver.c:912
+#: ../src/xfpm-main.c:273 ../src/xfpm-driver.c:296 ../src/xfpm-driver.c:309
+#: ../src/xfpm-driver.c:788
msgid "Xfce power manager"
msgstr "Xfce 电源管理器"
-#: ../src/xfpm-battery.c:784
+#: ../src/xfpm-battery.c:782
msgid "Shutdown the system"
msgstr "关闭系统"
-#: ../src/xfpm-battery.c:792
+#: ../src/xfpm-battery.c:790
msgid "Hibernate the system"
msgstr "休眠"
-#: ../src/xfpm-battery.c:814 ../src/xfpm-settings.c:453
+#: ../src/xfpm-battery.c:812 ../src/xfpm-settings.c:453
#: ../src/xfpm-settings.c:920 ../src/xfpm-settings.c:952
#: ../src/xfpm-settings.c:978
msgid "Shutdown"
@@ -287,11 +287,11 @@
msgid "Monitor Settings"
msgstr "显示器设置"
-#: ../src/xfpm-settings.c:1244
+#: ../src/xfpm-settings.c:1243
msgid "Power Manager Preferences"
msgstr "电源管理器首选项"
-#: ../src/xfpm-settings.c:1275
+#: ../src/xfpm-settings.c:1274
msgid "Extended"
msgstr "扩展"
@@ -404,7 +404,8 @@
msgid "Turn off after"
msgstr "多长时间后关机"
-#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1243
+#: ../src/xfpm-common.c:146 ../src/xfpm-driver.c:1067
+#: ../src/xfpm-settings-main.c:106
msgid "Xfce4 Power Manager"
msgstr "Xfce4 电源管理器"
@@ -412,27 +413,19 @@
msgid "translator-credits"
msgstr "HuntXu <huntxu at live.cn>"
-#: ../src/xfpm-main.c:61
+#: ../src/xfpm-main.c:65
msgid "Show the configuration dialog"
msgstr "显示配置对话框"
-#: ../src/xfpm-main.c:62
+#: ../src/xfpm-main.c:66
msgid "Quit any running xfce power manager"
msgstr "退出正在运行中的任何 xfce 电源管理器程序"
-#: ../src/xfpm-main.c:63
-msgid "Settings manager socket"
-msgstr "设置管理器套接字"
-
-#: ../src/xfpm-main.c:63
-msgid "SOCKET ID"
-msgstr "套接字 ID"
-
-#: ../src/xfpm-main.c:64
+#: ../src/xfpm-main.c:67
msgid "Version information"
msgstr "版本信息"
-#: ../src/xfpm-main.c:71
+#: ../src/xfpm-main.c:74
#, c-format
msgid ""
"\n"
@@ -453,55 +446,56 @@
"Licensed under the GNU GPL.\n"
"\n"
-#: ../src/xfpm-main.c:85
+#: ../src/xfpm-main.c:88
msgid "Xfce Power Manager"
msgstr "Xfce 电源管理器"
-#: ../src/xfpm-main.c:86
+#: ../src/xfpm-main.c:89
msgid ""
"Unable to read your home directory environment variable, autostart option "
"may not work"
msgstr "无法读取家目录环境变量，可能无法开机自动启动"
-#: ../src/xfpm-main.c:161 ../src/xfpm-main.c:182
+#: ../src/xfpm-main.c:164 ../src/xfpm-main.c:185
#, c-format
msgid "Type '%s --help' for usage."
msgstr "输入 '%s --help' 查看使用方式"
-#: ../src/xfpm-main.c:180
+#: ../src/xfpm-main.c:183
#, c-format
msgid "Too many arguments"
msgstr "太多参数"
-#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:253
+#: ../src/xfpm-main.c:197 ../src/xfpm-main.c:274
msgid ""
"Unable to run Xfce4 power manager, make sure the hardware abstract layer and "
"the message bus daemon are running"
msgstr "无法启动 Xfce4 电源管理器。请检查 HAL 和 D-Bus 是否都已启动"
-#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:257
+#: ../src/xfpm-main.c:201 ../src/xfpm-main.c:278
msgid "Unable to load xfce4 power manager"
msgstr "无法载入 xfce4 电源管理器"
#: ../src/xfpm-main.c:211 ../src/xfpm-main.c:234
+#: ../src/xfpm-settings-main.c:168
#, c-format
msgid "Xfce power manager is not running"
msgstr "Xfce 电源管理器未运行"
-#: ../src/xfpm-main.c:214
+#: ../src/xfpm-main.c:214 ../src/xfpm-settings-main.c:171
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr "Xfce4 电源管理器未运行，您要现在启动它吗？"
-#: ../src/xfpm-main.c:216
+#: ../src/xfpm-main.c:216 ../src/xfpm-settings-main.c:173
msgid "Run"
msgstr "运行"
-#: ../src/xfpm-main.c:265
+#: ../src/xfpm-main.c:286
#, c-format
msgid "Xfce power manager is already running"
msgstr "Xfce 电源管理器已在运行中"
-#: ../src/xfpm-driver.c:291
+#: ../src/xfpm-driver.c:283
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 "
@@ -510,11 +504,11 @@
"无法读取交流电源信息，电源管理器无法正常工作。可能是由于交流电源驱动没有\n"
"加载，或者无法和 HAL 以及 D-Bus 通讯"
-#: ../src/xfpm-driver.c:728
+#: ../src/xfpm-driver.c:604
msgid "System failed to shutdown"
msgstr "关机失败"
-#: ../src/xfpm-driver.c:907
+#: ../src/xfpm-driver.c:783
msgid ""
"Unable to use power management service, functionalities like hibernate and "
"suspend will not work. Possible reasons: you don't have enough permission, "
@@ -524,11 +518,11 @@
"无法使用电源管理器提供的服务。系统无法休眠或挂起。你可能没有这个权限，或者\n"
"HAL 以及 D-Bus 没有启动"
-#: ../src/xfpm-driver.c:920
+#: ../src/xfpm-driver.c:796
msgid "Don't show this message again"
msgstr "不再显示此信息"
-#: ../src/xfpm-driver.c:1243
+#: ../src/xfpm-driver.c:1067 ../src/xfpm-settings-main.c:106
msgid "Failed to load power manager configuration, using defaults"
msgstr "读取电源管理器配置时失败，使用默认设置"
@@ -638,14 +632,6 @@
msgid "No reply from HAL daemon to set power save profile"
msgstr "HAL 没有回应，所以无法设置省电模式"
-#: ../src/xfpm-dbus-messages.c:86
-msgid "Failed to create dbus message\n"
-msgstr "dbus消息创建失败\n"
-
-#: ../src/xfpm-dbus-messages.c:122 ../src/xfpm-dbus-messages.c:223
-msgid "Failed to send message\n"
-msgstr "消息发送失败\n"
-
#: ../src/xfce4-power-manager.desktop.in.h:1
msgid "Power"
msgstr "电源"
@@ -662,5 +648,17 @@
msgid "Xfce 4 Power Manager"
msgstr "Xfce 4 电源管理器"
+#~ msgid "Settings manager socket"
+#~ msgstr "设置管理器套接字"
+
+#~ msgid "SOCKET ID"
+#~ msgstr "套接字 ID"
+
+#~ msgid "Failed to create dbus message\n"
+#~ msgstr "dbus消息创建失败\n"
+
+#~ msgid "Failed to send message\n"
+#~ msgstr "消息发送失败\n"
+
#~ msgid "Start xfce power manager"
#~ msgstr "打开 xfce 电源管理器"
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/Makefile.am 2009-03-02 09:59:29 UTC (rev 6827)
@@ -1,88 +1,149 @@
-bin_PROGRAMS = xfce4-power-manager
+bin_PROGRAMS = xfce4-power-manager \
+ xfce4-power-manager-settings
-generated_files = \
- xfpm-enum-types.c \
- xfpm-enum-types.h \
- xfpm-marshal.c \
- xfpm-marshal.h
-
+generated_files = \
+ xfpm-enum-types.c \
+ xfpm-enum-types.h \
+ xfpm-marshal.c \
+ xfpm-marshal.h
-xfce4_power_manager_SOURCES = $(generated_files) \
- xfpm-main.c \
- xfpm-debug.h \
- xfpm-hal.c \
- xfpm-hal.h \
- xfpm-driver.c \
- xfpm-driver.h \
- xfpm-ac-adapter.c \
- xfpm-ac-adapter.h \
- xfpm-cpu.c \
- xfpm-cpu.h \
- xfpm-lcd-brightness.c \
- xfpm-lcd-brightness.h \
- xfpm-button.c \
- xfpm-button.h \
- xfpm-dbus-messages.c \
- xfpm-dbus-messages.h \
- xfpm-battery.c \
- xfpm-battery.h \
- xfpm-battery-icon.c \
- xfpm-battery-icon.h \
- xfpm-spin-button.c \
- xfpm-spin-button.h \
- xfpm-dpms.c \
- xfpm-dpms.h \
- xfpm-dpms-spins.c \
- xfpm-dpms-spins.h \
- xfpm-popups.c \
- xfpm-popups.h \
- xfpm-notify.c \
- xfpm-notify.h \
- xfpm-enums.h \
- xfpm-settings.c \
- xfpm-settings.h \
- xfpm-common.c \
- xfpm-common.h
-xfce4_power_manager_CFLAGS = \
- -DLOCALEDIR=\"$(localedir)\" \
- -DG_LOG_DOMAIN=\"xfce4-power-manager\" \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(HAL_CFLAGS) \
- $(LIBXFCE4GUI_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(DPMS_CFLAGS)
+xfce4_power_manager_SOURCES = \
+ $(generated_files) \
+ xfce-power-manager-dbus-server.h \
+ xfpm-main.c \
+ xfpm-debug.h \
+ xfpm-hal.c \
+ xfpm-hal.h \
+ xfpm-driver.c \
+ xfpm-driver.h \
+ xfpm-ac-adapter.c \
+ xfpm-ac-adapter.h \
+ xfpm-cpu.c \
+ xfpm-cpu.h \
+ xfpm-lcd-brightness.c \
+ xfpm-lcd-brightness.h \
+ xfpm-button.c \
+ xfpm-button.h \
+ xfpm-dbus-messages.c \
+ xfpm-dbus-messages.h \
+ xfpm-battery.c \
+ xfpm-battery.h \
+ xfpm-battery-icon.c \
+ xfpm-battery-icon.h \
+ xfpm-dpms.c \
+ xfpm-dpms.h \
+ xfpm-popups.c \
+ xfpm-popups.h \
+ xfpm-notify.c \
+ xfpm-notify.h \
+ xfpm-enums.h \
+ xfpm-common.c \
+ xfpm-common.h
-xfce4_power_manager_LDADD = \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(DBUS_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(LIBXFCE4GUI_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(HAL_LIBS) \
- $(XFCONF_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(DPMS_LIBS)
+xfce4_power_manager_CFLAGS = \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-power-manager\" \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(HAL_CFLAGS) \
+ $(LIBXFCE4GUI_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(DPMS_CFLAGS)
+xfce4_power_manager_LDADD = \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(LIBXFCE4GUI_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(HAL_LIBS) \
+ $(XFCONF_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(DPMS_LIBS)
-EXTRA_DIST = \
- xfpm-marshal.list \
- $(generated_files) \
+
+xfce4_power_manager_settings_SOURCES = \
+ xfpm-marshal.c \
+ xfpm-marshal.h \
+ xfpm-settings-main.c \
+ xfpm-settings.c \
+ xfpm-settings.h \
+ xfpm-common.c \
+ xfpm-common.h \
+ xfpm-enum.h \
+ xfpm-enum-types.c \
+ xfpm-enum-types.h \
+ xfpm-string.c \
+ xfpm-string.h \
+ xfpm-spin-button.c \
+ xfpm-spin-button.h \
+ xfpm-dpms-spins.c \
+ xfpm-dpms-spins.h \
+ xfpm-dbus-messages.c \
+ xfpm-dbus-messages.h \
+ xfpm-popups.c \
+ xfpm-popups.h \
+ xfpm-debug.h
+
+
+xfce4_power_manager_settings_CFLAGS = \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-power-manager-settings\" \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(LIBXFCE4GUI_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(XFCONF_CFLAGS)
+
+xfce4_power_manager_settings_LDADD = \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(LIBXFCE4GUI_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(XFCONF_LIBS)
+
+EXTRA_DIST = \
+ xfpm-marshal.list \
+ xfce-power-manager-dbus-server.h \
+ xfce-power-manager-dbus-client.h \
+ xfpm-enum-types.c \
+ xfpm-enum-types.h \
+ xfpm-marshal.c \
+ xfpm-marshal.h
$(desktop_in_files)
-DISTCLEANFILES = \
- $(generated_files) \
+DISTCLEANFILES = \
+ xfce-power-manager-dbus-server.h \
+ xfce-power-manager-dbus-client.h \
+ xfpm-enum-types.c \
+ xfpm-enum-types.h \
+ xfpm-marshal.c \
+ xfpm-marshal.h
$(desktop_DATA)
-xfpm_headers = \
+xfpm_headers = \
$(srcdir)/xfpm-enums.h
+if MAINTAINER_MODE
+
+BUILT_SOURCES = \
+ xfce-power-manager-dbus-server.h \
+ xfce-power-manager-dbus-client.h \
+ xfpm-marshal.c \
+ xfpm-marshal.h \
+ xfpm-enum-types.c \
+ xfpm-enum-types.h
+
xfpm-enum-types.h: $(xfpm_headers)
( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef _XFPM_ENUM_TYPES_H\n#define _XFPM_ENUM_TYPES_H\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
@@ -110,15 +171,21 @@
$(srcdir)/xfpm-marshal.list > tmp-marshal.h && \
cp tmp-marshal.h $(@F) && \
rm -f tmp-marshal.h tmp-marshal.h~
-
+
xfpm-marshal.c: xfpm-marshal.h
glib-genmarshal --body --prefix="_xfpm_marshal" \
$(srcdir)/xfpm-marshal.list > tmp-marshal.c && \
cp tmp-marshal.c $(@F) && \
rm -f tmp-marshal.c tmp-marshal.c~
-
-
+xfce-power-manager-dbus-server.h: $(srcdir)/org.xfce.Power.Manager.xml
+ dbus-binding-tool --mode=glib-server --prefix=xfpm_driver $< >$@
+
+xfce-power-manager-dbus-client.h: $(srdir)org.xfce.Power.Manager.xml
+ dbus-binding-tool --mode=glib-client --prefix=xfpm_client $< >$@
+
+endif
+
#
# .desktop file
#
@@ -128,5 +195,4 @@
desktop_DATA = \
$(desktop_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-
+ at INTLTOOL_DESKTOP_RULE@
\ No newline at end of file
Added: xfce4-power-manager/trunk/src/org.xfce.Power.Manager.xml
===================================================================
--- xfce4-power-manager/trunk/src/org.xfce.Power.Manager.xml (rev 0)
+++ xfce4-power-manager/trunk/src/org.xfce.Power.Manager.xml 2009-03-02 09:59:29 UTC (rev 6827)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<node name="/org/xfce/PowerManager">
+ <interface name="org.xfce.Power.Manager">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol"
+ value="xfpm_driver_dbus"/>
+ <annotation name="org.freedesktop.DBus.GLib.ClientCSymbol"
+ value="xfpm_driver_dbus_client"/>
+
+ <method name="Quit">
+ </method>
+
+ <method name="GetConf">
+ <arg direction="out" name="system_laptop" type="b"/>
+ <arg direction="out" name="power_management" type="i"/>
+ <arg direction="out" name="with_dpms" type="b"/>
+ <arg direction="out" name="governor" type="i"/>
+ <arg direction="out" name="switch_buttons" type="i"/>
+ <arg direction="out" name="brightness_control" type="b"/>
+ <arg direction="out" name="ups_found" type="b"/>
+ </method>
+
+ <method name="GetInfo">
+ <arg direction="out" name="name" type="s"/>
+ <arg direction="out" name="version" type="s"/>
+ <arg direction="out" name="vendor" type="s"/>
+ </method>
+
+ </interface>
+</node>
Modified: xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in
===================================================================
--- xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in 2009-03-02 09:59:29 UTC (rev 6827)
@@ -5,7 +5,7 @@
_GenericName=Power Manager
_X-XfceSettingsName=Power
_Comment=Settings for the Xfce 4 Power Manager
-Exec=xfce4-power-manager -c
+Exec=xfce4-power-manager-settings
Icon=gpm-ac-adapter
Terminal=false
Type=Application
Modified: xfce4-power-manager/trunk/src/xfpm-battery-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery-icon.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-battery-icon.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -487,7 +487,7 @@
gboolean ac_adapter_present)
{
g_return_if_fail(XFPM_IS_BATTERY_ICON(battery_icon));
- battery_icon->battery_present = ac_adapter_present;
+ battery_icon->battery_present = present;
guint critical_level = battery_icon->type == PRIMARY || UPS ? battery_icon->critical_level : 5;
#ifdef DEBUG
gchar *content_is_charging;
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -107,8 +107,6 @@
XfpmBatteryType battery_type);
static void xfpm_battery_handle_primary_critical(XfpmBattery *batt,
XfpmBatteryIcon *icon);
-static void xfpm_battery_handle_ups_critical(XfpmBattery *batt,
- XfpmBatteryIcon *icon);
static void xfpm_battery_handle_critical_charge(XfpmBattery *batt,
XfpmBatteryIcon *icon);
@@ -854,10 +852,38 @@
}
}
-static void
-xfpm_battery_handle_ups_critical(XfpmBattery *batt,XfpmBatteryIcon *icon)
+static gboolean
+xfpm_battery_is_critical_charge(XfpmBattery *batt)
{
- xfpm_battery_show_critical_options(batt,icon,UPS);
+ XfpmBatteryPrivate *priv;
+ priv = XFPM_BATTERY_GET_PRIVATE(batt);
+
+ if ( g_hash_table_size(priv->batteries ) == 1 ) return TRUE;
+ if ( g_hash_table_size(priv->batteries) == 0 ) return FALSE;
+
+ GList *icons_list;
+ int i=0;
+ icons_list = g_hash_table_get_values(priv->batteries);
+
+ gboolean critical = FALSE;
+
+ for ( i = 0 ; i < g_list_length(icons_list) ; i++ )
+ {
+ XfpmBatteryType type;
+ XfpmBatteryState state;
+ XfpmBatteryIcon *icon;
+ icon = g_list_nth_data(icons_list,i);
+ if ( icon )
+ {
+ g_object_get(G_OBJECT(icon),"battery-type", &type, "battery-state", &state, NULL);
+ if ( type != PRIMARY || type != UPS ) continue;
+
+ if ( state == CRITICAL ) critical = TRUE;
+ else critical = FALSE;
+ }
+ }
+
+ return critical;
}
static void
@@ -866,14 +892,11 @@
XfpmBatteryType battery_type;
g_object_get(G_OBJECT(icon),"battery-type",&battery_type,NULL);
- if ( battery_type == PRIMARY )
+ if ( battery_type == PRIMARY || battery_type == UPS )
{
- xfpm_battery_handle_primary_critical(batt,icon);
+ if ( xfpm_battery_is_critical_charge(batt) )
+ xfpm_battery_handle_primary_critical(batt,icon);
}
- else if ( battery_type == UPS )
- {
- xfpm_battery_handle_ups_critical(batt,icon);
- }
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-common.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-common.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-common.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -111,7 +111,7 @@
void
xfpm_preferences(void)
{
- g_spawn_command_line_async("xfce4-power-manager -c",NULL);
+ g_spawn_command_line_async("xfce4-power-manager-settings",NULL);
}
void
Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -72,163 +72,8 @@
{
return connection;
}
-
}
-static DBusMessage *xfpm_dbus_new_signal(const gchar *signal)
-{
- DBusMessage *message;
- message = dbus_message_new_signal(XFPM_PM_ROOT,
- XFPM_PM_IFACE,
- signal);
- if ( !message )
- {
- g_critical(_("Failed to create dbus message\n"));
- return NULL;
- }
- else
- {
- return message;
- }
-}
-
-gboolean xfpm_dbus_send_message(const char *signal)
-{
- DBusConnection *connection;
- DBusMessage *message;
-
- connection = xfpm_dbus_get_connection(DBUS_BUS_SESSION);
- if ( !connection )
- {
- return FALSE;
- }
-
- message = xfpm_dbus_new_signal(signal);
-
- if (!message)
- {
- return FALSE;
- }
-
- gboolean ret =
- dbus_connection_send(connection,
- message,
- NULL);
-
- dbus_message_unref(message);
- dbus_connection_unref(connection);
- if ( ret == FALSE )
- {
- g_critical(_("Failed to send message\n"));
- return FALSE;
- } else
- {
- return TRUE;
- }
-}
-
-gboolean xfpm_dbus_send_message_with_reply (const char *signal,gint *get_reply) {
-
- DBusConnection *connection;
- DBusMessage *message;
- DBusPendingCall *pend;
-
- connection = xfpm_dbus_get_connection(DBUS_BUS_SESSION);
- if ( !connection )
- {
- return FALSE;
- }
-
- message = xfpm_dbus_new_signal(signal);
-
- if (!message)
- {
- dbus_connection_unref(connection);
- return FALSE;
- }
-
-
- if(!dbus_connection_send_with_reply(connection,
- message,
- &pend,
- 200))
- {
- dbus_message_unref(message);
- dbus_connection_unref(connection);
- return FALSE;
- }
-
- dbus_pending_call_block(pend);
- if ( !pend )
- {
- dbus_message_unref(message);
- dbus_connection_unref(connection);
- return FALSE;
- }
-
- DBusMessage *reply = dbus_pending_call_steal_reply(pend);
-
- dbus_pending_call_unref(pend);
-
- if ( reply != NULL )
- {
- if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
- {
- *get_reply = 1;
- } else
- {
- *get_reply = 0;
- }
- dbus_message_unref(reply);
- } else
- {
- *get_reply = 0;
- }
-
- dbus_message_unref(message);
- dbus_connection_unref(connection);
- return TRUE;
-}
-
-gboolean
-xfpm_dbus_send_customize_message(guint32 socket_id)
-{
- DBusConnection *connection;
- DBusMessage *message;
-
- connection = xfpm_dbus_get_connection(DBUS_BUS_SESSION);
- if ( !connection )
- {
- return FALSE;
- }
-
- message = xfpm_dbus_new_signal("Customize");
-
- if (!message)
- {
- return FALSE;
- }
-
- dbus_message_append_args(message,DBUS_TYPE_UINT32,&socket_id,DBUS_TYPE_INVALID);
-
- gboolean ret =
- dbus_connection_send(connection,
- message,
- NULL);
-
- dbus_message_unref(message);
- dbus_connection_unref(connection);
- if ( ret == FALSE )
- {
- g_critical(_("Failed to send message\n"));
- return FALSE;
- } else
- {
- return TRUE;
- }
-
-}
-
void
xfpm_dbus_send_nm_message (const gchar *signal)
{
@@ -271,14 +116,14 @@
}
}
-gboolean xfpm_dbus_register_name(DBusConnection *connection)
+gboolean xfpm_dbus_register_name(DBusConnection *connection, const gchar *name)
{
DBusError error;
dbus_error_init(&error);
int ret =
- dbus_bus_request_name(connection,XFPM_PM_IFACE,0,&error);
+ dbus_bus_request_name(connection, name , 0, &error);
if ( dbus_error_is_set(&error) )
{
@@ -295,14 +140,14 @@
return FALSE;
}
-gboolean xfpm_dbus_release_name(DBusConnection *connection)
+gboolean xfpm_dbus_release_name(DBusConnection *connection, const gchar *name)
{
DBusError error;
dbus_error_init(&error);
int ret =
- dbus_bus_release_name(connection,XFPM_PM_IFACE,&error);
+ dbus_bus_release_name(connection, name, &error);
if ( dbus_error_is_set(&error) )
{
Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.h 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.h 2009-03-02 09:59:29 UTC (rev 6827)
@@ -22,10 +22,7 @@
#ifndef __XFPM_DBUS_MESSAGES
#define __XFPM_DBUS_MESSAGES
-#define XFPM_PM_ROOT "/xfpm/power/manager"
-#define XFPM_PM_IFACE "xfpm.power.manager"
-
-#define NM_SERVICE "org.freedesktop.NetworkManager"
+#define NM_SERVICE "org.freedesktop.NetworkManager"
#define NM_PATH "/org/freedesktop/NetworkManager"
#define NM_INTERFACE "org.freedesktop.NetworkManager"
@@ -34,11 +31,12 @@
gboolean xfpm_dbus_name_has_owner(DBusConnection *connection,
const gchar *service);
-gboolean xfpm_dbus_send_message (const gchar *signal);
-gboolean xfpm_dbus_send_message_with_reply (const gchar *signal,gint *get_reply);
-gboolean xfpm_dbus_send_customize_message (guint32 socket_id);
+
void xfpm_dbus_send_nm_message (const gchar *signal);
-gboolean xfpm_dbus_register_name(DBusConnection *connection);
-gboolean xfpm_dbus_release_name();
+gboolean xfpm_dbus_register_name (DBusConnection *connection,
+ const gchar *name);
+gboolean xfpm_dbus_release_name (DBusConnection *connection,
+ const gchar *name);
+
#endif /* __XFPM_DBUS_MESSAGES */
Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -65,7 +65,6 @@
#include "xfpm-lcd-brightness.h"
#include "xfpm-popups.h"
#include "xfpm-enum-types.h"
-#include "xfpm-settings.h"
#include "xfpm-dbus-messages.h"
#ifdef HAVE_LIBNOTIFY
@@ -86,6 +85,9 @@
static void xfpm_driver_class_init (XfpmDriverClass *klass);
static void xfpm_driver_finalize (GObject *object);
+static void xfpm_driver_dbus_class_init (XfpmDriverClass *klass);
+static void xfpm_driver_dbus_init (XfpmDriver *manager);
+
static void xfpm_driver_ac_adapter_state_changed_cb(XfpmAcAdapter *adapter,
gboolean present,
gboolean state_ok,
@@ -98,8 +100,6 @@
GValue *value,
XfpmDriver *drv);
-static gboolean xfpm_driver_show_options_dialog(XfpmDriver *drv);
-
/* Function that receives events suspend/hibernate,shutdown for all
* Xfce power manager components and syncronize them
*/
@@ -129,26 +129,19 @@
static void xfpm_driver_load_all(XfpmDriver *drv);
-/* DBus message Filter and replies */
-static void xfpm_driver_send_reply(DBusConnection *conn,DBusMessage *mess);
-static DBusHandlerResult xfpm_driver_signal_filter
- (DBusConnection *connection,DBusMessage *message,void *user_data);
-
-static guint32 socket_id = 0;
-
#define XFPM_DRIVER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o),XFPM_TYPE_DRIVER,XfpmDriverPrivate))
struct XfpmDriverPrivate
{
- DBusConnection *conn;
+ DBusGConnection *bus;
GMainLoop *loop;
+ XfconfChannel *channel;
SystemFormFactor formfactor;
guint8 power_management;
- gboolean dialog_opened;
#ifdef HAVE_LIBNOTIFY
gboolean show_power_management_error;
#endif
@@ -159,7 +152,7 @@
gboolean cpufreq_control;
gboolean buttons_control;
gboolean lcd_brightness_control;
- gboolean nm_responding;
+ gboolean nm_responding;
XfpmHal *hal;
XfpmCpu *cpu;
@@ -184,6 +177,7 @@
object_class->finalize = xfpm_driver_finalize;
g_type_class_add_private(klass,sizeof(XfpmDriverPrivate));
+
}
static void
@@ -192,16 +186,14 @@
XfpmDriverPrivate *priv;
priv = XFPM_DRIVER_GET_PRIVATE(drv);
- priv->conn = NULL;
priv->power_management = 0;
- priv->dialog_opened = FALSE;
priv->cpufreq_control = FALSE;
priv->buttons_control = FALSE;
priv->enable_power_save = FALSE;
priv->lcd_brightness_control = FALSE;
priv->accept_sleep_request = TRUE;
- priv->nm_responding = FALSE;
+ priv->nm_responding = FALSE;
priv->loop = NULL;
priv->cpu = NULL;
@@ -252,9 +244,9 @@
{
g_object_unref(drv->priv->lcd);
}
- if ( drv->priv->conn )
+ if ( drv->priv->bus )
{
- dbus_connection_unref(drv->priv->conn);
+ dbus_g_connection_unref(drv->priv->bus);
}
if ( drv->priv->loop )
{
@@ -342,50 +334,6 @@
}
static void
-_dialog_response_cb(GtkDialog *dialog, gint response, XfpmDriver *drv)
-{
- XfpmDriverPrivate *priv;
- priv = XFPM_DRIVER_GET_PRIVATE(drv);
-
- priv->dialog_opened = FALSE;
-
- switch(response)
- {
- case GTK_RESPONSE_HELP:
- xfpm_help();
- break;
- default:
- gtk_widget_destroy(GTK_WIDGET(dialog));
- break;
- }
-
-}
-
-static void
-_close_dialog_cb(GtkDialog *dialog,XfpmDriver *drv)
-{
- gpointer data =
- g_object_get_data(G_OBJECT(drv),"conf-channel");
- if ( data )
- {
- XfconfChannel *channel = (XfconfChannel *)data;
- g_object_unref(channel);
- }
-
-}
-
-static void
-_close_plug_cb(GtkWidget *plug,GdkEvent *ev,XfpmDriver *drv)
-{
- XfpmDriverPrivate *priv;
- priv = XFPM_DRIVER_GET_PRIVATE(drv);
- priv->dialog_opened = FALSE;
- _close_dialog_cb(NULL,drv);
- gtk_widget_destroy(plug);
-
-}
-
-static void
xfpm_driver_property_changed_cb(XfconfChannel *channel,gchar *property,
GValue *value,XfpmDriver *drv)
{
@@ -554,78 +502,6 @@
}
-static gboolean
-xfpm_driver_show_options_dialog(XfpmDriver *drv)
-{
- XfpmDriverPrivate *priv;
- priv = XFPM_DRIVER_GET_PRIVATE(drv);
-
- if ( priv->dialog_opened )
- {
- return FALSE;
- }
-
- XfconfChannel *channel;
- GtkWidget *dialog;
-
- gboolean with_dpms;
-
- channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
- g_object_set_data(G_OBJECT(drv),"conf-channel",channel);
- g_signal_connect(channel,"property-changed",
- G_CALLBACK(xfpm_driver_property_changed_cb),drv);
-
- guint8 governors = 0;
- if ( priv->cpufreq_control )
- {
- governors = xfpm_cpu_get_available_governors(priv->cpu);
- }
-
-#ifdef HAVE_DPMS
- with_dpms = xfpm_dpms_capable(priv->dpms);
-#else
- with_dpms = FALSE;
-#endif
-
- guint8 switch_buttons = 0;
- if ( priv->buttons_control )
- {
- switch_buttons = xfpm_button_get_available_buttons(priv->bt);
- }
- gboolean ups_found = xfpm_battery_ups_found(priv->batt);
-
- dialog = xfpm_settings_new(channel,
- priv->formfactor == SYSTEM_LAPTOP ? TRUE : FALSE,
- priv->power_management,
- with_dpms,
- governors,
- switch_buttons,
- priv->lcd_brightness_control,
- ups_found,
- socket_id);
- if ( socket_id == 0 )
- {
- xfce_gtk_window_center_on_monitor_with_pointer(GTK_WINDOW(dialog));
- gtk_window_set_modal(GTK_WINDOW(dialog), FALSE);
-
- gdk_x11_window_set_user_time(dialog->window,gdk_x11_get_server_time (dialog->window));
-
- g_signal_connect(dialog,"response",G_CALLBACK(_dialog_response_cb),drv);
- g_signal_connect(dialog,"close",G_CALLBACK(_close_dialog_cb),drv);
- gtk_widget_show(dialog);
- }
- else
- {
- g_signal_connect(dialog,"delete-event",G_CALLBACK(_close_plug_cb),drv);
- gdk_notify_startup_complete();
- }
-
- priv->dialog_opened = TRUE;
- socket_id = 0 ;
-
- return FALSE;
-}
-
#ifdef HAVE_LIBNOTIFY
static void
xfpm_driver_report_sleep_errors(XfpmDriver *driver,const gchar *icon_name,const gchar *error)
@@ -1142,56 +1018,28 @@
}
static void
-xfpm_driver_send_reply(DBusConnection *conn,DBusMessage *mess)
+xfpm_driver_quit(XfpmDriver *drv)
{
- DBusMessage *reply;
- reply = dbus_message_new_method_return(mess);
- dbus_connection_send (conn, reply, NULL);
- dbus_connection_flush (conn);
- dbus_message_unref(reply);
-}
-
-static DBusHandlerResult xfpm_driver_signal_filter
- (DBusConnection *connection,DBusMessage *message,void *user_data)
-{
- XfpmDriver *drv = XFPM_DRIVER(user_data);
- XfpmDriverPrivate *priv;
- priv = XFPM_DRIVER_GET_PRIVATE(drv);
+ XfpmDriverPrivate *priv = XFPM_DRIVER_GET_PRIVATE(drv);
- if ( dbus_message_is_signal(message,"xfpm.power.manager","Customize" ) )
- {
- /* don't block the signal filter so show the configuration dialog in a
- * timeout function otherwise xfce4-power-manager -q will have no effect*/
- DBusError error;
- dbus_error_init(&error);
- dbus_message_get_args(message,&error,DBUS_TYPE_UINT32,&socket_id,DBUS_TYPE_INVALID);
- if ( dbus_error_is_set(&error) )
- {
- XFPM_DEBUG("Failed to get socket id: %s\n",error.message);
- dbus_error_free(&error);
- }
- XFPM_DEBUG("message customize received with socket_id=%d\n",socket_id);
- g_timeout_add(100,(GSourceFunc)xfpm_driver_show_options_dialog,drv);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
+ xfpm_dbus_release_name(dbus_g_connection_get_connection(priv->bus), "org.xfce.PowerManager");
- if ( dbus_message_is_signal(message,"xfpm.power.manager","Quit" ) )
- {
- XFPM_DEBUG("message quit received\n");
- xfpm_driver_send_reply(connection,message);
- g_main_loop_quit(priv->loop);
- g_object_unref(drv);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ g_main_loop_quit(priv->loop);
+ g_object_unref(drv);
}
XfpmDriver *
-xfpm_driver_new(void)
+xfpm_driver_new(DBusGConnection *bus)
{
XfpmDriver *driver = NULL;
driver = g_object_new(XFPM_TYPE_DRIVER,NULL);
+
+ XfpmDriverPrivate *priv = XFPM_DRIVER_GET_PRIVATE(driver);
+ priv->bus = bus;
+
+ xfpm_driver_dbus_class_init(XFPM_DRIVER_GET_CLASS(driver));
+ xfpm_driver_dbus_init(driver);
+
return driver;
}
@@ -1206,23 +1054,6 @@
priv->loop = g_main_loop_new(NULL,FALSE);
- DBusError error;
-
- dbus_error_init(&error);
-
- priv->conn = dbus_bus_get(DBUS_BUS_SESSION,&error);
-
- if (!priv->conn )
- {
- g_critical("Failed to connect to the DBus daemon: %s\n",error.message);
- dbus_error_free(&error);
- return FALSE;
- }
-
- dbus_connection_setup_with_g_main(priv->conn,NULL);
- dbus_bus_add_match(priv->conn, "type='signal',interface='xfpm.power.manager'",NULL);
- dbus_connection_add_filter(priv->conn,xfpm_driver_signal_filter,drv,NULL);
-
priv->hal = xfpm_hal_new();
if ( !xfpm_hal_is_connected(priv->hal) )
{
@@ -1238,8 +1069,14 @@
g_error_free(g_error);
}
+ else
+ {
+ priv->channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
+ g_signal_connect(G_OBJECT(priv->channel), "property-changed",
+ G_CALLBACK(xfpm_driver_property_changed_cb), drv);
+ }
- xfpm_dbus_register_name(priv->conn);
+ xfpm_dbus_register_name(dbus_g_connection_get_connection(priv->bus), "org.xfce.PowerManager");
xfpm_driver_load_config(drv);
_get_system_form_factor(priv);
@@ -1249,13 +1086,122 @@
xfpm_driver_load_all(drv);
g_main_loop_run(priv->loop);
-
- xfpm_dbus_release_name(priv->conn);
-
- dbus_connection_remove_filter(priv->conn,xfpm_driver_signal_filter,NULL);
-
-
+
xfconf_shutdown();
return TRUE;
}
+
+
+/*
+ *
+ * DBus server implementation
+ *
+ */
+
+static gboolean xfpm_driver_dbus_quit (XfpmDriver *driver,
+ GError **error);
+static gboolean xfpm_driver_dbus_get_conf(XfpmDriver *driver,
+ gboolean *OUT_system_laptop,
+ gint *OUT_power_management,
+ gboolean *OUT_with_dpms,
+ gint *OUT_governor,
+ gint *OUT_switch_buttons,
+ gboolean *OUT_brightness_control,
+ gboolean *OUT_ups_found,
+ GError **error);
+static gboolean xfpm_driver_dbus_get_info (XfpmDriver *driver,
+ gchar **OUT_name,
+ gchar **OUT_version,
+ gchar **OUT_vendor,
+ GError **error);
+
+#include "xfce-power-manager-dbus-server.h"
+
+static void
+xfpm_driver_dbus_class_init(XfpmDriverClass *klass)
+{
+ dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
+ &dbus_glib_xfpm_driver_object_info);
+}
+
+static void
+xfpm_driver_dbus_init(XfpmDriver *driver)
+{
+ XfpmDriverPrivate *priv;
+ priv = XFPM_DRIVER_GET_PRIVATE(driver);
+ dbus_g_connection_register_g_object(priv->bus,
+ "/org/xfce/PowerManager",
+ G_OBJECT(driver));
+}
+
+static gboolean
+xfpm_driver_dbus_quit(XfpmDriver *driver, GError **error)
+{
+ XFPM_DEBUG("Quit message received\n");
+
+ xfpm_driver_quit(driver);
+
+ return TRUE;
+}
+
+static gboolean
+xfpm_driver_dbus_get_conf(XfpmDriver *driver,
+ gboolean *OUT_system_laptop,
+ gint *OUT_power_management,
+ gboolean *OUT_with_dpms,
+ gint *OUT_governor,
+ gint *OUT_switch_buttons,
+ gboolean *OUT_brightness_control,
+ gboolean *OUT_ups_found,
+ GError **error)
+{
+ XFPM_DEBUG("Get info message received\n");
+ XfpmDriverPrivate *priv = XFPM_DRIVER_GET_PRIVATE(driver);
+
+ gboolean with_dpms;
+
+ guint8 governors = 0;
+ if ( priv->cpufreq_control )
+ {
+ governors = xfpm_cpu_get_available_governors(priv->cpu);
+ }
+
+#ifdef HAVE_DPMS
+ with_dpms = xfpm_dpms_capable(priv->dpms);
+#else
+ with_dpms = FALSE;
+#endif
+
+ guint8 switch_buttons = 0;
+ if ( priv->buttons_control )
+ {
+ switch_buttons = xfpm_button_get_available_buttons(priv->bt);
+ }
+ gboolean ups_found = xfpm_battery_ups_found(priv->batt);
+
+ *OUT_system_laptop = priv->formfactor == SYSTEM_LAPTOP ? TRUE : FALSE;
+ *OUT_power_management = priv->power_management;
+ *OUT_with_dpms = with_dpms;
+ *OUT_governor = governors;
+ *OUT_switch_buttons = switch_buttons;
+ *OUT_brightness_control = priv->lcd_brightness_control;
+ *OUT_ups_found = ups_found;
+
+ return TRUE;
+}
+
+static gboolean
+xfpm_driver_dbus_get_info (XfpmDriver *driver,
+ gchar **OUT_name,
+ gchar **OUT_version,
+ gchar **OUT_vendor,
+ GError **error)
+{
+
+ *OUT_name = g_strdup(PACKAGE);
+ *OUT_version = g_strdup(VERSION);
+ *OUT_vendor = g_strdup("Xfce-goodies");
+
+ return TRUE;
+}
Modified: xfce4-power-manager/trunk/src/xfpm-driver.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.h 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-driver.h 2009-03-02 09:59:29 UTC (rev 6827)
@@ -28,6 +28,8 @@
#include <config.h>
#endif
+#include <dbus/dbus-glib-lowlevel.h>
+
#include "xfpm-hal.h"
#include "xfpm-enums.h"
@@ -40,6 +42,7 @@
#define XFPM_TYPE_DRIVER (xfpm_driver_get_type())
#define XFPM_DRIVER(o) (G_TYPE_CHECK_INSTANCE_CAST((o),XFPM_TYPE_DRIVER,XfpmDriver))
#define XFPM_IS_DRIVER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o),XFPM_TYPE_DRIVER))
+#define XFPM_DRIVER_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS((k), XFPM_TYPE_DRIVER, XfpmDriverClass))
typedef struct XfpmDriverPrivate XfpmDriverPrivate;
@@ -57,7 +60,7 @@
} XfpmDriverClass;
GType xfpm_driver_get_type (void);
-XfpmDriver *xfpm_driver_new (void);
+XfpmDriver *xfpm_driver_new (DBusGConnection *bus);
gboolean xfpm_driver_monitor (XfpmDriver *drv);
G_END_DECLS
Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-main.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -45,13 +45,16 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
#include "xfpm-driver.h"
#include "xfpm-hal.h"
#include "xfpm-dbus-messages.h"
#include "xfpm-popups.h"
#include "xfpm-debug.h"
-static GdkNativeWindow socket_id = 0;
+#include "xfce-power-manager-dbus-client.h"
+
static gboolean run = FALSE;
static gboolean quit = FALSE;
static gboolean config = FALSE;
@@ -61,7 +64,6 @@
{ "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,&run,NULL,NULL },
{ "customize", 'c', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &config, N_("Show the configuration dialog"), NULL },
{ "quit", 'q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &quit, N_("Quit any running xfce power manager"), NULL },
- { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
{ "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Version information"), NULL },
{ NULL, },
};
@@ -152,7 +154,7 @@
{
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
- GError *error = NULL;
+ GError *error = NULL;
if(!gtk_init_with_args(&argc, &argv, "", option_entries, PACKAGE, &error))
{
@@ -185,14 +187,11 @@
return EXIT_FAILURE;
}
- DBusConnection *connection;
- DBusError derror;
+ DBusGConnection *bus;
- dbus_error_init(&derror);
+ bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
- connection = dbus_bus_get(DBUS_BUS_SESSION, &derror);
-
- if ( dbus_error_is_set(&derror) )
+ if ( error )
{
xfpm_popup_message(_("Xfce power manager"),
_("Unable to run Xfce4 power manager, " \
@@ -201,52 +200,73 @@
GTK_MESSAGE_ERROR);
g_error(_("Unable to load xfce4 power manager"));
g_print("\n");
- dbus_error_free(&derror);
+ g_error_free(error);
return EXIT_FAILURE;
}
if ( config )
{
- if (!xfpm_dbus_name_has_owner(connection,XFPM_PM_IFACE))
+ if (!xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager"))
{
- g_print(_("Xfce power manager is not running"));
+ g_print(_("Xfce power manager is not running"));
g_print("\n");
- gboolean ret =
- xfce_confirm(_("Xfce4 Power Manager is not running, do you want to launch it now?"),
- GTK_STOCK_YES,
- _("Run"));
- if ( ret )
- {
- g_spawn_command_line_async("xfce4-power-manager",NULL);
- }
- return EXIT_SUCCESS;
+ gboolean ret =
+ xfce_confirm(_("Xfce4 Power Manager is not running, do you want to launch it now?"),
+ GTK_STOCK_YES,
+ _("Run"));
+ if ( ret )
+ {
+ g_spawn_command_line_async("xfce4-power-manager",NULL);
+ }
+ return EXIT_SUCCESS;
}
else
{
- xfpm_dbus_send_customize_message(socket_id);
+ g_spawn_command_line_async("xfce4-power-manager-settings", NULL);
return EXIT_SUCCESS;
}
}
if ( quit )
{
- if (!xfpm_dbus_name_has_owner(connection,XFPM_PM_IFACE))
+ if (!xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager"))
{
g_print(_("Xfce power manager is not running"));
- g_print("\n");
+ g_print("\n");
return EXIT_SUCCESS;
}
else
{
- xfpm_dbus_send_message("Quit");
+ GError *error = NULL;
+ DBusGProxy *proxy = dbus_g_proxy_new_for_name(bus,
+ "org.xfce.PowerManager",
+ "/org/xfce/PowerManager",
+ "org.xfce.Power.Manager");
+
+ if ( !proxy )
+ {
+ g_critical ("Failed to get proxy");
+ dbus_g_connection_unref(bus);
+ return EXIT_SUCCESS;
+ }
+
+ xfpm_driver_dbus_client_quit(proxy , &error);
+
+ if ( error )
+ {
+ g_critical("Failed to sent quit message %s", error->message);
+ g_error_free(error);
+ }
+
+ g_object_unref(proxy);
+ dbus_g_connection_unref(bus);
return EXIT_SUCCESS;
}
}
- if (!xfpm_dbus_name_has_owner(connection,XFPM_PM_IFACE) )
+ if (!xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager") )
{
- dbus_connection_unref(connection);
- XfpmDriver *driver = xfpm_driver_new();
+ XfpmDriver *driver = xfpm_driver_new(bus);
autostart();
if (!xfpm_driver_monitor(driver))
{
Added: xfce4-power-manager/trunk/src/xfpm-settings-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings-main.c (rev 0)
+++ xfce4-power-manager/trunk/src/xfpm-settings-main.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -0,0 +1,183 @@
+/*
+ * * Copyright (C) 2008-2009 Ali <aliov at xfce.org>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <glib.h>
+
+#include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <xfconf/xfconf.h>
+
+#include "xfce-power-manager-dbus-client.h"
+
+#include "xfpm-string.h"
+#include "xfpm-dbus-messages.h"
+
+#include "xfpm-settings.h"
+#include "xfpm-common.h"
+#include "xfpm-popups.h"
+
+static void dialog_response_cb(GtkDialog *dialog, gint response, gpointer data)
+{
+ XfconfChannel *channel = (XfconfChannel *)g_object_get_data(G_OBJECT(data), "channel");
+ DBusGConnection *bus = (DBusGConnection *)g_object_get_data(G_OBJECT(data), "bus");
+
+ switch(response)
+ {
+ case GTK_RESPONSE_HELP:
+ xfpm_help();
+ break;
+ default:
+ g_object_unref(G_OBJECT(channel));
+ xfpm_dbus_release_name(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager.Config");
+ dbus_g_connection_unref(bus);
+ xfconf_shutdown();
+ g_object_unref(G_OBJECT(data));
+ gtk_widget_destroy(GTK_WIDGET(dialog));
+ gtk_main_quit();
+ break;
+ }
+
+
+}
+
+int main(int argc, char **argv)
+{
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
+ gtk_init(&argc, &argv);
+
+ GError *error = NULL;
+
+ DBusGConnection *bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+
+ if ( error )
+ {
+ g_error("%s\n",error->message);
+ g_error_free(error);
+ return EXIT_FAILURE;
+ }
+
+ if ( xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager") )
+ {
+ g_print("Xfce power manager is running\n");
+
+ if ( xfpm_dbus_name_has_owner(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager.Config") )
+ {
+ g_warning("Settings dialog already open\n");
+ dbus_g_connection_unref(bus);
+ return EXIT_SUCCESS;
+ }
+
+ xfpm_dbus_register_name(dbus_g_connection_get_connection(bus), "org.xfce.PowerManager.Config");
+
+ if ( !xfconf_init(&error) )
+ {
+ g_critical("xfconf init failed: %s using default settings\n",error->message);
+ xfpm_popup_message(_("Xfce4 Power Manager"),_("Failed to load power manager configuration, "\
+ "using defaults"),GTK_MESSAGE_WARNING);
+ g_error_free(error);
+ error = NULL;
+ }
+
+ XfconfChannel *channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
+
+ DBusGProxy *proxy;
+
+ proxy = dbus_g_proxy_new_for_name(bus,
+ "org.xfce.PowerManager",
+ "/org/xfce/PowerManager",
+ "org.xfce.Power.Manager");
+ gboolean system_laptop;
+ gint power_management;
+ gboolean with_dpms;
+ gint governor;
+ gint switch_buttons;
+ gboolean brightness_control;
+ gboolean ups_found;
+
+ xfpm_driver_dbus_client_get_conf(proxy, &system_laptop, &power_management
+ ,&with_dpms, &governor, &switch_buttons,
+ &brightness_control, &ups_found, &error);
+
+ if ( error ) g_error("%s \n", error->message);
+
+ g_print("laptop=%d pm=%d dpms=%d gov=%d bt=%d br=%d ups=%d",
+ system_laptop, power_management,with_dpms, governor,
+ switch_buttons, brightness_control, ups_found);
+
+ GtkWidget *dialog = xfpm_settings_new(channel,
+ system_laptop,
+ power_management,
+ with_dpms,
+ governor,
+ switch_buttons,
+ brightness_control,
+ ups_found);
+
+ xfce_gtk_window_center_on_monitor_with_pointer(GTK_WINDOW(dialog));
+ gtk_window_set_modal(GTK_WINDOW(dialog), FALSE);
+
+ gdk_x11_window_set_user_time(dialog->window, gdk_x11_get_server_time (dialog->window));
+
+ gpointer data;
+ data = g_object_new(G_TYPE_OBJECT, NULL);
+
+ g_object_set_data(G_OBJECT(data), "bus", bus);
+ g_object_set_data(G_OBJECT(data), "channel", channel);
+
+ g_signal_connect(dialog, "response", G_CALLBACK(dialog_response_cb), data);
+
+ gtk_widget_show(dialog);
+
+ gtk_main();
+
+ return EXIT_SUCCESS;
+ }
+ else
+ {
+ g_print(_("Xfce power manager is not running"));
+ g_print("\n");
+ gboolean ret =
+ xfce_confirm(_("Xfce4 Power Manager is not running, do you want to launch it now?"),
+ GTK_STOCK_YES,
+ _("Run"));
+ if ( ret )
+ {
+ g_spawn_command_line_async("xfce4-power-manager",NULL);
+ }
+
+ dbus_g_connection_unref(bus);
+ }
+
+ return EXIT_SUCCESS;
+}
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -1230,8 +1230,7 @@
guint8 govs,
guint8 switch_buttons,
gboolean lcd,
- gboolean ups_found,
- guint32 socket_id)
+ gboolean ups_found)
{
GtkWidget *Dialog; /* Main dialog window */
GtkWidget *mainbox; /* Box to get (Dialog)->vbox */
@@ -1321,12 +1320,5 @@
gtk_notebook_append_page(GTK_NOTEBOOK(nt),box,NULL);
- GtkWidget *plug;
- if ( socket_id != 0 )
- {
- plug = gtk_plug_new(socket_id);
- gtk_widget_show (plug);
- gtk_widget_reparent(allbox,plug);
- }
- return socket_id == 0 ? Dialog : plug ;
+ return Dialog;
}
Modified: xfce4-power-manager/trunk/src/xfpm-settings.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.h 2009-03-01 22:48:31 UTC (rev 6826)
+++ xfce4-power-manager/trunk/src/xfpm-settings.h 2009-03-02 09:59:29 UTC (rev 6827)
@@ -22,6 +22,8 @@
#ifndef __XFPM_SETTINGS_H
#define __XFPM_SETTINGS_H
+#include <xfconf/xfconf.h>
+
GtkWidget *xfpm_settings_new(XfconfChannel *channel,
gboolean is_laptop,
guint8 power_management,
@@ -29,8 +31,7 @@
guint8 govs,
guint8 switch_buttons,
gboolean lcd,
- gboolean ups_found,
- guint32 socket_id);
+ gboolean ups_found);
#endif /* __XFPM_SETTINGS_H */
Added: xfce4-power-manager/trunk/src/xfpm-string.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-string.c (rev 0)
+++ xfce4-power-manager/trunk/src/xfpm-string.c 2009-03-02 09:59:29 UTC (rev 6827)
@@ -0,0 +1,53 @@
+/*
+ * * Copyright (C) 2008-2009 Ali <aliov at xfce.org>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "xfpm-string.h"
+
+gint xfpm_strcmp (const gchar *str1, const gchar *str2)
+{
+#if GLIB_CHECK_VERSION(2, 16, 0)
+ return g_strcmp0(str1, str2);
+#else
+ if (!str1) return -(str1 != str2);
+ if (!str2) return str1 != str2;
+
+ return strcmp (str1, str2);
+#endif
+}
+
+gboolean xfpm_strequal (const gchar *str1, const gchar *str2)
+{
+ if (xfpm_strcmp(str1, str2) == 0 ) return TRUE;
+ return FALSE;
+}
+
+const gchar *xfpm_bool_to_string (gboolean value)
+{
+ if ( value == TRUE ) return "TRUE";
+ else return "FALSE";
+}
+
+gboolean xfpm_string_to_bool (const gchar *string)
+{
+ if ( xfpm_strequal(string, "TRUE") ) return TRUE;
+ else if ( xfpm_strequal(string, "FALSE")) return FALSE;
+
+ return FALSE;
+}
Added: xfce4-power-manager/trunk/src/xfpm-string.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-string.h (rev 0)
+++ xfce4-power-manager/trunk/src/xfpm-string.h 2009-03-02 09:59:29 UTC (rev 6827)
@@ -0,0 +1,37 @@
+/*
+ * * Copyright (C) 2008-2009 Ali <aliov at xfce.org>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __XFPM_STRING_H
+#define __XFPM_STRING_H
+
+#include <glib.h>
+#include <string.h>
+
+gint xfpm_strcmp (const gchar *str1,
+ const gchar *str2);
+
+gboolean xfpm_strequal (const gchar *str1,
+ const gchar *str2);
+const gchar *xfpm_bool_to_string (gboolean value);
+
+gboolean xfpm_string_to_bool (const gchar *string);
+
+
+#endif /* XFPM_STRING_H */
More information about the Goodies-commits
mailing list