[Xfce4-commits] <xfce4-time-out-plugin:master> Improve the strings for easier translation

[Florian Rivoal]

Updating branch refs/heads/master
         to 24e6a849ce3897e41379b46fb1ab647d75f31712 (commit)
       from 3b1f377e80fdc183c80eaadb5d7eef7d5d3f11e6 (commit)

commit 24e6a849ce3897e41379b46fb1ab647d75f31712
Author: Florian Rivoal <frivoal at xfce.org>
Date:   Sat Dec 11 01:10:52 2010 +0900

    Improve the strings for easier translation
    
    Applies the patch from bug #5611 (thanks to Gabor Kelemen
    <kelemeng at gnome.hu>)

 panel-plugin/time-out-countdown.c |  173 +++++++++----------------
 po/ast.po                         |  203 ++++++++----------------------
 po/ca.po                          |  214 +++++++++----------------------
 po/cs.po                          |  216 ++++++++++----------------------
 po/da.po                          |  212 +++++++++----------------------
 po/de.po                          |  214 +++++++++----------------------
 po/el.po                          |  203 ++++++++----------------------
 po/en_GB.po                       |  191 ++++++++---------------------
 po/es.po                          |  233 ++++++++++++++++-------------------
 po/eu.po                          |  237 ++++++++++++++++-------------------
 po/fi.po                          |  241 ++++++++++++++++-------------------
 po/fr.po                          |  201 ++++++++---------------------
 po/gl.po                          |  203 ++++++++----------------------
 po/he.po                          |  206 +++++++++----------------------
 po/hu.po                          |  210 +++++++++----------------------
 po/id.po                          |  203 ++++++++----------------------
 po/it.po                          |  250 +++++++++++++++++--------------------
 po/ja.po                          |  199 ++++++++---------------------
 po/kk.po                          |  241 ++++++++++++++++-------------------
 po/lv.po                          |  208 +++++++++----------------------
 po/pl.po                          |  235 ++++++++++++++++-------------------
 po/pt.po                          |  207 +++++++++----------------------
 po/pt_BR.po                       |  237 ++++++++++++++++-------------------
 po/ru.po                          |  215 +++++++++----------------------
 po/sv.po                          |  235 ++++++++++++++++-------------------
 po/tr.po                          |  203 ++++++++----------------------
 po/ug.po                          |  203 ++++++++----------------------
 po/uk.po                          |  204 +++++++++----------------------
 po/ur.po                          |  237 ++++++++++++++++-------------------
 po/ur_PK.po                       |  203 ++++++++----------------------
 po/zh_CN.po                       |  196 ++++++++---------------------
 po/zh_TW.po                       |  193 +++++++---------------------
 32 files changed, 2310 insertions(+), 4516 deletions(-)

diff --git a/panel-plugin/time-out-countdown.c b/panel-plugin/time-out-countdown.c
index 18aa7f9..0e948bf 100644
--- a/panel-plugin/time-out-countdown.c
+++ b/panel-plugin/time-out-countdown.c
@@ -420,6 +420,11 @@ time_out_countdown_seconds_to_string (gint     seconds,
     }
   else
     {
+
+      gchar * hrs = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours);
+      gchar * mins = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes);
+      gchar * secs = g_strdup_printf (ngettext("%d second", "%d seconds", seconds), seconds);
+
       if (display_hours)
         {
           if (display_seconds)
@@ -428,58 +433,16 @@ time_out_countdown_seconds_to_string (gint     seconds,
                 {
                   if (minutes <= 0)
                     {
-                      if (seconds <= 1) 
-                        g_string_printf (str, _("Time left: 1 second"));
-                      else
-                        g_string_printf (str, _("Time left: %d seconds"), seconds);
-                    }
-                  else if (minutes == 1)
-                    {
-                      if (seconds <= 0)
-                        g_string_printf (str, _("Time left: 1 minute"));
-                      else if (seconds == 1)
-                        g_string_printf (str, _("Time left: 1 minute 1 second"));
-                      else
-                        g_string_printf (str, _("Time left: 1 minute %d seconds"), seconds);
+                      /* Translators: this is %s seconds/minutes/hours */
+                      g_string_printf (str, _("Time left: %s"), secs);
                     }
                   else
                     {
                       if (seconds <= 0)
-                        g_string_printf (str, _("Time left: %d minutes"), minutes);
-                      else if (seconds == 1)
-                        g_string_printf (str, _("Time left: %d minutes 1 second"), minutes);
+                        g_string_printf (str, _("Time left: %s"), mins);
                       else
-                        g_string_printf (str, _("Time left: %d minutes %d seconds"), minutes, seconds);
-                    }
-                }
-              else if (hours == 1)
-                {
-                  if (minutes <= 0)
-                    {
-                      if (seconds <= 0)
-                        g_string_printf (str, _("Time left: 1 hour"));
-                      if (seconds == 1) 
-                        g_string_printf (str, _("Time left: 1 hour 1 second"));
-                      else
-                        g_string_printf (str, _("Time left: 1 hour %d seconds"), seconds);
-                    }
-                  else if (minutes == 1)
-                    {
-                      if (seconds <= 0)
-                        g_string_printf (str, _("Time left: 1 hour 1 minute"));
-                      else if (seconds == 1)
-                        g_string_printf (str, _("Time left: 1 hour 1 minute 1 second"));
-                      else
-                        g_string_printf (str, _("Time left: 1 hour 1 minute %d seconds"), seconds);
-                    }
-                  else
-                    {
-                      if (seconds <= 0)
-                        g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes);
-                      if (seconds == 1)
-                        g_string_printf (str, _("Time left: 1 hour %d minutes 1 second"), minutes);
-                      else
-                        g_string_printf (str, _("Time left: 1 hour %d minutes %d seconds"), minutes, seconds);
+                        /* Translators: this is %s minutes, %s seconds */
+                        g_string_printf (str, _("Time left: %s %s"), mins, secs);
                     }
                 }
               else 
@@ -487,29 +450,21 @@ time_out_countdown_seconds_to_string (gint     seconds,
                   if (minutes <= 0)
                     {
                       if (seconds <= 0)
-                        g_string_printf (str, _("Time left: %d hours"), hours);
-                      else if (seconds == 1) 
-                        g_string_printf (str, _("Time left: %d hours 1 second"), hours);
-                      else
-                        g_string_printf (str, _("Time left: %d hours %d seconds"), hours, seconds);
-                    }
-                  else if (minutes == 1)
-                    {
-                      if (seconds <= 0)
-                        g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
-                      else if (seconds == 1)
-                        g_string_printf (str, _("Time left: %d hours 1 minute 1 second"), hours);
-                      else
-                        g_string_printf (str, _("Time left: %d hours 1 minute %d seconds"), hours, seconds);
+                        g_string_printf (str, _("Time left: %s"), hrs);
+                      else 
+                        {
+                        /* Translators: this is %s hours %s seconds */
+                        g_string_printf (str, _("Time left: %s %s"), hrs, secs);
+                        }
                     }
                   else
                     {
                       if (seconds <= 0)
-                        g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes);
-                      else if (seconds == 1)
-                        g_string_printf (str, _("Time left: %d hours %d minutes 1 second"), hours, minutes);
+                        /* Translators: this is %s hours, %s minutes */
+                        g_string_printf (str, _("Time left: %s %s"), hrs, mins);
                       else
-                        g_string_printf (str, _("Time left: %d hours %d minutes %d seconds"), hours, minutes, seconds);
+                        /* Translators: this is %s hours, %s minutes, %s seconds */
+                        g_string_printf (str, _("Time left: %s %s %s"), hrs, mins, secs);
                     }
                 }
             }
@@ -519,35 +474,37 @@ time_out_countdown_seconds_to_string (gint     seconds,
                 {
                   if (minutes < 1)
                     {
-                      g_string_printf (str, _("Time left: 1 minute"));
+                      /* Do not show 0 minutes */
+                      minutes = 1;
                     }
-                  else 
+                  if (seconds == 0)
+                    g_string_printf (str, _("Time left: %s"), mins);
+                  else
                     {
-                      if (seconds == 0)
-                        g_string_printf (str, _("Time left: %d minutes"), minutes);
-                      else
-                        g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+                      /* Round up the number of minutes */
+                      mins = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes + 1);
+                      g_string_printf (str, _("Time left: %s"), mins);
+                      g_free (mins);
                     }
                 }
-              else if (hours == 1)
-                {
-                  if (minutes < 1)
-                    g_string_printf (str, _("Time left: 1 hour 1 minute"));
-                  else
-                    if (seconds == 0)
-                      g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes);
-                    else
-                      g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes + 1);
-                }
               else 
                 {
                   if (minutes < 1)
-                    g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
+                    {
+                    /* Do not show 0 minutes */
+                    minutes = 1;
+                    }
+                  if (seconds == 0)
+                    /* Translators: this is %s hours, %s minutes */
+                    g_string_printf (str, _("Time left: %s %s"), hrs, mins);
                   else
-                    if (seconds == 0)
-                      g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes);
-                    else
-                      g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes + 1);
+                    {
+                      /* Round up the number of minutes */
+                      mins = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes + 1);
+                      /* Translators: this is %s hours, %s minutes */
+                      g_string_printf (str, _("Time left: %s %s"), hrs, mins);
+                      g_free (mins);
+                    }
                 }
             }
         }
