[Goodies-commits] r2718 - in xfce4-time-out-plugin/trunk: . panel-plugin po

Jannis Pohlmann jannis at xfce.org
Sun May 6 15:44:42 CEST 2007


Author: jannis
Date: 2007-05-06 13:44:42 +0000 (Sun, 06 May 2007)
New Revision: 2718

Modified:
   xfce4-time-out-plugin/trunk/ChangeLog
   xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c
   xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.h
   xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.c
   xfce4-time-out-plugin/trunk/panel-plugin/time-out.c
   xfce4-time-out-plugin/trunk/po/ChangeLog
   xfce4-time-out-plugin/trunk/po/de.po
   xfce4-time-out-plugin/trunk/po/xfce4-time-out-plugin.pot
Log:
	* panel-plugin/time-out-countdown.{c,h}: Enhance seconds to 
	  string conversion. It's now able to not include hours.
	* panel-plugin/time-out.c: Add options to show/hide hours and
	  the time in general. Tooltip added to the event box. Small
	  icon is now visible in the panel. Time can be hidden now.
	  Properly handle size and orientation changes.
	* panel-plugin/time-out-lock-screen.c: Update to new seconds
	  to string conversion. 
 	* xfce4-time-out-plugin.pot: Merge new strings.
	* de.po: Update German translations.

Modified: xfce4-time-out-plugin/trunk/ChangeLog
===================================================================
--- xfce4-time-out-plugin/trunk/ChangeLog	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/ChangeLog	2007-05-06 13:44:42 UTC (rev 2718)
@@ -1,5 +1,16 @@
 2007-05-06	Jannis Pohlmann <jannis at xfce.org>
 
