Fix a couple of translatable strings

* Remove space before punctuation.
* Use "TODO" instead of "ToDo".
* Strip some formats to make sure lines are <=80 characters wide.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

src/calcurse.c

@@ -115,7 +115,7 @@ static inline void key_view_item(void)
 		day_popup_item(day_get_item(ui_day_hilt()));
 	else if ((wins_slctd() == TOD) && (ui_todo_hilt() != 0))
 		item_in_popup(NULL, NULL, ui_todo_saved_mesg(),
-			      _("To do :"));
+			      _("TODO:"));
 	wins_update(FLAG_ALL);
 }
 

src/help.c

@@ -491,9 +491,9 @@ void help_screen(void)
 
 	hscr[HELP_DELETE].title = _("Delete\n");
 	snprintf(hscr[HELP_DELETE].text, HELPTEXTSIZ,
-		 _("Delete an element in the ToDo or Appointment list.\n"
+		 _("Delete an element in the TODO or Appointment list.\n"
 		   "\nDepending on which panel is selected when you press the delete key,\n"
-		   "the hilighted item of either the ToDo or Appointment list will be \n"
+		   "the hilighted item of either the TODO or Appointment list will be \n"
 		   "removed from this list.\n"
 		   "\nIf the item to be deleted is recurrent, you will be asked if you\n"
 		   "wish to suppress all of the item occurences or just the one you\n"
@@ -505,7 +505,7 @@ void help_screen(void)
 
 	hscr[HELP_ADD].title = _("Add\n");
 	snprintf(hscr[HELP_ADD].text, HELPTEXTSIZ,
-		 _("Add an item in either the ToDo or Appointment list, depending on which\n"
+		 _("Add an item in either the TODO or Appointment list, depending on which\n"
 		  "panel is selected when you press '%s'.\n"
 		  "\nTo enter a new item in the TODO list, you will need first to enter the"
 		  "\ndescription of this new item. Then you will be asked to specify the "
@@ -610,7 +610,7 @@ void help_screen(void)
 
 	hscr[HELP_PRIORITY].title = _("Priority\n");
 	snprintf(hscr[HELP_PRIORITY].text, HELPTEXTSIZ,
-		 _("Change the priority of the currently selected item in the ToDo list.\n"
+		 _("Change the priority of the currently selected item in the TODO list.\n"
 		  "Priorities are represented by the number appearing in front of the\n"
 		  "todo description. This number goes from 9 for the lowest priority to\n"
 		  "1 for the highest priority.\n"
@@ -692,7 +692,7 @@ void help_screen(void)
 		  "                           you resize your terminal screen or when\n"
 		  "                           garbage appears inside the display\n"
 		  " '%s' : Add Appointment -> add an appointment or an event\n"
-		  " '%s' : Add ToDo        -> add a todo\n"
+		  " '%s' : Add TODO        -> add a todo\n"
 		  " '%s' : -1 Day          -> move to previous day\n"
 		  " '%s' : +1 Day          -> move to next day\n"
 		  " '%s' : -1 Week         -> move to previous week\n"

src/io.c

@@ -269,7 +269,7 @@ void io_init(const char *cfile, const char *datadir)
 		/* check if the file exists, otherwise create it */
 		data_file = fopen(path_apts, "r");
 		if (data_file == NULL) {
-			printf(_("%s does not exist, create it now [y or n] ? "),
+			printf(_("%s does not exist, create it now [y/n]? "),
 			       path_apts);
 			ch = getchar();
 			switch (ch) {

src/ui-day.c

@@ -45,7 +45,7 @@ static int day_edit_time(int time, unsigned *new_hour,
 {
 	char *timestr = date_sec2date_str(time, "%H:%M");
 	const char *msg_time =
-	    _("Enter the new time ([hh:mm] or [hhmm]) : ");
+	    _("Enter start time ([hh:mm] or [hhmm]):");
 	const char *enter_str = _("Press [Enter] to continue");
 	const char *fmt_msg =
 	    _("You entered an invalid time, should be [hh:mm] or [hhmm]");
@@ -70,7 +70,7 @@ static int day_edit_duration(int start, int dur, unsigned *new_duration)
 {
 	char *timestr = date_sec2date_str(start + dur, "%H:%M");
 	const char *msg_time =
-	    _("Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : ");
+	    _("Enter end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm]):");
 	const char *enter_str = _("Press [Enter] to continue");
 	const char *fmt_msg =
 	    _("You entered an invalid time, should be [hh:mm] or [hhmm]");
@@ -433,7 +433,7 @@ void ui_day_item_add(void)
 	const char *mesg_1 =
 	    _("Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event:");
 	const char *mesg_2 =
-	    _("Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : ");
+	    _("Enter end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm]):");
 	const char *mesg_3 = _("Enter description:");
 	const char *format_message_1 =
 	    _("You entered an invalid start time, should be [hh:mm] or [hhmm]");

src/ui-todo.c

@@ -45,9 +45,9 @@ static char *msgsav;
 void ui_todo_add(void)
 {
 	int ch = 0;
-	const char *mesg = _("Enter the new ToDo item : ");
+	const char *mesg = _("Enter the new TODO item:");
 	const char *mesg_id =
-	    _("Enter the ToDo priority [1 (highest) - 9 (lowest)] :");
+	    _("Enter the TODO priority [1 (highest) - 9 (lowest)]:");
 	char todo_input[BUFSIZ] = "";
 
 	status_mesg(mesg, "");
@@ -62,7 +62,7 @@ void ui_todo_add(void)
 	}
 }
 
-/* Delete an item from the ToDo list. */
+/* Delete an item from the TODO list. */
 void ui_todo_delete(void)
 {
 	const char *del_todo_str =
@@ -113,7 +113,7 @@ void ui_todo_delete(void)
 void ui_todo_edit(void)
 {
 	struct todo *i;
-	const char *mesg = _("Enter the new ToDo description :");
+	const char *mesg = _("Enter the new TODO description:");
 
 	status_mesg(mesg, "");
 	i = todo_get_item(ui_todo_hilt());
@@ -250,7 +250,7 @@ display_todo_item(int incolor, char *msg, int prio, int note, int width,
 		custom_remove_attr(w, ATTR_HIGHEST);
 }
 
-/* Updates the ToDo panel. */
+/* Updates the TODO panel. */
 void ui_todo_update_panel(int which_pan)
 {
 	llist_item_t *i;

src/wins.c

@@ -254,7 +254,7 @@ static void wins_init_panels(void)
 
 	win[TOD].p =
 	    newwin(win[TOD].h, win[TOD].w, win[TOD].y, win[TOD].x);
-	wins_show(win[TOD].p, _("ToDo"));
+	wins_show(win[TOD].p, _("TODO"));
 
 	/* Enable function keys (i.e. arrow keys) in those windows */
 	keypad(win[CAL].p, TRUE);