@@ -559,43 +516,37 @@ time_out_countdown_seconds_to_string (gint     seconds,
             {
               if (minutes <= 0)
                 {
-                  if (seconds <= 1)
-                    g_string_printf (str, _("Time left: 1 second"));
-                  else
-                    g_string_printf (str, _("Time left: %d seconds"), seconds);
-                }
-              else if (minutes == 1)
-                {
-                  if (seconds <= 0)
-                    g_string_printf (str, _("Time left: 1 minute"));
-                  else if (seconds == 1)
-                    g_string_printf (str, _("Time left: 1 minute 1 second"));
-                  else
-                    g_string_printf (str, _("Time left: 1 minute %d seconds"), seconds);
+                  g_string_printf (str, _("Time left: %s"), secs);
                 }
-              else
+              else 
                 {
                   if (seconds <= 0)
-                    g_string_printf (str, _("Time left: %d minutes"), minutes);
-                  else if (seconds == 1)
-                    g_string_printf (str, _("Time left: %d minutes 1 second"), minutes);
+                    g_string_printf (str, _("Time left: %s"), mins);
                   else
-                    g_string_printf (str, _("Time left: %d minutes %d seconds"), minutes, seconds);
+                    /* Translators: this is %s minutes %s seconds */
+                    g_string_printf (str, _("Time left: %s %s"), mins, secs);
                 }
             }
           else
             {
-              if (minutes < 1)
-                g_string_printf (str, _("Time left: 1 minute"));
+              if (minutes < 1) 
+                {
+                  /* Do not show 0 minutes */
+                  minutes = 1; 
+                }
+              if (seconds == 0)
+                g_string_printf (str, _("Time left: %s"), mins);
               else
-                if (seconds == 0)
-                  g_string_printf (str, _("Time left: %d minutes"), minutes);
-                else
-                  g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+                {
+                  /* Round up the number of minutes */
+                  mins = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes + 1);
+                  g_string_printf (str, _("Time left: %s"), mins);
+                  g_free (mins);
+                }
             }
         }
+    g_free (hrs), g_free (mins), g_free (secs);
     }
-
   /* Return generated string */
   return str;
 }
diff --git a/po/ast.po b/po/ast.po
index 088dd56..9d21ee8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-07-13 19:55+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -137,155 +137,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tiempu restante: 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tiempu restante: %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tiempu restante: 1 minutu"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tiempu restante: 1 minutu 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tiempu restante: 1 minutu %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tiempu restante: %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tiempu restante: %d minutos 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tiempu restante: %d minutos %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tiempu restante: 1 hora"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tiempu restante: 1 hora 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tiempu restante: 1 hora %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tiempu restante: 1 hora 1 minutu"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tiempu restante: 1 hora 1 minutu 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tiempu restante: 1 hora 1 minutu %d segundos"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutu"
+msgstr[1] "%d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundu"
+msgstr[1] "%d Segundos"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tiempu restante: 1 hora %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tiempu restante: 1 hora %d minutos 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tiempu restante: 1 hora %d minutos %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tiempu restante: %d hores"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tiempu restante: %d horas 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tiempu restante: %d horas %d segundos"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tiempu restante: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tiempu restante: %d horas 1 minutu"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tiempu restante: %d horas 1 minutu 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tiempu restante: %d horas 1 minutu %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tiempu restante: %d hores %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tiempu restante: %d hores %d minutos 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tiempu restante: %d hores %d minutos %d segundos"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tiempu restante: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tiempu restante: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/ca.po b/po/ca.po
index d0409ab..abe0446 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,19 +3,19 @@
 # Copyright (C) 2009 THE xfce4-time-out-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-time-out-plugin package.
 #  Harald Servat <redcrash at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-04-03 12:50+0100\n"
 "Last-Translator: Harald Servat <redcrash at gmail.com>\n"
 "Language-Team: Harald Servat\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-Country: Spain\n"
 
@@ -35,8 +35,11 @@ msgid "Enabled"
 msgstr "Activat"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Connector per al quadre de Xfce per a prendre's un descans de tant en tant de l'ordinador."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Connector per al quadre de Xfce per a prendre's un descans de tant en tant "
+"de l'ordinador."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -140,155 +143,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Temps restant: 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Temps restant: %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Temps restant: 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Temps restant: 1 minut i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Temps restant: 1 minut i %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Temps restant: %d minuts"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Temps restant: %d minuts i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Temps restant: %d minuts i %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Temps restant: 1 hora"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Temps restant: 1 hora i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Temps restant: 1 hora i %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Temps restant: 1 hora i 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Temps restant: 1 hora, 1 minut i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Temps restant: 1 hora, 1 minut i %d segons"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuts"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segon"
+msgstr[1] "%d segons"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Temps restant: 1 hora i %d minuts"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Temps restant: 1 hora, %d minuts i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Temps restant: 1 hora, %d minuts i %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Temps restant: %d hores"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Temps restant: %d hores i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Temps restant: %d hores i %d segons"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Temps restant: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Temps restant: %d hores i 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Temps restant: %d hores, 1 minut i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Temps restant: %d hores, 1 minut i %d segons"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Temps restant: %d hores i %d minuts"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Temps restant: %d hores, %d minuts i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Temps restant: %d hores, %d minuts i %d segons"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Temps restant: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Temps restant: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/cs.po b/po/cs.po
index 52ce8d6..6da4f83 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-12-11 15:17+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. Create menu item for taking an instant break
@@ -33,8 +33,11 @@ msgid "Enabled"
 msgstr "Povoleno"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Zásuvný modul panelu Xfce k upozornění o občasné přestávce při práci s počítačem"
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Zásuvný modul panelu Xfce k upozornění o občasné přestávce při práci s "
+"počítačem"
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -138,157 +141,68 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Zbývající čas: 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Zbývající čas: %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Zbývající čas: 1 minuta"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Zbývající čas: 1 minuta 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Zbývající čas: 1 minuta %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Zbývající čas: %d minut"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Zbývající čas: %d minut 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Zbývající čas: %d minut %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Zbývající čas: 1 hodina"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Zbývající čas: 1 hodina 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Zbývající čas: 1 hodina %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Zbývající čas: 1 hodina 1 minuta"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Zbývající čas: 1 hodina 1 minuta 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Zbývající čas: 1 hodina 1 minuta %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodina"
+msgstr[1] "%d hodin"
+msgstr[2] "%d hodin"
+
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minut"
+msgstr[2] "%d minut"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekund"
+msgstr[2] "%d sekund"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Zbývající čas: 1 hodina %d minut"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Zbývající čas: 1 hodina %d minut 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Zbývající čas: 1 hodina %d minut %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Zbývající čas: %d hodin"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Zbývající čas: %d hodin 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Zbývající čas: %d hodin %d sekund"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Zbývající čas: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Zbývající čas: %d hodin 1 minuta"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Zbývající čas: %d hodin 1 minuta 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Zbývající čas: %d hodin 1 minuta %d sekund"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Zbývající čas: %d hodin %d minut"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Zbývající čas: %d hodin %d minut 1 sekunda"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Zbývající čas: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Zbývající čas: %d hodin %d minut %d sekund"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Zbývající čas: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automaticky ovládané vypršení času a přestávky"
-
diff --git a/po/da.po b/po/da.po
index d567fc2..d61c3fc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-10-14 15:10+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "X-Poedit-Language: Danish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: DENMARK\n"
@@ -35,8 +35,11 @@ msgid "Enabled"
 msgstr "Aktiveret"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "En udvidelse til panelet Xfce som indfører en pause fra arbejde med computeren fra tid til anden."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"En udvidelse til panelet Xfce som indfører en pause fra arbejde med "
+"computeren fra tid til anden."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -147,155 +150,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tid tilbage: 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tid tilbage: %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tid tilbage: 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tid tilbage: 1 minut 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tid tilbage: 1 minut %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tid tilbage: %d minutter"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tid tilbage: %d minutter 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tid tilbage: %d minutter %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tid tilbage: 1 time"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tid tilbage: 1 time 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tid tilbage: 1 time %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tid tilbage: 1 time 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tid tilbage: 1 time 1 minut 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tid tilbage: 1 time 1 minut %d sekunder"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minutter"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tid tilbage: 1 time %d minutter"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tid tilbage: 1 time %d minutter 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tid tilbage: 1 time %d minutter %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tid tilbage: %d timer"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tid tilbage: %d timer 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tid tilbage: %d timer %d sekunder"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tid tilbage: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tid tilbage: %d timer 1 minut"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tid tilbage: %d timer 1 minut 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tid tilbage: %d timer 1 minut %d sekunder"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tid tilbage: %d timer %d minutter"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tid tilbage: %d timer %d minutter 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tid tilbage: %d timer %d minutter %d sekunder"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tid tilbage: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tid tilbage: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/de.po b/po/de.po
index 087b364..7f0e21f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Jannis Pohlmann <jannis at xfce.org>
 # This file is distributed under the same license as the xfce4-time-out package.
 # Jannis Pohlmann <jannis at xfce.org>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2007-05-06 01:25++0200\n"
 "Last-Translator: Jannis Pohlmann <jannis at xfce.org>\n"
 "Language-Team: German <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:265
@@ -32,8 +32,11 @@ msgid "Enabled"
 msgstr "Aktiviert"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Xfce Leistenprogramm um hin und wieder eine Pause bei der Computerarbeit einzulegen."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Xfce Leistenprogramm um hin und wieder eine Pause bei der Computerarbeit "
+"einzulegen."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -140,155 +143,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Verbleibende Zeit: 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Verbleibende Zeit: %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Verbleibende Zeit: 1 Minute"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Verbleibende Zeit: 1 Minute 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Verbleibende Zeit: 1 Minute %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Verbleibende Zeit: %d Minuten"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Verbleibende Zeit: %d Minuten 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Verbleibende Zeit: %d Minuten %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Verbleibende Zeit: 1 Stunde"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Verbleibende Zeit: 1 Stunde 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Verbleibende Zeit: 1 Stunde %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Verbleibende Zeit: 1 Stunde 1 Minute"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Verbleibende Zeit: 1 Stunde 1 Minute 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Verbleibende Zeit: 1 Stunde 1 Minute %d Sekunden"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d stunde"
+msgstr[1] "%d stunden"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minuten"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunde"
+msgstr[1] "%d sekunden"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Verbleibende Zeit: 1 Stunde %d Minuten"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Verbleibende Zeit: 1 Stunde %d Minuten 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Verbleibende Zeit: 1 Stunde %d Minuten %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Verbleibende Zeit: %d Stunden"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Verbleibende Zeit: %d Stunden 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Verbleibende Zeit: %d Minuten %d Sekunden"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Verbleibende Zeit: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Verbleibende Zeit: %d Stunden 1 Minute"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Verbleibende Zeit: %d Stunden 1 Minute 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Verbleibende Zeit: %d Stunden 1 Minute %d Sekunden"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Verbleibende Zeit: %d Stunden %d Minuten"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Verbleibende Zeit: %d Stunden %d Minuten 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Verbleibende Zeit: %d Stunden %d Minuten %d Sekunden"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Verbleibende Zeit: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Verbleibende Zeit: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/el.po b/po/el.po
index 873c16a..cbfc940 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-04-28 18:45+0300\n"
 "Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -141,155 +141,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Χρόνος που απομένει: 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Χρόνος που απομένει σε %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Χρόνος που απομένει: 1 λεπτό"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Χρόνος που απομένει: 1 λεπτό και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Χρόνος που απομένει: 1 λεπτό και %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Χρόνος που απομένει: %d λεπτά"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Χρόνος που απομένει:%d λεπτά και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Χρόνος που απομένει:%d λεπτά και %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Χρόνος που απομένει: 1 ώρα"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Χρόνος που απομένει:1 ώρα και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Χρόνος που απομένει:1 ώρα και %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Χρόνος που απομένει: 1 ώρα και 1 λεπτό"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Χρόνος που απομένει: 1 ώρα 1 λεπτό και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Χρόνος που απομένει: 1 ώρα 1 λεπτό και %d δευτερόλεπτα"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ώρα"