+	* panel-plugin/time-out-countdown.{c,h}: Enhance seconds to 
+	  string conversion. It's now able to not include hours.
+	* panel-plugin/time-out.c: Add options to show/hide hours and
+	  the time in general. Tooltip added to the event box. Small
+	  icon is now visible in the panel. Time can be hidden now.
+	  Properly handle size and orientation changes.
+	* panel-plugin/time-out-lock-screen.c: Update to new seconds
+	  to string conversion.
+
+2007-05-06	Jannis Pohlmann <jannis at xfce.org>
+
 	* panel-plugin/time-out-lock-screen.c: Remove invalid cast from
 	  GtkButton to GtkMisc.
 

Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c	2007-05-06 13:44:42 UTC (rev 2718)
@@ -365,6 +365,7 @@
 GString*
 time_out_countdown_seconds_to_string (gint     seconds,
                                       gboolean display_seconds,
+                                      gboolean display_hours,
                                       gboolean compressed)
 {
   GString *str;
@@ -387,15 +388,36 @@
   if (compressed)
     {
       if (G_UNLIKELY (display_seconds))
-        g_string_printf (str, _("%02d:%02d:%02d"), hours, minutes, seconds);
+        {
+          if (display_hours)
+            {
+              /* Hours:minutes:seconds */
+              g_string_printf (str, _("%02d:%02d:%02d"), hours, minutes, seconds);
+            }
+          else
+            {
+              /* Minutes:seconds */
+              g_string_printf (str, _("%02d:%02d"), minutes, seconds);
+            }
+        }
       else
-        g_string_printf (str, _("%02d:%02d"), hours, minutes);
+        {
+          if (display_hours)
+            {
+              /* Hours:minutes */
+              g_string_printf (str, _("%02d:%02d"), hours, minutes + 1);
+            }
+          else
+            {
+              g_string_printf (str, "%02d", minutes + 1);
+            }
+        }
     }
   else
     {
       if (hours <= 0)
         {
-          if (minutes <= 0) 
+          if (minutes <= 1) 
             {
               if (G_UNLIKELY (display_seconds))
                 g_string_printf (str, _("Time left: %d seconds"), seconds);

Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.h
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.h	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.h	2007-05-06 13:44:42 UTC (rev 2718)
@@ -50,6 +50,7 @@
 gint              time_out_countdown_get_remaining     (TimeOutCountdown *countdown);
 GString          *time_out_countdown_seconds_to_string (gint              seconds,
                                                         gboolean          display_seconds,
+                                                        gboolean          display_hours,
                                                         gboolean          compressed);
 
 G_END_DECLS;

Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.c
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.c	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.c	2007-05-06 13:44:42 UTC (rev 2718)
@@ -275,7 +275,7 @@
   lock_screen->remaining_seconds = seconds;
 
   /* Get long string representation of the remaining time */
-  time_string = time_out_countdown_seconds_to_string (seconds, TRUE, FALSE);
+  time_string = time_out_countdown_seconds_to_string (seconds, TRUE, TRUE, FALSE);
   
   /* Add markup */
   g_string_prepend (time_string, "<span size=\"x-large\">");

Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out.c
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out.c	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out.c	2007-05-06 13:44:42 UTC (rev 2718)
@@ -38,7 +38,9 @@
 /* Default settings */
 #define DEFAULT_ENABLED                    TRUE
 #define DEFAULT_ALLOW_POSTPONE             TRUE
-#define DEFAULT_DISPLAY_SECONDS            FALSE
+#define DEFAULT_DISPLAY_SECONDS            TRUE
+#define DEFAULT_DISPLAY_HOURS              FALSE
+#define DEFAULT_DISPLAY_TIME               TRUE
 #define DEFAULT_BREAK_COUNTDOWN_SECONDS    1800 /* 30 minutes */ 
 #define DEFAULT_LOCK_COUNTDOWN_SECONDS      300 /*  5 minutes */
 #define DEFAULT_POSTPONE_COUNTDOWN_SECONDS  120 /*  2 minutes */
@@ -62,7 +64,9 @@
   gint               postpone_countdown_seconds;
   guint              enabled : 1;
   guint              display_seconds : 1;              
+  guint              display_hours : 1;              
   guint              allow_postpone : 1;
+  guint              display_time : 1;
 
   /* Lock screen to be shown during breaks */
   TimeOutLockScreen *lock_screen;
@@ -71,6 +75,8 @@
   GtkWidget         *ebox;
   GtkWidget         *hvbox;
   GtkWidget         *time_label;
+  GtkWidget         *panel_icon;
+  GtkTooltips       *tooltips;
 };
 
 
@@ -83,6 +89,9 @@
 static gboolean       time_out_size_changed                       (XfcePanelPlugin   *plugin,
                                                                    gint               size,
                                                                    TimeOutPlugin     *time_out);
+static void           time_out_orientation_changed                (XfcePanelPlugin   *plugin,
+                                                                   GtkOrientation     orientation,
+                                                                   TimeOutPlugin     *time_out);
 static void           time_out_configure                          (XfcePanelPlugin   *plugin,
                                                                    TimeOutPlugin     *time_out);
 static void           time_out_end_configure                      (GtkDialog         *dialog,
@@ -96,8 +105,12 @@
                                                                    TimeOutPlugin     *time_out);
 static void           time_out_allow_postpone_toggled             (GtkToggleButton   *toggle_button,
                                                                    TimeOutPlugin     *time_out);
+static void           time_out_display_time_toggled               (GtkToggleButton   *toggle_button,
+                                                                   TimeOutPlugin     *time_out);
 static void           time_out_display_seconds_toggled            (GtkToggleButton   *toggle_button,
                                                                    TimeOutPlugin     *time_out);
+static void           time_out_display_hours_toggled              (GtkToggleButton   *toggle_button,
+                                                                   TimeOutPlugin     *time_out);
 static void           time_out_load_settings                      (TimeOutPlugin     *time_out);
 static void           time_out_save_settings                      (TimeOutPlugin     *time_out);
 static void           time_out_take_break                         (GtkMenuItem       *menu_item,
@@ -172,12 +185,21 @@
   gtk_container_add (GTK_CONTAINER (time_out->ebox), time_out->hvbox);
   gtk_widget_show (time_out->hvbox);
 
+  /* Create time out icon */
+  time_out->panel_icon = gtk_image_new_from_icon_name ("xfce4-time-out-plugin", GTK_ICON_SIZE_DIALOG);
+  gtk_image_set_pixel_size (GTK_IMAGE (time_out->panel_icon), xfce_panel_plugin_get_size (time_out->plugin) - 8);
+  gtk_box_pack_start (GTK_BOX (time_out->hvbox), time_out->panel_icon, TRUE, TRUE, 0);
+  gtk_widget_show (time_out->panel_icon);
+
   /* Create label for displaying the remaining time until the next break */
   time_out->time_label = gtk_label_new ("Inactive");
   gtk_misc_set_alignment (GTK_MISC (time_out->time_label), 0.5, 0.5);
   gtk_box_pack_start (GTK_BOX (time_out->hvbox), time_out->time_label, TRUE, TRUE, 0);
   gtk_widget_show (time_out->time_label);
 
+  /* Create tooltips group */
+  time_out->tooltips = gtk_tooltips_new ();
+
   return time_out;
 }
 
@@ -244,6 +266,7 @@
   g_signal_connect (G_OBJECT (plugin), "free-data", G_CALLBACK (time_out_free), time_out);
   g_signal_connect (G_OBJECT (plugin), "size-changed", G_CALLBACK (time_out_size_changed), time_out);
   g_signal_connect (G_OBJECT (plugin), "configure-plugin", G_CALLBACK (time_out_configure), time_out);
+  g_signal_connect (G_OBJECT (plugin), "orientation-changed", G_CALLBACK (time_out_orientation_changed), time_out);
 
   /* Display the configure menu item */
   xfce_panel_plugin_menu_show_configure (plugin);
@@ -301,9 +324,15 @@
 {
   GtkOrientation orientation;
 
+  g_return_val_if_fail (plugin != NULL, FALSE);
+  g_return_val_if_fail (time_out != NULL, FALSE);
+
   /* Get the orientation of the panel */
   orientation = xfce_panel_plugin_get_orientation (plugin);
 
+  /* Update icon size */
+  gtk_image_set_pixel_size (GTK_IMAGE (time_out->panel_icon), size - 8);
+
   /* Update widget size */
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, size);
@@ -317,6 +346,20 @@
 
 
 static void
+time_out_orientation_changed (XfcePanelPlugin *plugin,
+                              GtkOrientation  orientation,
+                              TimeOutPlugin   *time_out)
+{
+  g_return_if_fail (plugin != NULL);
+  g_return_if_fail (time_out != NULL);
+
+  /* Apply orientation to hvbox */
+  xfce_hvbox_set_orientation (XFCE_HVBOX (time_out->hvbox), orientation);
+}
+
+
+
+static void
 time_out_configure (XfcePanelPlugin *plugin,
                     TimeOutPlugin   *time_out)
 {
@@ -326,6 +369,7 @@
   GtkWidget *behaviourbin;
   GtkWidget *appearancebin;
   GtkWidget *table;
+  GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *spin;
   GtkWidget *checkbutton;
@@ -428,11 +472,30 @@
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), framebox, TRUE, TRUE, 0);
   gtk_widget_show (framebox);
 
+  /* Create appearance box */
+  vbox = gtk_vbox_new (FALSE, 6);
+  gtk_container_add (GTK_CONTAINER (appearancebin), vbox);
+  gtk_widget_show (vbox);
+
+  /* Create display time check button */
+  checkbutton = gtk_check_button_new_with_label (_("Display remaining time in the panel"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), time_out->display_time);
+  g_signal_connect (checkbutton, "toggled", G_CALLBACK (time_out_display_time_toggled), time_out);
+  gtk_container_add (GTK_CONTAINER (vbox), checkbutton);
+  gtk_widget_show (checkbutton);
+
+  /* Create display hours check button */
+  checkbutton = gtk_check_button_new_with_label (_("Display hours"));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), time_out->display_hours);
+  g_signal_connect (checkbutton, "toggled", G_CALLBACK (time_out_display_hours_toggled), time_out);
+  gtk_container_add (GTK_CONTAINER (vbox), checkbutton);
+  gtk_widget_show (checkbutton);
+
   /* Create display seconds check button */
   checkbutton = gtk_check_button_new_with_label (_("Display seconds"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), time_out->display_seconds);
   g_signal_connect (checkbutton, "toggled", G_CALLBACK (time_out_display_seconds_toggled), time_out);
