[Goodies-commits] r2725 - in xfce4-time-out-plugin/trunk: . panel-plugin po
Jannis Pohlmann
jannis at xfce.org
Sun May 6 23:45:06 CEST 2007
Author: jannis
Date: 2007-05-06 21:45:06 +0000 (Sun, 06 May 2007)
New Revision: 2725
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-lock-screen.c
xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.h
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: Make seconds to string
conversion even better. Introduce new strings. Maybe I should
switch to using ngettext ...
* panel-plugin/time-out.c,
panel-plugin/time-out-lock-screen.{c,h}: Make it possible to
hide hours, seconds in the lock screen.
*
* 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 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/ChangeLog 2007-05-06 21:45:06 UTC (rev 2725)
@@ -1,5 +1,14 @@
2007-05-06 Jannis Pohlmann <jannis at xfce.org>
+ * panel-plugin/time-out-countdown.c: Make seconds to string
+ conversion even better. Introduce new strings. Maybe I should
+ switch to using ngettext ...
+ * panel-plugin/time-out.c,
+ panel-plugin/time-out-lock-screen.{c,h}: Make it possible to
+ hide hours, seconds in the lock screen.
+ *
+2007-05-06 Jannis Pohlmann <jannis at xfce.org>
+
* configure.in.in: Check for --as-needed support for the
linker.
* panel-plugin/time-out.c: Only restart the break countdown
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 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-countdown.c 2007-05-06 21:45:06 UTC (rev 2725)
@@ -387,57 +387,204 @@
if (compressed)
{
- if (G_UNLIKELY (display_seconds))
+ if (display_hours)
{
- if (display_hours)
+ if (display_seconds)
{
/* Hours:minutes:seconds */
g_string_printf (str, _("%02d:%02d:%02d"), hours, minutes, seconds);
}
else
{
- /* Minutes:seconds */
- g_string_printf (str, _("%02d:%02d"), minutes, seconds);
+ /* Hours:minutes */
+ g_string_printf (str, _("%02d:%02d"), hours, minutes + 1);
}
}
else
{
- if (display_hours)
+ if (display_seconds)
{
- /* Hours:minutes */
- g_string_printf (str, _("%02d:%02d"), hours, minutes + 1);
+ /* Minutes:seconds */
+ g_string_printf (str, _("%02d:%02d"), hours * 60 + minutes, seconds);
}
else
{
- g_string_printf (str, "%02d", minutes + 1);
+ /* Minutes */
+ g_string_printf (str, "%02d", hours * 60 + minutes + 1);
}
}
}
else
{
- if (hours <= 0)
+ if (display_hours)
{
- if (minutes <= 1)
+ if (display_seconds)
{
- if (G_UNLIKELY (display_seconds))
- g_string_printf (str, _("Time left: %d seconds"), seconds);
- else
- g_string_printf (str, _("Time left: 1 minute"));
+ if (hours <= 0)
+ {
+ if (minutes <= 0)
+ {
+ if (seconds <= 1)
+ g_string_printf (str, _("Time left: 1 second"));
+ else
+ g_string_printf (str, _("Time left: %d seconds"), seconds);
+ }
+ else if (minutes == 1)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: 1 minute"));
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: 1 minute 1 second"));
+ else
+ g_string_printf (str, _("Time left: 1 minute %d seconds"), seconds);
+ }
+ else
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: %d minutes"), minutes);
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: %d minutes 1 second"), minutes);
+ else
+ g_string_printf (str, _("Time left: %d minutes %d seconds"), minutes, seconds);
+ }
+ }
+ else if (hours == 1)
+ {
+ if (minutes <= 0)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: 1 hour"));
+ if (seconds == 1)
+ g_string_printf (str, _("Time left: 1 hour 1 second"));
+ else
+ g_string_printf (str, _("Time left: 1 hour %d seconds"), seconds);
+ }
+ else if (minutes == 1)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: 1 hour 1 minute"));
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: 1 hour 1 minute 1 second"));
+ else
+ g_string_printf (str, _("Time left: 1 hour 1 minute %d seconds"), seconds);
+ }
+ else
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes);
+ if (seconds == 1)
+ g_string_printf (str, _("Time left: 1 hour %d minutes 1 second"), minutes);
+ else
+ g_string_printf (str, _("Time left: 1 hour %d minutes %d seconds"), minutes, seconds);
+ }
+ }
+ else
+ {
+ if (minutes <= 0)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: %d hours"), hours);
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: %d hours 1 second"), hours);
+ else
+ g_string_printf (str, _("Time left: %d hours %d seconds"), hours, seconds);
+ }
+ else if (minutes == 1)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: %d hours 1 minute 1 second"), hours);
+ else
+ g_string_printf (str, _("Time left: %d hours 1 minute %d seconds"), hours, seconds);
+ }
+ else
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes);
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: %d hours %d minutes 1 second"), hours, minutes);
+ else
+ g_string_printf (str, _("Time left: %d hours %d minutes %d seconds"), hours, minutes, seconds);
+ }
+ }
}
else
{
- if (G_UNLIKELY (display_seconds))
- g_string_printf (str, _("Time left: %d minutes %d seconds"), minutes, seconds);
- else
- g_string_printf (str, _("Time left: %d minutes"), minutes);
+ if (hours <= 0)
+ {
+ if (minutes < 1)
+ {
+ g_string_printf (str, _("Time left: 1 minute"));
+ }
+ else
+ {
+ g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+ }
+ }
+ else if (hours == 1)
+ {
+ if (minutes < 1)
+ {
+ g_string_printf (str, _("Time left: 1 hour 1 minute"));
+ }
+ else
+ {
+ g_string_printf (str, _("Time left: 1 hour %d minutes"), minutes + 1);
+ }
+ }
+ else
+ {
+ if (minutes < 1)
+ {
+ g_string_printf (str, _("Time left: %d hours 1 minute"), hours);
+ }
+ else
+ {
+ g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes + 1);
+ }
+ }
}
}
else
{
- if (G_UNLIKELY (display_seconds))
- g_string_printf (str, _("Time left: %d hours %d minutes %d seconds"), hours, minutes, seconds);
+ minutes = hours * 60 + minutes;
+
+ if (display_seconds)
+ {
+ if (minutes <= 0)
+ {
+ if (seconds <= 1)
+ g_string_printf (str, _("Time left: 1 second"));
+ else
+ g_string_printf (str, _("Time left: %d seconds"), seconds);
+ }
+ else if (minutes == 1)
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: 1 minute"));
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: 1 minute 1 second"));
+ else
+ g_string_printf (str, _("Time left: 1 minute %d seconds"), seconds);
+ }
+ else
+ {
+ if (seconds <= 0)
+ g_string_printf (str, _("Time left: %d minutes"), minutes);
+ else if (seconds == 1)
+ g_string_printf (str, _("Time left: %d minutes 1 second"), minutes);
+ else
+ g_string_printf (str, _("Time left: %d minutes %d seconds"), minutes, seconds);
+ }
+ }
else
- g_string_printf (str, _("Time left: %d hours %d minutes"), hours, minutes);
+ {
+ if (minutes < 1)
+ g_string_printf (str, _("Time left: 1 minute"));
+ else
+ g_string_printf (str, _("Time left: %d minutes"), minutes + 1);
+ }
}
}
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 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.c 2007-05-06 21:45:06 UTC (rev 2725)
@@ -57,11 +57,14 @@
/* Remaining seconds */
gint remaining_seconds;
+ /* Whether to allow postpone */
+ guint allow_postpone : 1;
+
/* Whether to display seconds */
guint display_seconds : 1;
- /* Whether to allow postpone */
- guint allow_postpone : 1;
+ /* Whether to display hours */
+ guint display_hours : 1;
/* Widgets */
GtkWidget *window;
@@ -141,8 +144,9 @@
GtkWidget *vbox;
GtkWidget *image;
- lock_screen->display_seconds = FALSE;
+ lock_screen->display_seconds = TRUE;
lock_screen->allow_postpone = TRUE;
+ lock_screen->display_hours = FALSE;
lock_screen->fadeout = NULL;
/* Create information window */
@@ -275,7 +279,7 @@
lock_screen->remaining_seconds = seconds;
/* Get long string representation of the remaining time */
- time_string = time_out_countdown_seconds_to_string (seconds, TRUE, TRUE, FALSE);
+ time_string = time_out_countdown_seconds_to_string (seconds, lock_screen->display_seconds, lock_screen->display_hours, FALSE);
/* Add markup */
g_string_prepend (time_string, "<span size=\"x-large\">");
@@ -308,6 +312,30 @@
+void
+time_out_lock_screen_set_display_seconds (TimeOutLockScreen *lock_screen,
+ gboolean display_seconds)
+{
+ g_return_if_fail (IS_TIME_OUT_LOCK_SCREEN (lock_screen));
+
+ /* Set display seconds attribute */
+ lock_screen->display_seconds = display_seconds;
+}
+
+
+
+void
+time_out_lock_screen_set_display_hours (TimeOutLockScreen *lock_screen,
+ gboolean display_hours)
+{
+ g_return_if_fail (IS_TIME_OUT_LOCK_SCREEN (lock_screen));
+
+ /* Set display hours attribute */
+ lock_screen->display_hours = display_hours;
+}
+
+
+
static void
time_out_lock_screen_postpone (GtkButton *button,
TimeOutLockScreen *lock_screen)
Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.h
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.h 2007-05-06 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out-lock-screen.h 2007-05-06 21:45:06 UTC (rev 2725)
@@ -43,6 +43,10 @@
void time_out_lock_screen_hide (TimeOutLockScreen *lock_screen);
void time_out_lock_screen_set_remaining (TimeOutLockScreen *lock_screen,
gint seconds);
+void time_out_lock_screen_set_display_seconds (TimeOutLockScreen *lock_screen,
+ gboolean display_seconds);
+void time_out_lock_screen_set_display_hours (TimeOutLockScreen *lock_screen,
+ gboolean display_hours);
void time_out_lock_screen_set_allow_postpone (TimeOutLockScreen *lock_screen,
gboolean allow_postpone);
Modified: xfce4-time-out-plugin/trunk/panel-plugin/time-out.c
===================================================================
--- xfce4-time-out-plugin/trunk/panel-plugin/time-out.c 2007-05-06 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/panel-plugin/time-out.c 2007-05-06 21:45:06 UTC (rev 2725)
@@ -865,6 +865,8 @@
g_return_if_fail (time_out != NULL);
/* Update lock screen */
+ time_out_lock_screen_set_display_seconds (time_out->lock_screen, time_out->display_seconds);
+ time_out_lock_screen_set_display_hours (time_out->lock_screen, time_out->display_hours);
time_out_lock_screen_set_remaining (time_out->lock_screen, seconds_remaining);
}
Modified: xfce4-time-out-plugin/trunk/po/ChangeLog
===================================================================
--- xfce4-time-out-plugin/trunk/po/ChangeLog 2007-05-06 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/po/ChangeLog 2007-05-06 21:45:06 UTC (rev 2725)
@@ -5,6 +5,11 @@
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 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/po/de.po 2007-05-06 21:45:06 UTC (rev 2725)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xfce4-time-out-plugin 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 15:46+0200\n"
+"POT-Creation-Date: 2007-05-06 23:27+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,68 +16,68 @@
"Content-Transfer-Encoding: 8bit\n"
#. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:247
+#: ../panel-plugin/time-out.c:245
msgid "Take a break"
msgstr "Eine Pause machen"
#. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:255
+#: ../panel-plugin/time-out.c:253
msgid "Enabled"
msgstr "Aktiviert"
#. Create properties dialog
-#: ../panel-plugin/time-out.c:388
+#: ../panel-plugin/time-out.c:390
#: ../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:405
+#: ../panel-plugin/time-out.c:407
msgid "Time settings"
msgstr "Zeiten"
#. Create break countdown time label
-#: ../panel-plugin/time-out.c:418
+#: ../panel-plugin/time-out.c:420
msgid "Time between breaks (minutes):"
msgstr "Zeit zwischen den Pausen (in Minuten):"
#. Create lock countdown time label
-#: ../panel-plugin/time-out.c:431
+#: ../panel-plugin/time-out.c:435
msgid "Break length (minutes):"
msgstr "Dauer der Pausen (in Minuten):"
#. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:444
+#: ../panel-plugin/time-out.c:448
msgid "Postpone length (minutes):"
msgstr "Dauer des Verschiebens (in Minuten):"
#. Create behaviour section
-#: ../panel-plugin/time-out.c:457
+#: ../panel-plugin/time-out.c:461
msgid "Behaviour"
msgstr "Verhalten"
#. Create postpone check button
-#: ../panel-plugin/time-out.c:463
+#: ../panel-plugin/time-out.c:467
msgid "Allow postpone"
msgstr "Erlaube es Pausen zu verschieben"
#. Create appearance section
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:474
msgid "Appearance"
msgstr "Aussehen"
#. Create display time check button
-#: ../panel-plugin/time-out.c:481
+#: ../panel-plugin/time-out.c:485
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
+#: ../panel-plugin/time-out.c:492
msgid "Display hours"
msgstr "Zeige Stunden an"
#. Create display seconds check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:499
msgid "Display seconds"
msgstr "Zeige Sekunden an"
@@ -87,48 +87,170 @@
msgstr "_Pause verschieben"
#. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:395
+#: ../panel-plugin/time-out-countdown.c:396
+#: ../panel-plugin/time-out-countdown.c:461
#, c-format
msgid "%02d:%02d:%02d"
msgstr "%02d:%02d:%02d"
#. Minutes:seconds
#. Hours:minutes
-#: ../panel-plugin/time-out-countdown.c:400
-#: ../panel-plugin/time-out-countdown.c:408
+#. 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
#, c-format
msgid "%02d:%02d"
msgstr "%02d:%02d"
-#: ../panel-plugin/time-out-countdown.c:423
+#: ../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
#, c-format
msgid "Time left: %d seconds"
msgstr "Verbleibend: %d Sekunden"
-#: ../panel-plugin/time-out-countdown.c:425
+#: ../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
msgid "Time left: 1 minute"
msgstr "Verbleibend: 1 Minute"
-#: ../panel-plugin/time-out-countdown.c:430
+#: ../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"
+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
+#, c-format
msgid "Time left: %d minutes %d seconds"
msgstr "Verbleibend: %d Minuten %d Sekunden"
-#: ../panel-plugin/time-out-countdown.c:432
+#: ../panel-plugin/time-out-countdown.c:441
+#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:588
+#: ../panel-plugin/time-out-countdown.c:640
+#: ../panel-plugin/time-out-countdown.c:652
#, c-format
msgid "Time left: %d minutes"
msgstr "Verbleibend: %d Minuten"
-#: ../panel-plugin/time-out-countdown.c:438
+#: ../panel-plugin/time-out-countdown.c:447
+#: ../panel-plugin/time-out-countdown.c:574
#, 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:440
+#: ../panel-plugin/time-out-countdown.c:449
+#: ../panel-plugin/time-out-countdown.c:570
+#: ../panel-plugin/time-out-countdown.c:610
#, 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"
+
+#: ../panel-plugin/time-out-countdown.c:512
+#: ../panel-plugin/time-out-countdown.c:642
+#, 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
+msgid "Time left: 1 hour 1 second"
+msgstr "Verbleibend: 1 Stunde 1 Sekunde"
+
+#: ../panel-plugin/time-out-countdown.c:526
+#, c-format
+msgid "Time left: 1 hour %d seconds"
+msgstr "Verbleibend: 1 Stunde %d Sekunden"
+
+#: ../panel-plugin/time-out-countdown.c:531
+#: ../panel-plugin/time-out-countdown.c:595
+msgid "Time left: 1 hour 1 minute"
+msgstr "Verbleibend: 1 Stunde 1 Minute"
+
+#: ../panel-plugin/time-out-countdown.c:533
+msgid "Time left: 1 hour 1 minute 1 second"
+msgstr "Verbleibend: 1 Stunde 1 Minute 1 Sekunde"
+
+#: ../panel-plugin/time-out-countdown.c:535
+#, 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
+#, c-format
+msgid "Time left: 1 hour %d minutes"
+msgstr "Verbleibend: 1 Stunde %d Minuten"
+
+#: ../panel-plugin/time-out-countdown.c:542
+#, 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
+#, 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
+#, c-format
+msgid "Time left: %d hours"
+msgstr "Verbleibend: %d Stunden"
+
+#: ../panel-plugin/time-out-countdown.c:554
+#, c-format
+msgid "Time left: %d hours 1 second"
+msgstr "Verbleibend: %d Stunden 1 Sekunde"
+
+#: ../panel-plugin/time-out-countdown.c:556
+#, 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
+#, c-format
+msgid "Time left: %d hours 1 minute"
+msgstr "Verbleibend: %d Stunden 1 Minute"
+
+#: ../panel-plugin/time-out-countdown.c:563
+#, 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
+#, 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
+#, c-format
+msgid "Time left: %d hours %d minutes 1 second"
+msgstr "Verbleibend: %d Stunden %d Minuten 1 Sekunde"
+
#: ../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"
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 20:12:04 UTC (rev 2724)
+++ xfce4-time-out-plugin/trunk/po/xfce4-time-out-plugin.pot 2007-05-06 21:45:06 UTC (rev 2725)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 15:46+0200\n"
+"POT-Creation-Date: 2007-05-06 23:27+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,68 +17,68 @@
"Content-Transfer-Encoding: 8bit\n"
#. Create menu item for taking an instant break
-#: ../panel-plugin/time-out.c:247
+#: ../panel-plugin/time-out.c:245
msgid "Take a break"
msgstr ""
#. Create menu item for enabling/disabling the countdown
-#: ../panel-plugin/time-out.c:255
+#: ../panel-plugin/time-out.c:253
msgid "Enabled"
msgstr ""
#. Create properties dialog
-#: ../panel-plugin/time-out.c:388
+#: ../panel-plugin/time-out.c:390
#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2
msgid "Time Out"
msgstr ""
#. Create time settings section
-#: ../panel-plugin/time-out.c:405
+#: ../panel-plugin/time-out.c:407
msgid "Time settings"
msgstr ""
#. Create break countdown time label
-#: ../panel-plugin/time-out.c:418
+#: ../panel-plugin/time-out.c:420
msgid "Time between breaks (minutes):"
msgstr ""
#. Create lock countdown time label
-#: ../panel-plugin/time-out.c:431
+#: ../panel-plugin/time-out.c:435
msgid "Break length (minutes):"
msgstr ""
#. Create postpone countdown time label
-#: ../panel-plugin/time-out.c:444
+#: ../panel-plugin/time-out.c:448
msgid "Postpone length (minutes):"
msgstr ""
#. Create behaviour section
-#: ../panel-plugin/time-out.c:457
+#: ../panel-plugin/time-out.c:461
msgid "Behaviour"
msgstr ""
#. Create postpone check button
-#: ../panel-plugin/time-out.c:463
+#: ../panel-plugin/time-out.c:467
msgid "Allow postpone"
msgstr ""
#. Create appearance section
-#: ../panel-plugin/time-out.c:470
+#: ../panel-plugin/time-out.c:474
msgid "Appearance"
msgstr ""
#. Create display time check button
-#: ../panel-plugin/time-out.c:481
+#: ../panel-plugin/time-out.c:485
msgid "Display remaining time in the panel"
msgstr ""
#. Create display hours check button
-#: ../panel-plugin/time-out.c:488
+#: ../panel-plugin/time-out.c:492
msgid "Display hours"
msgstr ""
#. Create display seconds check button
-#: ../panel-plugin/time-out.c:495
+#: ../panel-plugin/time-out.c:499
msgid "Display seconds"
msgstr ""
@@ -88,48 +88,170 @@
msgstr ""
#. Hours:minutes:seconds
-#: ../panel-plugin/time-out-countdown.c:395
+#: ../panel-plugin/time-out-countdown.c:396
+#: ../panel-plugin/time-out-countdown.c:461
#, c-format
msgid "%02d:%02d:%02d"
msgstr ""
#. Minutes:seconds
#. Hours:minutes
-#: ../panel-plugin/time-out-countdown.c:400
-#: ../panel-plugin/time-out-countdown.c:408
+#. 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
#, c-format
msgid "%02d:%02d"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:423
+#: ../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
#, c-format
msgid "Time left: %d seconds"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:425
+#: ../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
msgid "Time left: 1 minute"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:430
+#: ../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"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:439
+#: ../panel-plugin/time-out-countdown.c:514
+#: ../panel-plugin/time-out-countdown.c:644
+#, c-format
msgid "Time left: %d minutes %d seconds"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:432
+#: ../panel-plugin/time-out-countdown.c:441
+#: ../panel-plugin/time-out-countdown.c:510
+#: ../panel-plugin/time-out-countdown.c:588
+#: ../panel-plugin/time-out-countdown.c:640
+#: ../panel-plugin/time-out-countdown.c:652
#, c-format
msgid "Time left: %d minutes"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:438
+#: ../panel-plugin/time-out-countdown.c:447
+#: ../panel-plugin/time-out-countdown.c:574
#, c-format
msgid "Time left: %d hours %d minutes %d seconds"
msgstr ""
-#: ../panel-plugin/time-out-countdown.c:440
+#: ../panel-plugin/time-out-countdown.c:449
+#: ../panel-plugin/time-out-countdown.c:570
+#: ../panel-plugin/time-out-countdown.c:610
#, 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"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:512
+#: ../panel-plugin/time-out-countdown.c:642
+#, 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
+msgid "Time left: 1 hour 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:526
+#, c-format
+msgid "Time left: 1 hour %d seconds"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:531
+#: ../panel-plugin/time-out-countdown.c:595
+msgid "Time left: 1 hour 1 minute"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:533
+msgid "Time left: 1 hour 1 minute 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:535
+#, 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
+#, c-format
+msgid "Time left: 1 hour %d minutes"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:542
+#, c-format
+msgid "Time left: 1 hour %d minutes 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:544
+#, c-format
+msgid "Time left: 1 hour %d minutes %d seconds"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:552
+#, c-format
+msgid "Time left: %d hours"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:554
+#, c-format
+msgid "Time left: %d hours 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:556
+#, c-format
+msgid "Time left: %d hours %d seconds"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:561
+#: ../panel-plugin/time-out-countdown.c:606
+#, c-format
+msgid "Time left: %d hours 1 minute"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:563
+#, c-format
+msgid "Time left: %d hours 1 minute 1 second"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:565
+#, c-format
+msgid "Time left: %d hours 1 minute %d seconds"
+msgstr ""
+
+#: ../panel-plugin/time-out-countdown.c:572
+#, c-format
+msgid "Time left: %d hours %d minutes 1 second"
+msgstr ""
+
#: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:1
msgid "Automatically controlled time outs and breaks"
msgstr ""
More information about the Goodies-commits
mailing list