+msgstr[1] "%d ώρες"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d λεπτό"
+msgstr[1] "%d λεπτά"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d δευτερόλεπτο"
+msgstr[1] "%d δευτερόλεπτα"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Χρόνος που απομένει: 1 ώρα και %d λεπτά"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Χρόνος που απομένει: 1 ώρα %d λεπτά και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Χρόνος που απομένει: 1 ώρα %d λεπτά και %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Χρόνος που απομένει: %d ώρες"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Χρόνος που απομένει: %d ώρες και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Χρόνος που απομένει: %d ώρες και %d δευτερόλεπτα"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Χρόνος που απομένει: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Χρόνος που απομένει: %d ώρες και 1 λεπτό"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Χρόνος που απομένει: %d ώρες 1 λεπτό και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Χρόνος που απομένει: %d ώρες 1 λεπτό και %d δευτερόλεπτα"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Χρόνος που απομένει: %d ωρες και %d λεπτά"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Χρόνος που απομένει: %d ώρες %d λεπτά και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Χρόνος που απομένει: %d ώρες %d λεπτά και %d δευτερόλεπτα"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Χρόνος που απομένει: %s και %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Χρόνος που απομένει: %s %s και %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5d9e164..4004291 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-05-10 13:36+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -140,155 +140,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 second"
-msgstr "Time left: 1 second"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Time left: %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Time left: 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Time left: 1 minute 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Time left: 1 minute %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Time left: %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Time left: %d minutes 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Time left: %d minutes %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Time left: 1 hour"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Time left: 1 hour 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Time left: 1 hour %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Time left: 1 hour 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Time left: 1 hour 1 minute 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Time left: 1 hour 1 minute %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
+#: ../panel-plugin/time-out-countdown.c:543
 #, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Time left: 1 hour %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Time left: 1 hour %d minutes 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Time left: 1 hour %d minutes %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Time left: %d hours"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Time left: %d hours 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Time left: %d hours %d seconds"
+msgid "Time left: %s"
+msgstr "Time left: %s"
 
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Time left: %d hours 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Time left: %d hours 1 minute 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Time left: %d hours 1 minute %d seconds"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Time left: %d hours %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
 #, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Time left: %d hours %d minutes 1 second"
+msgid "Time left: %s %s"
+msgstr "Time left: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Time left: %d hours %d minutes %d seconds"
+msgid "Time left: %s %s %s"
+msgstr "Time left: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/es.po b/po/es.po
index c7978dd..6949097 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-02-11 21:46+0100\n"
 "Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -142,156 +142,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tiempo restante: 1 segundo"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
 #, c-format
-msgid "Time left: %d seconds"
-msgstr "Tiempo restante: %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
+msgid "Time left: %s"
+msgstr "Tiempo restante: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
 #, c-format
-msgid "Time left: 1 minute"
-msgstr "Tiempo restante: 1 minuto"
+msgid "Time left: %s %s"
+msgstr "Tiempo restante: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
 #, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tiempo restante: 1 minuto 1 segundo"
+msgid "Time left: %s %s %s"
+msgstr "Tiempo restante: %s %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tiempo restante: 1 minuto %d segundos"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Controlar automáticamente tiempo de salida y pausas"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tiempo restante: %d minutos"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Tiempo restante: 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tiempo restante: %d minutos 1 segundo"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Tiempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tiempo restante: %d minutos %d segundos"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Tiempo restante: 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tiempo restante: 1 hora"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Tiempo restante: 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tiempo restante: 1 hora 1 segundo"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Tiempo restante: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tiempo restante: 1 hora %d segundos"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Tiempo restante: %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tiempo restante: 1 hora 1 minuto"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Tiempo restante: %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tiempo restante: 1 hora 1 minuto 1 segundo"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Tiempo restante: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tiempo restante: 1 hora 1 minuto %d segundos"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Tiempo restante: 1 hora 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tiempo restante: 1 hora %d minutos"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Tiempo restante: 1 hora %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tiempo restante: 1 hora %d minutos 1 segundo"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Tiempo restante: 1 hora 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tiempo restante: 1 hora %d minutos %d segundos"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Tiempo restante: 1 hora 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tiempo restante: %d horas"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Tiempo restante: 1 hora 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tiempo restante: %d horas 1 segundo"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Tiempo restante: 1 hora %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tiempo restante: %d horas %d segundos"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Tiempo restante: 1 hora %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tiempo restante: %d horas 1 minuto"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Tiempo restante: 1 hora %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tiempo restante: %d horas 1 minuto 1 segundo"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Tiempo restante: %d horas 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tiempo restante: %d horas 1 minuto %d segundos"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Tiempo restante: %d horas %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tiempo restante: %d horas %d minutos"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Tiempo restante: %d horas 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tiempo restante: %d horas %d minutos 1 segundo"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Tiempo restante: %d horas 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tiempo restante: %d horas %d minutos %d segundos"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Tiempo restante: %d horas 1 minuto %d segundos"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Controlar automáticamente tiempo de salida y pausas"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Tiempo restante: %d horas %d minutos"
+
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Tiempo restante: %d horas %d minutos 1 segundo"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Tiempo restante: %d horas %d minutos %d segundos"
diff --git a/po/eu.po b/po/eu.po
index f174563..bf53ca4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-11-05 13:57+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -142,156 +142,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Gelditzen den denbora: segundu bat"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "ordu bat"
+msgstr[1] "%d ordu"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Gelditzen den denbora: %d segundu"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "minutu bat"
+msgstr[1] "%d minutu"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "segundu bat"
+msgstr[1] "%d segundu"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Gelditzen den denbora: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Gelditzen den denbora: %s eta %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Gelditzen den denbora: Minutu bat"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Gelditzen den denbora: %s, %s eta %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Gelditzen den denbora: minutu bat eta segundu bat"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Automatikoki kontrolatutako atsedenak"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Gelditzen den denbora: Minutu bat eta %d segundu"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Gelditzen den denbora: segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Gelditzen den denbora: %d minutu"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Gelditzen den denbora: Minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Gelditzen den denbora: %d minutu eta segundu bat"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Gelditzen den denbora: minutu bat eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Gelditzen den denbora: %d minutu eta %d segundu"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Gelditzen den denbora: Minutu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Gelditzen den denbora: ordu bat"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Gelditzen den denbora: %d minutu"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Gelditzen den denbora: ordu bat eta segundo bat"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Gelditzen den denbora: %d minutu eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Gelditzen den denbora: %d minutu eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Gelditzen den denbora: ordu bat eta minutu bat"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Gelditzen den denbora: ordu bat"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Gelditzen den denbora: ordu bat, minutu bat eta segundu bat"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Gelditzen den denbora: ordu bat eta segundo bat"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Gelditzen den denbora: ordu bat, minutu bat eta %d segundu"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Gelditzen den denbora: ordu bat eta %d minutu"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Gelditzen den denbora: ordu bat eta minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Gelditzen den denbora: ordu bat, %d minutu eta segundu bat"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Gelditzen den denbora: ordu bat, minutu bat eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Gelditzen den denbora: ordu bat, %d minutu eta %d segundu"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Gelditzen den denbora: ordu bat, minutu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Gelditzen den denbora: %d ordu"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Gelditzen den denbora: ordu bat eta %d minutu"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Gelditzen den denbora: ordu bat, %d minutu eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Gelditzen den denbora: %d ordu eta %d segundu"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Gelditzen den denbora: ordu bat, %d minutu eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Gelditzen den denbora: %d ordu eta minutu bat"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Gelditzen den denbora: %d ordu, minutu bat eta segundu bat"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Gelditzen den denbora: %d ordu eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Gelditzen den denbora: %d ordu, minutu bat eta %d segundu"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Gelditzen den denbora: %d ordu eta minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Gelditzen den denbora: %d ordu %d minutu"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Gelditzen den denbora: %d ordu, minutu bat eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Gelditzen den denbora: %d ordu, %d minutu eta segundu bat"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Gelditzen den denbora: %d ordu, minutu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Gelditzen den denbora: %d ordu %d minutu %d segundu"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Gelditzen den denbora: %d ordu %d minutu"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Automatikoki kontrolatutako atsedenak"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Gelditzen den denbora: %d ordu, %d minutu eta segundu bat"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Gelditzen den denbora: %d ordu %d minutu %d segundu"
diff --git a/po/fi.po b/po/fi.po
index 1252f7f..8117836 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-07 15:01+0200\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-12-07 15:25+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <xfce-i18n at xfce.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,8 +35,7 @@ msgstr "Käynnissä"
 #: ../panel-plugin/time-out.c:422
 msgid ""
 "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr ""