-  gtk_container_add (GTK_CONTAINER (appearancebin), checkbutton);
+  gtk_container_add (GTK_CONTAINER (vbox), checkbutton);
   gtk_widget_show (checkbutton);
 
   /* Show the entire dialog */
@@ -518,6 +581,25 @@
 
 
 static void 
+time_out_display_time_toggled (GtkToggleButton *toggle_button,
+                               TimeOutPlugin   *time_out)
+{
+  g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
+  g_return_if_fail (time_out != NULL);
+
+  /* Set display time attribute */
+  time_out->display_time = gtk_toggle_button_get_active (toggle_button);
+
+  /* Hide or display the time label */
+  if (time_out->display_time) 
+    gtk_widget_show (time_out->time_label);
+  else
+    gtk_widget_hide (time_out->time_label);
+}
+
+
+
+static void 
 time_out_display_seconds_toggled (GtkToggleButton *toggle_button,
                                   TimeOutPlugin   *time_out)
 {
@@ -530,6 +612,19 @@
 
 
 
+static void 
+time_out_display_hours_toggled (GtkToggleButton *toggle_button,
+                                TimeOutPlugin   *time_out)
+{
+  g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
+  g_return_if_fail (time_out != NULL);
+
+  /* Set display hours attribute */
+  time_out->display_hours = gtk_toggle_button_get_active (toggle_button);
+}
+
+
+
 static void
 time_out_load_settings (TimeOutPlugin *time_out)
 {
@@ -542,6 +637,8 @@
   gint     postpone_countdown_seconds = DEFAULT_POSTPONE_COUNTDOWN_SECONDS;
   gboolean enabled = DEFAULT_ENABLED;
   gboolean display_seconds = DEFAULT_DISPLAY_SECONDS;
+  gboolean display_hours = DEFAULT_DISPLAY_HOURS;
+  gboolean display_time = DEFAULT_DISPLAY_TIME;
   gboolean allow_postpone = DEFAULT_ALLOW_POSTPONE;
 
   g_return_if_fail (time_out != NULL);
@@ -564,6 +661,8 @@
           postpone_countdown_seconds = xfce_rc_read_int_entry (rc, "postpone-countdown-seconds", postpone_countdown_seconds);
           enabled = xfce_rc_read_bool_entry (rc, "enabled", enabled);
           display_seconds = xfce_rc_read_bool_entry (rc, "display-seconds", display_seconds);
+          display_hours = xfce_rc_read_bool_entry (rc, "display-hours", display_hours);
+          display_time = xfce_rc_read_bool_entry (rc, "display-time", display_time);
           allow_postpone = xfce_rc_read_bool_entry (rc, "allow-postpone", allow_postpone);
 
           /* Close file handle */
@@ -580,6 +679,8 @@
   time_out->postpone_countdown_seconds = postpone_countdown_seconds;
   time_out->enabled = enabled;
   time_out->display_seconds = display_seconds;
+  time_out->display_hours = display_hours;
+  time_out->display_time = display_time;
   time_out->allow_postpone = allow_postpone;
 }
 
@@ -611,6 +712,8 @@
           xfce_rc_write_int_entry (rc, "postpone-countdown-seconds", time_out->postpone_countdown_seconds);
           xfce_rc_write_bool_entry (rc, "enabled", time_out->enabled);
           xfce_rc_write_bool_entry (rc, "display-seconds", time_out->display_seconds);
+          xfce_rc_write_bool_entry (rc, "display-hours", time_out->display_hours);
+          xfce_rc_write_bool_entry (rc, "display-time", time_out->display_time);
 
           /* Close file handle */
           xfce_rc_close (rc);
@@ -707,19 +810,25 @@
                                  gint              seconds_remaining,
                                  TimeOutPlugin    *time_out)
 {
-  GString *time_string;
+  GString *short_time_string;
+  GString *long_time_string;
 
   g_return_if_fail (IS_TIME_OUT_COUNTDOWN (countdown));
   g_return_if_fail (time_out != NULL);
 
-  /* Get short version of the time string */
-  time_string = time_out_countdown_seconds_to_string (seconds_remaining, time_out->display_seconds, TRUE);
+  /* Get time strings */
+  short_time_string = time_out_countdown_seconds_to_string (seconds_remaining, time_out->display_seconds, time_out->display_hours, TRUE);
+  long_time_string = time_out_countdown_seconds_to_string (seconds_remaining, TRUE, TRUE, FALSE);
 
   /* Set label text */
-  gtk_label_set_text (GTK_LABEL (time_out->time_label), time_string->str);
+  gtk_label_set_text (GTK_LABEL (time_out->time_label), short_time_string->str);
 
-  /* Free time string */
-  g_string_free (time_string, TRUE);
+  /* Update tooltips */
+  gtk_tooltips_set_tip (GTK_TOOLTIPS (time_out->tooltips), time_out->ebox, long_time_string->str, long_time_string->str);
+
+  /* Free time strings */
+  g_string_free (short_time_string, TRUE);
+  g_string_free (long_time_string, TRUE);
 }
 
 

