[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Improve strings in devices tab and add percentage (Bug #6652)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 47d4ba88c43f97427746839363bced83e191afc1
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Jun 30 14:56:19 2014 +0200

    Improve strings in devices tab and add percentage (Bug #6652)
---
 settings/xfpm-settings.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 7f1741b..0d3a36d 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1728,9 +1728,9 @@ update_device_details (UpDevice *device)
         /*Percentage*/
         if (percent >= 0)
         {
-            str = g_strdup_printf("%d", (guint) percent);
+            str = g_strdup_printf("%d%%", (guint) percent);
 
-            update_device_info_value_for_name (view, list_store, _("Energy percent"), str);
+            update_device_info_value_for_name (view, list_store, _("Current charge"), str);
 
             g_free(str);
         }
@@ -1740,7 +1740,7 @@ update_device_details (UpDevice *device)
             /* TRANSLATORS: Unit here is Watt hour*/
             str = xfpm_info_get_energy_property (energy_full_design, _("Wh"));
 
-            update_device_info_value_for_name (view, list_store, _("Energy full design"), str);
+            update_device_info_value_for_name (view, list_store, _("Fully charged (design)"), str);
 
             g_free (str);
         }
@@ -1749,8 +1749,9 @@ update_device_details (UpDevice *device)
         {
             /* TRANSLATORS: Unit here is Watt hour*/
             str = xfpm_info_get_energy_property (energy_full, _("Wh"));
+            strcat (str, g_strdup_printf(" (%d%%)", (guint) (energy_full / energy_full_design *100)));
 
-            update_device_info_value_for_name (view, list_store, _("Energy full"), str);
+            update_device_info_value_for_name (view, list_store, _("Fully charged"), str);
 
             g_free (str);
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.