-"Xfce-paneelin liitännäinen, joka käskee sinut ajoittain tauolle."
+msgstr "Xfce-paneelin liitännäinen, joka käskee sinut ajoittain tauolle."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -139,156 +139,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Jäljellä: sekunti"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "tunti"
+msgstr[1] "%d tuntia"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Jäljellä: %d sekuntia"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "minuutti"
+msgstr[1] "%d minuuttia"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "sekunti"
+msgstr[1] "%d sekuntia"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Jäljellä: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Jäljellä: %s ja %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Jäljellä: minuutti"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Jäljellä: %s, %s ja %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Jäljellä: minuutti ja 1 sekunti"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Näytön lukitus säännöllisten taukojen ajaksi"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Jäljellä: minuutti ja %d sekuntia"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Jäljellä: sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Jäljellä: %d minuuttia"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Jäljellä: minuutti"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Jäljellä: %d minuuttia ja 1 sekunti"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Jäljellä: minuutti ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Jäljellä: %d minuuttia ja %d sekuntia"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Jäljellä: minuutti ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Jäljellä: tunti"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Jäljellä: %d minuuttia"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Jäljellä: tunti ja 1 sekunti"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Jäljellä: %d minuuttia ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Jäljellä: tunti ja %d sekuntia"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Jäljellä: %d minuuttia ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Jäljellä: tunti ja 1 minuutti"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Jäljellä: tunti"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Jäljellä: tunti, 1 minuutti ja 1 sekunti"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Jäljellä: tunti ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Jäljellä: tunti, 1 minuutti ja %d sekuntia"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Jäljellä: tunti ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Jäljellä: tunti ja %d minuuttia"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Jäljellä: tunti ja 1 minuutti"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Jäljellä: tunti, %d minuuttia ja 1 sekunti"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Jäljellä: tunti, 1 minuutti ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Jäljellä: tunti, %d minuuttia ja %d sekuntia"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Jäljellä: tunti, 1 minuutti ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Jäljellä: %d tuntia"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Jäljellä: tunti ja %d minuuttia"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Jäljellä: %d tuntia ja 1 sekunti"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Jäljellä: tunti, %d minuuttia ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Jäljellä: %d tuntia ja %d sekuntia"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Jäljellä: tunti, %d minuuttia ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Jäljellä: %d tuntia ja 1 minuutti"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Jäljellä: %d tuntia ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Jäljellä: %d tuntia, 1 minuutti ja 1 sekunti"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Jäljellä: %d tuntia ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Jäljellä: %d tuntia, 1 minuutti ja %d sekuntia"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Jäljellä: %d tuntia ja 1 minuutti"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Jäljellä: %d tuntia ja %d minuuttia"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Jäljellä: %d tuntia, 1 minuutti ja 1 sekunti"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Jäljellä: %d tuntia, %d minuuttia ja 1 sekunti"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Jäljellä: %d tuntia, 1 minuutti ja %d sekuntia"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Jäljellä: %d tuntia, %d minuuttia ja %d sekuntia"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Jäljellä: %d tuntia ja %d minuuttia"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Näytön lukitus säännöllisten taukojen ajaksi"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Jäljellä: %d tuntia, %d minuuttia ja 1 sekunti"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Jäljellä: %d tuntia, %d minuuttia ja %d sekuntia"
diff --git a/po/fr.po b/po/fr.po
index a102bde..29323cc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Jannis Pohlmann <jannis at xfce.org>
 # This file is distributed under the same license as the xfce4-time-out-plugin package.
 # Jannis Pohlmann <jannis at xfce.org>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-11-07 16:28+0900\n"
 "Last-Translator: Florian Rivoal <frivoal at xfce.org>\n"
 "Language-Team: Xfce <xfce-i18n at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
@@ -35,8 +35,10 @@ msgstr "Activé"
 
 #: ../panel-plugin/time-out.c:422
 #, fuzzy
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Plugin du panneau Xfce pour prendre de temps en temps une pause d'ordinateur."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Plugin du panneau Xfce pour prendre de temps en temps une pause d'ordinateur."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -140,155 +142,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Temps restant : 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Temps restant : %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Temps restant : 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Temps restant : 1 minute 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Temps restant : 1 minute %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Temps restant : %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Temps restant : %d minutes 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Temps restant : %d minutes %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Temps restant : 1 heure"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Temps restant : 1 heure 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Temps restant : 1 heure %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Temps restant : 1 heure 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:471
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Temps restant : 1 heure 1 minute 1 seconde"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d heure"
+msgstr[1] "%d heures"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Temps restant : 1 heure 1 minute %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d seconde"
+msgstr[1] "%d secondes"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Temps restant : 1 heure %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Temps restant : 1 heure %d minutes 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Temps restant : 1 heure %d minutes %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Temps restant : %d heures"
-
-#: ../panel-plugin/time-out-countdown.c:492
+#: ../panel-plugin/time-out-countdown.c:543
 #, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Temps restant : %d heures 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Temps restant : %d heures %d secondes"
+msgid "Time left: %s"
+msgstr "Temps restant : %s"
 
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Temps restant : %d heures 1 minute"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Temps restant : %d heures 1 minute 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Temps restant : %d heures 1 minute %d secondes"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Temps restant : %d heures % minutes"
-
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
 #, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Temps restant : %d heures %d minutes 1 seconde"
+msgid "Time left: %s %s"
+msgstr "Temps restant : %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Temps restant : %d heures %d minutes %d secondes"
+msgid "Time left: %s %s %s"
+msgstr "Temps restant : %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/gl.po b/po/gl.po
index a9aebae..efdcd9f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-07-15 18:13+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -145,155 +145,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tempo restante: %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tempo restante: 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tempo restante: %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo restante: %d minutos e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tempo restante: 1 hora"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tempo restante: 1 hora e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tempo restante: 1 hora e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tempo restante: 1 hora e 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tempo restante: 1 hora 1 minuto e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tempo restante: 1 hora 1 minuto e %d segundos"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tempo restante: 1 hora e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tempo restante: 1 hora %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tempo restante: 1 hora %d minutos e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tempo restante: %d horas"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tempo restante: %d horas e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tempo restante: %d horas e %d segundos"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tempo restante: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tempo restante: %d horas e 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tempo restante: %d horas 1 minuto e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tempo restante: %d horas 1 minuto e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d horas e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tempo restante: %d horas %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d horas %d minutos e %d segundos"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tempo restante: %s e %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tempo restante: %s %s e %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/he.po b/po/he.po
index 8842ff2..5e10599 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4 time out plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Hezy Amiel <open at hezyamiel.com>\n"
 "Language-Team: Hebrew <xfce-i18n at xfce.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +33,8 @@ msgid "Enabled"
 msgstr "פעיל"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "תוסף ללוח של Xfce ללקיחת הפסקות מדי פעם."
 
 #: ../panel-plugin/time-out.c:431
@@ -137,157 +139,65 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "זמן נותר: שנייה"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "זמן נותר: %d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "זמן נותר: דקה"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "זמן נותר: דקה ושנייה"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "זמן נותר: דקה ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "זמן נותר: %d דקות"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "זמן נותר: %d דקות ושנייה"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d שעה"
+msgstr[1] "%d שעות"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "זמן נותר: %d דקות ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "זמן נותר: שעה"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "זמן נותר: שעה ושניה"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "זמן נותר: שעה ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "זמן נותר: שעה ודקה"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "זמן נותר: שעה, דקה ושנייה"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "זמן נותר: שעה, דקה  ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d דקה"
+msgstr[1] "%d דקות"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d שנייה"
+msgstr[1] "%d שניות"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "זמן נותר: שעה ו־%d דקות"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "זמן נותר: שעה, %d דקות ושנייה"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "זמן נותר: שעה, %d דקות ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "זמן נותר: %d שעות"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "זמן נותר: %d שעות ושנייה"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "זמן נותר: %d שעות ו־%d שניות"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "זמן נותר: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "זמן נותר: %d שעות ודקה"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "זמן נותר: %d שעות, דקה ושנייה"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "זמן נותר: %d שעות, דקה ו־%d שניות"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "זמן נותר: %d שעות ו־%d דקות"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "זמן נותר: %d שעות, %d דקות ושנייה"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "זמן נותר: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "זמן נותר: %d שעות, %d דקות ו־%d שניות"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "זמן נותר: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "שליטה אוטומטית על פסקי זמן והפסקות"
-
diff --git a/po/hu.po b/po/hu.po
index 3d95f25..c17db55 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,21 +1,21 @@
 # Hungarian translation of xfce4-time-out-plugin
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfce4-time-out-plugin package.
-# 
+#
 # SZERVÁC Attila <sas at 321.hu>, 2007.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-07-25 01:40+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -35,7 +35,8 @@ msgid "Enabled"
 msgstr "Engedélyezve"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "Xfce panelbővítmény rendszeres szünetek tartásához."
 
 #: ../panel-plugin/time-out.c:431
@@ -140,155 +141,64 @@ msgstr "%02d.%02d.%02d"
 msgid "%02d:%02d"
 msgstr "%02d.%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Hátralévő idő: 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Hátralévő idő: %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Hátralévő idő: 1 perc"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Hátralévő idő: 1 perc 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Hátralévő idő: 1 perc %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Hátralévő idő: %d perc"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Hátralévő idő: %d perc 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Hátralévő idő: %d perc %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Hátralévő idő: 1 óra"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Hátralévő idő: 1 óra 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Hátralévő idő: 1 óra %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Hátralévő idő: 1 óra 1 perc"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Hátralévő idő: 1 óra 1 perc 1 másodperc"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d óra"
+msgstr[1] "%d óra"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Hátralévő idő: 1 óra 1 perc %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d perc"
+msgstr[1] "%d perc"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d másodperc"
+msgstr[1] "%d másodperc"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Hátralévő idő: 1 óra %d perc"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Hátralévő idő: 1 óra %d perc 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Hátralévő idő: 1 óra %d perc %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Hátralévő idő: %d óra"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Hátralévő idő: %d óra 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Hátralévő idő: %d óra %d másodperc"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Hátralévő idő: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Hátralévő idő: %d óra 1 perc"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Hátralévő idő: %d óra 1 perc 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Hátralévő idő: %d óra 1 perc %d másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Hátralévő idő: %d óra %d perc"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Hátralévő idő: %d óra %d perc 1 másodperc"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Hátralévő idő: %d óra %d perc %d másodperc"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Hátralévő idő: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Hátralévő idő: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/id.po b/po/id.po
index fa6e786..fab2ec3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-06-21 15:09+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -140,155 +140,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Sisa waktu: 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Sisa waktu: %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Sisa waktu: 1 menit"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Sisa waktu: 1 menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Sisa waktu: 1 menit %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Sisa waktu: %d menit"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Sisa waktu: %d menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Sisa waktu: %d menit %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Sisa waktu: 1 jam"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Sisa waktu: 1 jam 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Sisa waktu: 1 jam %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Sisa waktu: 1 jam 1 menit"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Sisa waktu: 1 jam 1 menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Sisa waktu: 1 jam 1 menit %d detik"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d jam"
+msgstr[1] "%d jam"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d menit"
+msgstr[1] "%d menit"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d detik"
+msgstr[1] "%d detik"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Sisa waktu: 1 jam %d menit"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Sisa waktu: 1 jam %d menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Sisa waktu: 1 jam %d menit %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Sisa waktu: %d jam"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Sisa waktu: %d jam 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Sisa waktu: %d jam %d detik"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Sisa waktu: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Sisa waktu: %d jam 1 menit"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Sisa waktu: %d jam 1 menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Sisa waktu: %d jam 1 menit %d detik"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Sisa waktu: %d jam %d menit"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Sisa waktu: %d jam %d menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Sisa waktu: %d jam %d menit %d detik"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Sisa waktu: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Sisa waktu: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/it.po b/po/it.po
index bf6b31a..1d0b2cc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,28 +2,28 @@
 # Copyright (C) 2006 Kemal Ilgar Eroglu <kieroglu at math.washington.edu>
 # This file is distributed under the same license as the xfce4-timer-plugin package.
 # Cristian Marchi <cri.penta at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-01-31 15:10+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 