Modified: xfce4-time-out-plugin/trunk/po/ChangeLog
===================================================================
--- xfce4-time-out-plugin/trunk/po/ChangeLog	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/po/ChangeLog	2007-05-06 13:44:42 UTC (rev 2718)
@@ -1,5 +1,10 @@
 2007-05-06	Jannis Pohlmann <jannis at xfce.org>
 
+	* xfce4-time-out-plugin.pot: Merge new strings.
+	* de.po: Update German translations.
+
+2007-05-06	Jannis Pohlmann <jannis at xfce.org>
+
 	* POTFILES.in, xfce4-time-out-plugin.pot: Merge new strings.
 	* de.po: Update German translations.
 

Modified: xfce4-time-out-plugin/trunk/po/de.po
===================================================================
--- xfce4-time-out-plugin/trunk/po/de.po	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/po/de.po	2007-05-06 13:44:42 UTC (rev 2718)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-time-out-plugin 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 01:25+0200\n"
+"POT-Creation-Date: 2007-05-06 15:40+0200\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"
@@ -16,58 +16,68 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:225
+#: ../panel-plugin/time-out.c:247
 msgid "Take a break"
 msgstr "Eine Pause machen"
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:233
+#: ../panel-plugin/time-out.c:255
 msgid "Enabled"
 msgstr "Aktiviert"
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:344
+#: ../panel-plugin/time-out.c:388
 #: ../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:361
