aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/alarm-notify/util.c3
-rw-r--r--calendar/gui/dialogs/recurrence-page.c1
-rw-r--r--calendar/gui/misc.c1
4 files changed, 11 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a0393412d1..630444d0f7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-11 Andre Klapper <a9016009@gmx.de>
+ * gui/dialogs/recurrence-page.c:
+ * gui/alarm-notify/util.c:
+ * gui/misc.c:
+ adding translator comments to "second" strings to distinguish
+ ordinal numbers and time divisions. Fixes bug 328988.
+
2006-02-11 Karsten Bräckelmann <guenther@rudersport.de>
* gui/dialogs/comp-editor.c (setup_widgets):
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 93e44c1336..9409cc928c 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -61,6 +61,7 @@ calculate_time (time_t start, time_t end)
minutes = difference / 60;
seconds = difference % 60;
if (seconds)
+ /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes), seconds, ngettext(_("second"), _("seconds"), seconds));
else
str = g_strdup_printf (_("(%d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes));
@@ -81,7 +82,7 @@ calculate_time (time_t start, time_t end)
s_hours = g_strdup_printf (ngettext(_("%u hour"),_("%u hours"), hours), hours);
if (s_minutes && s_seconds)
- str = g_strconcat ("(", s_hours, s_minutes, s_seconds, ")", NULL);
+ str = g_strconcat ("(", s_hours, s_minutes, s_seconds, ")", NULL);
else if (s_minutes)
str = g_strconcat ("(", s_hours, s_minutes, ")", NULL);
else if (s_seconds)
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5968ca4324..d37d13a813 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -984,6 +984,7 @@ make_recur_month_num_menu (int month_index)
{
static const char *options[] = {
N_("first"),
+ /* TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute") */
N_("second"),
N_("third"),
N_("fourth"),
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 5ab2739525..2bcc9e1ab5 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -108,6 +108,7 @@ calculate_time (time_t start, time_t end)
minutes = difference / 60;
seconds = difference % 60;
if (seconds)
+ /* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
str = g_strdup_printf (_("(%d %s %d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes), seconds, ngettext(_("second"), _("seconds"), seconds));
else
str = g_strdup_printf (_("(%d %s)"), minutes, ngettext(_("minute"), _("minutes"), minutes));