-#. Create menu item for taking an instant break
 # glossario
 # break = pausa
 # time out = interruzione
 # postpone = rinvia, rinviare
 # display = visualizzare (verbo)
+#. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:265
 msgid "Take a break"
 msgstr "Fai una pausa"
@@ -39,8 +39,11 @@ msgid "Enabled"
 msgstr "Abilitato"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Plugin del pannello di Xfce che ricorda di fare una pausa dal computer ogni tanto"
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Plugin del pannello di Xfce che ricorda di fare una pausa dal computer ogni "
+"tanto"
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
@@ -144,156 +147,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 secondo"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ora"
+msgstr[1] "%d ore"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tempo restante: %d secondi"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tempo restante: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tempo restante: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tempo restante: 1 minuto"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tempo restante: %s %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto 1 secondo"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Interruzioni e pause controllate automaticamente"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto %d secondi"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Tempo restante: 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tempo restante: %d minuti"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Tempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minuti 1 secondo"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Tempo restante: 1 minuto 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo restante: %d minuti %d secondi"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Tempo restante: 1 minuto %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tempo restante: 1 ora"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Tempo restante: %d minuti"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tempo restante: 1 ora 1 secondo"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Tempo restante: %d minuti 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tempo restante: 1 ora %d secondi"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Tempo restante: %d minuti %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tempo restante: 1 ora 1 minuto"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Tempo restante: 1 ora"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tempo restante: 1 ora 1 minuto 1 secondo"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Tempo restante: 1 ora 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tempo restante: 1 ora 1 minuto %d secondi"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Tempo restante: 1 ora %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tempo restante: 1 ora %d minuti"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Tempo restante: 1 ora 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tempo restante: 1 ora %d minuti 1 secondo"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Tempo restante: 1 ora 1 minuto 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tempo restante: 1 ora %d minuti %d secondi"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Tempo restante: 1 ora 1 minuto %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tempo restante: %d ore"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Tempo restante: 1 ora %d minuti"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tempo restante: %d ore 1 secondo"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Tempo restante: 1 ora %d minuti 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tempo restante: %d ore %d secondi"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Tempo restante: 1 ora %d minuti %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tempo restante: %d ore 1 minuto"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Tempo restante: %d ore 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tempo restante: %d ore 1 minuto 1 secondo"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Tempo restante: %d ore %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tempo restante: %d ore 1 minuto %d secondi"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Tempo restante: %d ore 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d ore %d minuti"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Tempo restante: %d ore 1 minuto 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tempo restante: %d ore %d minuti 1 secondo"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Tempo restante: %d ore 1 minuto %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d ore %d minuti %d secondi"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Tempo restante: %d ore %d minuti"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Interruzioni e pause controllate automaticamente"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Tempo restante: %d ore %d minuti 1 secondo"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Tempo restante: %d ore %d minuti %d secondi"
diff --git a/po/ja.po b/po/ja.po
index a87684c..97edc71 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 20:11+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-11-17 20:11+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-i18n at xfce.org>\n"
@@ -15,6 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:265
@@ -140,155 +141,61 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 second"
-msgstr "残り時間: 1 秒"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d時間"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "残り時間: %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "残り時間: 1分"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "残り時間: 1分 1秒"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "残り時間: 1 分 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "残り時間: %d 分"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "残り時間: %d 分 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "残り時間: %d 分 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "残り時間: 1 時間"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "残り時間: 1 時間 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "残り時間: 1 時間 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "残り時間: 1 時間 1 分"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "残り時間: 1 時間 1 分 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "残り時間: 1 時間 1 分 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d分"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d秒"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "残り時間: 1 時間 %d 分"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "残り時間: 1 時間 %d 分 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "残り時間: 1 時間 %d 分 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "残り時間: %d 時間"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "残り時間: %d 時間 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "残り時間: %d 時間 %d 秒"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "残り時間：%s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "残り時間: %d 時間 1 分"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "残り時間: %d 時間 1 分 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "残り時間: %d 時間 1 分 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "残り時間: %d 時間 %d 分"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "残り時間: %d 時間 %d 分 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "残り時間: %d 時間 %d 分 %d 秒"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "残り時間：%s%s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "残り時間：%s%s%s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/kk.po b/po/kk.po
index 23ed543..c517703 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2010 The Xfce team
 # This file is distributed under the same license as the xfce4-time-out-plugin package.
 # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-09-01 14:31+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Kazakh\n"
 "X-Poedit-Country: KAZAKHSTAN\n"
@@ -35,7 +35,8 @@ msgid "Enabled"
 msgstr "Қосулы"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "Компьютерден демалу үшін үзілістерді жасайтын Xfce панелінің плагині."
 
 #: ../panel-plugin/time-out.c:431
@@ -140,156 +141,134 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Қалған уақыты: 1 секунд"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d сағат"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Қалған уақыты: %d секунд"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минут"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунд"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Қалған уақыты: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Қалған уақыты: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Қалған уақыты: 1 минут"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Қалған уақыты: %s %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Қалған уақыты: 1 минут 1 секунд"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Үзілістерді автоматты басқару"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Қалған уақыты: 1 минут %d секунд"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Қалған уақыты: 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Қалған уақыты: %d минут"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Қалған уақыты: 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Қалған уақыты: %d минут 1 секунд"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Қалған уақыты: 1 минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Қалған уақыты: %d минут %d секунд"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Қалған уақыты: 1 минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Қалған уақыты: 1 сағат"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Қалған уақыты: %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Қалған уақыты: 1 сағат 1 секунд"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Қалған уақыты: %d минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Қалған уақыты: 1 сағат %d секунд"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Қалған уақыты: %d минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Қалған уақыты: 1 сағат 1 минут"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Қалған уақыты: 1 сағат"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Қалған уақыты: 1 сағат 1 минут 1 секунд"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Қалған уақыты: 1 сағат 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Қалған уақыты: 1 сағат 1 минут %d секунд"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Қалған уақыты: 1 сағат %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Қалған уақыты: 1 сағат %d минут"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Қалған уақыты: 1 сағат 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Қалған уақыты: 1 сағат %d минут 1 секунд"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Қалған уақыты: 1 сағат 1 минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Қалған уақыты: 1 сағат %d минут %d секунд"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Қалған уақыты: 1 сағат 1 минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Қалған уақыты: %d сағат"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Қалған уақыты: 1 сағат %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Қалған уақыты: %d сағат 1 секунд"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Қалған уақыты: 1 сағат %d минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Қалған уақыты: %d сағат %d секунд"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Қалған уақыты: 1 сағат %d минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Қалған уақыты: %d сағат 1 минут"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Қалған уақыты: %d сағат 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Қалған уақыты: %d сағат 1 минут 1 секунд"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Қалған уақыты: %d сағат %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Қалған уақыты: %d сағат 1 минут %d секунд"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Қалған уақыты: %d сағат 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Қалған уақыты: %d сағат %d минут"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Қалған уақыты: %d сағат 1 минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Қалған уақыты: %d сағат %d минут 1 секунд"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Қалған уақыты: %d сағат 1 минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Қалған уақыты: %d сағат %d минут %d секунд"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Қалған уақыты: %d сағат %d минут"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Үзілістерді автоматты басқару"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Қалған уақыты: %d сағат %d минут 1 секунд"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Қалған уақыты: %d сағат %d минут %d секунд"
diff --git a/po/lv.po b/po/lv.po
index 00703d2..053fda1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-09-18 23:22+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -144,155 +144,67 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Atlikušas: 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Atlikušas: %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Atlikušas: 1 minūte"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Atlikušas: 1 minūte 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Atlikušas: 1 minūte %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Atlikušas: %d minūtes"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Atlikušas: %d minūtes 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Atlikušas: %d minūtes %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Atlikušas: 1 stunda"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Atlikušas: 1 stunda 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Atlikušas: 1 stunda %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Atlikušas: 1 stunda 1 minūte"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Atlikušas: 1 stunda 1 minūte 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Atlikušas: 1 stunda 1 minūte %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d stunda"
+msgstr[1] "%d stundas"
+msgstr[2] "%d stundas"
+
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minūte"
+msgstr[1] "%d minūtes"
+msgstr[2] "%d minūtes"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunde"
+msgstr[1] "%d sekundes"
+msgstr[2] "%d sekundes"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Atlikušas: 1 stunda %d minūtes"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Atlikušas: 1 stunda %d minūtes 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Atlikušas: 1 stunda %d minūtes %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Atlikušas: %d stundas"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Atlikušas: %d stundas 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Atlikušas: %d stundas %d sekundes"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Atlikušas: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Atlikušas: %d stundas 1 minūte"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Atlikušas: %d stundas 1 minūte 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Atlikušas: %d stundas 1 minūte %d sekundes"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Atlikušas: %d stundas %d minūtes"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Atlikušas: %d stundas %d minūtes 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Atlikušas: %d stundas %d minūtes %d sekundes"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Atlikušas: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Atlikušas: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/pl.po b/po/pl.po
index 64776c7..6d0f6eb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tomasz Chudyk <chudyk at gmail.com>\n"
 "Language-Team: Polish\n"