+#: ../panel-plugin/time-out.c:405
 msgid "Time settings"
 msgstr "Zeiten"
 
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:374
+#: ../panel-plugin/time-out.c:418
 msgid "Time between breaks (minutes):"
 msgstr "Zeit zwischen den Pausen (in Minuten):"
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:387
+#: ../panel-plugin/time-out.c:431
 msgid "Break length (minutes):"
 msgstr "Dauer der Pausen (in Minuten):"
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:400
+#: ../panel-plugin/time-out.c:444
 msgid "Postpone length (minutes):"
 msgstr "Dauer des Verschiebens (in Minuten):"
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:413
+#: ../panel-plugin/time-out.c:457
 msgid "Behaviour"
 msgstr "Verhalten"
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:419
+#: ../panel-plugin/time-out.c:463
 msgid "Allow postpone"
 msgstr "Erlaube es Pausen zu verschieben"
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:426
+#: ../panel-plugin/time-out.c:470
 msgid "Appearance"
 msgstr "Aussehen"
 
+#. Create display time check button
+#: ../panel-plugin/time-out.c:481
+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:488
+msgid "Display hours"
+msgstr "Zeige Stunden an"
+
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:432
+#: ../panel-plugin/time-out.c:495
 msgid "Display seconds"
 msgstr "Zeige Sekunden an"
 
@@ -76,41 +86,45 @@
 msgid "_Postpone"
 msgstr "_Pause verschieben"
 
-#: ../panel-plugin/time-out-countdown.c:390
+#. Hours:minutes:seconds
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr "%02d:%02d:%02d"
 
-#: ../panel-plugin/time-out-countdown.c:392
+#. Minutes:seconds
+#. Hours:minutes
+#: ../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:401
+#: ../panel-plugin/time-out-countdown.c:423
 #, c-format
 msgid "Time left: %d seconds"
 msgstr "Verbleibend: %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:403
+#: ../panel-plugin/time-out-countdown.c:425
 msgid "Time left: 1 minute"
 msgstr "Verbleibend: 1 Minute"
 
-#: ../panel-plugin/time-out-countdown.c:408
+#: ../panel-plugin/time-out-countdown.c:430
 #, c-format
 msgid "Time left: %d minutes %d seconds"
 msgstr "Verbleibend: %d Minuten %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:410
+#: ../panel-plugin/time-out-countdown.c:432
 #, c-format
 msgid "Time left: %d minutes"
 msgstr "Verbleibend: %d Minuten"
 
-#: ../panel-plugin/time-out-countdown.c:416
+#: ../panel-plugin/time-out-countdown.c:438
 #, c-format
 msgid "Time left: %d hours %d minutes %d seconds"
 msgstr "Verbleibend: %d Stunden %d Minuten %d Sekunden"
 
