[Xfce4-commits] <xfce4-time-out-plugin:master> Allow setting the time with a precision in seconds

Florian Rivoal noreply at xfce.org
Sun Nov 7 09:52:02 CET 2010


Updating branch refs/heads/master
         to 5b5f6a1060c00b13722d1c667f77e2d1220397f8 (commit)
       from c4b143cf722745b4f6341ea2a19f02d34efc16a0 (commit)

commit 5b5f6a1060c00b13722d1c667f77e2d1220397f8
Author: Florian Rivoal <frivoal at xfce.org>
Date:   Sat Nov 6 16:07:22 2010 +0900

    Allow setting the time with a precision in seconds
    
    This allows people who would rather make frequent micro pauses than
    infrequent long ones to use this plugin.
    
    Updated the pot file and the po files with the new strings.
    
    This should solve the issues described in Bug 3220.

 panel-plugin/time-out.c      |  102 ++++++++++++++++++----
 po/ast.po                    |  195 ++++++++++++++++++++++-------------------
 po/ca.po                     |  196 ++++++++++++++++++++++--------------------
 po/cs.po                     |  196 ++++++++++++++++++++++--------------------
 po/da.po                     |  196 ++++++++++++++++++++++--------------------
 po/de.po                     |  197 ++++++++++++++++++++++--------------------
 po/el.po                     |  196 ++++++++++++++++++++++--------------------
 po/en_GB.po                  |  194 +++++++++++++++++++++--------------------
 po/es.po                     |  196 ++++++++++++++++++++++--------------------
 po/eu.po                     |  194 +++++++++++++++++++++-------------------
 po/fr.po                     |  194 +++++++++++++++++++++--------------------
 po/gl.po                     |  196 ++++++++++++++++++++++--------------------
 po/hu.po                     |   53 +++++++-----
 po/id.po                     |  195 ++++++++++++++++++++++-------------------
 po/it.po                     |  199 ++++++++++++++++++++++--------------------
 po/ja.po                     |   50 +++++++----
 po/kk.po                     |  195 +++++++++++++++++++++--------------------
 po/lv.po                     |  196 ++++++++++++++++++++++--------------------
 po/pl.po                     |  196 ++++++++++++++++++++++--------------------
 po/pt.po                     |  196 ++++++++++++++++++++++--------------------
 po/pt_BR.po                  |  195 ++++++++++++++++++++++-------------------
 po/ru.po                     |  197 ++++++++++++++++++++++--------------------
 po/sv.po                     |   53 +++++++-----
 po/tr.po                     |  196 ++++++++++++++++++++++--------------------
 po/ug.po                     |   52 +++++++----
 po/uk.po                     |  196 ++++++++++++++++++++++--------------------
 po/ur.po                     |  196 ++++++++++++++++++++++--------------------
 po/ur_PK.po                  |  196 ++++++++++++++++++++++--------------------
 po/xfce4-time-out-plugin.pot |  179 ++++++++++++++++++++------------------
 po/zh_CN.po                  |  195 ++++++++++++++++++++++-------------------
 30 files changed, 2772 insertions(+), 2415 deletions(-)

diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c
index 49ab97d..3e77371 100644
--- a/panel-plugin/time-out.c
+++ b/panel-plugin/time-out.c
@@ -97,8 +97,12 @@ static void           time_out_configure                          (XfcePanelPlug
 static void           time_out_end_configure                      (GtkDialog         *dialog,
                                                                    gint               response_id,
                                                                    TimeOutPlugin     *time_out);
+static void           time_out_lock_countdown_minutes_changed     (GtkSpinButton     *spin_button,
+                                                                   TimeOutPlugin     *time_out);
 static void           time_out_lock_countdown_seconds_changed     (GtkSpinButton     *spin_button,
                                                                    TimeOutPlugin     *time_out);
+static void           time_out_postpone_countdown_minutes_changed (GtkSpinButton     *spin_button,
+                                                                   TimeOutPlugin     *time_out);
 static void           time_out_postpone_countdown_seconds_changed (GtkSpinButton     *spin_button,
                                                                    TimeOutPlugin     *time_out);
 static void           time_out_allow_postpone_toggled             (GtkToggleButton   *toggle_button,
@@ -417,51 +421,81 @@ time_out_configure (XfcePanelPlugin *plugin,
   gtk_widget_show (framebox);
 
   /* Create time settings table */
-  table = gtk_table_new (2, 2, FALSE);
+  table = gtk_table_new (3, 3, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_table_set_col_spacings (GTK_TABLE (table), 12);
   gtk_container_add (GTK_CONTAINER (timebin), table);
   gtk_widget_show (table);
 
+  /* Create the labels for the minutes and seconds spins */
+  label = gtk_label_new (_("Minutes"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
+  gtk_widget_show (label);
+
+  label = gtk_label_new (_("Seconds"));
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
+  gtk_widget_show (label);
+
   /* Create break countdown time label */
-  label = gtk_label_new (_("Time between breaks (minutes):"));
+  label = gtk_label_new (_("Time between breaks:"));
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
   gtk_widget_show (label);
 
-  /* Create break countdown time spin */
+  /* Create break countdown time minute spin */
   spin = gtk_spin_button_new_with_range (1, 24 * 60, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->break_countdown_seconds / 60);
-  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_widget_show (spin);
+
+  /* Store reference on the spin button in the plugin */
+  g_object_set_data (G_OBJECT (time_out->plugin), "break-countdown-minutes-spin", spin);
+
+  /* Create break countdown time minute spin */
+  spin = gtk_spin_button_new_with_range (0, 59, 1);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->break_countdown_seconds % 60);
+  gtk_table_attach (GTK_TABLE (table), spin, 2, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
   gtk_widget_show (spin);
 
   /* Store reference on the spin button in the plugin */
   g_object_set_data (G_OBJECT (time_out->plugin), "break-countdown-seconds-spin", spin);
 
   /* Create lock countdown time label */
-  label = gtk_label_new (_("Break length (minutes):"));
+  label = gtk_label_new (_("Break length:"));
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
   gtk_widget_show (label);
 
-  /* Create lock countdown time spin */
-  spin = gtk_spin_button_new_with_range (1, 24 * 60, 1);
+  /* Create lock countdown time spins */
+  spin = gtk_spin_button_new_with_range (0, 24 * 60, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->lock_countdown_seconds / 60);
+  g_signal_connect (spin, "value-changed", G_CALLBACK (time_out_lock_countdown_minutes_changed), time_out);
+  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_widget_show (spin);
+  spin = gtk_spin_button_new_with_range (0, 59, 1);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->lock_countdown_seconds % 60);
   g_signal_connect (spin, "value-changed", G_CALLBACK (time_out_lock_countdown_seconds_changed), time_out);
-  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), spin, 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
   gtk_widget_show (spin);
 
   /* Create postpone countdown time label */
-  label = gtk_label_new (_("Postpone length (minutes):"));
+  label = gtk_label_new (_("Postpone length:"));
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK, GTK_FILL, 1.0, 0.5);
   gtk_widget_show (label);
 
-  /* Create postpone countdown time spin */
-  spin = gtk_spin_button_new_with_range (1, 24 * 60, 1);
+  /* Create postpone countdown time spins */
+  spin = gtk_spin_button_new_with_range (0, 24 * 60, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->postpone_countdown_seconds / 60);
+  g_signal_connect (spin, "value-changed", G_CALLBACK (time_out_postpone_countdown_minutes_changed), time_out);
+  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_widget_show (spin);
+  spin = gtk_spin_button_new_with_range (0, 59, 1);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), time_out->postpone_countdown_seconds % 60);
   g_signal_connect (spin, "value-changed", G_CALLBACK (time_out_postpone_countdown_seconds_changed), time_out);
-  gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), spin, 2, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0.0, 0.5);
   gtk_widget_show (spin);
 
   /* Create behaviour section */
@@ -531,8 +565,12 @@ time_out_end_configure (GtkDialog     *dialog,
   xfce_panel_plugin_unblock_menu (time_out->plugin);
 
   /* Get spin button value for the break countdown settings */
-  spin = g_object_get_data (G_OBJECT (time_out->plugin), "break-countdown-seconds-spin");
+  spin = g_object_get_data (G_OBJECT (time_out->plugin), "break-countdown-minutes-spin");
   value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)) * 60;
+  g_object_set_data (G_OBJECT (time_out->plugin), "break-countdown-minutes-spin", NULL);
+
+  spin = g_object_get_data (G_OBJECT (time_out->plugin), "break-countdown-seconds-spin");
+  value += gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
   g_object_set_data (G_OBJECT (time_out->plugin), "break-countdown-seconds-spin", NULL);
 
   /* Check if the break countdown seconds have changed */
