From ac3c36760b8f34c441e5dc143c977cee1298b139 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Mon, 25 Feb 2008 05:43:49 +0100 Subject: [PATCH] Improved the tooltip on the Gnome applet. --- clients/gnome-trans-applet/dolcon-trans-applet.c | 7 +++++- po/sv.po | 30 ++++++++++++++++-------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/clients/gnome-trans-applet/dolcon-trans-applet.c b/clients/gnome-trans-applet/dolcon-trans-applet.c index 6b4a6e9..5520776 100644 --- a/clients/gnome-trans-applet/dolcon-trans-applet.c +++ b/clients/gnome-trans-applet/dolcon-trans-applet.c @@ -91,7 +91,12 @@ static gboolean updatetip(struct appletdata *data) strcpy(buf, _("Time left: Infinite (Transfer is standing still)")); } else { left = (data->curdisplay->size - data->curdisplay->pos) / speed; - sprintf(buf, _("Time left: %i:%02i"), left / 3600, (left / 60) % 60); + if(left >= 86400) + sprintf(buf, _("Time left: %id%02ih%02im"), left / 86400, (left / 3600) % 24, (left / 60) % 60); + else if(left >= 3600) + sprintf(buf, _("Time left: %ih%02im"), left / 3600, (left / 60) % 60); + else + sprintf(buf, _("Time left: %im"), left / 60); } } gtk_tooltips_set_tip(data->tips, GTK_WIDGET(data->applet), buf, NULL); diff --git a/po/sv.po b/po/sv.po index 7cd7ee6..5fb8934 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: doldaconnect 0.1.1\n" "Report-Msgid-Bugs-To: fredrik@dolda2000.com\n" -"POT-Creation-Date: 2008-02-14 15:53+0100\n" -"PO-Revision-Date: 2007-08-31 03:37+0200\n" +"POT-Creation-Date: 2008-02-25 05:39+0100\n" +"PO-Revision-Date: 2008-02-25 05:41+0100\n" "Last-Translator: Fredrik Tolf \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -121,7 +121,7 @@ msgstr "" "%s" #: clients/gtk2/dolcon.c:1338 clients/gtk2/hublist.c:206 -#: clients/gnome-trans-applet/dolcon-trans-applet.c:113 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:118 msgid "Connecting..." msgstr "Ansluter..." @@ -507,7 +507,7 @@ msgid "Connect _automatically on startup" msgstr "Anslut au_tomatiskt vid uppstart" #: clients/gnome-trans-applet/dolcon-trans-applet.c:79 -#: clients/gnome-trans-applet/dolcon-trans-applet.c:125 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:130 msgid "No transfer selected" msgstr "Ingen överföring vald" @@ -519,20 +519,30 @@ msgstr "Beräknar återstående tid..." msgid "Time left: Infinite (Transfer is standing still)" msgstr "Tid kvar: Oändlig (Överföringen står still)" -#: clients/gnome-trans-applet/dolcon-trans-applet.c:94 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:95 #, c-format -msgid "Time left: %i:%02i" -msgstr "Tid kvar: %i:%02i" +msgid "Time left: %id%02ih%02im" +msgstr "Tid kvar: %id%02ih%02im" -#: clients/gnome-trans-applet/dolcon-trans-applet.c:109 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:97 +#, c-format +msgid "Time left: %ih%02im" +msgstr "Tid kvar: %ih%02im" + +#: clients/gnome-trans-applet/dolcon-trans-applet.c:99 +#, c-format +msgid "Time left: %im" +msgstr "Tid kvar: %im" + +#: clients/gnome-trans-applet/dolcon-trans-applet.c:114 msgid "Not connected" msgstr "Ej ansluten" -#: clients/gnome-trans-applet/dolcon-trans-applet.c:121 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:126 msgid "No transfers to display" msgstr "Inga överföringar" -#: clients/gnome-trans-applet/dolcon-trans-applet.c:134 +#: clients/gnome-trans-applet/dolcon-trans-applet.c:139 msgid "Initializing" msgstr "Förbereder" -- 2.11.0