-#: ../panel-plugin/time-out-countdown.c:418
+#: ../panel-plugin/time-out-countdown.c:440
 #, c-format
 msgid "Time left: %d hours %d minutes"
 msgstr "Verbleibend: %d Stunden %d Minuten"

Modified: xfce4-time-out-plugin/trunk/po/xfce4-time-out-plugin.pot
===================================================================
--- xfce4-time-out-plugin/trunk/po/xfce4-time-out-plugin.pot	2007-05-06 08:02:53 UTC (rev 2717)
+++ xfce4-time-out-plugin/trunk/po/xfce4-time-out-plugin.pot	2007-05-06 13:44:42 UTC (rev 2718)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 01:25+0200\n"
+"POT-Creation-Date: 2007-05-06 15:40+0200\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"
@@ -17,58 +17,68 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:225
+#: ../panel-plugin/time-out.c:247
 msgid "Take a break"
 msgstr ""
 
 #. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:233
+#: ../panel-plugin/time-out.c:255
 msgid "Enabled"
 msgstr ""
 
 #. Create properties dialog
-#: ../panel-plugin/time-out.c:344
+#: ../panel-plugin/time-out.c:388
 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
 msgid "Time Out"
 msgstr ""
 
 #. Create time settings section
-#: ../panel-plugin/time-out.c:361
+#: ../panel-plugin/time-out.c:405
 msgid "Time settings"
 msgstr ""
 
 #. Create break countdown time label
-#: ../panel-plugin/time-out.c:374
+#: ../panel-plugin/time-out.c:418
 msgid "Time between breaks (minutes):"
 msgstr ""
 
 #. Create lock countdown time label
-#: ../panel-plugin/time-out.c:387
+#: ../panel-plugin/time-out.c:431
 msgid "Break length (minutes):"
 msgstr ""
 
 #. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:400
+#: ../panel-plugin/time-out.c:444
 msgid "Postpone length (minutes):"
 msgstr ""
 
 #. Create behaviour section
-#: ../panel-plugin/time-out.c:413
+#: ../panel-plugin/time-out.c:457
 msgid "Behaviour"
 msgstr ""
 
 #. Create postpone check button
-#: ../panel-plugin/time-out.c:419
+#: ../panel-plugin/time-out.c:463
 msgid "Allow postpone"
 msgstr ""
 
 #. Create appearance section
-#: ../panel-plugin/time-out.c:426
+#: ../panel-plugin/time-out.c:470
 msgid "Appearance"
 msgstr ""
 
+#. Create display time check button
+#: ../panel-plugin/time-out.c:481
+msgid "Display remaining time in the panel"
+msgstr ""
+
+#. Create display hours check button
+#: ../panel-plugin/time-out.c:488
+msgid "Display hours"
+msgstr ""
+
 #. Create display seconds check button
-#: ../panel-plugin/time-out.c:432
+#: ../panel-plugin/time-out.c:495
 msgid "Display seconds"
 msgstr ""
 
@@ -77,41 +87,45 @@
 msgid "_Postpone"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:390
+#. Hours:minutes:seconds
+#: ../panel-plugin/time-out-countdown.c:395
 #, c-format
 msgid "%02d:%02d:%02d"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:392
+#. Minutes:seconds
+#. Hours:minutes
+#: ../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:401
+#: ../panel-plugin/time-out-countdown.c:423
 #, c-format
 msgid "Time left: %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:403
+#: ../panel-plugin/time-out-countdown.c:425
 msgid "Time left: 1 minute"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:408
+#: ../panel-plugin/time-out-countdown.c:430
 #, c-format
 msgid "Time left: %d minutes %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:410
+#: ../panel-plugin/time-out-countdown.c:432
 #, c-format
 msgid "Time left: %d minutes"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:416
+#: ../panel-plugin/time-out-countdown.c:438
 #, c-format
 msgid "Time left: %d hours %d minutes %d seconds"
 msgstr ""
 
-#: ../panel-plugin/time-out-countdown.c:418
+#: ../panel-plugin/time-out-countdown.c:440
 #, c-format
 msgid "Time left: %d hours %d minutes"
 msgstr ""




More information about the Goodies-commits mailing list