@@ -138,156 +138,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 second"
-msgstr "Pozostało czasu: 1 s"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuty"
+msgstr[1] "%d minuty"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundy"
+msgstr[1] "%d sekundy"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Pozostało czasu: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Pozostało czasu: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Pozostało czasu: %d s"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Pozostało czasu: %s %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Pozostało czasu: 1 min"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Przerywa pracę o określonym czasie"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Pozostało czasu: 1 min 1 s"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Pozostało czasu: 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Pozostało czasu 1 min %d s"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Pozostało czasu: 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Pozostało czasu: %d min"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Pozostało czasu: 1 min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Pozostało czasu: %d min 1 s"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Pozostało czasu 1 min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Pozostało czasu: %d min %d s"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Pozostało czasu: %d min"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Pozostało czasu: 1 h"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Pozostało czasu: %d min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Pozostało czasu: 1 h 1 s"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Pozostało czasu: %d min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Pozostało czasu: 1 h %d s"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Pozostało czasu: 1 h"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Pozostało czasu: 1 h 1 min"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Pozostało czasu: 1 h 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Pozostało czasu: 1 h 1 min 1 s"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Pozostało czasu: 1 h %d s"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Pozostało czasu: 1 h 1 min %d s"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Pozostało czasu: 1 h 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Pozostało czasu: 1 h %d min"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Pozostało czasu: 1 h 1 min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Pozostało czasu: 1 h %d min 1 s"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Pozostało czasu: 1 h 1 min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Pozostało czasu: 1 h %d min %d s"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Pozostało czasu: 1 h %d min"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Pozostało czasu: %d h"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Pozostało czasu: 1 h %d min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Pozostało czasu: %d h 1 s"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Pozostało czasu: 1 h %d min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Pozostało czasu: %d h %d s"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Pozostało czasu: %d h 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Pozostało czasu: %d h 1 min"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Pozostało czasu: %d h %d s"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Pozostało czasu: %d h 1 min 1 s"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Pozostało czasu: %d h 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Pozostało czasu: %d h 1 min %d s"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Pozostało czasu: %d h 1 min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Pozostało czasu: %d h %d min"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Pozostało czasu: %d h 1 min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Pozostało czasu: %d h %d min 1 s"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Pozostało czasu: %d h %d min"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Pozostało czasu: %d h %d m %d s"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Pozostało czasu: %d h %d min 1 s"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Przerywa pracę o określonym czasie"
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Pozostało czasu: %d h %d m %d s"
diff --git a/po/pt.po b/po/pt.po
index df002dd..6c92daf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-11-11 20:27-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:265
@@ -31,7 +31,8 @@ msgid "Enabled"
 msgstr "Activo"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "O \"plug-in\" do painel Xfce irá funcionar ocasionalmente."
 
 #: ../panel-plugin/time-out.c:431
@@ -136,157 +137,65 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tempo restante: %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tempo restante: 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tempo restante: %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo restante: %d minutos e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tempo restante: 1 hora"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tempo restante: 1 hora e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tempo restante: 1 hora e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tempo restante: 1 hora e 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tempo restante: 1 hora 1 minuto 1 segundo"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tempo restante: 1 hora, 1 minuto e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tempo restante: 1 hora e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tempo restante: 1 hora, %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tempo restante: 1 hora, %d minutos e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tempo restante: %d horas"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tempo restante: %d horas e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tempo restante: %d horas e %d segundos"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tempo restante: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tempo restante: %d horas e 1 minuto"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tempo restante: %d horas, 1 minuto e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tempo restante: %d horas, 1 minuto e %d segundos"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d horas e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tempo restante: %d horas, %d minutos e 1 segundo"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tempo restante: %s e %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d horas, %d minutos e %d segundos"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tempo restante: %s, %s e %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Controlar automaticamente as interrupções e pausas"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a6e06b0..4f8c93f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2007-11-09 09:44-0300\n"
 "Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -141,156 +141,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tempo estimado: 1 segundo"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Tempo estimado: %d segundos"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tempo estimado: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tempo estimado: %s e %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tempo estimado: 1 minuto"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Tempo estimado: %s, %s e %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo estimado: 1 minuto e 1 segundo"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Controlar automaticamente as interrupções e intervalos"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo estimado: 1 minuto e %d segundos"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Tempo estimado: 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tempo estimado: %d minutos"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Tempo estimado: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo estimado: %d minutos e 1 segundo"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Tempo estimado: 1 minuto e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo estimado: %d minutos e %d segundos"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Tempo estimado: 1 minuto e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tempo estimado: 1 hora"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Tempo estimado: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tempo estimado: 1 hora e 1 segundo"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Tempo estimado: %d minutos e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tempo estimado: 1 hora e %d segundos"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Tempo estimado: %d minutos e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tempo estimado: 1 hora e 1 minuto"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Tempo estimado: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tempo estimado: 1 hora, 1 minuto e 1 segundo"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Tempo estimado: 1 hora e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tempo estimado: 1 hora, 1 minuto e %d segundos"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Tempo estimado: 1 hora e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tempo estimado: 1 hora e %d minutos"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Tempo estimado: 1 hora e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tempo estimado: 1 hora, %d minutos e 1 segundo"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Tempo estimado: 1 hora, 1 minuto e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tempo estimado: 1 hora, %d minutos e %d segundos"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Tempo estimado: 1 hora, 1 minuto e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tempo estimado: %d horas"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Tempo estimado: 1 hora e %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tempo estimado: %d horas e 1 segundo"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Tempo estimado: 1 hora, %d minutos e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tempo estimado: %d horas e %d segundos"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Tempo estimado: 1 hora, %d minutos e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tempo estimado: %d horas e 1 minuto"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Tempo estimado: %d horas e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tempo estimado: %d horas, 1 minuto e 1 segundo"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Tempo estimado: %d horas e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tempo estimado: %d horas, 1 minuto e %d segundos"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Tempo estimado: %d horas e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo estimado: %d horas e %d minutos"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Tempo estimado: %d horas, 1 minuto e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tempo estimado: %d horas, %d minutos e 1 segundo"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Tempo estimado: %d horas, 1 minuto e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo estimado: %d horas, %d minutos e %d segundos"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Tempo estimado: %d horas e %d minutos"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Controlar automaticamente as interrupções e intervalos"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Tempo estimado: %d horas, %d minutos e 1 segundo"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Tempo estimado: %d horas, %d minutos e %d segundos"
diff --git a/po/ru.po b/po/ru.po
index 2996553..db8404a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,20 +2,20 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-01-04 18:55+0300\n"
 "Last-Translator: dima <info at cnc-parts.info>\n"
 "Language-Team: xfce _ru_ <arch at cnc-parts.info>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: LATVIA\n"
-"Language: \n"
 "X-Poedit-Language: Russian\n"
 
 #. Create menu item for taking an instant break
@@ -34,13 +34,15 @@ msgid "Enabled"
 msgstr "Включен"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Позволяет делать перерывы в работе через определенные промежутки времени."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
+msgstr ""
+"Позволяет делать перерывы в работе через определенные промежутки времени."
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
 msgstr ""
-"??, 2010\r\n"
+"??, 2010\n"
 "Alex <davian818 at gmail.com>, 2010"
 
 #. Create properties dialog
@@ -141,155 +143,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Осталось времени: 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Осталось времени: %d с."
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Осталось времени: 1 мин."
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Осталось времени: 1 мин. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Осталось времени: 1 мин. и %d с."
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Осталось времени: %d мин."
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Осталось времени: %d мин. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Осталось времени: %d мин. и %d с."
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Осталось времени: 1 час"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Осталось времени: 1 час и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Осталось времени: 1 час и %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Осталось времени: 1 час и 1 мин."
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Осталось времени: 1 час 1 мин. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Осталось времени: 1 час 1 мин. и %d с."
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d час"
+msgstr[1] "%d час"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d мин."
+msgstr[1] "%d мин."
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d сек."
+msgstr[1] "%d сек."
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Осталось времени: 1 час и %d мин."
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Осталось времени: 1 час %d минут и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Осталось времени: 1 час %d мин. и %d с."
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Осталось времени: %d ч."
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Осталось времени: %d ч. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Осталось времени: %d ч. %d с."
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Осталось времени: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Осталось времени: %d ч. и 1 мин."
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Осталось времени: %d ч. 1 мин. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Осталось времени: %d ч. 1 мин. и %d с."
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Осталось времени: %d ч. и %d мин."
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Осталось времени: %d ч. %d мин. и 1 с."
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Осталось времени: %d ч. %d мин. и %d с."
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Осталось времени: %s u %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Осталось времени: %s %s u %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/sv.po b/po/sv.po
index 810a839..fbfb897 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-12-14 21:06+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -140,156 +140,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Tid kvar: 1 sekund"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d timme"
+msgstr[1] "%d timmar"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuter"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Tid kvar: %d timmar"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Tid kvar: %d timmar"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
 msgstr "Tid kvar: %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Tid kvar: 1 minut"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "Automatiskt kontrollerade pauser och raster"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Tid kvar: 1 minut 1 sekund"
