aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog96
-rw-r--r--calendar/gui/e-alarm-list.c15
2 files changed, 20 insertions, 91 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ffc2b3837a..596f86ef2c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-06 Andre Klapper <a9016009@gmx.de>
+ * gui/e-alarm-list.c: added translator comments to several strings.
+ Fixes bug 325612.
+
2006-01-06 Andre Klapper <a9016009@gmx.de>
* evolution/calendar/calendar.error.xml:
* evolution/calendar/gui/e-itip-control.c:
@@ -11829,94 +11833,4 @@
expunge async, just get the object list immediately
* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
- expunge async, just get the object list immediately
-
- * gui/e-cal-model.c (query_objects_added_cb): callback for objects
- added to the query
- (query_objects_modified_cb): ditto for modifications
- (query_objects_removed_cb): ditto for removed
- (query_progress_cb): progress of the query
- (query_done_cb): query is done
- (update_query_for_client): connect to the new signals
-
- * cal-client/client-test.c (cal_opened_cb): run a query
-
- * cal-client/cal-query.c: we are given the listener now - listen
- for signals from the listener and emit signals matching the api
- changes
-
- * cal-client/query-listener.[hc]: rewrite to match new query
- listener methods and emit signals rather than using function
- callbacks
-
- * cal-client/cal-marshal.list: add to marshallers
-
- * cal-client/cal-listener.h: add query signal
-
- * cal-client/cal-listener.c (impl_notifyQuery): implement
- (cal_listener_class_init): set notifyQuery method
- (cal_listener_class_init): add query signal
-
- * cal-client/cal-client.h: update protos
-
- * cal-client/cal-client.c (cal_query_cb): handle response to
- getQuery
- (cal_client_init): listen for query signal
- (cal_client_get_query): get a query from the calendar
-
- * pcs/query.h: update protos
-
- * pcs/query.c: rewrite to implement the query start method and
- provide notification calls
-
- * pcs/cal.h: add proto
-
- * pcs/cal.c (impl_Cal_getQuery): re-implement so the backend
- doesn't create the query for us
- (cal_notify_query): respond with the query
-
- * pcs/cal-factory.c: re-order includes
-
- * pcs/cal-common.h: add types
-
- * pcs/cal-backend.h: update protos, vmethods
-
- * pcs/cal-backend.c (cal_backend_class_init): init start_query
- vmethod
- (cal_backend_finalize): free mutex
- (cal_backend_start_query): call through
- (cal_backend_add_query): add a query to the list the backend is
- running
- (cal_backend_get_queries): get the query list
-
- * pcs/cal-backend-object-sexp.h: add proto
-
- * pcs/cal-backend-file.c (cal_backend_file_start_query): skeleton
- for new backend implementation
-
- * pcs/Makefile.am: don't build dead files
-
- * idl/evolution-calendar.idl: make the getQuery call async, make
- the query listener calls oneway and match the addressbook
-
-2003-09-09 Rodrigo Moya <rodrigo@ximian.com>
-
- * pcs/cal-backend-file.c (cal_backend_file_get_object_component):
- added case for getting the individual recurrences if 'rid' is
- not NULL,
-
-2003-09-09 Rodrigo Moya <rodrigo@ximian.com>
-
- * pcs/cal-backend-file.c (match_object_sexp): expand recurrences
- for recurrent objects.
- (match_recurrence_sexp): add the recurrences that match the query
- expression to the object list.
-
-2003-09-08 Rodrigo Moya <rodrigo@ximian.com>
-
- * pcs/cal-backend-file.c: don't store all recurrences in the
- private structure.
-
-2003-09-04 Rodrigo Moya <rodrigo@ximian.com>
-
- * gui/e-day-vie
+ expunge asyn \ No newline at end of file
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 13c0537ec3..9eb5f2db34 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -392,26 +392,31 @@ get_alarm_duration_string (struct icaldurationtype *duration)
have_something = FALSE;
if (duration->days >= 1) {
+ /* Translator: Entire string is like "Pop up an alert %d days before start of appointment" */
g_string_sprintf (string, ngettext("%d day", "%d days", duration->days), duration->days);
have_something = TRUE;
}
if (duration->weeks >= 1) {
+ /* Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" */
g_string_sprintf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
have_something = TRUE;
}
if (duration->hours >= 1) {
+ /* Translator: Entire string is like "Pop up an alert %d hours before start of appointment" */
g_string_sprintf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
have_something = TRUE;
}
if (duration->minutes >= 1) {
+ /* Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" */
g_string_sprintf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
have_something = TRUE;
}
if (duration->seconds >= 1) {
+ /* Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" */
g_string_sprintf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
have_something = TRUE;
}
@@ -494,14 +499,20 @@ get_alarm_string (ECalComponentAlarm *alarm)
if (dur) {
if (trigger.u.rel_duration.is_neg)
+ /* Translator: The first %s refers to the base, which would be actions like
+ * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" */
str = g_strdup_printf (_("%s %s before the end of the appointment"),
base, dur);
else
+ /* Translator: The first %s refers to the base, which would be actions like
+ * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes" */
str = g_strdup_printf (_("%s %s after the end of the appointment"),
base, dur);
g_free (dur);
} else
+ /* Translator: The %s refers to the base, which would be actions like
+ * "Play a sound" */
str = g_strdup_printf (_("%s at the end of the appointment"), base);
break;
@@ -524,12 +535,16 @@ get_alarm_string (ECalComponentAlarm *alarm)
e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
FALSE, FALSE, buf, sizeof (buf));
+ /* Translator: The first %s refers to the base, which would be actions like
+ * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM" */
str = g_strdup_printf (_("%s at %s"), base, buf);
break; }
case E_CAL_COMPONENT_ALARM_TRIGGER_NONE:
default:
+ /* Translator: The %s refers to the base, which would be actions like
+ * "Play a sound". "Trigger types" are absolute or relative dates */
str = g_strdup_printf (_("%s for an unknown trigger type"), base);
break;
}