[Goodies-commits] r7119 - in xfce4-power-manager/trunk: . panel-plugins/brightness panel-plugins/inhibit po src
Ali Abdallah
aliov at xfce.org
Mon Apr 6 08:45:10 CEST 2009
Author: aliov
Date: 2009-04-06 06:45:10 +0000 (Mon, 06 Apr 2009)
New Revision: 7119
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
xfce4-power-manager/trunk/panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in
xfce4-power-manager/trunk/po/xfce4-power-manager.pot
xfce4-power-manager/trunk/src/xfpm-engine.c
Log:
Fix untranslated panel plugins comment
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-04-05 21:25:58 UTC (rev 7118)
+++ xfce4-power-manager/trunk/ChangeLog 2009-04-06 06:45:10 UTC (rev 7119)
@@ -1,4 +1,7 @@
+2009-04-06 8:45 Ali aliov at xfce.org
+ * : Fix untranslated panel plugins comment
+
2009-04-05 21:06 Ali aliov at xfce.org
* : The battery critical level was not shown correctly in the settings dialog
Modified: xfce4-power-manager/trunk/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in 2009-04-05 21:25:58 UTC (rev 7118)
+++ xfce4-power-manager/trunk/panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in 2009-04-06 06:45:10 UTC (rev 7119)
@@ -2,7 +2,7 @@
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
_Name=Brightness plugin
-Comment=Control your LCD brightness
+_Comment=Control your LCD brightness
Icon=gpm-brightness-lcd
X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-brightness-plugin
X-XFCE-Unique=TRUE
Modified: xfce4-power-manager/trunk/panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in
===================================================================
--- xfce4-power-manager/trunk/panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in 2009-04-05 21:25:58 UTC (rev 7118)
+++ xfce4-power-manager/trunk/panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in 2009-04-06 06:45:10 UTC (rev 7119)
@@ -2,7 +2,7 @@
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
_Name=Inhibit plugin
-Comment=Inhibit automatic power saving
+_Comment=Inhibit automatic power savings
Icon=gnome-inhibit-applet
X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-inhibit-plugin
X-XFCE-Unique=TRUE
Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-04-05 21:25:58 UTC (rev 7118)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2009-04-06 06:45:10 UTC (rev 7119)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-02 15:35+0200\n"
+"POT-Creation-Date: 2009-04-06 08:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -36,11 +36,11 @@
msgid "<b>Monitor</b>"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:6 ../settings/xfpm-settings.c:1035
+#: ../settings/xfpm-settings.glade.h:6 ../settings/xfpm-settings.c:1091
msgid "Advanced"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:7 ../settings/xfpm-settings.c:724
+#: ../settings/xfpm-settings.glade.h:7 ../settings/xfpm-settings.c:758
msgid "Always show icon"
msgstr ""
@@ -56,8 +56,8 @@
msgid "Enable notification"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:11 ../settings/xfpm-settings.c:992
-#: ../settings/xfpm-settings.c:997
+#: ../settings/xfpm-settings.glade.h:11 ../settings/xfpm-settings.c:1048
+#: ../settings/xfpm-settings.c:1053
msgid "General"
msgstr ""
@@ -65,14 +65,14 @@
msgid "Lock screen when going for suspend/hibernate"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:452
-#: ../settings/xfpm-settings.c:534 ../settings/xfpm-settings.c:648
-#: ../settings/xfpm-settings.c:764 ../settings/xfpm-settings.c:812
+#: ../settings/xfpm-settings.glade.h:13 ../settings/xfpm-settings.c:451
+#: ../settings/xfpm-settings.c:544 ../settings/xfpm-settings.c:670
+#: ../settings/xfpm-settings.c:798 ../settings/xfpm-settings.c:857
msgid "Nothing"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:1006
-#: ../settings/xfpm-settings.c:1011
+#: ../settings/xfpm-settings.glade.h:14 ../settings/xfpm-settings.c:1062
+#: ../settings/xfpm-settings.c:1067
msgid "On AC"
msgstr ""
@@ -105,10 +105,10 @@
msgstr ""
#. Suspend menu option
-#: ../settings/xfpm-settings.glade.h:22 ../settings/xfpm-settings.c:539
-#: ../settings/xfpm-settings.c:653 ../settings/xfpm-settings.c:769
-#: ../settings/xfpm-settings.c:817 ../src/xfpm-tray-icon.c:194
-#: ../src/xfpm-tray-icon.c:253
+#: ../settings/xfpm-settings.glade.h:22 ../settings/xfpm-settings.c:549
+#: ../settings/xfpm-settings.c:675 ../settings/xfpm-settings.c:803
+#: ../settings/xfpm-settings.c:862 ../src/xfpm-tray-icon.c:198
+#: ../src/xfpm-tray-icon.c:262
msgid "Suspend"
msgstr ""
@@ -136,9 +136,9 @@
msgid "When sleep button is pressed:"
msgstr ""
-#: ../settings/xfpm-settings.glade.h:29 ../settings/xfpm-settings-main.c:113
+#: ../settings/xfpm-settings.glade.h:29 ../settings/xfpm-settings-main.c:112
#: ../src/xfpm-main.c:125 ../src/xfpm-main.c:187 ../src/xfpm-main.c:217
-#: ../src/xfpm-tray-icon.c:304 ../src/xfce4-power-manager.desktop.in.h:2
+#: ../src/xfpm-tray-icon.c:313 ../src/xfce4-power-manager.desktop.in.h:2
msgid "Xfce Power Manager"
msgstr ""
@@ -150,86 +150,86 @@
msgid "gtk-help"
msgstr ""
-#: ../settings/xfpm-settings.c:307 ../settings/xfpm-settings.c:323
+#: ../settings/xfpm-settings.c:306 ../settings/xfpm-settings.c:322
msgid "Never"
msgstr ""
-#: ../settings/xfpm-settings.c:310
+#: ../settings/xfpm-settings.c:309
msgid "One minute"
msgstr ""
-#: ../settings/xfpm-settings.c:312
+#: ../settings/xfpm-settings.c:311
msgid "Minutes"
msgstr ""
-#: ../settings/xfpm-settings.c:325
+#: ../settings/xfpm-settings.c:324
msgid "Seconds"
msgstr ""
-#: ../settings/xfpm-settings.c:442 ../settings/xfpm-settings.c:526
+#: ../settings/xfpm-settings.c:443 ../settings/xfpm-settings.c:536
msgid "Shutdown and hibernate operations not permitted"
msgstr ""
#. Hibernate menu option
-#: ../settings/xfpm-settings.c:457 ../settings/xfpm-settings.c:545
-#: ../settings/xfpm-settings.c:659 ../settings/xfpm-settings.c:775
-#: ../settings/xfpm-settings.c:823 ../src/xfpm-tray-icon.c:167
-#: ../src/xfpm-tray-icon.c:238
+#: ../settings/xfpm-settings.c:456 ../settings/xfpm-settings.c:555
+#: ../settings/xfpm-settings.c:681 ../settings/xfpm-settings.c:809
+#: ../settings/xfpm-settings.c:868 ../src/xfpm-tray-icon.c:167
+#: ../src/xfpm-tray-icon.c:247
msgid "Hibernate"
msgstr ""
-#: ../settings/xfpm-settings.c:461 ../settings/xfpm-settings.c:779
+#: ../settings/xfpm-settings.c:460 ../settings/xfpm-settings.c:813
msgid "Shutdown"
msgstr ""
-#: ../settings/xfpm-settings.c:642 ../settings/xfpm-settings.c:758
-#: ../settings/xfpm-settings.c:806 ../settings/xfpm-settings.c:918
+#: ../settings/xfpm-settings.c:664 ../settings/xfpm-settings.c:792
+#: ../settings/xfpm-settings.c:851 ../settings/xfpm-settings.c:974
msgid "Hibernate and suspend operations not permitted"
msgstr ""
-#: ../settings/xfpm-settings.c:727
+#: ../settings/xfpm-settings.c:761
msgid "When battery is present"
msgstr ""
-#: ../settings/xfpm-settings.c:730
+#: ../settings/xfpm-settings.c:764
msgid "When battery is charging or discharging"
msgstr ""
-#: ../settings/xfpm-settings.c:886
+#: ../settings/xfpm-settings.c:942
msgid "When all the power sources of the computer reach this charge level"
msgstr ""
-#: ../settings/xfpm-settings.c:1021 ../settings/xfpm-settings.c:1026
+#: ../settings/xfpm-settings.c:1077 ../settings/xfpm-settings.c:1082
msgid "On Battery"
msgstr ""
-#: ../settings/xfpm-settings.c:1040
+#: ../settings/xfpm-settings.c:1096
msgid "Advance"
msgstr ""
-#: ../settings/xfpm-settings-main.c:113
+#: ../settings/xfpm-settings-main.c:112
msgid "Failed to load power manager configuration, using defaults"
msgstr ""
-#: ../settings/xfpm-settings-main.c:139
+#: ../settings/xfpm-settings-main.c:138
msgid "Xfce Power Manager Settings"
msgstr ""
-#: ../settings/xfpm-settings-main.c:140
+#: ../settings/xfpm-settings-main.c:139
msgid "Unable to connect to Xfce Power Manager"
msgstr ""
-#: ../settings/xfpm-settings-main.c:159 ../src/xfpm-main.c:141
+#: ../settings/xfpm-settings-main.c:158 ../src/xfpm-main.c:141
#: ../src/xfpm-main.c:188
#, c-format
msgid "Xfce power manager is not running"
msgstr ""
-#: ../settings/xfpm-settings-main.c:162
+#: ../settings/xfpm-settings-main.c:161
msgid "Xfce4 Power Manager is not running, do you want to launch it now?"
msgstr ""
-#: ../settings/xfpm-settings-main.c:164
+#: ../settings/xfpm-settings-main.c:163
msgid "Run"
msgstr ""
@@ -257,8 +257,8 @@
msgid "Your battery is discharging"
msgstr ""
-#: ../src/xfpm-battery.c:112 ../src/xfpm-battery.c:372
-#: ../src/xfpm-battery.c:384
+#: ../src/xfpm-battery.c:112 ../src/xfpm-battery.c:378
+#: ../src/xfpm-battery.c:390
msgid "System is running on battery power"
msgstr ""
@@ -270,125 +270,125 @@
msgid "System is running on low power"
msgstr ""
-#: ../src/xfpm-battery.c:213 ../src/xfpm-supply.c:277 ../src/xfpm-supply.c:300
+#: ../src/xfpm-battery.c:219 ../src/xfpm-supply.c:282 ../src/xfpm-supply.c:305
#: ../src/xfpm-tray-icon.c:115 ../src/xfpm-tray-icon.c:139
-#: ../src/xfpm-manager.c:195
+#: ../src/xfpm-manager.c:199
msgid "Xfce power manager"
msgstr ""
-#: ../src/xfpm-battery.c:231
+#: ../src/xfpm-battery.c:237
msgid "Your UPS"
msgstr ""
-#: ../src/xfpm-battery.c:233
+#: ../src/xfpm-battery.c:239
msgid "Your Mouse battery"
msgstr ""
-#: ../src/xfpm-battery.c:235
+#: ../src/xfpm-battery.c:241
msgid "Your Keyboard battery"
msgstr ""
-#: ../src/xfpm-battery.c:237
+#: ../src/xfpm-battery.c:243
msgid "Your Camera battery"
msgstr ""
-#: ../src/xfpm-battery.c:239
+#: ../src/xfpm-battery.c:245
msgid "Your PDA battery"
msgstr ""
-#: ../src/xfpm-battery.c:241
+#: ../src/xfpm-battery.c:247
msgid "Your Battery"
msgstr ""
-#: ../src/xfpm-battery.c:256
+#: ../src/xfpm-battery.c:262
msgid "is fully charged"
msgstr ""
-#: ../src/xfpm-battery.c:261
+#: ../src/xfpm-battery.c:267
msgid "charge level"
msgstr ""
-#: ../src/xfpm-battery.c:266
+#: ../src/xfpm-battery.c:272
msgid "is charging"
msgstr ""
-#: ../src/xfpm-battery.c:273
+#: ../src/xfpm-battery.c:279
msgid "is discharging"
msgstr ""
-#: ../src/xfpm-battery.c:278
+#: ../src/xfpm-battery.c:284
msgid "charge is low"
msgstr ""
-#: ../src/xfpm-battery.c:283
+#: ../src/xfpm-battery.c:289
msgid "is almost empty"
msgstr ""
-#: ../src/xfpm-battery.c:303
+#: ../src/xfpm-battery.c:309
msgid "is not present"
msgstr ""
-#: ../src/xfpm-battery.c:334
+#: ../src/xfpm-battery.c:340
msgid "Battery not present"
msgstr ""
-#: ../src/xfpm-battery.c:356
+#: ../src/xfpm-battery.c:362
msgid "Estimated time left"
msgstr ""
-#: ../src/xfpm-battery.c:360
+#: ../src/xfpm-battery.c:366
msgid "Estimated time to be fully charged"
msgstr ""
-#: ../src/xfpm-battery.c:363
+#: ../src/xfpm-battery.c:369
msgid "hours"
msgstr ""
-#: ../src/xfpm-battery.c:363
+#: ../src/xfpm-battery.c:369
msgid "hour"
msgstr ""
-#: ../src/xfpm-battery.c:364
+#: ../src/xfpm-battery.c:370
msgid "minutes"
msgstr ""
-#: ../src/xfpm-battery.c:364
+#: ../src/xfpm-battery.c:370
msgid "minute"
msgstr ""
-#: ../src/xfpm-battery.c:368 ../src/xfpm-battery.c:380
+#: ../src/xfpm-battery.c:374 ../src/xfpm-battery.c:386
msgid "Battery"
msgstr ""
-#: ../src/xfpm-battery.c:371 ../src/xfpm-battery.c:383
+#: ../src/xfpm-battery.c:377 ../src/xfpm-battery.c:389
msgid "System is running on AC power"
msgstr ""
-#: ../src/xfpm-battery-info.c:58 ../libxfpm/hal-battery.c:488
+#: ../src/xfpm-battery-info.c:62 ../libxfpm/hal-battery.c:488
msgid "Unknown unit"
msgstr ""
-#: ../src/xfpm-battery-info.c:65
+#: ../src/xfpm-battery-info.c:69
msgid "Technology:"
msgstr ""
-#: ../src/xfpm-battery-info.c:88
+#: ../src/xfpm-battery-info.c:92
msgid "Design:"
msgstr ""
-#: ../src/xfpm-battery-info.c:116
+#: ../src/xfpm-battery-info.c:120
msgid "Last full:"
msgstr ""
-#: ../src/xfpm-battery-info.c:140
+#: ../src/xfpm-battery-info.c:144
msgid "Vendor:"
msgstr ""
-#: ../src/xfpm-battery-info.c:164
+#: ../src/xfpm-battery-info.c:168
msgid "Model:"
msgstr ""
-#: ../src/xfpm-battery-info.c:197
+#: ../src/xfpm-battery-info.c:201
msgid "Battery information"
msgstr ""
@@ -448,23 +448,23 @@
msgid "Xfce power manager is already running"
msgstr ""
-#: ../src/xfpm-supply.c:169
+#: ../src/xfpm-supply.c:171
msgid "Adapter present"
msgstr ""
-#: ../src/xfpm-supply.c:170
+#: ../src/xfpm-supply.c:172
msgid "Adapter not present"
msgstr ""
-#: ../src/xfpm-supply.c:246
+#: ../src/xfpm-supply.c:251
msgid "Shutdown the system"
msgstr ""
-#: ../src/xfpm-supply.c:257
+#: ../src/xfpm-supply.c:262
msgid "Hibernate the system"
msgstr ""
-#: ../src/xfpm-supply.c:269
+#: ../src/xfpm-supply.c:274
msgid ""
"System is running on low power, but an application is currently disabling "
"the automatic sleep, this means that doing a sleep now may damage the data "
@@ -472,7 +472,7 @@
"sleep mode or plug in your AC adapter"
msgstr ""
-#: ../src/xfpm-supply.c:295
+#: ../src/xfpm-supply.c:300
msgid "System is running on low power. Save your work to avoid losing data"
msgstr ""
@@ -483,41 +483,41 @@
"to hibernate the system?"
msgstr ""
-#: ../src/xfpm-tray-icon.c:162 ../src/xfpm-tray-icon.c:189
+#: ../src/xfpm-tray-icon.c:162 ../src/xfpm-tray-icon.c:193
msgid "Are you sure you want to procced?"
msgstr ""
-#: ../src/xfpm-tray-icon.c:186
+#: ../src/xfpm-tray-icon.c:190
msgid ""
"An application is currently disabling the automatic sleep, doing this action "
"now may damage the working state of this application, are you sure you want "
"to suspend the system?"
msgstr ""
-#: ../src/xfpm-tray-icon.c:211
-msgid "Exit Xfce power manager"
+#: ../src/xfpm-tray-icon.c:220
+msgid "Quit the Xfce power manager"
msgstr ""
-#: ../src/xfpm-tray-icon.c:213
+#: ../src/xfpm-tray-icon.c:222
msgid "Quit"
msgstr ""
-#: ../src/xfpm-engine.c:529 ../src/xfpm-engine.c:558
+#: ../src/xfpm-engine.c:539 ../src/xfpm-engine.c:568
#, c-format
msgid "Permission denied"
msgstr ""
-#: ../src/xfpm-engine.c:536
+#: ../src/xfpm-engine.c:546
#, c-format
msgid "Hibernate not supported"
msgstr ""
-#: ../src/xfpm-engine.c:565
+#: ../src/xfpm-engine.c:575
#, c-format
msgid "Suspend not supported"
msgstr ""
-#: ../src/xfpm-manager.c:195
+#: ../src/xfpm-manager.c:199
msgid "HAL daemon is not running"
msgstr ""
@@ -559,8 +559,8 @@
msgid "System failed to sleep"
msgstr ""
-#: ../src/xfpm-shutdown.c:359 ../src/xfpm-shutdown.c:377
-#: ../src/xfpm-shutdown.c:409
+#: ../src/xfpm-shutdown.c:374 ../src/xfpm-shutdown.c:391
+#: ../src/xfpm-shutdown.c:419
#, c-format
msgid "HAL daemon is currently not connected"
msgstr ""
@@ -616,6 +616,10 @@
msgid "Brightness plugin"
msgstr ""
+#: ../panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in.h:2
+msgid "Control your LCD brightness"
+msgstr ""
+
#: ../panel-plugins/inhibit/inhibit-plugin.c:221
#: ../panel-plugins/inhibit/inhibit-plugin.c:445
msgid "No power manager instance running"
@@ -644,8 +648,8 @@
#: ../panel-plugins/inhibit/inhibit-plugin.c:308
#: ../panel-plugins/inhibit/inhibit-plugin.c:344
#: ../panel-plugins/inhibit/inhibit-plugin.c:523
-#: ../panel-plugins/inhibit/inhibit-plugin.c:625
-#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:1
+#: ../panel-plugins/inhibit/inhibit-plugin.c:627
+#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:2
msgid "Inhibit plugin"
msgstr ""
@@ -662,3 +666,7 @@
#: ../panel-plugins/inhibit/inhibit-plugin.c:524
msgid "Power manager is connected"
msgstr ""
+
+#: ../panel-plugins/inhibit/xfce4-inhibit-plugin.desktop.in.in.h:1
+msgid "Inhibit automatic power savings"
+msgstr ""
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-05 21:25:58 UTC (rev 7118)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-06 06:45:10 UTC (rev 7119)
@@ -163,8 +163,12 @@
TRACE ("Sleep button disabled in configuration");
return;
}
- else if (!engine->priv->inhibited)
+ else if ( engine->priv->inhibited == TRUE && critical == FALSE )
{
+ return;
+ }
+ else
+ {
TRACE ("Going to do %s\n", action);
xfpm_send_message_to_network_manager ("sleep");
More information about the Goodies-commits
mailing list