+#~ msgid "Time left: 1 second"
+#~ msgstr "Tid kvar: 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tid kvar: 1 minut %d sekunder"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "Tid kvar: 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Tid kvar: %d minuter"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "Tid kvar: 1 minut 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tid kvar: %d minuter 1 sekund"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "Tid kvar: 1 minut %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tid kvar: %d minuter %d sekunder"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "Tid kvar: %d minuter"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Tid kvar: 1 timme"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "Tid kvar: %d minuter 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Tid kvar: 1 timme 1 sekund"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "Tid kvar: %d minuter %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Tid kvar: 1 timme %d sekunder"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "Tid kvar: 1 timme"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Tid kvar: 1 timme 1 minut"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "Tid kvar: 1 timme 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Tid kvar: 1 timme 1 minut 1 sekund"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "Tid kvar: 1 timme %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Tid kvar: 1 timme 1 minut %d sekunder"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "Tid kvar: 1 timme 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Tid kvar: 1 timme %d minuter"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "Tid kvar: 1 timme 1 minut 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Tid kvar: 1 timme %d minuter 1 sekund"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "Tid kvar: 1 timme 1 minut %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Tid kvar: 1 timme %d minuter %d sekunder"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "Tid kvar: 1 timme %d minuter"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Tid kvar: %d timmar"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "Tid kvar: 1 timme %d minuter 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Tid kvar: %d timmar 1 sekund"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "Tid kvar: 1 timme %d minuter %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Tid kvar: %d timmar %d sekunder"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "Tid kvar: %d timmar 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Tid kvar: %d timmar 1 minut"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "Tid kvar: %d timmar %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Tid kvar: %d timmar 1 minut 1 sekund"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "Tid kvar: %d timmar 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Tid kvar: %d timmar 1 minut %d sekunder"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "Tid kvar: %d timmar 1 minut 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tid kvar: %d timmar %d minuter"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "Tid kvar: %d timmar 1 minut %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Tid kvar: %d timmar %d minuter 1 sekund"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "Tid kvar: %d timmar %d minuter"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tid kvar: %d timmar %d minuter %d sekunder"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "Tid kvar: %d timmar %d minuter 1 sekund"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "Automatiskt kontrollerade pauser och raster"
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "Tid kvar: %d timmar %d minuter %d sekunder"
diff --git a/po/tr.po b/po/tr.po
index 0dce3a0..2c54d99 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4 timeout plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
@@ -136,155 +136,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Kalan süre: 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Kalan süre: %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Kalan süre: 1 dakika"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Kalan süre: 1 dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Kalan süre: 1 dakika %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Kalan süre: %d dakika"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Kalan süre: %d dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Kalan süre: %d dakika %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Kalan süre: 1 saat"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Kalan süre: 1 saat 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Kalan süre: 1 saat %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Kalan süre: 1 saat 1 dakika"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Kalan süre: 1 saat 1 dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Kalan süre: 1 saat 1 dakika %d saniye"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d saat"
+msgstr[1] "%d saat"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d dakika"
+msgstr[1] "%d dakika"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d saniye"
+msgstr[1] "%d saniye"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Kalan süre: 1 saat %d dakika"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Kalan süre: 1 saat %d dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Kalan süre: 1 saat %d dakika %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "Kalan süre: %d saat"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Kalan süre %d saat 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Kalan süre: %d saat %d saniye"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "Kalan süre: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Kalan süre: %d saat 1 dakika"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Kalan süre: %d saat 1 dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Kalan süre: %d saat 1 dakika %d saniye"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Kalan süre: %d saat %d dakika"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Kalan süre: %d saat %d dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Kalan süre: %d saat %d dakika %d saniye"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Kalan süre: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Kalan süre: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/ug.po b/po/ug.po
index f25f004..5ef6021 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-11-16 22:32+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
@@ -140,155 +140,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "قالغان ۋاقىت: 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "قالغان ۋاقىت: %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "قالغان ۋاقىت: 1 مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "قالغان ۋاقىت: 1مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "قالغان ۋاقىت: 1 مىنۇت %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "قالغان ۋاقىت: %d مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "قالغان ۋاقىت: %d مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "قالغان ۋاقىت: %d مىنۇت %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "قالغان ۋاقىت: 1 سائەت"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "قالغان ۋاقىت: 1 سائەت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "قالغان ۋاقىت: 1 سائەت %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "قالغان ۋاقىت: 1 سائەت 1 مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "قالغان ۋاقىت: 1 سائەت 1 مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "قالغان ۋاقىت: 1 سائەت 1 مىنۇت %d سېكۇنت"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d سائەت"
+msgstr[1] "%d سائەت"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ﻡﻰﻧۇﺕ "
+msgstr[1] "%d ﻡﻰﻧۇﺕ "
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ﺱېﻙۇﻦﺗ"
+msgstr[1] "%d ﺱېﻙۇﻦﺗ"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "قالغان ۋاقىت: 1 سائەت %d مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "قالغان ۋاقىت: 1 سائەت %d مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "قالغان ۋاقىت: 1 سائەت %d مىنۇت %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "قالغان ۋاقىت: %d سائەت"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "قالغان ۋاقىت: %d سائەت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "قالغان ۋاقىت: %d سائەت %d سېكۇنت"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "قالغان ۋاقىت: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "قالغان ۋاقىت: %d سائەت 1 مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "قالغان ۋاقىت: %d سائەت 1 مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "قالغان ۋاقىت: %d سائەت 1 مىنۇت %d سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "قالغان ۋاقىت: %d سائەت %d مىنۇت"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "قالغان ۋاقىت: %d سائەت %d مىنۇت 1 سېكۇنت"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "قالغان ۋاقىت: %d سائەت %d مىنۇت %d سېكۇنت"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "قالغان ۋاقىت: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "قالغان ۋاقىت: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/uk.po b/po/uk.po
index 6deae8b..1b54ed3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,20 +1,20 @@
 # Ukrainian translation of xfce4-time-out-plugin.
 # Copyright (C) 2008 Dmitry Nikitin
 # This file is distributed under the same license as the xfce4-time-out-plugin package.
-# 
+#
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2008-11-27 21:02+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Create menu item for taking an instant break
@@ -33,7 +33,8 @@ msgid "Enabled"
 msgstr "Активно"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "Плагін панелі Xfce для організації часу роботи з комп’ютером"
 
 #: ../panel-plugin/time-out.c:431
@@ -138,155 +139,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "Залишилось часу: 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "Залишилось часу: %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "Залишилось часу: 1 хвилина"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "Залишилось часу: 1 хвилина 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Залишилось часу: 1 хвилина %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "Залишилось часу: %d хвилин"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Залишилось часу: %d хвилин 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Залишилось часу: %d хвилин %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "Залишилось часу: 1 година"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "Залишилось часу: 1 година 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "Залишилось часу: 1 година %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "Залишилось часу: 1 година 1 хвилина"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "Залишилось часу: 1 година 1 хвилина 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "Залишилось часу: 1 година 1 хвилина %d секунд"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d година"
+msgstr[1] "%d годин"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d хвилина"
+msgstr[1] "%d Хвилини"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунди"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "Залишилось часу: 1 година %d хвилин"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "Залишилось часу: 1 година %d хвилин 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "Залишилось часу: 1 година %d хвилин %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
 msgstr "Залишилось часу: %d годин"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "Залишилось часу: %d годин 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "Залишилось часу: %d годин %d секунд"
-
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "Залишилось часу: %d годин 1 хвилина"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "Залишилось часу: %d годин 1 хвилина 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "Залишилось часу: %d годин 1 хвилина %d секунд"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Залишилось часу: %d годин %d хвилин"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "Залишилось часу: %d годин %d хвилин 1 секунда"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "Залишилось часу: %d годин"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Залишилось часу: %d годин %d хвилин %d секунд"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "Залишилось часу: %d секунд"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/ur.po b/po/ur.po
index 3b781e0..4c65eb8 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-05-14 03:23+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -144,156 +144,137 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "بقیہ وقت: 1 سیکنڈ"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d گھنٹے"
+msgstr[1] "%d گھنٹے"
 
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "بقیہ وقت: %d سیکنڈ"
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ﻢﻧٹ"
+msgstr[1] "%d ﻢﻧٹ"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ﺱیکﻥڈ"
+msgstr[1] "%d ﺱیکﻥڈ"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:538
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "بقیہ وقت: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
+#: ../panel-plugin/time-out-countdown.c:499
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "بقیہ وقت: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "بقیہ وقت: 1 منٹ"
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "بقیہ وقت: %s %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
+#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
+msgid "Automatically controlled time outs and breaks"
+msgstr "وقت تمام اور وقفے خودکار کنٹرول شدہ"
 
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 منٹ %d سیکنڈ"
+#~ msgid "Time left: 1 second"
+#~ msgstr "بقیہ وقت: 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "بقیہ وقت: %d منٹ"
+#~ msgid "Time left: 1 minute"
+#~ msgstr "بقیہ وقت: 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
+#~ msgid "Time left: 1 minute 1 second"
+#~ msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "بقیہ وقت: %d منٹ %d سیکنڈ"
+#~ msgid "Time left: 1 minute %d seconds"
+#~ msgstr "بقیہ وقت: 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "بقیہ وقت: 1 گھنٹہ"
+#~ msgid "Time left: %d minutes"
+#~ msgstr "بقیہ وقت: %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 سیکنڈ"
+#~ msgid "Time left: %d minutes 1 second"
+#~ msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ %d سیکنڈ"
+#~ msgid "Time left: %d minutes %d seconds"
+#~ msgstr "بقیہ وقت: %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ"
+#~ msgid "Time left: 1 hour"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ 1 سیکنڈ"
+#~ msgid "Time left: 1 hour 1 second"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ %d سیکنڈ"
+#~ msgid "Time left: 1 hour %d seconds"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:478
-#: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ"
+#~ msgid "Time left: 1 hour 1 minute"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ 1 سیکنڈ"
+#~ msgid "Time left: 1 hour 1 minute 1 second"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ %d سیکنڈ"
+#~ msgid "Time left: 1 hour 1 minute %d seconds"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "بقیہ وقت: %d گھنٹے"
+#~ msgid "Time left: 1 hour %d minutes"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "بقیہ وقت: %d گھنٹے 1 سیکنڈ"
+#~ msgid "Time left: 1 hour %d minutes 1 second"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d سیکنڈ"
+#~ msgid "Time left: 1 hour %d minutes %d seconds"
+#~ msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ"
+#~ msgid "Time left: %d hours 1 second"
+#~ msgstr "بقیہ وقت: %d گھنٹے 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ 1 سیکنڈ"
+#~ msgid "Time left: %d hours %d seconds"
+#~ msgstr "بقیہ وقت: %d گھنٹے %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ %d سیکنڈ"
+#~ msgid "Time left: %d hours 1 minute"
+#~ msgstr "بقیہ وقت: %d گھنٹے 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
+#~ msgid "Time left: %d hours 1 minute 1 second"
+#~ msgstr "بقیہ وقت: %d گھنٹے 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ 1 سیکنڈ"
+#~ msgid "Time left: %d hours 1 minute %d seconds"
+#~ msgstr "بقیہ وقت: %d گھنٹے 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+#~ msgid "Time left: %d hours %d minutes"
+#~ msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
 