@@ -541,6 +579,13 @@ time_out_end_configure (GtkDialog     *dialog,
   /* Apply new break countdown seconds */
   time_out->break_countdown_seconds = value;
 
+  /* prevent 0 seconds values */
+  if (!time_out->lock_countdown_seconds)
+    time_out->lock_countdown_seconds = 1;
+
+  if (!time_out->postpone_countdown_seconds)
+    time_out->postpone_countdown_seconds = 1;
+
   /* Save plugin configuration */
   time_out_save_settings (time_out);
 
@@ -560,6 +605,17 @@ time_out_end_configure (GtkDialog     *dialog,
 
 
 static void
+time_out_lock_countdown_minutes_changed (GtkSpinButton *spin_button,
+                                         TimeOutPlugin *time_out)
+{
+  g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+  g_return_if_fail (time_out != NULL);
+
+  /* Set plugin attribute */
+  time_out->lock_countdown_seconds = gtk_spin_button_get_value_as_int (spin_button) * 60 + time_out->lock_countdown_seconds % 60;
+}
+
+static void
 time_out_lock_countdown_seconds_changed (GtkSpinButton *spin_button,
                                          TimeOutPlugin *time_out)
 {
@@ -567,10 +623,20 @@ time_out_lock_countdown_seconds_changed (GtkSpinButton *spin_button,
   g_return_if_fail (time_out != NULL);
 
   /* Set plugin attribute */
-  time_out->lock_countdown_seconds = gtk_spin_button_get_value_as_int (spin_button) * 60;
+  time_out->lock_countdown_seconds = time_out->lock_countdown_seconds / 60 * 60 + gtk_spin_button_get_value_as_int (spin_button);
 }
 
 
+static void
+time_out_postpone_countdown_minutes_changed (GtkSpinButton *spin_button,
+                                             TimeOutPlugin *time_out)
+{
+  g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+  g_return_if_fail (time_out != NULL);
+
+  /* Set plugin attribute */
+  time_out->postpone_countdown_seconds = gtk_spin_button_get_value_as_int (spin_button) * 60 + time_out->postpone_countdown_seconds % 60;
+}
 
 static void
 time_out_postpone_countdown_seconds_changed (GtkSpinButton *spin_button,
@@ -580,7 +646,7 @@ time_out_postpone_countdown_seconds_changed (GtkSpinButton *spin_button,
   g_return_if_fail (time_out != NULL);
 
   /* Set plugin attribute */
-  time_out->postpone_countdown_seconds = gtk_spin_button_get_value_as_int (spin_button) * 60;
+  time_out->postpone_countdown_seconds = time_out->postpone_countdown_seconds / 60 * 60 +gtk_spin_button_get_value_as_int (spin_button);
 }
 
 
diff --git a/po/ast.po b/po/ast.po
index e95ec5c..3bdce7e 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,251 +3,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Asele un pocu"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Activáu"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Tiempu colar"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Opciones de tiempu"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundos"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tiempu ente descansos (minutos):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tiempu ente descansos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Duración del descansu (minutos):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Duración del descansu:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Duración de posposición (minutos):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Duración de posposición:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamientu"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Permitir posponer"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aspeutu"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Amosar tiempu restante nel panel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Amosar hores"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Amosar segundos"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Postponer"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tiempu restante: 1 segundu"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tiempu restante: %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tiempu restante: 1 minutu"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tiempu restante: 1 minutu %d segundos"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tiempu restante: 1 minutu 1 segundu"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tiempu restante: %d minutos %d segundos"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Tiempu restante: 1 minutu %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tiempu restante: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tiempu restante: %d hores %d minutos %d segundos"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tiempu restante: %d minutos 1 segundu"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tiempu restante: %d hores %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tiempu restante: 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tiempu restante: 1 minutu 1 segundu"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tiempu restante: %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tiempu restante: %d minutos 1 segundu"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tiempu restante: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tiempu restante: 1 hora 1 segundu"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tiempu restante: 1 hora %d segundos"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tiempu restante: 1 hora 1 minutu"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tiempu restante: 1 hora %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tiempu restante: %d hores"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tiempu restante: %d horas 1 segundu"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tiempu restante: %d horas %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tiempu restante: %d horas 1 minutu"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tiempu restante: %d hores %d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tiempu restante: %d hores %d minutos %d segundos"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Remanar automáticamente tiempu colar y pauses"
diff --git a/po/ca.po b/po/ca.po
index 06cd19e..fbce8a1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -19,242 +20,251 @@ msgstr ""
 "X-Poedit-Country: Spain\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Pren un descans"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Activat"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Pausa"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Opcions del temps"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuts"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segons"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Temps entre descansos (en minuts):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Temps entre descansos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Durada del descans (en minuts):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Durada del descans:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Durada de la posposició (en minuts):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Durada de la posposició:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportament"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Permetre posposar"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aparença"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Mostrar el temps restant en el panell"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Mostrar hores"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Mostrar segons"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Posposar"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Temps restant: 1 segon"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Temps restant: %d segons"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Temps restant: 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Temps restant: 1 minut i %d segons"
+msgid "Time left: 1 minute 1 second"
+msgstr "Temps restant: 1 minut i 1 segon"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Temps restant: %d minuts i %d segons"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Temps restant: 1 minut i %d segons"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Temps restant: %d minuts"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Temps restant: %d hores, %d minuts i %d segons"
+msgid "Time left: %d minutes 1 second"
+msgstr "Temps restant: %d minuts i 1 segon"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Temps restant: %d hores i %d minuts"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Temps restant: 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Temps restant: 1 minut i 1 segon"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Temps restant: %d minuts i %d segons"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Temps restant: %d minuts i 1 segon"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Temps restant: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Temps restant: 1 hora i 1 segon"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Temps restant: 1 hora i %d segons"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Temps restant: 1 hora i 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Temps restant: 1 hora i %d minuts"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Temps restant: %d hores"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Temps restant: %d hores i 1 segon"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Temps restant: %d hores i %d segons"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Temps restant: %d hores i 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Temps restant: %d hores i %d minuts"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Temps restant: %d hores, %d minuts i %d segons"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Descansos control·lats automàticament"
-
diff --git a/po/cs.po b/po/cs.po
index fea7d3d..652ff38 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,252 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: 2007-12-17 14:22+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"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Vzít si přestávku"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Povoleno"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Čas vypršel"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Nastavení času"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minut "
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekund"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "čas mezi přestávkami (v minutách):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "čas mezi přestávkami:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Délka přestávky (v minutách):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Délka přestávky:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Délka odložení (v minutách):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Délka odložení:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Chování"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Povolit odložení"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Vzhled"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Zobrazovat zbývající čas v panelu"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Zobrazovat hodiny"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Zobrazovat sekundy"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Odložit"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Zbývající čas: 1 sekunda"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Zbývající čas: %d sekund"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Zbývající čas: 1 minuta"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Zbývající čas: 1 minuta %d sekund"
+msgid "Time left: 1 minute 1 second"
+msgstr "Zbývající čas: 1 minuta 1 sekunda"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Zbývající čas: %d minut %d sekund"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Zbývající čas: 1 minuta %d sekund"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Zbývající čas: %d minut"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Zbývající čas: %d hodin %d minut %d sekund"
+msgid "Time left: %d minutes 1 second"
+msgstr "Zbývající čas: %d minut 1 sekunda"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Zbývající čas: %d hodin %d minut"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Zbývající čas: 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Zbývající čas: 1 minuta 1 sekunda"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Zbývající čas: %d minut %d sekund"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Zbývající čas: %d minut 1 sekunda"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Zbývající čas: 1 hodina"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Zbývající čas: 1 hodina 1 sekunda"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Zbývající čas: 1 hodina %d sekund"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Zbývající čas: 1 hodina 1 minuta"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Zbývající čas: 1 hodina %d minut"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Zbývající čas: %d hodin"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Zbývající čas: %d hodin 1 sekunda"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Zbývající čas: %d hodin %d sekund"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Zbývající čas: %d hodin 1 minuta"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Zbývající čas: %d hodin %d minut"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Zbývající čas: %d hodin %d minut %d sekund"
+
 #: ../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 18e0336..4582135 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -19,242 +20,251 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Tag en pause"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Aktiveret"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Timeout"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Tidsindstillinger"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutter"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekunder"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tid mellem pauser (minutter):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tid mellem pauser:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Pauselængde (minutter):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Pauselængde:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Udsættelseslængde (minutter):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Udsættelseslængde:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Opførsel"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Tillad udsættelse"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Udseende"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Vis tilbageværende tid i panelet"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Vis timer"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Vis sekunder"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Udsæt"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tid tilbage: 1 sekund"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tid tilbage: %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tid tilbage: 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tid tilbage: 1 minut %d sekunder"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tid tilbage: 1 minut 1 sekund"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tid tilbage: %d minutter %d sekunder"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Tid tilbage: 1 minut %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tid tilbage: %d minutter"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tid tilbage: %d timer %d minutter %d sekunder"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tid tilbage: %d minutter 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tid tilbage: %d timer %d minutter"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tid tilbage: 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tid tilbage: 1 minut 1 sekund"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tid tilbage: %d minutter %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tid tilbage: %d minutter 1 sekund"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tid tilbage: 1 time"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tid tilbage: 1 time 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tid tilbage: 1 time %d sekunder"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tid tilbage: 1 time 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tid tilbage: 1 time %d minutter"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tid tilbage: %d timer"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tid tilbage: %d timer 1 sekund"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tid tilbage: %d timer %d sekunder"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tid tilbage: %d timer 1 minut"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tid tilbage: %d timer %d minutter"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tid tilbage: %d timer %d minutter %d sekunder"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatisk kontrollerede timeout og pauser"
-
diff --git a/po/de.po b/po/de.po
index b9a8ce2..8019dd8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,255 +2,266 @@
 # 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: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Eine Pause machen"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Aktiviert"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Auszeit"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Zeiten"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuten"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekunden"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Zeit zwischen den Pausen (in Minuten):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Zeit zwischen den Pausen:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Dauer der Pausen (in Minuten):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Dauer der Pausen:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Dauer des Verschiebens (in Minuten):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Dauer des Verschiebens:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Verhalten"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Erlaube das Verschieben von Pausen"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aussehen"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Zeige verbleibende Zeit in der Leiste an"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Zeige Stunden an"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Zeige Sekunden an"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Pause verschieben"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Verbleibend: 1 Sekunde"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Verbleibend: %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Verbleibend: 1 Minute"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
-#, c-format
-msgid "Time left: 1 minute %d seconds"
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
+#, fuzzy, c-format
+msgid "Time left: 1 minute 1 second"
 msgstr "Verbleibend: 1 Minute %d Sekunden"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Verbleibend: %d Minuten %d Sekunden"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Verbleibend: 1 Minute %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Verbleibend: %d Minuten"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Verbleibend: %d Stunden %d Minuten %d Sekunden"
+msgid "Time left: %d minutes 1 second"
+msgstr "Verbleibend: %d Minuten 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Verbleibend: %d Stunden %d Minuten"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Verbleibend: 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Verbleibend: 1 Minute %d Sekunden"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Verbleibend: %d Minuten %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Verbleibend: %d Minuten 1 Sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Verbleibend: 1 Stunde"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Verbleibend: 1 Stunde 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Verbleibend: 1 Stunde %d Sekunden"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Verbleibend: 1 Stunde 1 Minute"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Verbleibend: 1 Stunde 1 Minute 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Verbleibend: 1 Stunde 1 Minute %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Verbleibend: 1 Stunde %d Minuten"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Verbleibend: 1 Stunde %d Minuten 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Verbleibend: 1 Stunde %d Minuten %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Verbleibend: %d Stunden"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Verbleibend: %d Stunden 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Verbleibend: %d Minuten %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Verbleibend: %d Stunden 1 Minute"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Verbleibend: %d Stunden 1 Minute 1 Sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Verbleibend: %d Stunden 1 Minute %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Verbleibend: %d Stunden %d Minuten"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Verbleibend: %d Stunden %d Minuten 1 Sekunde"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Verbleibend: %d Stunden %d Minuten %d Sekunden"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatisierte Auszeiten, in denen der Bildschirm gesperrt wird"
diff --git a/po/el.po b/po/el.po
index 8c7b234..9a726d8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,252 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Κάνε διάλειμμα"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Χρονική ανάπαυλα"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Ρυθμίσεις ώρας"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Λεπτά "
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Δευτερόλεπτα"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Χρόνος μεταξύ των διαλειμμάτων (λεπτά):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Χρόνος μεταξύ των διαλειμμάτων:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Διάρκεια διαλείμματος (λεπτά):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Διάρκεια διαλείμματος:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Διάρκεια αναβολής (λεπτά):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Διάρκεια αναβολής:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Συμπεριφορά"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Να επιτρέπονται οι αναβολές"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Εμφάνιση"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Εμφάνιση χρόνου που απομένει στο ταμπλό"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Να εμφανίζονται οι ώρες"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Να εμφανίζονται τα δευτερόλεπτα"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "Αν_αβολή"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Χρόνος που απομένει: 1 δευτερόλεπτο"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Χρόνος που απομένει σε %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Χρόνος που απομένει: 1 λεπτό"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Χρόνος που απομένει: 1 λεπτό και %d δευτερόλεπτα"
+msgid "Time left: 1 minute 1 second"
+msgstr "Χρόνος που απομένει: 1 λεπτό και 1 δευτερόλεπτο"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Χρόνος που απομένει: %d λεπτά"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Χρόνος που απομένει: %d ώρες %d λεπτά και %d δευτερόλεπτα"
+msgid "Time left: %d minutes 1 second"
+msgstr "Χρόνος που απομένει:%d λεπτά και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Χρόνος που απομένει: %d ωρες και %d λεπτά"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Χρόνος που απομένει: 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Χρόνος που απομένει: 1 λεπτό και 1 δευτερόλεπτο"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Χρόνος που απομένει:%d λεπτά και %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Χρόνος που απομένει:%d λεπτά και 1 δευτερόλεπτο"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Χρόνος που απομένει: 1 ώρα"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Χρόνος που απομένει:1 ώρα και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Χρόνος που απομένει:1 ώρα και %d δευτερόλεπτα"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Χρόνος που απομένει: 1 ώρα και 1 λεπτό"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Χρόνος που απομένει: 1 ώρα 1 λεπτό και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Χρόνος που απομένει: 1 ώρα 1 λεπτό και %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Χρόνος που απομένει: 1 ώρα και %d λεπτά"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Χρόνος που απομένει: 1 ώρα %d λεπτά και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Χρόνος που απομένει: 1 ώρα %d λεπτά και %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Χρόνος που απομένει: %d ώρες"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Χρόνος που απομένει: %d ώρες και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Χρόνος που απομένει: %d ώρες και %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Χρόνος που απομένει: %d ώρες και 1 λεπτό"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Χρόνος που απομένει: %d ώρες 1 λεπτό και 1 δευτερόλεπτο"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Χρόνος που απομένει: %d ώρες 1 λεπτό και %d δευτερόλεπτα"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Χρόνος που απομένει: %d ωρες και %d λεπτά"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Χρόνος που απομένει: %d ώρες %d λεπτά και 1 δευτερόλεπτο"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Χρόνος που απομένει: %d ώρες %d λεπτά και %d δευτερόλεπτα"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Αυτόματα ελεγχόμενες χρονικές ανάπαυλες και διαλείμματα"
-
diff --git a/po/en_GB.po b/po/en_GB.po
index e5c693c..62a6793 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,242 +19,249 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Take a break"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Enabled"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Time Out"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Time settings"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+msgid "Minutes"
+msgstr "Minutes"
+
+#: ../panel-plugin/time-out.c:436
+msgid "Seconds"
+msgstr "Seconds"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Time between breaks (minutes):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Time between breaks:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Break length (minutes):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Break length:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Postpone length (minutes):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Postpone length:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Behaviour"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Allow postpone"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Appearance"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Display remaining time in the panel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Display hours"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Display seconds"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Postpone"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Time left: 1 second"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Time left: %d seconds"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Time left: 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Time left: 1 minute %d seconds"
+msgid "Time left: 1 minute 1 second"
+msgstr "Time left: 1 minute 1 second"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Time left: %d minutes %d seconds"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Time left: 1 minute %d seconds"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Time left: %d minutes"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Time left: %d hours %d minutes %d seconds"
+msgid "Time left: %d minutes 1 second"
+msgstr "Time left: %d minutes 1 second"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Time left: %d hours %d minutes"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Time left: 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Time left: 1 minute 1 second"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Time left: %d minutes %d seconds"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Time left: %d minutes 1 second"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Time left: 1 hour"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Time left: 1 hour 1 second"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Time left: 1 hour %d seconds"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Time left: 1 hour 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Time left: 1 hour %d minutes"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Time left: %d hours"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Time left: %d hours 1 second"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Time left: %d hours %d seconds"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Time left: %d hours 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Time left: %d hours %d minutes"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Time left: %d hours %d minutes 1 second"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Time left: %d hours %d minutes %d seconds"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatically controlled time outs and breaks"
-
diff --git a/po/es.po b/po/es.po
index 74b7cf6..cb04902 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,252 +8,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Tómese un descanso"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Activado"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Tiempo de salir"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Opciones de tiempo"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundo"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tiempo entre descansos (minutos):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tiempo entre descansos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Duración de descanso (minutos):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Duración de descanso:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Duración de posposición (minutos):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Duración de posposición:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamiento"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Permitir posponer"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Apariencia"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Mostrar tiempo restante en el panel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Mostrar horas"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Mostrar segundos"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Postponer"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tiempo restante: 1 segundo"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tiempo restante: %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tiempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tiempo restante: 1 minuto %d segundos"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tiempo restante: 1 minuto 1 segundo"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tiempo restante: %d minutos %d segundos"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Tiempo restante: 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tiempo restante: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tiempo restante: %d horas %d minutos %d segundos"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tiempo restante: %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tiempo restante: %d horas %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tiempo restante: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tiempo restante: 1 minuto 1 segundo"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tiempo restante: %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tiempo restante: %d minutos 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tiempo restante: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tiempo restante: 1 hora 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tiempo restante: 1 hora %d segundos"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tiempo restante: 1 hora 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Tiempo restante: 1 hora 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Tiempo restante: 1 hora 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tiempo restante: 1 hora %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Tiempo restante: 1 hora %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Tiempo restante: 1 hora %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tiempo restante: %d horas"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tiempo restante: %d horas 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tiempo restante: %d horas %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tiempo restante: %d horas 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Tiempo restante: %d horas 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Tiempo restante: %d horas 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tiempo restante: %d horas %d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Tiempo restante: %d horas %d minutos 1 segundo"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tiempo restante: %d horas %d minutos %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"
-
diff --git a/po/eu.po b/po/eu.po
index 706e3ae..0029143 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: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -19,241 +19,251 @@ msgstr ""
 "X-Generator: Pootle 1.2.0\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Atseden bat hartu"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Gaituta"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Orduz-kanpo"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Ordu ezarpenak"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutu"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundu"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Atseden arteko denbora (minutuak):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Atseden arteko denbora:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Atseden iraupena (minutu):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Atseden iraupena:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Atzerapen denbora (minutu):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Atzerapen denbora:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Portaera"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Gaitu atzeratzea"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Itxura"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Bistaratu gelditzen den denbora panelean"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Bistaratu orduak"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Bistaratu segunduak"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "A_tzeratu"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Gelditzen den denbora: segundu bat"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Gelditzen den denbora: %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Gelditzen den denbora: Minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Gelditzen den denbora: Minutu bat eta %d segundu"
+msgid "Time left: 1 minute 1 second"
+msgstr "Gelditzen den denbora: minutu bat eta segundu bat"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Gelditzen den denbora: %d minutu"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, 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 minutes 1 second"
+msgstr "Gelditzen den denbora: %d minutu eta segundu bat"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Gelditzen den denbora: %d ordu %d minutu"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Gelditzen den denbora: segundu bat"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Gelditzen den denbora: minutu bat eta segundu bat"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Gelditzen den denbora: %d minutu eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Gelditzen den denbora: %d minutu eta segundu bat"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Gelditzen den denbora: ordu bat"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Gelditzen den denbora: ordu bat eta segundo bat"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Gelditzen den denbora: ordu bat eta minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Gelditzen den denbora: ordu bat eta %d minutu"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Gelditzen den denbora: %d ordu"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Gelditzen den denbora: ordu bat eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Gelditzen den denbora: %d ordu eta %d segundu"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Gelditzen den denbora: %d ordu eta minutu bat"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Gelditzen den denbora: %d ordu %d minutu"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Gelditzen den denbora: %d ordu, %d minutu eta segundu bat"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Gelditzen den denbora: %d ordu %d minutu %d segundu"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatikoki kontrolatutako atsedenak"
diff --git a/po/fr.po b/po/fr.po
index d6ae205..9ae4f23 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: 2007-10-24 11:47+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\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"
@@ -18,242 +19,249 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Prendre une pause"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Activé"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Temps Mort"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Réglage du temps"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+msgid "Minutes"
+msgstr "Minutes"
+
+#: ../panel-plugin/time-out.c:436
+msgid "Seconds"
+msgstr "Secondes"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Temps entre les pauses (minutes) :"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Temps entre les pauses:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Durée des pauses (minutes) :"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Durée des pauses:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Repousser la durée (minutes) :"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Repousser la durée:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportement"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Autoriser les durées repoussées"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Apparence"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Afficher le temps restant dans le panneau"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Afficher les heures"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Afficher les secondes"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Repousser"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Temps restant : 1 seconde"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Temps restant : %d secondes"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Temps restant : 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Temps restant : 1 minute %d secondes"
+msgid "Time left: 1 minute 1 second"
+msgstr "Temps restant : 1 minute 1 seconde"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Temps restant : %d minutes %d secondes"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Temps restant : 1 minute %d secondes"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Temps restant : %d minutes"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Temps restant : %d heures %d minutes %d secondes"
+msgid "Time left: %d minutes 1 second"
+msgstr "Temps restant : %d minutes 1 seconde"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Temps restant : %d heures % minutes"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Temps restant : 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Temps restant : 1 minute 1 seconde"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Temps restant : %d minutes %d secondes"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Temps restant : %d minutes 1 seconde"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Temps restant : 1 heure"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Temps restant : 1 heure 1 seconde"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Temps restant : 1 heure %d secondes"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Temps restant : 1 heure 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Temps restant : 1 heure 1 minute 1 seconde"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Temps restant : 1 heure %d minutes"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Temps restant : %d heures"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Temps restant : %d heures 1 seconde"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Temps restant : %d heures %d secondes"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Temps restant : %d heures 1 minute"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Temps restant : %d heures % minutes"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Temps restant : %d heures %d minutes 1 seconde"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Temps restant : %d heures %d minutes %d secondes"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Temps mort et pause contrôlés automatiquement"
-
diff --git a/po/gl.po b/po/gl.po
index 9d146a2..e849506 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,252 +11,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Tome un descanso"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Activado"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Tempo de espera"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Configuración de tempo"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundos"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tempo entre descansos (minutos):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tempo entre descansos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Duración do descanso (minutos):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Duración do descanso:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Duración da posposición (minutos):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Duración da posposición:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamento"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Permitir pospoñer"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aparencia"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Mostrar o tempo restante no panel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Mostrar as horas"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Mostrar os segundos"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Pospor"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tempo restante: 1 segundo"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tempo restante: %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto e %d segundos"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tempo restante: 1 minuto e 1 segundo"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo restante: %d minutos e %d segundos"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Tempo restante: 1 minuto e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tempo restante: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d horas %d minutos e %d segundos"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tempo restante: %d minutos e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d horas e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto e 1 segundo"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tempo restante: %d minutos e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tempo restante: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tempo restante: 1 hora e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tempo restante: 1 hora e %d segundos"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tempo restante: 1 hora e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tempo restante: 1 hora e %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tempo restante: %d horas"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tempo restante: %d horas e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tempo restante: %d horas e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tempo restante: %d horas e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tempo restante: %d horas e %d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tempo restante: %d horas %d minutos e %d segundos"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Tempos de espera e descansos controlados automaticamente"
-
diff --git a/po/hu.po b/po/hu.po
index 42f5d8e..44dddf5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-24 18:32+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -19,68 +20,79 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Tartson szünetet"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Engedélyezve"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:393
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Időkorlát"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:410
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Időbeállítások"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Perc"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Másodperc"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:423
-msgid "Time between breaks (minutes):"
-msgstr "Szünetek közti idő (perc):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Szünetek közti idő:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:438
-msgid "Break length (minutes):"
-msgstr "Szünet hossza (perc):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Szünet hossza:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:451
-msgid "Postpone length (minutes):"
-msgstr "Elhalasztás hossza (perc):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Elhalasztás hossza:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:464
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Viselkedés"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Elhalasztás engedélyezése"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:477
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Megjelenés"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:488
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Hátralévő idő megjelenítése a panelen"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Órák megjelenítése"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:502
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Másodpercek megjelenítése"
 
@@ -256,4 +268,3 @@ msgstr "Hátralévő idő: %d óra %d perc %d másodperc"
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatikus időkorlátok és szünetek"
-
diff --git a/po/id.po b/po/id.po
index e23be2e..cda35f9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,250 +7,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Istirahat sejenak"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Aktifkan"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Istirahat"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Pengaturan waktu"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Menit"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Detik"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Lama antara jeda (menit):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Lama antara jeda:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Lama istirahat (menit):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Lama istirahat:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Lama penundaan (menit):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Lama penundaan:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Perilaku"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Izinkan penundaan"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Tampilan"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Tampilkan waktu tersisa di panel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Tampilkan jam"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Tampilkan detik"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Penundaan"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Sisa waktu: 1 detik"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Sisa waktu: %d detik"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Sisa waktu: 1 menit"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Sisa waktu: 1 menit %d detik"
+msgid "Time left: 1 minute 1 second"
+msgstr "Sisa waktu: 1 menit 1 detik"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Sisa waktu: %d menit %d detik"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Sisa waktu: 1 menit %d detik"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Sisa waktu: %d menit"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Sisa waktu: %d jam %d menit %d detik"
+msgid "Time left: %d minutes 1 second"
+msgstr "Sisa waktu: %d menit 1 detik"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Sisa waktu: %d jam %d menit"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Sisa waktu: 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Sisa waktu: 1 menit 1 detik"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Sisa waktu: %d menit %d detik"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Sisa waktu: %d menit 1 detik"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Sisa waktu: 1 jam"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Sisa waktu: 1 jam 1 detik"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Sisa waktu: 1 jam %d detik"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Sisa waktu: 1 jam 1 menit"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Sisa waktu: 1 jam %d menit"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Sisa waktu: %d jam"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Sisa waktu: %d jam 1 detik"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Sisa waktu: %d jam %d detik"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Sisa waktu: %d jam 1 menit"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Sisa waktu: %d jam %d menit"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Sisa waktu: %d jam %d menit %d detik"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Otomatis mengatur waktu jeda dan istirahat"
diff --git a/po/it.po b/po/it.po
index 73f488c..a83be11 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -22,246 +23,252 @@ msgstr ""
 # time out = interruzione
 # postpone = rinvia, rinviare
 # display = visualizzare (verbo)
-
-
-
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Fai una pausa"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Abilitato"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Interruzione"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Impostazioni del tempo"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuti"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Secondi"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Intervallo in minuti fra le pause:"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Intervallo fra le pause:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Lunghezza in minuti della pausa"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Lunghezza della pausa"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Lunghezza in minuti del rinvio:"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Lunghezza del rinvio:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamento"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Permetti il rinvio"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aspetto"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Visualizza il tempo rimanente nel pannello"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Visualizza le ore"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Visualizza i secondi"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Rinvia"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tempo restante: 1 secondo"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tempo restante: %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto %d secondi"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tempo restante: 1 minuto 1 secondo"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tempo restante: %d minuti"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d ore %d minuti %d secondi"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tempo restante: %d minuti 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d ore %d minuti"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 secondo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto 1 secondo"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tempo restante: %d minuti %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minuti 1 secondo"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tempo restante: 1 ora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tempo restante: 1 ora 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tempo restante: 1 ora %d secondi"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tempo restante: 1 ora 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Tempo restante: 1 ora 1 minuto 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Tempo restante: 1 ora 1 minuto %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tempo restante: 1 ora %d minuti"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Tempo restante: 1 ora %d minuti 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Tempo restante: 1 ora %d minuti %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tempo restante: %d ore"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tempo restante: %d ore 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tempo restante: %d ore %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tempo restante: %d ore 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Tempo restante: %d ore 1 minuto 1 secondo"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Tempo restante: %d ore 1 minuto %d secondi"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tempo restante: %d ore %d minuti"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Tempo restante: %d ore %d minuti 1 secondo"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tempo restante: %d ore %d minuti %d secondi"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Interruzioni e pause controllate automaticamente"
-
diff --git a/po/ja.po b/po/ja.po
index 6de8e21..ec895b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,77 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-24 17:44+0900\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: 2008-11-16 22:32+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
 "Language-Team: Japanese <xfce-i18n at xfce.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "ひと休みする"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "有効"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:393
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "タイムアウト"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:410
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "時間設定"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+msgid "Minutes"
+msgstr "分"
+
+#: ../panel-plugin/time-out.c:436
+msgid "Seconds"
+msgstr "秒"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:423
-msgid "Time between breaks (minutes):"
-msgstr "休憩間の時間 (分):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "休憩間の時間:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:438
-msgid "Break length (minutes):"
-msgstr "休憩時間 (分):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "休憩時間:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:451
-msgid "Postpone length (minutes):"
-msgstr "延期時間 (分):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "延期時間:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:464
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "挙動"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "許容遅延時間"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:477
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "外観"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:488
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "パネルに残り時間を表示する"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "時間を表示する"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:502
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "分を表示する"
 
diff --git a/po/kk.po b/po/kk.po
index 68f6a38..fe81879 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -20,242 +20,251 @@ msgstr ""
 "X-Poedit-Country: KAZAKHSTAN\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Демалу уақыты"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Қосулы"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Үзіліс"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Уақыт баптаулары"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Минут"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Секунд"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Жұмыс уақытының ұзақтығы (минуттар):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Жұмыс уақытының ұзақтығы:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Үзіліс ұзақтығы (минуттар):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Үзіліс ұзақтығы:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Кейінге қалдыру (минуттар):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Кейінге қалдыру:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Мінез-құлығы"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Кейінге қалдыруды рұқсат ету"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Сыртқы түрі"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Қалған уақытты панельде көрсету"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Сағаттарды көрсету"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Секундтарды көрсету"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Кейінге қалдыру"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Қалған уақыты: 1 секунд"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Қалған уақыты: %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Қалған уақыты: 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Қалған уақыты: 1 минут %d секунд"
+msgid "Time left: 1 minute 1 second"
+msgstr "Қалған уақыты: 1 минут 1 секунд"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Қалған уақыты: %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Қалған уақыты: %d сағат %d минут %d секунд"
+msgid "Time left: %d minutes 1 second"
+msgstr "Қалған уақыты: %d минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Қалған уақыты: %d сағат %d минут"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Қалған уақыты: 1 секунд"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Қалған уақыты: 1 минут 1 секунд"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Қалған уақыты: %d минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Қалған уақыты: %d минут 1 секунд"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Қалған уақыты: 1 сағат"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Қалған уақыты: 1 сағат 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Қалған уақыты: 1 сағат %d секунд"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Қалған уақыты: 1 сағат 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Қалған уақыты: 1 сағат 1 минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Қалған уақыты: 1 сағат 1 минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Қалған уақыты: 1 сағат %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Қалған уақыты: 1 сағат %d минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Қалған уақыты: 1 сағат %d минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Қалған уақыты: %d сағат"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Қалған уақыты: %d сағат 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Қалған уақыты: %d сағат %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Қалған уақыты: %d сағат 1 минут"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Қалған уақыты: %d сағат 1 минут 1 секунд"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Қалған уақыты: %d сағат 1 минут %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Қалған уақыты: %d сағат %d минут"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Қалған уақыты: %d сағат %d минут 1 секунд"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Қалған уақыты: %d сағат %d минут %d секунд"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Үзілістерді автоматты басқару"
-
diff --git a/po/lv.po b/po/lv.po
index b32011e..ecba556 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,251 @@ msgstr ""
 "2);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Laiks pārtraukumam"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Ieslēgt"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Laiks iztecējis"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Laika uzstādījumi"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minūtes"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekundes"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Laiks starp pārtraukumiem (minūtes):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Laiks starp pārtraukumiem:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Pārtraukuma garums (minūtes):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Pārtraukuma garums:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Aizkavēšanas garums (minūtes):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Aizkavēšanas garums:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Uzvedība"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Atļaut aizkavēt"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Izskats"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Rādīt atlikušo laiku panelī"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Rādīt stundas"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Rādīt sekundes"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Aizkavēt"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Atlikušas: 1 sekunde"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Atlikušas: %d sekundes"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Atlikušas: 1 minūte"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Atlikušas: 1 minūte %d sekundes"
+msgid "Time left: 1 minute 1 second"
+msgstr "Atlikušas: 1 minūte 1 sekunde"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Atlikušas: %d minūtes %d sekundes"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Atlikušas: 1 minūte %d sekundes"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Atlikušas: %d minūtes"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Atlikušas: %d stundas %d minūtes %d sekundes"
+msgid "Time left: %d minutes 1 second"
+msgstr "Atlikušas: %d minūtes 1 sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Atlikušas: %d stundas %d minūtes"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Atlikušas: 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Atlikušas: 1 minūte 1 sekunde"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Atlikušas: %d minūtes %d sekundes"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Atlikušas: %d minūtes 1 sekunde"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Atlikušas: 1 stunda"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Atlikušas: 1 stunda 1 sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Atlikušas: 1 stunda %d sekundes"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Atlikušas: 1 stunda 1 minūte"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Atlikušas: 1 stunda %d minūtes"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Atlikušas: %d stundas"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Atlikušas: %d stundas 1 sekunde"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Atlikušas: %d stundas %d sekundes"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Atlikušas: %d stundas 1 minūte"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Atlikušas: %d stundas %d minūtes"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Atlikušas: %d stundas %d minūtes %d sekundes"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automātiski kontrolē laika iztecējumu un pārtraukumus"
-
diff --git a/po/pl.po b/po/pl.po
index b13cb55..5f97aa0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tomasz Chudyk <chudyk at gmail.com>\n"
 "Language-Team: Polish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -14,242 +15,251 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Przerwa"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Aktywny"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Przerywanie pracy"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Ustawienia czasu"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuty"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekundy"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Czas między przerwami (minuty)"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Czas między przerwami:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Długość przerwy (minuty)"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Długość przerwy:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Czas odłożenia przerwy (minuty)"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Czas odłożenia przerwy:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Zachowanie"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Pozwól odłożyć przerwę"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Wygląd"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Wyświetlaj pozostały czas w panelu"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Wyświetlaj godziny"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Wyświetlaj sekundy"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "Odłóż przerwę"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Pozostało czasu: 1 s"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Pozostało czasu: %d s"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Pozostało czasu: 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Pozostało czasu 1 min %d s"
+msgid "Time left: 1 minute 1 second"
+msgstr "Pozostało czasu: 1 min 1 s"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Pozostało czasu: %d min %d s"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Pozostało czasu 1 min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Pozostało czasu: %d min"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, 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 minutes 1 second"
+msgstr "Pozostało czasu: %d min 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Pozostało czasu: %d h %d min"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Pozostało czasu: 1 s"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Pozostało czasu: 1 min 1 s"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Pozostało czasu: %d min %d s"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Pozostało czasu: %d min 1 s"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Pozostało czasu: 1 h"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Pozostało czasu: 1 h 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Pozostało czasu: 1 h %d s"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Pozostało czasu: 1 h 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Pozostało czasu: 1 h %d min"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Pozostało czasu: %d h"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Pozostało czasu: %d h 1 s"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Pozostało czasu: %d h %d s"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Pozostało czasu: %d h 1 min"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Pozostało czasu: %d h %d min"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Pozostało czasu: %d h %d min 1 s"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Pozostało czasu: %d h %d m %d 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"
-
diff --git a/po/pt.po b/po/pt.po
index 2419ab0..edea246 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,251 +7,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: 2008-03-18 20:11+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Fazer pausa"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Ligado"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Tempo esgotado"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Definições de tempo"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundos"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tempo entre intervalos (minutos):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tempo entre intervalos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Duração do intervalo (minutos):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Duração do intervalo:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Duração do adiamento (minutos):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Duração do adiamento:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamento"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Ligar adiamento"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aparência"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Mostrar tempo restante no painel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Mostrar horas"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Mostra segundos"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Adiar"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tempo restante: 1 segundo"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tempo restante: %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tempo restante: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo restante: 1 minuto %d segundos"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tempo restante: 1 minuto 1 segundo"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Tempo restante: %d minutos %d segundos"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Tempo restante: 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tempo restante: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Tempo restante: %d horas %d minutos %d segundos"
+msgid "Time left: %d minutes 1 second"
+msgstr "Tempo restante: %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo restante: %d horas %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tempo restante: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo restante: 1 minuto 1 segundo"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tempo restante: %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo restante: %d minutos 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tempo restante: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tempo restante: 1 hora 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tempo restante: 1 hora %d segundos"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tempo restante: 1 hora 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Tempo restante: 1 hora 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tempo restante: 1 hora %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Tempo restante: 1 hora %d minutos 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Tempo restante: 1 hora %d minutos %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tempo restante: %d horas"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tempo restante: %d horas 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tempo restante: %d horas %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tempo restante: %d horas 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Tempo restante: %d horas 1 minuto 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Tempo restante: %d horas 1 minuto %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tempo restante: %d horas %d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Tempo restante: %d horas %d minutos 1 segundo"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tempo restante: %d horas %d minutos %d segundos"
+
 #: ../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 os intervalos"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f943a33..3b948b2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,251 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Pausar"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Habilitado"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Tempo Esgotado"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Configurações do tempo"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Segundos"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Tempo entre os intervalos (minutos):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tempo entre os intervalos:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Duração do intervalo (minutos):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Duração do intervalo:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Duração do adiamento (minutos):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Duração do adiamento:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Comportamento"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Habilitar adiamento"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Aparência"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Exibir o tempo restante no painel"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Exibir horas"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Exibir segundos"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Adiar"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Tempo estimado: 1 segundo"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Tempo estimado: %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Tempo estimado: 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Tempo estimado: 1 minuto e %d segundos"
+msgid "Time left: 1 minute 1 second"
+msgstr "Tempo estimado: 1 minuto e 1 segundo"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Tempo estimado: %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, 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 minutes 1 second"
+msgstr "Tempo estimado: %d minutos e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Tempo estimado: %d horas e %d minutos"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Tempo estimado: 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Tempo estimado: 1 minuto e 1 segundo"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Tempo estimado: %d minutos e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Tempo estimado: %d minutos e 1 segundo"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Tempo estimado: 1 hora"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Tempo estimado: 1 hora e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Tempo estimado: 1 hora e %d segundos"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Tempo estimado: 1 hora e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Tempo estimado: 1 hora e %d minutos"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Tempo estimado: %d horas"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Tempo estimado: %d horas e 1 segundo"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Tempo estimado: %d horas e %d segundos"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Tempo estimado: %d horas e 1 minuto"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Tempo estimado: %d horas e %d minutos"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Tempo estimado: %d horas, %d minutos e 1 segundo"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Tempo estimado: %d horas, %d minutos e %d segundos"
+
 #: ../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"
diff --git a/po/ru.po b/po/ru.po
index 209e480..9ede9fe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,15 +2,16 @@
 # 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: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
@@ -18,241 +19,251 @@ msgstr ""
 "X-Poedit-Country: LATVIA\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Время отдохнуть"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Включен"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Перерыв"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Установка временных промежутков"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Минут"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Секунд"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Длительность рабочего времени (в минутах):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Длительность рабочего времени:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Длительность перерыва (в минутах):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Длительность перерыва:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Откладывание (в минутах)"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Откладывание:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Поведение"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Разрешить откладывание"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Внешний вид"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Отображать оставшееся время на панели"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Отображать часы"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Отображать секунды"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "Отложить"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Осталось времени: 1 секунда"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Осталось времени: %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Осталось времени: 1 минута"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Осталось времени: 1 минута и %d секунд"
+msgid "Time left: 1 minute 1 second"
+msgstr "Осталось времени: 1 минута и 1 секунда"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Осталось времени: %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Осталось времени: %d часов %d минут и %d секунд"
+msgid "Time left: %d minutes 1 second"
+msgstr "Осталось времени: %d минут и 1секунда"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Осталось времени: %d часов и %d минут"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Осталось времени: 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Осталось времени: 1 минута и 1 секунда"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Осталось времени: %d минут и %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Осталось времени: %d минут и 1секунда"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Осталось времени: 1 час"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Осталось времени: 1 час и 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Осталось времени: 1 час и %d секунд"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Осталось времени: 1 час и 1 минута"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Осталось времени: 1 час 1 минута и 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Осталось времени: 1 час 1 минута и %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Осталось времени: 1 час и %d минут"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Осталось времени: 1 час %d минут и 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Осталось времени: 1 час %d минут и %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Осталось времени: %d часов"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Осталось времени: %d часов и 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Осталось времени: %d часов %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Осталось времени: %d часов и 1 минута"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Осталось времени: %d часов 1 минута и 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Осталось времени: %d часов 1 минута и %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Осталось времени: %d часов и %d минут"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Осталось времени: %d часов %d минут и 1 секунда"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Осталось времени: %d часов %d минут и %d секунд"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Автоматически контролировать перерывы"
diff --git a/po/sv.po b/po/sv.po
index b64692a..4db833c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,77 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-14 16:17+0100\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Ta en paus"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Aktiverad"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:393
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Rast"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:410
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Tidsinställningar"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Minuter"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekunder"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:423
-msgid "Time between breaks (minutes):"
-msgstr "Tid mellan pauser (minuter):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Tid mellan pauser:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:438
-msgid "Break length (minutes):"
-msgstr "Tidslängd (minuter):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Tidslängd:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:451
-msgid "Postpone length (minutes):"
-msgstr "Tidslängd på framflyttning (minuter):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Tidslängd på framflyttning:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:464
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Beteende"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Tillåt framflyttning"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:477
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Utseende"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:488
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Visa återstående tid i panelen"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Visa timmar"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:502
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Visa sekunder"
 
@@ -253,4 +265,3 @@ msgstr "Tid kvar: %d timmar %d minuter %d sekunder"
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Automatiskt kontrollerade pauser och raster"
-
diff --git a/po/tr.po b/po/tr.po
index 069270c..f914bc0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,252 +2,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4 timeout plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: TURKEY\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Mola ver"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Etkin"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Zaman Aşımı"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Süre ayarları"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Dakika"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Saniye"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Molalar arası süre (dakika):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Molalar arası süre:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Mola süresi (dakika):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Mola süresi:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Erteleme süresi (dakika):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Erteleme süresi:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Davranış ayarları"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Ertelemeye izin ver"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Görünüm"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Kalan süreyi panelde görüntüle"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Saati görüntüle"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Saniyeyi görüntüle"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Ertele"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Kalan süre: 1 saniye"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Kalan süre: %d saniye"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Kalan süre: 1 dakika"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Kalan süre: 1 dakika %d saniye"
+msgid "Time left: 1 minute 1 second"
+msgstr "Kalan süre: 1 dakika 1 saniye"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
-msgstr "Kalan süre: %d dakika %d saniye"
+msgid "Time left: 1 minute %d seconds"
+msgstr "Kalan süre: 1 dakika %d saniye"
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Kalan süre: %d dakika"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Kalan süre: %d saat %d dakika %d saniye"
+msgid "Time left: %d minutes 1 second"
+msgstr "Kalan süre: %d dakika 1 saniye"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Kalan süre: %d saat %d dakika"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Kalan süre: 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Kalan süre: 1 dakika 1 saniye"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Kalan süre: %d dakika %d saniye"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Kalan süre: %d dakika 1 saniye"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Kalan süre: 1 saat"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Kalan süre: 1 saat 1 saniye"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Kalan süre: 1 saat %d saniye"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Kalan süre: 1 saat 1 dakika"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, 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:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, 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:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Kalan süre: 1 saat %d dakika"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, 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:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, 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:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Kalan süre: %d saat"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Kalan süre %d saat 1 saniye"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Kalan süre: %d saat %d saniye"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Kalan süre: %d saat 1 dakika"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, 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:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, 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:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Kalan süre: %d saat %d dakika"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, 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:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Kalan süre: %d saat %d dakika %d saniye"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Otomatik kontrollü mola ve zaman aşımları"
-
diff --git a/po/ug.po b/po/ug.po
index adfe378..784bc83 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,77 +7,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fce4-time-out-plugin 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-24 17:44+0900\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "ئارام ئال"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "ئىناۋەتلىك"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:393
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "ۋاقىت ئېشىپ كەتتى"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:410
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "ۋاقىت تەڭشىكى"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "ﻡﻰﻧۇﺕ "
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "ﺱېﻙۇﻦﺗ"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:423
-msgid "Time between breaks (minutes):"
-msgstr "ئاراملار ئارىسىدىكى ۋاقىت (مىنۇت):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "ئاراملار ئارىسىدىكى ۋاقىت:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:438
-msgid "Break length (minutes):"
-msgstr "ئارام ۋاقتى (مىنۇت):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "ئارام ۋاقتى:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:451
-msgid "Postpone length (minutes):"
-msgstr "ئۇزارتىش ۋاقتى (مىنۇت):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "ئۇزارتىش ۋاقتى:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:464
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "قىلمىش"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "يول قويغان ئۇزارتىش ۋاقتى"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:477
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "كۆرۈنۈشى"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:488
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "panel دا قالغان ۋاقىتنى كۆرسەتسۇن"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "سائەتنى كۆرسەت"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:502
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "مىنۇتنى كۆرسەت"
 
diff --git a/po/uk.po b/po/uk.po
index 6097359..b448c37 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,252 +7,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "Зробити перерву"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "Активно"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "Пауза"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "Налаштування часу"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "Хвилин"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "Секунд"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "Час до перерви (хвилин):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "Час до перерви:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "Тривалість перерви (хвилин):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "Тривалість перерви:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "Тривалість затримки (хвилин):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "Тривалість затримки:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "Заголовок"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "Дозволити затримку"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "Відображати в панелі час, що залишився"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "Показувати години"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "Показувати секунди"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_Затримка"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "Залишилось часу: 1 секунда"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Залишилось часу: %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "Залишилось часу: 1 хвилина"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "Залишилось часу: 1 хвилина %d секунд"
+msgid "Time left: 1 minute 1 second"
+msgstr "Залишилось часу: 1 хвилина 1 секунда"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Залишилось часу: %d хвилин"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "Залишилось часу: %d годин %d хвилин %d секунд"
+msgid "Time left: %d minutes 1 second"
+msgstr "Залишилось часу: %d хвилин 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "Залишилось часу: %d годин %d хвилин"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "Залишилось часу: 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "Залишилось часу: 1 хвилина 1 секунда"
+msgid "Time left: %d minutes %d seconds"
+msgstr "Залишилось часу: %d хвилин %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "Залишилось часу: %d хвилин 1 секунда"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "Залишилось часу: 1 година"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "Залишилось часу: 1 година 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "Залишилось часу: 1 година %d секунд"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "Залишилось часу: 1 година 1 хвилина"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "Залишилось часу: 1 година 1 хвилина 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "Залишилось часу: 1 година 1 хвилина %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "Залишилось часу: 1 година %d хвилин"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "Залишилось часу: 1 година %d хвилин 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "Залишилось часу: 1 година %d хвилин %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "Залишилось часу: %d годин"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "Залишилось часу: %d годин 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "Залишилось часу: %d годин %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "Залишилось часу: %d годин 1 хвилина"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "Залишилось часу: %d годин 1 хвилина 1 секунда"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "Залишилось часу: %d годин 1 хвилина %d секунд"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "Залишилось часу: %d годин %d хвилин"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "Залишилось часу: %d годин %d хвилин 1 секунда"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "Залишилось часу: %d годин %d хвилин %d секунд"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "Автоматично контрольовані паузи та перерви"
-
diff --git a/po/ur.po b/po/ur.po
index 84fd703..688782d 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,251 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "وقفہ لیں"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "فعال"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "وقت تمام"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "وقت ترتیبات"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "ﻢﻧٹ"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "ﺱیکﻥڈ"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "وقفوں کا درمیانی وقت (منٹ):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "وقفوں کا درمیانی وقت:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "وقفہ طول (منٹ):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "وقفہ طول:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "مؤخر طول (منٹ):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "مؤخر طول:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "سلوک"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "مؤخر کی اجازت"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "مظہر"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "باقی وقت پینل میں ظاہر کریں"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "گھنٹے ظاہر کریں"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "سیکنڈ ظاہر کریں"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_مؤخر"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "بقیہ وقت: 1 سیکنڈ"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "بقیہ وقت: %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "بقیہ وقت: 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 منٹ %d سیکنڈ"
+msgid "Time left: 1 minute 1 second"
+msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "بقیہ وقت: %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+msgid "Time left: %d minutes 1 second"
+msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "بقیہ وقت: 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
+msgid "Time left: %d minutes %d seconds"
+msgstr "بقیہ وقت: %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "بقیہ وقت: 1 گھنٹہ"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ %d سیکنڈ"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "بقیہ وقت: %d گھنٹے"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "بقیہ وقت: %d گھنٹے 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "بقیہ وقت: %d گھنٹے %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "بقیہ وقت: %d گھنٹے %d منٹ 1 سیکنڈ"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "وقت تمام اور وقفے خودکار کنٹرول شدہ"
-
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 84fd703..688782d 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+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"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,251 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "وقفہ لیں"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "فعال"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "وقت تمام"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "وقت ترتیبات"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "ﻢﻧٹ"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "ﺱیکﻥڈ"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "وقفوں کا درمیانی وقت (منٹ):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "وقفوں کا درمیانی وقت:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "وقفہ طول (منٹ):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "وقفہ طول:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "مؤخر طول (منٹ):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "مؤخر طول:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "سلوک"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "مؤخر کی اجازت"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "مظہر"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "باقی وقت پینل میں ظاہر کریں"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "گھنٹے ظاہر کریں"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "سیکنڈ ظاہر کریں"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "_مؤخر"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "بقیہ وقت: 1 سیکنڈ"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "بقیہ وقت: %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "بقیہ وقت: 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "بقیہ وقت: 1 منٹ %d سیکنڈ"
+msgid "Time left: 1 minute 1 second"
+msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "بقیہ وقت: %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+msgid "Time left: %d minutes 1 second"
+msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "بقیہ وقت: 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "بقیہ وقت: 1 منٹ 1 سیکنڈ"
+msgid "Time left: %d minutes %d seconds"
+msgstr "بقیہ وقت: %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "بقیہ وقت: %d منٹ 1 سیکنڈ"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "بقیہ وقت: 1 گھنٹہ"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ %d سیکنڈ"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "بقیہ وقت: 1 گھنٹہ %d منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "بقیہ وقت: %d گھنٹے"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "بقیہ وقت: %d گھنٹے 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "بقیہ وقت: %d گھنٹے %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ 1 سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "بقیہ وقت: %d گھنٹے 1 منٹ %d سیکنڈ"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "بقیہ وقت: %d گھنٹے %d منٹ"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "بقیہ وقت: %d گھنٹے %d منٹ 1 سیکنڈ"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "بقیہ وقت: %d گھنٹے %d منٹ %d سیکنڈ"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "وقت تمام اور وقفے خودکار کنٹرول شدہ"
-
diff --git a/po/xfce4-time-out-plugin.pot b/po/xfce4-time-out-plugin.pot
index c1c441b..fc244ae 100644
--- a/po/xfce4-time-out-plugin.pot
+++ b/po/xfce4-time-out-plugin.pot
@@ -8,250 +8,259 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr ""
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr ""
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr ""
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr ""
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+msgid "Minutes"
+msgstr ""
+
+#: ../panel-plugin/time-out.c:436
+msgid "Seconds"
+msgstr ""
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
 msgstr ""
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
 msgstr ""
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
 msgstr ""
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr ""
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr ""
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr ""
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr ""
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr ""
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr ""
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr ""
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr ""
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
+msgid "Time left: 1 minute 1 second"
 msgstr ""
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, c-format
-msgid "Time left: %d minutes %d seconds"
+msgid "Time left: 1 minute %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
+msgid "Time left: %d minutes 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr ""
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr ""
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
+msgid "Time left: %d minutes %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr ""
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr ""
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr ""
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr ""
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fb0c190..e5fa042 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,250 +7,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-time-out-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 23:27+0200\n"
+"POT-Creation-Date: 2010-11-06 16:27+0900\n"
 "PO-Revision-Date: 2009-05-13 11:48+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"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:245
+#: ../panel-plugin/time-out.c:253
 msgid "Take a break"
 msgstr "休息一下"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:253
+#: ../panel-plugin/time-out.c:261
 msgid "Enabled"
 msgstr "启动"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:390
+#: ../panel-plugin/time-out.c:401
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr "超时"
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:407
+#: ../panel-plugin/time-out.c:418
 msgid "Time settings"
 msgstr "时间设置"
 
+#. Create the labels for the minutes and seconds spins
+#: ../panel-plugin/time-out.c:431
+#, fuzzy
+msgid "Minutes"
+msgstr "分钟"
+
+#: ../panel-plugin/time-out.c:436
+#, fuzzy
+msgid "Seconds"
+msgstr "秒"
+
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:420
-msgid "Time between breaks (minutes):"
-msgstr "每次休息的时间间隔(分钟):"
+#: ../panel-plugin/time-out.c:442
+msgid "Time between breaks:"
+msgstr "每次休息的时间间隔:"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:435
-msgid "Break length (minutes):"
-msgstr "休息时间(分钟):"
+#: ../panel-plugin/time-out.c:466
+msgid "Break length:"
+msgstr "休息时间:"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:448
-msgid "Postpone length (minutes):"
-msgstr "延迟时间(分钟):"
+#: ../panel-plugin/time-out.c:484
+msgid "Postpone length:"
+msgstr "延迟时间:"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:461
+#: ../panel-plugin/time-out.c:502
 msgid "Behaviour"
 msgstr "行为"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:467
+#: ../panel-plugin/time-out.c:508
 msgid "Allow postpone"
 msgstr "允许延迟"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:474
+#: ../panel-plugin/time-out.c:515
 msgid "Appearance"
 msgstr "外观"
 
 #. Create display time check button
-#: ../panel-plugin/time-out.c:485
+#: ../panel-plugin/time-out.c:526
 msgid "Display remaining time in the panel"
 msgstr "在面板上显示剩余时间"
 
 #. Create display hours check button
-#: ../panel-plugin/time-out.c:492
+#: ../panel-plugin/time-out.c:533
 msgid "Display hours"
 msgstr "显示小时数"
 
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:499
+#: ../panel-plugin/time-out.c:540
 msgid "Display seconds"
 msgstr "显示秒数"
 
 #. Create postpone button
-#: ../panel-plugin/time-out-lock-screen.c:185
+#: ../panel-plugin/time-out-lock-screen.c:189
 msgid "_Postpone"
 msgstr "延迟(_P)"
 
 #. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:396
-#: ../panel-plugin/time-out-countdown.c:461
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#. Minutes:seconds
 #. Hours:minutes
 #. Minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:401
-#: ../panel-plugin/time-out-countdown.c:409
-#: ../panel-plugin/time-out-countdown.c:466
-#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:400
+#: ../panel-plugin/time-out-countdown.c:408
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:424
-#: ../panel-plugin/time-out-countdown.c:431
-#: ../panel-plugin/time-out-countdown.c:496
-#: ../panel-plugin/time-out-countdown.c:626
+#: ../panel-plugin/time-out-countdown.c:428
+#: ../panel-plugin/time-out-countdown.c:559
+#, c-format
+msgid "Time left: 1 second"
+msgstr "剩余时间: 1 秒"
+
+#: ../panel-plugin/time-out-countdown.c:430
+#: ../panel-plugin/time-out-countdown.c:561
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "剩余时间: %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:426
-#: ../panel-plugin/time-out-countdown.c:501
-#: ../panel-plugin/time-out-countdown.c:584
-#: ../panel-plugin/time-out-countdown.c:631
-#: ../panel-plugin/time-out-countdown.c:650
+#: ../panel-plugin/time-out-countdown.c:435
+#: ../panel-plugin/time-out-countdown.c:518
+#: ../panel-plugin/time-out-countdown.c:566
+#: ../panel-plugin/time-out-countdown.c:585
+#, c-format
 msgid "Time left: 1 minute"
 msgstr "剩余时间: 1 分钟"
 
-#: ../panel-plugin/time-out-countdown.c:433
-#: ../panel-plugin/time-out-countdown.c:505
-#: ../panel-plugin/time-out-countdown.c:635
+#: ../panel-plugin/time-out-countdown.c:437
+#: ../panel-plugin/time-out-countdown.c:568
 #, c-format
-msgid "Time left: 1 minute %d seconds"
-msgstr "剩余时间: 1 分钟 %d 秒"
+msgid "Time left: 1 minute 1 second"
+msgstr "剩余时间: 1 分钟 1 秒"
 
 #: ../panel-plugin/time-out-countdown.c:439
-#: ../panel-plugin/time-out-countdown.c:514
-#: ../panel-plugin/time-out-countdown.c:644
+#: ../panel-plugin/time-out-countdown.c:570
 #, 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:441
-#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:444
+#: ../panel-plugin/time-out-countdown.c:523
+#: ../panel-plugin/time-out-countdown.c:525
+#: ../panel-plugin/time-out-countdown.c:575
 #: ../panel-plugin/time-out-countdown.c:588
-#: ../panel-plugin/time-out-countdown.c:640
-#: ../panel-plugin/time-out-countdown.c:652
+#: ../panel-plugin/time-out-countdown.c:590
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "剩余时间: %d 分钟"
 
-#: ../panel-plugin/time-out-countdown.c:447
-#: ../panel-plugin/time-out-countdown.c:574
+#: ../panel-plugin/time-out-countdown.c:446
+#: ../panel-plugin/time-out-countdown.c:577
 #, c-format
-msgid "Time left: %d hours %d minutes %d seconds"
-msgstr "剩余时间: %d 小时 %d 分钟 %d 秒"
+msgid "Time left: %d minutes 1 second"
+msgstr "剩余时间: %d 分钟 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:449
-#: ../panel-plugin/time-out-countdown.c:570
-#: ../panel-plugin/time-out-countdown.c:610
+#: ../panel-plugin/time-out-countdown.c:448
+#: ../panel-plugin/time-out-countdown.c:579
 #, c-format
-msgid "Time left: %d hours %d minutes"
-msgstr "剩余时间: %d 小时 %d 分钟"
-
-#: ../panel-plugin/time-out-countdown.c:494
-#: ../panel-plugin/time-out-countdown.c:624
-msgid "Time left: 1 second"
-msgstr "剩余时间: 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:503
-#: ../panel-plugin/time-out-countdown.c:633
-msgid "Time left: 1 minute 1 second"
-msgstr "剩余时间: 1 分钟 1 秒"
+msgid "Time left: %d minutes %d seconds"
+msgstr "剩余时间: %d 分钟 %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:512
-#: ../panel-plugin/time-out-countdown.c:642
+#: ../panel-plugin/time-out-countdown.c:456
 #, c-format
-msgid "Time left: %d minutes 1 second"
-msgstr "剩余时间: %d 分钟 1 秒"
-
-#: ../panel-plugin/time-out-countdown.c:522
 msgid "Time left: 1 hour"
 msgstr "剩余时间: 1 小时"
 
-#: ../panel-plugin/time-out-countdown.c:524
+#: ../panel-plugin/time-out-countdown.c:458
+#, c-format
 msgid "Time left: 1 hour 1 second"
 msgstr "剩余时间: 1 小时 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:526
+#: ../panel-plugin/time-out-countdown.c:460
 #, c-format
 msgid "Time left: 1 hour %d seconds"
 msgstr "剩余时间: 1 小时 %d 秒"
 
+#: ../panel-plugin/time-out-countdown.c:465
 #: ../panel-plugin/time-out-countdown.c:531
-#: ../panel-plugin/time-out-countdown.c:595
+#, c-format
 msgid "Time left: 1 hour 1 minute"
 msgstr "剩余时间: 1 小时 1 分钟"
 
-#: ../panel-plugin/time-out-countdown.c:533
+#: ../panel-plugin/time-out-countdown.c:467
+#, c-format
 msgid "Time left: 1 hour 1 minute 1 second"
 msgstr "剩余时间: 1 小时 1 分钟 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:535
+#: ../panel-plugin/time-out-countdown.c:469
 #, c-format
 msgid "Time left: 1 hour 1 minute %d seconds"
 msgstr "剩余时间: 1 小时 1 分钟 %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:540
-#: ../panel-plugin/time-out-countdown.c:599
+#: ../panel-plugin/time-out-countdown.c:474
+#: ../panel-plugin/time-out-countdown.c:534
+#: ../panel-plugin/time-out-countdown.c:536
 #, c-format
 msgid "Time left: 1 hour %d minutes"
 msgstr "剩余时间: 1 小时 %d 分钟"
 
-#: ../panel-plugin/time-out-countdown.c:542
+#: ../panel-plugin/time-out-countdown.c:476
 #, c-format
 msgid "Time left: 1 hour %d minutes 1 second"
 msgstr "剩余时间: 1 小时 %d 分钟 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:478
 #, c-format
 msgid "Time left: 1 hour %d minutes %d seconds"
 msgstr "剩余时间: 1 小时 %d 分钟 %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:552
+#: ../panel-plugin/time-out-countdown.c:486
 #, c-format
 msgid "Time left: %d hours"
 msgstr "剩余时间: %d 小时"
 
-#: ../panel-plugin/time-out-countdown.c:554
+#: ../panel-plugin/time-out-countdown.c:488
 #, c-format
 msgid "Time left: %d hours 1 second"
 msgstr "剩余时间: %d 小时 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:556
+#: ../panel-plugin/time-out-countdown.c:490
 #, c-format
 msgid "Time left: %d hours %d seconds"
 msgstr "剩余时间: %d 小时 %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:561
-#: ../panel-plugin/time-out-countdown.c:606
+#: ../panel-plugin/time-out-countdown.c:495
+#: ../panel-plugin/time-out-countdown.c:541
 #, c-format
 msgid "Time left: %d hours 1 minute"
 msgstr "剩余时间: %d 小时 1 分钟"
 
-#: ../panel-plugin/time-out-countdown.c:563
+#: ../panel-plugin/time-out-countdown.c:497
 #, c-format
 msgid "Time left: %d hours 1 minute 1 second"
 msgstr "剩余时间: %d 小时 1 分钟 1 秒"
 
-#: ../panel-plugin/time-out-countdown.c:565
+#: ../panel-plugin/time-out-countdown.c:499
 #, c-format
 msgid "Time left: %d hours 1 minute %d seconds"
 msgstr "剩余时间: %d 小时 1 分钟 %d 秒"
 
-#: ../panel-plugin/time-out-countdown.c:572
+#: ../panel-plugin/time-out-countdown.c:504
+#: ../panel-plugin/time-out-countdown.c:544
+#: ../panel-plugin/time-out-countdown.c:546
+#, c-format
+msgid "Time left: %d hours %d minutes"
+msgstr "剩余时间: %d 小时 %d 分钟"
+
+#: ../panel-plugin/time-out-countdown.c:506
 #, c-format
 msgid "Time left: %d hours %d minutes 1 second"
 msgstr "剩余时间: %d 小时 %d 分钟 1 秒"
 
+#: ../panel-plugin/time-out-countdown.c:508
+#, c-format
+msgid "Time left: %d hours %d minutes %d seconds"
+msgstr "剩余时间: %d 小时 %d 分钟 %d 秒"
+
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
 msgid "Automatically controlled time outs and breaks"
 msgstr "自动控制超时与休息"



More information about the Xfce4-commits mailing list