This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-power-manager.
commit d57fa9b2142a5989f1c78b8bee9022c895ebb9e0 Author: Simon Steinbeiss <[email protected]> Date: Sun Oct 29 23:19:44 2017 +0100 Harmonize capitalisation of hours, minutes and seconds --- settings/xfpm-settings.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c index 16c8c70..4bdda9c 100644 --- a/settings/xfpm-settings.c +++ b/settings/xfpm-settings.c @@ -607,11 +607,11 @@ format_dpms_value_cb (GtkScale *scale, gdouble value, gpointer data) { if ( (gint)value == 0 ) return g_strdup (_("Never")); - + if ( (int)value == 1 ) return g_strdup (_("One minute")); - return g_strdup_printf ("%d %s", (int)value, _("Minutes")); + return g_strdup_printf ("%d %s", (int)value, _("minutes")); } @@ -619,23 +619,23 @@ gchar * format_inactivity_value_cb (GtkScale *scale, gdouble value, gpointer data) { gint h, min; - + if ( (gint)value <= 14 ) return g_strdup (_("Never")); else if ( (gint)value < 60 ) - return g_strdup_printf ("%d %s", (gint)value, _("Minutes")); + return g_strdup_printf ("%d %s", (gint)value, _("minutes")); else if ( (gint)value == 60) return g_strdup (_("One hour")); /* value > 60 */ h = (gint)value/60; min = (gint)value%60; - + if ( h <= 1 ) if ( min == 0 ) return g_strdup_printf ("%s", _("One hour")); else if ( min == 1 ) return g_strdup_printf ("%s %s", _("One hour"), _("one minute")); else return g_strdup_printf ("%s %d %s", _("One hour"), min, _("minutes")); - else + else if ( min == 0 ) return g_strdup_printf ("%d %s", h, _("hours")); else if ( min == 1 ) return g_strdup_printf ("%d %s %s", h, _("hours"), _("one minute")); else return g_strdup_printf ("%d %s %d %s", h, _("hours"), min, _("minutes")); @@ -649,8 +649,8 @@ format_brightness_value_cb (GtkScale *scale, gdouble value, gpointer data) { if ( (gint)value <= 9 ) return g_strdup (_("Never")); - - return g_strdup_printf ("%d %s", (int)value, _("Seconds")); + + return g_strdup_printf ("%d %s", (int)value, _("seconds")); } gchar * @@ -1500,14 +1500,14 @@ format_light_locker_value_cb (GtkScale *scale, gdouble value, gpointer data) if ( (gint)value <= 0 ) return g_strdup (_("Never")); else if ( value <= 59.0 ) - return g_strdup_printf ("%d %s", (gint)value, _("Seconds")); + return g_strdup_printf ("%d %s", (gint)value, _("seconds")); else if ( value >= 60.0) { min = (gint)value - 60; if (min == 0) - return g_strdup_printf ("%d %s", (gint)min + 1, _("Minute")); + return g_strdup_printf ("%d %s", (gint)min + 1, _("minute")); else - return g_strdup_printf ("%d %s", (gint)min + 1, _("Minutes")); + return g_strdup_printf ("%d %s", (gint)min + 1, _("minutes")); } } -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