-#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
-msgid "Automatically controlled time outs and breaks"
-msgstr "وقت تمام اور وقفے خودکار کنٹرول شدہ"
+#~ msgid "Time left: %d hours %d minutes 1 second"
+#~ msgstr "بقیہ وقت: %d گھنٹے %d منٹ 1 سیکنڈ"
+
+#~ msgid "Time left: %d hours %d minutes %d seconds"
+#~ msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 3b781e0..96539d0 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2009-05-14 03:23+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -144,155 +144,64 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "بقیہ وقت: 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "بقیہ وقت: %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "بقیہ وقت: 1 منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 منٹ %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "بقیہ وقت: %d منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "بقیہ وقت: %d منٹ %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "بقیہ وقت: 1 گھنٹہ"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ %d سیکنڈ"
+#: ../panel-plugin/time-out-countdown.c:424
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d گھنٹے"
+msgstr[1] "%d گھنٹے"
 
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ﻢﻧٹ"
+msgstr[1] "%d ﻢﻧٹ"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ﺱیکﻥڈ"
+msgstr[1] "%d ﺱیکﻥڈ"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "بقیہ وقت: %d گھنٹے"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "بقیہ وقت: %d گھنٹے 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d سیکنڈ"
-
+#: ../panel-plugin/time-out-countdown.c:543
+#, fuzzy, c-format
+msgid "Time left: %s"
+msgstr "بقیہ وقت: %s"
+
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے 1 منٹ %d سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:510
-#, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:512
-#, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
+#, fuzzy, c-format
+msgid "Time left: %s %s"
+msgstr "بقیہ وقت: %s %s"
+
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
+#, fuzzy, c-format
+msgid "Time left: %s %s %s"
+msgstr "بقیہ وقت: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 40d41e2..780b2b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,13 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: 2010-11-27 20:50+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (simplified)\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:265
@@ -33,13 +35,11 @@ msgstr "启动"
 #: ../panel-plugin/time-out.c:422
 msgid ""
 "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr ""
-"用以提醒您注意休息，避免长时间使用电脑工作的 Xfce 面板插件"
+msgstr "用以提醒您注意休息，避免长时间使用电脑工作的 Xfce 面板插件"
 
 #: ../panel-plugin/time-out.c:431
 msgid "translator-credits"
-msgstr ""
-"Hunt Xu <huntxu at live.cn>, 2010"
+msgstr "Hunt Xu <huntxu at live.cn>, 2010"
 
 #. Create properties dialog
 #: ../panel-plugin/time-out.c:463
@@ -139,155 +139,61 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "剩余时间: 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "剩余时间: %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "剩余时间: 1 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "剩余时间: 1 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
-#, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "剩余时间: 1 分钟 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "剩余时间: %d 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "剩余时间: %d 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "剩余时间: %d 分钟 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "剩余时间: 1 小时"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "剩余时间: 1 小时 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "剩余时间: 1 小时 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "剩余时间: 1 小时 1 分钟"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
 
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "剩余时间: 1 小时 1 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "剩余时间: 1 小时 1 分钟 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "剩余时间: 1 小时 %d 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "剩余时间: 1 小时 %d 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "剩余时间: 1 小时 %d 分钟 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "剩余时间: %d 小时"
-
-#: ../panel-plugin/time-out-countdown.c:492
+#: ../panel-plugin/time-out-countdown.c:543
 #, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "剩余时间: %d 小时 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "剩余时间: %d 小时 %d 秒"
+msgid "Time left: %s"
+msgstr "剩余时间: %s"
 
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "剩余时间: %d 小时 1 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "剩余时间: %d 小时 1 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "剩余时间: %d 小时 1 分钟 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "剩余时间: %d 小时 %d 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
 #, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "剩余时间: %d 小时 %d 分钟 1 秒"
+msgid "Time left: %s %s"
+msgstr "剩余时间: %s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "剩余时间: %d 小时 %d 分钟 %d 秒"
+msgid "Time left: %s %s %s"
+msgstr "剩余时间: %s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b26dce2..7136c5f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2010 THE xfce4-time-out-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-time-out-plugins package.
 # Cheng-Chia Tseng <pswo10680 at gmail.com>, 2010.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugins.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-12 00:07+0900\n"
+"POT-Creation-Date: 2010-12-12 00:01+0900\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: Chinese-l10n <chinese-l10n at googlegroups.com>\n"
@@ -33,7 +32,8 @@ msgid "Enabled"
 msgstr "啟用"
 
 #: ../panel-plugin/time-out.c:422
-msgid "Xfce Panel plugin for taking a break from computer work every now and then."
+msgid ""
+"Xfce Panel plugin for taking a break from computer work every now and then."
 msgstr "偶爾停下電腦工作並休息片刻的 Xfce 面板插件。"
 
 #: ../panel-plugin/time-out.c:431
@@ -138,157 +138,62 @@ msgstr "%02d:%02d:%02d"
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:432
-#: ../panel-plugin/time-out-countdown.c:563
-#, c-format
-msgid "Time left: 1 second"
-msgstr "剩餘時間：1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:434
-#: ../panel-plugin/time-out-countdown.c:565
-#, c-format
-msgid "Time left: %d seconds"
-msgstr "剩餘時間：%d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:522
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:589
-#, c-format
-msgid "Time left: 1 minute"
-msgstr "剩餘時間：1 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:572
-#, c-format
-msgid "Time left: 1 minute 1 second"
-msgstr "剩餘時間：1 分鐘 1秒"
-
-#: ../panel-plugin/time-out-countdown.c:443
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:424
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "剩餘時間：1 分鐘 %d 秒"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小時"
 
-#: ../panel-plugin/time-out-countdown.c:448
-#: ../panel-plugin/time-out-countdown.c:527
-#: ../panel-plugin/time-out-countdown.c:529
-#: ../panel-plugin/time-out-countdown.c:579
-#: ../panel-plugin/time-out-countdown.c:592
-#: ../panel-plugin/time-out-countdown.c:594
-#, c-format
-msgid "Time left: %d minutes"
-msgstr "剩餘時間：%d 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:450
-#: ../panel-plugin/time-out-countdown.c:581
-#, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "剩餘時間：%d 分鐘 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:452
-#: ../panel-plugin/time-out-countdown.c:583
-#, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "剩餘時間：%d 分鐘 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:460
-#, c-format
-msgid "Time left: 1 hour"
-msgstr "剩餘時間：1 小時"
-
-#: ../panel-plugin/time-out-countdown.c:462
-#, c-format
-msgid "Time left: 1 hour 1 second"
-msgstr "剩餘時間：1 小時 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:464
-#, c-format
-msgid "Time left: 1 hour %d seconds"
-msgstr "剩餘時間：1 小時 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:469
-#: ../panel-plugin/time-out-countdown.c:535
-#, c-format
-msgid "Time left: 1 hour 1 minute"
-msgstr "剩餘時間：1 小時 1 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:471
-#, c-format
-msgid "Time left: 1 hour 1 minute 1 second"
-msgstr "剩餘時間：1 小時 1 分鐘 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:473
-#, c-format
-msgid "Time left: 1 hour 1 minute %d seconds"
-msgstr "剩餘時間：1 小時 1 分鐘 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:478
+#. Round up the number of minutes
+#: ../panel-plugin/time-out-countdown.c:425
+#: ../panel-plugin/time-out-countdown.c:485
+#: ../panel-plugin/time-out-countdown.c:503
+#: ../panel-plugin/time-out-countdown.c:542
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分鐘"
+
+#: ../panel-plugin/time-out-countdown.c:426
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. Translators: this is %s seconds/minutes/hours
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:442
+#: ../panel-plugin/time-out-countdown.c:453
+#: ../panel-plugin/time-out-countdown.c:481
+#: ../panel-plugin/time-out-countdown.c:486
+#: ../panel-plugin/time-out-countdown.c:519
+#: ../panel-plugin/time-out-countdown.c:524
 #: ../panel-plugin/time-out-countdown.c:538
-#: ../panel-plugin/time-out-countdown.c:540
-#, c-format
-msgid "Time left: 1 hour %d minutes"
-msgstr "剩餘時間：1 小時 %d 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:480
-#, c-format
-msgid "Time left: 1 hour %d minutes 1 second"
-msgstr "剩餘時間：1 小時 %d 分鐘 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:482
-#, c-format
-msgid "Time left: 1 hour %d minutes %d seconds"
-msgstr "剩餘時間：1 小時 %d 分鐘 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:490
-#, c-format
-msgid "Time left: %d hours"
-msgstr "剩餘時間：%d 小時"
-
-#: ../panel-plugin/time-out-countdown.c:492
-#, c-format
-msgid "Time left: %d hours 1 second"
-msgstr "剩餘時間：%d 小時 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:494
+#: ../panel-plugin/time-out-countdown.c:543
 #, c-format
-msgid "Time left: %d hours %d seconds"
-msgstr "剩餘時間：%d 小時 %d 秒"
+msgid "Time left: %s"
+msgstr "剩餘時間：%s"
 
+#. Translators: this is %s minutes, %s seconds
+#. Translators: this is %s hours %s seconds
+#. Translators: this is %s hours, %s minutes
+#. Translators: this is %s minutes %s seconds
+#: ../panel-plugin/time-out-countdown.c:445
+#: ../panel-plugin/time-out-countdown.c:457
+#: ../panel-plugin/time-out-countdown.c:464
 #: ../panel-plugin/time-out-countdown.c:499
-#: ../panel-plugin/time-out-countdown.c:545
-#, c-format
-msgid "Time left: %d hours 1 minute"
-msgstr "剩餘時間：%d 小時 1 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:501
-#, c-format
-msgid "Time left: %d hours 1 minute 1 second"
-msgstr "剩餘時間：%d 小時 1 分鐘 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#, c-format
-msgid "Time left: %d hours 1 minute %d seconds"
-msgstr "剩餘時間：%d 小時 1分鐘 %d 秒"
-
-#: ../panel-plugin/time-out-countdown.c:508
-#: ../panel-plugin/time-out-countdown.c:548
-#: ../panel-plugin/time-out-countdown.c:550
-#, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "剩餘時間：%d 小時 %d 分鐘"
-
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:505
+#: ../panel-plugin/time-out-countdown.c:527
 #, c-format
-msgid "Time left: %d hours %d minutes 1 second"
-msgstr "剩餘時間：%d 小時 %d 分鐘 1 秒"
+msgid "Time left: %s %s"
+msgstr "剩餘時間：%s %s"
 
-#: ../panel-plugin/time-out-countdown.c:512
+#. Translators: this is %s hours, %s minutes, %s seconds
+#: ../panel-plugin/time-out-countdown.c:467
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "剩餘時間：%d 小時 %d 分鐘 %d 秒"
+msgid "Time left: %s %s %s"
+msgstr "剩餘時間：%s %s %s"
 
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "自動控制的倒數計時與休息"
-