Improve help texts for recurrence rules

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>

2 files changed, 19 insertions, 16 deletions

diff --git a/doc/repeat.txt b/doc/repeat.txt
index 5e3e435..584a442 100644
--- a/doc/repeat.txt
+++ b/doc/repeat.txt
@@ -19,7 +19,10 @@ three questions with which you specify the basic repetition characteristics:
 
   o  until date: specifies a day after which the repetitions do not occur.  To
                  indicate an endless repetition, enter 0 (zero) or RETURN, and
-		 the item will be repeated forever.
+		 the item will be repeated forever. To obtain a specific
+		 number of repetitions (a repeat count) enter '#' followed by
+		 a number (e.g. #10); it will be turned into the appropriate
+		 until date.
 
 For an advanced repetition you may, in addition to the basic characteristics,
 specify three lists of either days of the week, months of the year or days of
diff --git a/src/ui-day.c b/src/ui-day.c
index 7b2ea0b..76efc9a 100644
--- a/src/ui-day.c
+++ b/src/ui-day.c
@@ -491,22 +491,22 @@ static void help_ilist(int_list_t list, int rule)
 {
 	char *msg1 = "";
 	char *msg2 = "";
-	char *byday_w_d = _("only on these weekdays");
-	char *byday_w_w = _("also on these weekdays");
+	char *byday_w_d = _("Limit repetition to listed days.");
+	char *byday_w_w = _("Expand repetition to listed days.");
 	char *byday_m_m_1 =
-		_("also on these weekdays of month - or only on given monthdays");
+		_("Expand repetition to listed days, either all or 1st, 2nd, ... of month.");
 	char *byday_m_m_2 =
-		_("either all weekdays or 1st, 2nd, ... weekday or 1st, 2nd, ... from the end");
+		_("Note: limit to monthdays, if any.");
 	char *byday_y_y_1 =
-		_("also on these weekdays of year or given months - or only on given monthdays");
+		_("Expand repetition to listed days, either all or 1st, 2nd, ... of year.");
 	char *byday_y_y_2 =
-		_("positive: 1st, 2nd,... weekday of month or year, negative: 1st, 2nd,... from end");
+		_("Note: expand to listed months, if any; limit to monthdays, if any.");
 	char *bymonth_dwm =
-		_("only in these months");
+		_("Limit repetition to listed months.");
 	char *bymonth_y =
-		_("also in these months");
-	char *bymonthday_d = _("only on these days of the month");
-	char *bymonthday_my = _("also on these days of the month");
+		_("Expand repetition to listed months.");
+	char *bymonthday_d = _("Limit repetition to listed days of month.");
+	char *bymonthday_my = _("Expand repetition to listed days of month.");
 
 
 	switch (list) {
@@ -587,13 +587,13 @@ static int edit_ilist(llist_t *ilist, int_list_t list_type, int rule_type)
 {
 	char *msg;
 	char *wday = NULL;
-	char *wday_w = _("Weekdays (%s|..|%s), '?' for help:");
+	char *wday_w = _("Weekdays %s|..|%s, space-separated list, '?' for help:");
 	char *wday_m =
-		_("Weekdays (%1$s|..|%2$s or 1%1$s|..|5%2$s or -1%1$s|..|-5%2$s), '?' for help:");
+		_("Weekdays [n]%s|..|[n]%s, space-separated list, n=1,-1,..,5,-5, '?' for help:");
 	char *wday_y =
-		_("Weekdays (%1$s|..|%2$s or 1%1$s|..|53%2$s or -1%1$s|..|-53%2$s), '?' for help:");
-	char *month = _("Months (1..12), '?' for help:");
-	char *mday = _("Monthdays (1..31 or -1..-31), '?' for help:");
+		_("Weekdays [n]%s|..|[n]%s, space-separated list, n=1,-1,..,53,-53, '?' for help:");
+	char *month = _("Months 1|..|12, space-separated list, '?' for help:");
+	char *mday = _("Monthdays 1|..|31 or -1|..|-31, space-separated list, '?' for help:");
 	char *invalid = _("Invalid format - try again.");
 	char *cont = _("Press any key to continue.");
 	int updated = 0;