2.1_beta soon to be released

6 files changed, 1674 insertions, 1488 deletions

diff --git a/configure.ac b/configure.ac
index 7292366..d9d8de6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-#	$calcurse: configure.ac,v 1.16 2008/03/02 08:50:17 culot Exp $
+#	$calcurse: configure.ac,v 1.17 2008/04/20 13:52:06 culot Exp $
 
 #-------------------------------------------------------------------------------
 #                                                                           Init
 #-------------------------------------------------------------------------------
 AC_PREREQ(2.59)
-AC_INIT(calcurse, 2.0, frederic@culot.org)
+AC_INIT(calcurse, 2.1_beta, frederic@culot.org)
 AM_INIT_AUTOMAKE
 AM_GNU_GETTEXT([external])
 AC_CONFIG_SRCDIR([src/calcurse.c])
diff --git a/po/calcurse.pot b/po/calcurse.pot
index eb01e97..cddd23d 100755
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-02-16 12:26+0100\n"
+"POT-Creation-Date: 2008-04-20 11:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,76 +16,77 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:117
+#: src/apoint.c:119
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 
-#: src/apoint.c:118
+#: src/apoint.c:122
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr ""
 
-#: src/apoint.c:119
+#: src/apoint.c:123
 msgid "Enter description :"
 msgstr ""
 
-#: src/apoint.c:120
+#: src/apoint.c:125
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 
-#: src/apoint.c:121
+#: src/apoint.c:127
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 
-#: src/apoint.c:122 src/day.c:500 src/day.c:525 src/day.c:583
+#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
 msgid "Press [Enter] to continue"
 msgstr ""
 
-#: src/apoint.c:215
+#: src/apoint.c:230
 msgid "Do you really want to delete this item ?"
 msgstr ""
 
-#: src/apoint.c:216
+#: src/apoint.c:231
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr ""
 
-#: src/apoint.c:359 src/recur.c:239
+#: src/apoint.c:386 src/recur.c:252
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr ""
 
-#: src/apoint.c:381
+#: src/apoint.c:411
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr ""
 
-#: src/apoint.c:421
+#: src/apoint.c:454
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr ""
 
-#: src/apoint.c:573
+#: src/apoint.c:615
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr ""
 
 #: src/args.c:51
-msgid "Usage: calcurse [-h|-v] [-x] [-an] [-t[num]] [-d date|num] [-c file]\n"
+msgid ""
+"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr ""
 
-#: src/args.c:60
+#: src/args.c:59
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr ""
 
-#: src/args.c:73
+#: src/args.c:71
 msgid ""
 "\n"
-"Copyright (c) 2004-2007 Frederic Culot.\n"
+"Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 
-#: src/args.c:77 src/args.c:122
+#: src/args.c:74 src/args.c:121
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr ""
 
-#: src/args.c:90
+#: src/args.c:87
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -111,6 +112,10 @@ msgid ""
 "  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
 "\tis the remaining time before this next appointment.\n"
 "\n"
+"  -N, --note\n"
+"\twhen used with the '-a' or '-t' flag, also print note content\n"
+"\tif one is associated with the displayed item.\n"
+"\n"
 "  -t[num], --todo[=num]\n"
 "\tprint todo list and exit. If the optional number [num] is given,\n"
 "\tthen only todos having a priority equal to [num] will be returned.\n"
@@ -126,29 +131,29 @@ msgid ""
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 
-#: src/args.c:143
+#: src/args.c:169
+msgid "No note file found\n"
+msgstr ""
+
+#: src/args.c:191
 msgid "to do:\n"
 msgstr ""
 
-#: src/args.c:175
+#: src/args.c:225
 msgid "next appointment:\n"
 msgstr ""
 
-#: src/args.c:365
+#: src/args.c:449
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr ""
 
-#: src/args.c:367
-msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-msgstr ""
-
-#: src/args.c:369
+#: src/args.c:455
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 msgstr ""
 
-#: src/args.c:372
+#: src/args.c:458
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 
@@ -162,287 +167,303 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr ""
 
-#: src/calcurse.c:234
+#: src/calcurse.c:239
 msgid "To do :"
 msgstr ""
 
-#: src/calendar.c:129
+#: src/calendar.c:132
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:343
+#: src/calendar.c:347
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:344 src/custom.c:211 src/io.c:401 src/io.c:707 src/io.c:816
-#: src/io.c:835
+#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
+#: src/io.c:937
 msgid "Press [ENTER] to continue"
 msgstr ""
 
-#: src/calendar.c:346
-msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
-msgstr ""
-
-#: src/custom.c:46
+#: src/custom.c:47
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr ""
 
-#: src/custom.c:66
+#: src/custom.c:67
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr ""
 
-#: src/custom.c:68
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr ""
 
-#: src/custom.c:70
+#: src/custom.c:71
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 
-#: src/custom.c:78
+#: src/custom.c:81
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 
-#: src/custom.c:210
+#: src/custom.c:217
 msgid "Failed to open config file"
 msgstr ""
 
-#: src/custom.c:289
+#: src/custom.c:311
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 
-#: src/custom.c:343
+#: src/custom.c:369
 msgid "Exit"
 msgstr ""
 
-#: src/custom.c:344
+#: src/custom.c:370
 msgid "General"
 msgstr ""
 
-#: src/custom.c:345
+#: src/custom.c:371
 msgid "Layout"
 msgstr ""
 
-#: src/custom.c:346
+#: src/custom.c:372
 msgid "Color"
 msgstr ""
 
-#: src/custom.c:347
+#: src/custom.c:373
 msgid "Notify"
 msgstr ""
 
-#: src/custom.c:359
+#: src/custom.c:386
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr ""
 
-#: src/custom.c:360
+#: src/custom.c:388
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr ""
 
-#: src/custom.c:362
+#: src/custom.c:390
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr ""
 
-#: src/custom.c:364
+#: src/custom.c:392
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr ""
 
-#: src/custom.c:417
+#: src/custom.c:446
 msgid "Foreground"
 msgstr ""
 
-#: src/custom.c:418
+#: src/custom.c:447
 msgid "Background"
 msgstr ""
 
-#: src/custom.c:419
+#: src/custom.c:448
 msgid "(terminal's default)"
 msgstr ""
 
-#: src/custom.c:422
+#: src/custom.c:451
 msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
 msgstr ""
 
-#: src/custom.c:424
+#: src/custom.c:453
 msgid "('0' for no color, 'Q' to exit) :"
 msgstr ""
 
-#: src/custom.c:455
+#: src/custom.c:487
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr ""
 
-#: src/custom.c:644
+#: src/custom.c:680
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr ""
 
-#: src/custom.c:672
+#: src/custom.c:711
 msgid "auto_save = "
 msgstr ""
 
-#: src/custom.c:673
+#: src/custom.c:712
 msgid "confirm_quit = "
 msgstr ""
 
-#: src/custom.c:674
+#: src/custom.c:713
 msgid "confirm_delete = "
 msgstr ""
 
-#: src/custom.c:675
+#: src/custom.c:714
 msgid "skip_system_dialogs = "
 msgstr ""
 
-#: src/custom.c:676
+#: src/custom.c:715
 msgid "skip_progress_bar = "
 msgstr ""
 
-#: src/custom.c:677
+#: src/custom.c:716
 msgid "week_begins_on_monday = "
 msgstr ""
 
-#: src/custom.c:686
+#: src/custom.c:717
+msgid "output_datefmt = "
+msgstr ""
+
+#: src/custom.c:718
+msgid "input_datefmt = "
+msgstr ""
+
+#: src/custom.c:724
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr ""
 
-#: src/custom.c:692
+#: src/custom.c:729
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr ""
 
-#: src/custom.c:698
+#: src/custom.c:734
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr ""
 
-#: src/custom.c:704
+#: src/custom.c:741
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 
-#: src/custom.c:710
+#: src/custom.c:748
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 
-#: src/custom.c:716
+#: src/custom.c:755
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 
-#: src/custom.c:728 src/notify.c:505
+#: src/custom.c:763
+msgid "(Format of the date to be displayed in non-interactive mode)"
+msgstr ""
+
+#: src/custom.c:769
+msgid "(Format to be used when entering a date: "
+msgstr ""
+
+#: src/custom.c:770
+msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
+msgstr ""
+
+#: src/custom.c:795 src/notify.c:522
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr ""
 
-#: src/custom.c:733
+#: src/custom.c:797 src/notify.c:524
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
+#: src/custom.c:799
+msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
+msgstr ""
+
+#: src/custom.c:805
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr ""
 
-#: src/day.c:438
+#: src/day.c:456
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr ""
 
-#: src/day.c:441
+#: src/day.c:459
 msgid "Event :"
 msgstr ""
 
-#: src/day.c:445
+#: src/day.c:462
 msgid "Appointment :"
 msgstr ""
 
-#: src/day.c:499
+#: src/day.c:517
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr ""
 
-#: src/day.c:502
+#: src/day.c:519
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr ""
 
-#: src/day.c:524 src/day.c:579
+#: src/day.c:543 src/day.c:601
 msgid "Invalid time: start time must be before end time!"
 msgstr ""
 
-#: src/day.c:562
+#: src/day.c:585
 msgid "Enter the new item description:"
 msgstr ""
 
-#: src/day.c:574
+#: src/day.c:597
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:576 src/recur.c:615
+#: src/day.c:599 src/recur.c:651
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:577 src/recur.c:619
+#: src/day.c:600 src/recur.c:653
 msgid "The frequence you entered is not valid."
 msgstr ""
 
-#: src/day.c:580 src/recur.c:622
+#: src/day.c:602 src/recur.c:656
 msgid "The entered date is not valid."
 msgstr ""
 
-#: src/day.c:581 src/recur.c:624
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr ""
-
-#: src/day.c:600
+#: src/day.c:628
 msgid "Enter the new repetition frequence:"
 msgstr ""
 
-#: src/day.c:618
-msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
-msgstr ""
-
-#: src/day.c:692
+#: src/day.c:737
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr ""
 
-#: src/day.c:714
+#: src/day.c:758
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 
-#: src/day.c:738
+#: src/day.c:783
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr ""
 
-#: src/day.c:770
+#: src/day.c:816
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 
-#: src/day.c:773
+#: src/day.c:819
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 
-#: src/day.c:775
+#: src/day.c:821
 msgid "[i/n] "
 msgstr ""
 
-#: src/day.c:776
+#: src/day.c:822
 msgid "[a/o] "
 msgstr ""
 
-#: src/event.c:113
+#: src/event.c:118
 msgid "FATAL ERROR in event_scan: date error in the event\n"
 msgstr ""
 
-#: src/event.c:135
+#: src/event.c:143
 msgid "FATAL ERROR in event_get: no such item\n"
 msgstr ""
 
-#: src/event.c:166
+#: src/event.c:178
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr ""
 
-#: src/help.c:109
+#: src/help.c:119
 #, c-format
-msgid "CalCurse %s | help"
+msgid "Calcurse %s | help"
 msgstr ""
 
-#: src/help.c:267
+#: src/help.c:272
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr ""
 
-#: src/help.c:269
+#: src/help.c:274
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -461,11 +482,11 @@ msgid ""
 "       Credits:  Press '@' for credits."
 msgstr ""
 
-#: src/help.c:282
+#: src/help.c:287
 msgid "Save:\n"
 msgstr ""
 
-#: src/help.c:284
+#: src/help.c:289
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -480,11 +501,11 @@ msgid ""
 "automatically before quitting."
 msgstr ""
 
-#: src/help.c:294
+#: src/help.c:299
 msgid "Export:\n"
 msgstr ""
 
-#: src/help.c:296
+#: src/help.c:301
 msgid ""
 "Pressing 'X' exports the Calcurse data to iCalendar format.\n"
 "\n"
@@ -497,11 +518,11 @@ msgid ""
 "events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:303
+#: src/help.c:308
 msgid "Displacement keys:\n"
 msgstr ""
 
-#: src/help.c:305
+#: src/help.c:310
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -519,17 +540,17 @@ msgid ""
 "an item from those lists."
 msgstr ""
 
-#: src/help.c:317
+#: src/help.c:322
 msgid "View:\n"
 msgstr ""
 
-#: src/help.c:319
+#: src/help.c:324
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-"space to display it. If that is the case, the description will be\n"
+" space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
 "description, just press 'V' and a popup window will appear, containing\n"
 "the whole event.\n"
@@ -538,11 +559,11 @@ msgid ""
 "Calcurse screen."
 msgstr ""
 
-#: src/help.c:329
+#: src/help.c:335
 msgid "Tab:\n"
 msgstr ""
 
-#: src/help.c:331
+#: src/help.c:337
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -557,11 +578,11 @@ msgid ""
 "performed on the selected panel."
 msgstr ""
 
-#: src/help.c:341
+#: src/help.c:347
 msgid "Goto:\n"
 msgstr ""
 
-#: src/help.c:343
+#: src/help.c:349
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -571,11 +592,11 @@ msgid ""
 "system current date and you will be taken to that date."
 msgstr ""
 
-#: src/help.c:349
+#: src/help.c:355
 msgid "Delete:\n"
 msgstr ""
 
-#: src/help.c:351
+#: src/help.c:357
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -593,11 +614,11 @@ msgid ""
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:363
+#: src/help.c:369
 msgid "Add:\n"
 msgstr ""
 
-#: src/help.c:365
+#: src/help.c:371
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
@@ -624,22 +645,22 @@ msgid ""
 "pressing 'A'.\n"
 "\n"
 "Notes:\n"
-"       o if an appointment lasts for such a long time that it continues\n"
-"         on the next days, this event will be indicated on all the\n"
-"         corresponding days, and the beginning or ending hour will be\n"
-"         replaced by '..' if the event does not begin or end on the day.\n"
-"       o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-"         description prompt, without any description, no item will be\n"
-"         added.\n"
-"       o do not forget to save the calendar data to retrieve the new\n"
-"         event next time you launch Calcurse."
-msgstr ""
-
-#: src/help.c:396
+"     o if an appointment lasts for such a long time that it continues\n"
+"       on the next days, this event will be indicated on all the\n"
+"       corresponding days, and the beginning or ending hour will be\n"
+"       replaced by '..' if the event does not begin or end on the day.\n"
+"     o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
+"       description prompt, without any description, no item will be\n"
+"       added.\n"
+"     o do not forget to save the calendar data to retrieve the new\n"
+"       event next time you launch Calcurse."
+msgstr ""
+
+#: src/help.c:401
 msgid "Edit Item:\n"
 msgstr ""
 
-#: src/help.c:398
+#: src/help.c:403
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -650,19 +671,19 @@ msgid ""
 "its actual value, and you will be able to change it as you like.\n"
 "\n"
 "Notes:\n"
-"       o if you choose to edit the item repetition properties, you will\n"
-"         be asked to re-enter all of the repetition characteristics\n"
-"         (repetition type, frequence, and ending date). Moreover, the\n"
-"         previous data concerning the deleted occurences will be lost.\n"
-"       o do not forget to save the calendar data to retrieve the\n"
-"         modified properties next time you launch Calcurse."
+"     o if you choose to edit the item repetition properties, you will\n"
+"       be asked to re-enter all of the repetition characteristics\n"
+"       (repetition type, frequence, and ending date). Moreover, the\n"
+"       previous data concerning the deleted occurences will be lost.\n"
+"     o do not forget to save the calendar data to retrieve the\n"
+"       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:413
+#: src/help.c:418
 msgid "EditNote:\n"
 msgstr ""
 
-#: src/help.c:415
+#: src/help.c:420
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -673,44 +694,44 @@ msgid ""
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
-"       o if the 'VISUAL' environment variable is set, then this will be\n"
-"         the default editor to be called.\n"
-"       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
-"         will be used as the default editor.\n"
-"       o if none of the above environment variables is set, then\n"
-"         '/usr/bin/vi' will be used.\n"
+"     o if the 'VISUAL' environment variable is set, then this will be\n"
+"       the default editor to be called.\n"
+"     o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+"       will be used as the default editor.\n"
+"     o if none of the above environment variables is set, then\n"
+"       '/usr/bin/vi' will be used.\n"
 "\n"
 "Once the item note is edited and saved, quit your favorite editor.\n"
 "You will then go back to Calcurse, and the '>' sign will appear in front\n"
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:434
+#: src/help.c:439
 msgid "ViewNote:\n"
 msgstr ""
 
-#: src/help.c:436
+#: src/help.c:441
 msgid ""
 "Pressing the '>' key allows you to view a note which was previously\n"
 "attached to an item (an item which owns a note has a '>' sign in front\n"
 "of it). This command only permits to view the note, not to\n"
 "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the 'N' key\n"
+"Once you highlighted an item with a note attached to it, and the '>' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
-"       o if the 'PAGER' environment variable is set, then this will be\n"
-"         the default viewer to be called.\n"
-"       o if the above environment variable is not set, then\n"
-"         '/usr/bin/less' will be used.\n"
+"     o if the 'PAGER' environment variable is set, then this will be\n"
+"       the default viewer to be called.\n"
+"     o if the above environment variable is not set, then\n"
+"       '/usr/bin/less' will be used.\n"
 "As for the 'N' key, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:450
+#: src/help.c:456
 msgid "Priority:\n"
 msgstr ""
 
-#: src/help.c:452
+#: src/help.c:458
 msgid ""
 "Pressing '+' or '-' allows you to change the priority of the currently\n"
 "selected item in the ToDo list. Priorities are represented by the number\n"
@@ -727,11 +748,11 @@ msgid ""
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:464
+#: src/help.c:472
 msgid "Repeat:\n"
 msgstr ""
 
-#: src/help.c:466
+#: src/help.c:474
 msgid ""
 "Pressing 'R' allows you to repeat an event or an appointment. You must\n"
 "first select the item to be repeated by moving inside the appointment\n"
@@ -762,11 +783,11 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:490
+#: src/help.c:498
 msgid "Flag Item:\n"
 msgstr ""
 
-#: src/help.c:492
+#: src/help.c:500
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -778,11 +799,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:500
+#: src/help.c:508
 msgid "Config:\n"
 msgstr ""
 
-#: src/help.c:502
+#: src/help.c:510
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -801,11 +822,11 @@ msgid ""
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:513
+#: src/help.c:521
 msgid "General keybindings:\n"
 msgstr ""
 
-#: src/help.c:515
+#: src/help.c:523
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -825,11 +846,11 @@ msgid ""
 " '^J' : +1 Week         -> move to next week"
 msgstr ""
 
-#: src/help.c:531
+#: src/help.c:539
 msgid "OtherCmd:\n"
 msgstr ""
 
-#: src/help.c:533
+#: src/help.c:541
 msgid ""
 "Pressing 'O' allows you to switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
@@ -839,13 +860,13 @@ msgid ""
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:540
+#: src/help.c:548
 msgid "Calcurse - text-based organizer"
 msgstr ""
 
-#: src/help.c:542
+#: src/help.c:550
 msgid ""
-"Copyright (c) 2004-2007 Frederic Culot\n"
+"Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -862,92 +883,92 @@ msgid ""
 "Calcurse home page : http://culot.org/calcurse"
 msgstr ""
 
-#: src/io.c:59
+#: src/io.c:61
 msgid "Saving..."
 msgstr ""
 
-#: src/io.c:60
+#: src/io.c:62
 msgid "Loading..."
 msgstr ""
 
-#: src/io.c:61
+#: src/io.c:63
 msgid "Exporting..."
 msgstr ""
 
-#: src/io.c:124
+#: src/io.c:126
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:126
+#: src/io.c:128
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:128 src/recur.c:626
+#: src/io.c:129 src/recur.c:660
 msgid "Press [ENTER] to continue."
 msgstr ""
 
-#: src/io.c:345
+#: src/io.c:365
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr ""
 
-#: src/io.c:350 src/io.c:367
+#: src/io.c:371 src/io.c:391
 #, c-format
 msgid "aborting...\n"
 msgstr ""
 
-#: src/io.c:361
+#: src/io.c:385
 #, c-format
 msgid "%s successfully created\n"
 msgstr ""
 
-#: src/io.c:362
+#: src/io.c:386
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr ""
 
-#: src/io.c:397
+#: src/io.c:422
 msgid "Problems accessing data file ..."
 msgstr ""
 
-#: src/io.c:400
+#: src/io.c:433
 msgid "The data files were successfully saved"
 msgstr ""
 
-#: src/io.c:560
+#: src/io.c:612
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr ""
 
-#: src/io.c:579
+#: src/io.c:633
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr ""
 
-#: src/io.c:594
+#: src/io.c:649
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr ""
 
-#: src/io.c:706
+#: src/io.c:793
 msgid "Failed to open todo file"
 msgstr ""
 
-#: src/io.c:757 src/io.c:775
+#: src/io.c:855 src/io.c:875
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr ""
 
-#: src/io.c:814
+#: src/io.c:914
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr ""
 
-#: src/io.c:815
+#: src/io.c:915
 msgid "Data files found. Data will be loaded now."
 msgstr ""
 
-#: src/io.c:833
+#: src/io.c:935
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr ""
 
-#: src/io.c:834
+#: src/io.c:936
 msgid "The data were successfully exported"
 msgstr ""
 
@@ -955,137 +976,139 @@ msgstr ""
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr ""
 
-#: src/notify.c:139
+#: src/notify.c:138
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr ""
 
-#: src/notify.c:434
+#: src/notify.c:451
 msgid "notify-bar_show = "
 msgstr ""
 
-#: src/notify.c:435
+#: src/notify.c:452
 msgid "notify-bar_date = "
 msgstr ""
 
-#: src/notify.c:436
+#: src/notify.c:453
 msgid "notify-bar_clock = "
 msgstr ""
 
-#: src/notify.c:437
+#: src/notify.c:454
 msgid "notify-bar_warning = "
 msgstr ""
 
-#: src/notify.c:438
+#: src/notify.c:455
 msgid "notify-bar_command = "
 msgstr ""
 
-#: src/notify.c:441
+#: src/notify.c:458
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr ""
 
-#: src/notify.c:444
+#: src/notify.c:460
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:447
+#: src/notify.c:463
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:450
+#: src/notify.c:466
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 
-#: src/notify.c:454
+#: src/notify.c:469
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr ""
 
-#: src/notify.c:507
-msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-
-#: src/notify.c:509
+#: src/notify.c:526
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/notify.c:511
+#: src/notify.c:528
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 
-#: src/notify.c:512
+#: src/notify.c:529
 msgid "Enter the notification command "
 msgstr ""
 
-#: src/notify.c:516
+#: src/notify.c:533
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr ""
 
-#: src/recur.c:127
+#: src/recur.c:131
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr ""
 
-#: src/recur.c:158
+#: src/recur.c:163
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr ""
 
-#: src/recur.c:281
+#: src/recur.c:299
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr ""
 
-#: src/recur.c:399
+#: src/recur.c:421
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr ""
 
-#: src/recur.c:522
+#: src/recur.c:554
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr ""
 
-#: src/recur.c:591
+#: src/recur.c:626
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr ""
 
-#: src/recur.c:614
+#: src/recur.c:650
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:617
+#: src/recur.c:652
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:621
-msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
+#: src/recur.c:655
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr ""
+
+#: src/recur.c:658
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetetition"
 msgstr ""
 
-#: src/recur.c:625
+#: src/recur.c:659
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:628
+#: src/recur.c:662
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:717
+#: src/recur.c:776
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr ""
 
-#: src/recur.c:744
+#: src/recur.c:805
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr ""
 
-#: src/recur.c:811
+#: src/recur.c:880
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr ""
 
-#: src/recur.c:832
+#: src/recur.c:904
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr ""
 
-#: src/recur.c:865
+#: src/recur.c:940
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 
-#: src/todo.c:137
+#: src/todo.c:138
 msgid "Enter the new ToDo item : "
 msgstr ""
 
@@ -1093,39 +1116,39 @@ msgstr ""
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 
-#: src/todo.c:189
+#: src/todo.c:192
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr ""
 
-#: src/todo.c:198
+#: src/todo.c:201
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr ""
 
-#: src/todo.c:225
+#: src/todo.c:230
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr ""
 
-#: src/todo.c:235
+#: src/todo.c:240
 msgid "Do you really want to delete this task ?"
 msgstr ""
 
-#: src/todo.c:237
+#: src/todo.c:242
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 
-#: src/todo.c:240
+#: src/todo.c:244
 msgid "[t/n] "
 msgstr ""
 
-#: src/todo.c:312
+#: src/todo.c:328
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr ""
 
-#: src/todo.c:337
+#: src/todo.c:360
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr ""
 
-#: src/todo.c:352
+#: src/todo.c:375
 msgid "Enter the new ToDo description :"
 msgstr ""
 
@@ -1141,219 +1164,219 @@ msgstr ""
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:137
+#: src/utils.c:140
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/utils.c:360
+#: src/utils.c:378
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr ""
 
-#: src/utils.c:400
+#: src/utils.c:420
 msgid "Help"
 msgstr ""
 
-#: src/utils.c:401
+#: src/utils.c:421
 msgid "Quit"
 msgstr ""
 
-#: src/utils.c:402
+#: src/utils.c:422
 msgid "Save"
 msgstr ""
 
-#: src/utils.c:403
+#: src/utils.c:423
 msgid "Export"
 msgstr ""
 
-#: src/utils.c:404
+#: src/utils.c:424
 msgid "Add Item"
 msgstr ""
 
-#: src/utils.c:405
+#: src/utils.c:425
 msgid "Del Item"
 msgstr ""
 
-#: src/utils.c:406
+#: src/utils.c:426
 msgid "Edit Itm"
 msgstr ""
 
-#: src/utils.c:407
+#: src/utils.c:427
 msgid "Flag Itm"
 msgstr ""
 
-#: src/utils.c:408 src/utils.c:422
+#: src/utils.c:428 src/utils.c:442
 msgid "-+1 Day"
 msgstr ""
 
-#: src/utils.c:409 src/utils.c:423
+#: src/utils.c:429 src/utils.c:443
 msgid "-+1 Week"
 msgstr ""
 
-#: src/utils.c:410
+#: src/utils.c:430
 msgid "Up/Down"
 msgstr ""
 
-#: src/utils.c:411
+#: src/utils.c:431
 msgid "Repeat"
 msgstr ""
 
-#: src/utils.c:412
+#: src/utils.c:432
 msgid "Priority"
 msgstr ""
 
-#: src/utils.c:413
+#: src/utils.c:433
 msgid "Chg View"
 msgstr ""
 
-#: src/utils.c:414
+#: src/utils.c:434
 msgid "Go to"
 msgstr ""
 
-#: src/utils.c:415
+#: src/utils.c:435
 msgid "Config"
 msgstr ""
 
-#: src/utils.c:416
+#: src/utils.c:436
 msgid "View"
 msgstr ""
 
-#: src/utils.c:417
+#: src/utils.c:437
 msgid "Redraw"
 msgstr ""
 
-#: src/utils.c:418
+#: src/utils.c:438
 msgid "Add Appt"
 msgstr ""
 
-#: src/utils.c:419
+#: src/utils.c:439
 msgid "Add Todo"
 msgstr ""
 
-#: src/utils.c:420
+#: src/utils.c:440
 msgid "EditNote"
 msgstr ""
 
-#: src/utils.c:421
+#: src/utils.c:441
 msgid "ViewNote"
 msgstr ""
 
-#: src/utils.c:424
+#: src/utils.c:444
 msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:488
+#: src/utils.c:509
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr ""
 
-#: src/utils.c:743
+#: src/utils.c:725
 msgid "Appointment"
 msgstr ""
 
-#: src/utils.c:766
+#: src/utils.c:751
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr ""
 
-#: src/utils.c:834
+#: src/utils.c:825
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr ""
 
-#: src/utils.c:836
+#: src/utils.c:827
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr ""
 
-#: src/utils.c:857
+#: src/utils.c:849
 msgid "yes"
 msgstr ""
 
-#: src/utils.c:860
+#: src/utils.c:854
 msgid "no"
 msgstr ""
 
-#: src/utils.c:863
+#: src/utils.c:858
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr ""
 
-#: src/utils.c:900
+#: src/utils.c:895
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:914
+#: src/utils.c:909
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr ""
 
-#: src/vars.c:48
+#: src/vars.c:49
 msgid "January"
 msgstr ""
 
-#: src/vars.c:49
+#: src/vars.c:50
 msgid "February"
 msgstr ""
 
-#: src/vars.c:50
+#: src/vars.c:51
 msgid "March"
 msgstr ""
 
-#: src/vars.c:51
+#: src/vars.c:52
 msgid "April"
 msgstr ""
 
-#: src/vars.c:52
+#: src/vars.c:53
 msgid "May"
 msgstr ""
 
-#: src/vars.c:53
+#: src/vars.c:54
 msgid "June"
 msgstr ""
 
-#: src/vars.c:54
+#: src/vars.c:55
 msgid "July"
 msgstr ""
 
-#: src/vars.c:55
+#: src/vars.c:56
 msgid "August"
 msgstr ""
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "September"
 msgstr ""
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "October"
 msgstr ""
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "November"
 msgstr ""
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "December"
 msgstr ""
 
-#: src/vars.c:62 src/vars.c:69
+#: src/vars.c:64 src/vars.c:71
 msgid "Sun"
 msgstr ""
 
-#: src/vars.c:63
+#: src/vars.c:65
 msgid "Mon"
 msgstr ""
 
-#: src/vars.c:64
+#: src/vars.c:66
 msgid "Tue"
 msgstr ""
 
-#: src/vars.c:65
+#: src/vars.c:67
 msgid "Wed"
 msgstr ""
 
-#: src/vars.c:66
+#: src/vars.c:68
 msgid "Thu"
 msgstr ""
 
-#: src/vars.c:67
+#: src/vars.c:69
 msgid "Fri"
 msgstr ""
 
-#: src/vars.c:68
+#: src/vars.c:70
 msgid "Sat"
 msgstr ""
 
@@ -1372,6 +1395,6 @@ msgstr ""
 msgid "ToDo"
 msgstr ""
 
-#: src/wins.c:341
+#: src/wins.c:417
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index a57093f..5773465 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# 	$calcurse: de.po,v 1.11 2008/03/02 08:50:17 culot Exp $
+# 	$calcurse: de.po,v 1.12 2008/04/20 13:52:06 culot Exp $
 #
 # German translations for calcurse package.
 # Copyright (C) 2006-2007 Michael Schulz <bloodshower@web.de>
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.9\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-02-16 12:26+0100\n"
+"POT-Creation-Date: 2008-04-20 11:16+0200\n"
 "PO-Revision-Date: 2007-09-02 18:06+0200\n"
 "Last-Translator: Michael\n"
 "Language-Team:  Michael Schulz <bloodshower@freenet.de>\n"
@@ -18,86 +18,90 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/apoint.c:117
+#: src/apoint.c:119
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Geben Sie den Beginn ein ([SS:MM] oder [S:MM]), keine Eingabe für ein "
 "ganztägiges Ereignis:"
 
-#: src/apoint.c:118
+#: src/apoint.c:122
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Geben Sie das Ende ein ([SS:MM] oder [S:MM]) oder Dauer (in Minuten) :"
 
-#: src/apoint.c:119
+#: src/apoint.c:123
 msgid "Enter description :"
 msgstr "Geben Sie eine Beschreibung ein :"
 
-#: src/apoint.c:120
+#: src/apoint.c:125
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Sie gaben einen ungültigen Startzeitpunkt an! Format [S:MM] oder [SS:MM]."
 
-#: src/apoint.c:121
+#: src/apoint.c:127
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 "Sie gaben einen ungültigen Endzeitpunkt an! Format [S:MM] oder [SS:MM] oder "
 "[MM]."
 
-#: src/apoint.c:122 src/day.c:500 src/day.c:525 src/day.c:583
+#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
 msgid "Press [Enter] to continue"
 msgstr "[EINGABE]-Taste um fortzufahren"
 
-#: src/apoint.c:215
+#: src/apoint.c:230
 msgid "Do you really want to delete this item ?"
 msgstr "Möchten Sie wirklich diesen Eintrag löschen ?"
 
-#: src/apoint.c:216
+#: src/apoint.c:231
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "SCHWERER FEHLER in apoint_delete: Typ nicht gefunden\n"
 
-#: src/apoint.c:359 src/recur.c:239
+#: src/apoint.c:386 src/recur.c:252
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "SCHWERER FEHLER in apoint_scan: Termin hat fehlerhafte Zeit\n"
 
-#: src/apoint.c:381
+#: src/apoint.c:411
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "SCHWERER FEHLER in apoint_delete: Typ nicht gefunden\n"
 
-#: src/apoint.c:421
+#: src/apoint.c:454
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "SCHWERER FEHLER in apoint_delete_bynum: Termin nicht vorhanden"
 
-#: src/apoint.c:573
+#: src/apoint.c:615
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "SCHWERER FEHLER in apoint_switch_notify: Termin nicht vorhanden"
 
 #: src/args.c:51
-msgid "Usage: calcurse [-h|-v] [-x] [-an] [-t[num]] [-d date|num] [-c file]\n"
+#, fuzzy
+msgid ""
+"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr ""
 "Aufruf: calcurse [-h|-v] [-x] [-an] [-t[Nr]] [-d Datum|Nr] [-c Datei]\n"
 
-#: src/args.c:60
+#: src/args.c:59
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Versuche Sie 'calcurse -h', um weitere Informationen zu erhalten.\n"
 
-#: src/args.c:73
+#: src/args.c:71
+#, fuzzy
 msgid ""
 "\n"
-"Copyright (c) 2004-2007 Frederic Culot.\n"
+"Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 "\n"
 "Copyright (c) 2004-2007 Frederic Culot.\n"
 "Dies ist freie Software; lesen Sie den Programmcode zu näheren Details.\n"
 
-#: src/args.c:77 src/args.c:122
+#: src/args.c:74 src/args.c:121
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - textbasierender Terminkalender\n"
 
-#: src/args.c:90
+#: src/args.c:87
+#, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -123,6 +127,10 @@ msgid ""
 "  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
 "\tis the remaining time before this next appointment.\n"
 "\n"
+"  -N, --note\n"
+"\twhen used with the '-a' or '-t' flag, also print note content\n"
+"\tif one is associated with the displayed item.\n"
+"\n"
 "  -t[num], --todo[=num]\n"
 "\tprint todo list and exit. If the optional number [num] is given,\n"
 "\tthen only todos having a priority equal to [num] will be returned.\n"
@@ -179,23 +187,23 @@ msgstr ""
 "Bitte melden Sie Fehler und Vorschläge an <calcurse@culot.org>.\n"
 "\n"
 
-#: src/args.c:143
+#: src/args.c:169
+msgid "No note file found\n"
+msgstr ""
+
+#: src/args.c:191
 msgid "to do:\n"
 msgstr "Aufgaben:\n"
 
-#: src/args.c:175
+#: src/args.c:225
 msgid "next appointment:\n"
 msgstr "nächster Termin :\n"
 
-#: src/args.c:365
+#: src/args.c:449
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr "Argument von '-d' ist nicht gültig.\n"
 
-#: src/args.c:367
-msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-msgstr "Mögliche Formate für das Argument sind : 'MM/TT/JJJJ' oder 'n'\n"
-
-#: src/args.c:369
+#: src/args.c:455
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -203,7 +211,7 @@ msgstr ""
 "\n"
 "Für nähere Informationen bitte '?' eingeben oder lesen Sie die manpage!\n"
 
-#: src/args.c:372
+#: src/args.c:458
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 "Bitte melden Sie Programmfehler und Vorschläge an <calcurse@culot.org>\n"
@@ -221,315 +229,332 @@ msgid "Do you really want to quit ?"
 msgstr "Möchten Sie wirklich das Programm beenden ?"
 
 # Ist "Aufgabe" besser als "Zu erledigen"? -- Logo!
-#: src/calcurse.c:234
+#: src/calcurse.c:239
 msgid "To do :"
 msgstr "Aufgaben :"
 
-#: src/calendar.c:129
+#: src/calendar.c:132
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FEHLER in calendar_set_first_day_of week\n"
 
-#: src/calendar.c:343
+#: src/calendar.c:347
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:344 src/custom.c:211 src/io.c:401 src/io.c:707 src/io.c:816
-#: src/io.c:835
+#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
+#: src/io.c:937
 msgid "Press [ENTER] to continue"
 msgstr "[EINGABE]-Taste um fortzufahren"
 
-#: src/calendar.c:346
-msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
-msgstr "Gewünschtes Datum: [EINGABE für heute] : MM/TT/JJJJ"
-
-#: src/custom.c:46
+#: src/custom.c:47
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr ""
 "SCHWERER FEHLER in fill_config_var: falsches Format der "
 "Konfigurationsvariable.\n"
 
-#: src/custom.c:66
+#: src/custom.c:67
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "SCHWERER FEHLER in custom_load_color: falsche Farbennummer.\n"
 
-#: src/custom.c:68
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "SCHWERER FEHLER in custom_load_color: falscher Farbenname.\n"
 
-#: src/custom.c:70
+#: src/custom.c:71
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_color: falsches Format der "
 "Konfigurationsvariable.\n"
 
-#: src/custom.c:78
+#: src/custom.c:81
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_color: keine Farben in der config-Datei "
 "gefunden.\n"
 
-#: src/custom.c:210
+#: src/custom.c:217
 msgid "Failed to open config file"
 msgstr "Kann die Konfigurationsdatei nicht öffnen"
 
-#: src/custom.c:289
+#: src/custom.c:311
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_conf: unbekannte Konfigurationsvariable.\n"
 
-#: src/custom.c:343
+#: src/custom.c:369
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/custom.c:344
+#: src/custom.c:370
 msgid "General"
 msgstr "Allgemein"
 
-#: src/custom.c:345
+#: src/custom.c:371
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:346
+#: src/custom.c:372
 msgid "Color"
 msgstr "Farbe"
 
-#: src/custom.c:347
+#: src/custom.c:373
 msgid "Notify"
 msgstr "Benachrichtigung"
 
-#: src/custom.c:359
+#: src/custom.c:386
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Wählen Sie das gewünschte Layout im nächsten Fenster [EINGABE]"
 
-#: src/custom.c:360
+#: src/custom.c:388
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('T'= Terminpanel, 'K'= Kalenderpanel, 'A'= Aufgabenpanel)"
 
-#: src/custom.c:362
+#: src/custom.c:390
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    TK       TA       KT       AT       AK       AT       KA       TA"
 
-#: src/custom.c:364
+#: src/custom.c:392
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]TA    [2]TK    [3]AT    [4]KT    [5]AT    [6]AK    [7]TA    [8]KA"
 
-#: src/custom.c:417
+#: src/custom.c:446
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: src/custom.c:418
+#: src/custom.c:447
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/custom.c:419
+#: src/custom.c:448
 msgid "(terminal's default)"
 msgstr "(Standartwert des Terminals)"
 
-#: src/custom.c:422
+#: src/custom.c:451
 msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
 msgstr ""
 "Zum Auswählen bitte 'X' oder LEERTASTE, zum Bewegen bitte 'H/L' 'J/K' oder "
 "Pfeiltasten"
 
-#: src/custom.c:424
+#: src/custom.c:453
 msgid "('0' for no color, 'Q' to exit) :"
 msgstr "('0' für keine Farbe, 'Q' zum Beenden) :"
 
-#: src/custom.c:455
+#: src/custom.c:487
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | Farbwerte"
 
-#: src/custom.c:644
+#: src/custom.c:680
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "SCHWERER FEHLER in custom_color_theme_name: unbekannte Farbe\n"
 
-#: src/custom.c:672
+#: src/custom.c:711
 msgid "auto_save = "
 msgstr "automatisches_speichern = "
 
-#: src/custom.c:673
+#: src/custom.c:712
 msgid "confirm_quit = "
 msgstr "Beenden_bestätigen = "
 
-#: src/custom.c:674
+#: src/custom.c:713
 msgid "confirm_delete = "
 msgstr "Löschen_bestätigen = "
 
-#: src/custom.c:675
+#: src/custom.c:714
 msgid "skip_system_dialogs = "
 msgstr "Systemdialoge_überspringen = "
 
-#: src/custom.c:676
+#: src/custom.c:715
 msgid "skip_progress_bar = "
 msgstr "Fortschrittsanzeige_überspringen = "
 
-#: src/custom.c:677
+#: src/custom.c:716
 msgid "week_begins_on_monday = "
 msgstr "Wochenbeginn_am_Montag = "
 
-#: src/custom.c:686
+#: src/custom.c:717
+msgid "output_datefmt = "
+msgstr ""
+
+#: src/custom.c:718
+msgid "input_datefmt = "
+msgstr ""
+
+#: src/custom.c:724
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(ist JA gewählt, wird beim Beenden automatisch gespeichert)"
 
-#: src/custom.c:692
+#: src/custom.c:729
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr ""
 "(ist JA gewählt, ist eine Bestätigung erforderlich, um das Programm zu "
 "beenden)"
 
-#: src/custom.c:698
+#: src/custom.c:734
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr ""
 "(ist JA gewählt, ist eine Bestätigung erforderlich, um ein Ereignis zu "
 "löschen)"
 
-#: src/custom.c:704
+#: src/custom.c:741
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(ist JA gewählt, werden Mitteilungen über geladene und gespeicherte Daten "
 "nicht angezeigt)"
 
-#: src/custom.c:710
+#: src/custom.c:748
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 "(ist JA gewählt, wird der Fortschrittsbalken während des Speicherns der "
 "Daten nicht angezeigt.)"
 
-#: src/custom.c:716
+#: src/custom.c:755
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr "(ist JA gewählt, beginnt die Woche am Montag, ansonsten am Sonntag)"
 
-#: src/custom.c:728 src/notify.c:505
+#: src/custom.c:763
+#, fuzzy
+msgid "(Format of the date to be displayed in non-interactive mode)"
+msgstr "(Datumsformatierung innerhalb der Benachrichtigungszeile.)"
+
+#: src/custom.c:769
+msgid "(Format to be used when entering a date: "
+msgstr ""
+
+#: src/custom.c:770
+msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
+msgstr ""
+
+#: src/custom.c:795 src/notify.c:522
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr ""
 "Bitte eine Optionsnummer eingeben, um den Wert zu ändern [Q um zu beenden]"
 
-#: src/custom.c:733
+#: src/custom.c:797 src/notify.c:524
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr "Geben Sie das Datumsformat an (vgl. 'man 3 strftime')"
+
+#: src/custom.c:799
+msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
+msgstr ""
+
+#: src/custom.c:805
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | allgemeine Optionen"
 
-#: src/day.c:438
+#: src/day.c:456
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "SCHWERER FEHLER in day_popup_item: unbekannter Eintragstyp\n"
 
-#: src/day.c:441
+#: src/day.c:459
 msgid "Event :"
 msgstr "Ereignis :"
 
-#: src/day.c:445
+#: src/day.c:462
 msgid "Appointment :"
 msgstr "Termin :"
 
-#: src/day.c:499
+#: src/day.c:517
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Neue Uhrzeit: ([SS:MM] oder [S:MM]):"
 
-#: src/day.c:502
+#: src/day.c:519
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Ungültige Zeitangabe! Verwenden Sie das folgende Format: [S:MM] oder [SS:MM]"
 
-#: src/day.c:524 src/day.c:579
+#: src/day.c:543 src/day.c:601
 msgid "Invalid time: start time must be before end time!"
 msgstr "Ungültige Zeitangabe: Der Startzeitpunkt muss vor dem Ende liegen!"
 
-#: src/day.c:562
+#: src/day.c:585
 msgid "Enter the new item description:"
 msgstr "Geben Sie eine neue Beschreibung ein:"
 
-#: src/day.c:574
+#: src/day.c:597
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Art der neuen Wiederholung: (D) täglich, (W)öchentlich, (M)onatlich, (Y) "
 "jährlich"
 
-#: src/day.c:576 src/recur.c:615
+#: src/day.c:599 src/recur.c:651
 msgid "[D/W/M/Y] "
 msgstr "[T/W/M/J]"
 
-#: src/day.c:577 src/recur.c:619
+#: src/day.c:600 src/recur.c:653
 msgid "The frequence you entered is not valid."
 msgstr "Das eingegebene Intervall ist ungültig."
 
-#: src/day.c:580 src/recur.c:622
+#: src/day.c:602 src/recur.c:656
 msgid "The entered date is not valid."
 msgstr "Das eingegebene Datum ist ungültig."
 
-#: src/day.c:581 src/recur.c:624
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr "Mögliche Eingaben sind [MM/TT/JJJJ] oder '0' für unbegrenzt."
-
-#: src/day.c:600
+#: src/day.c:628
 msgid "Enter the new repetition frequence:"
 msgstr "Geben Sie das neue Wiederholungsintervall an:"
 
-#: src/day.c:618
-msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
-msgstr "Geben Sie das neue Enddatum ein: [MM/TT/JJ] oder '0'"
-
-#: src/day.c:692
+#: src/day.c:737
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Bearbeite: (1)Beschreibung oder (2)Wiederholung?"
 
-#: src/day.c:714
+#: src/day.c:758
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr "Bearbeite: (1)Beginn (2)Ende (3)Beschreibung oder (4)Wiederholung?"
 
-#: src/day.c:738
+#: src/day.c:783
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Bearbeite: (1)Beginn (2)Ende oder (3)Beschreibung?"
 
-#: src/day.c:770
+#: src/day.c:816
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/day.c:773
+#: src/day.c:819
 #, fuzzy
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/day.c:775
+#: src/day.c:821
 #, fuzzy
 msgid "[i/n] "
 msgstr "[a/o]"
 
-#: src/day.c:776
+#: src/day.c:822
 msgid "[a/o] "
 msgstr "[a/o]"
 
-#: src/event.c:113
+#: src/event.c:118
 msgid "FATAL ERROR in event_scan: date error in the event\n"
 msgstr "SCHWERER FEHLER in event_scan: fehlerhafte Zeit für das Ereignis\n"
 
-#: src/event.c:135
+#: src/event.c:143
 #, fuzzy
 msgid "FATAL ERROR in event_get: no such item\n"
 msgstr "SCHWERER FEHLER in recur_get_event: Eintrag nicht vorhanden\n"
 
-#: src/event.c:166
+#: src/event.c:178
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "SCHWERER FEHLER in event_delete_bynum: Ereignis nicht vorhanden\n"
 
-#: src/help.c:109
-#, c-format
-msgid "CalCurse %s | help"
+#: src/help.c:119
+#, fuzzy, c-format
+msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hilfe"
 
-#: src/help.c:267
+#: src/help.c:272
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Willkommen zu Calcurse. Dies ist Hauptseite der Hilfe.\n"
 
-#: src/help.c:269
+#: src/help.c:274
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -562,11 +587,11 @@ msgstr ""
 "\n"
 "        Autoren:  Betätigen Sie '@' um die Autoren von Calcurse zu sehen."
 
-#: src/help.c:282
+#: src/help.c:287
 msgid "Save:\n"
 msgstr "Speichern:\n"
 
-#: src/help.c:284
+#: src/help.c:289
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -592,11 +617,11 @@ msgstr ""
 "Im Einstellungsmenü können Sie eine Option wählen, welche die\n"
 "Calcurse-Daten automatisch vor dem Verlassen des Programms speichert."
 
-#: src/help.c:294
+#: src/help.c:299
 msgid "Export:\n"
 msgstr "Exportieren:\n"
 
-#: src/help.c:296
+#: src/help.c:301
 msgid ""
 "Pressing 'X' exports the Calcurse data to iCalendar format.\n"
 "\n"
@@ -619,11 +644,11 @@ msgstr ""
 "Alle calcurse Daten sind in folgender Anordung exportiert worden:\n"
 "Ereignisse, Termine, Aufgaben.\n"
 
-#: src/help.c:303
+#: src/help.c:308
 msgid "Displacement keys:\n"
 msgstr "Navigations-Tasten:\n"
 
-#: src/help.c:305
+#: src/help.c:310
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -655,17 +680,18 @@ msgstr ""
 "die Auf-und Abtasten (respektive K bzw. Pfeil auf und J bzw. Pfeil ab)\n"
 "die Auswahl eines Eintrags aus dieser Liste."
 
-#: src/help.c:317
+#: src/help.c:322
 msgid "View:\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:319
+#: src/help.c:324
+#, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-"space to display it. If that is the case, the description will be\n"
+" space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
 "description, just press 'V' and a popup window will appear, containing\n"
 "the whole event.\n"
@@ -685,11 +711,11 @@ msgstr ""
 "Betätigen Sie eine beliebige Taste um das Fenster zu schließen und zum\n"
 "Hauptfenster des Programms zurückzukehren."
 
-#: src/help.c:329
+#: src/help.c:335
 msgid "Tab:\n"
 msgstr "Tabulator:\n"
 
-#: src/help.c:331
+#: src/help.c:337
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -718,11 +744,11 @@ msgstr ""
 "Aktionen\n"
 "auf dem gewählten Panel durchgeführt werden können."
 
-#: src/help.c:341
+#: src/help.c:347
 msgid "Goto:\n"
 msgstr "Gehe zu:\n"
 
-#: src/help.c:343
+#: src/help.c:349
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -740,11 +766,11 @@ msgstr ""
 "das aktuelle\n"
 "Systemdatum und wählt automatisch diesen Tag aus."
 
-#: src/help.c:349
+#: src/help.c:355
 msgid "Delete:\n"
 msgstr "Löschen:\n"
 
-#: src/help.c:351
+#: src/help.c:357
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -773,11 +799,12 @@ msgstr ""
 "Ihre vorgenommenen Veränderungen beim nächsten Start von Calcurse ver-\n"
 "lorengehen."
 
-#: src/help.c:363
+#: src/help.c:369
 msgid "Add:\n"
 msgstr "Hinzufügen:\n"
 
-#: src/help.c:365
+#: src/help.c:371
+#, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
@@ -804,15 +831,15 @@ msgid ""
 "pressing 'A'.\n"
 "\n"
 "Notes:\n"
-"       o if an appointment lasts for such a long time that it continues\n"
-"         on the next days, this event will be indicated on all the\n"
-"         corresponding days, and the beginning or ending hour will be\n"
-"         replaced by '..' if the event does not begin or end on the day.\n"
-"       o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-"         description prompt, without any description, no item will be\n"
-"         added.\n"
-"       o do not forget to save the calendar data to retrieve the new\n"
-"         event next time you launch Calcurse."
+"     o if an appointment lasts for such a long time that it continues\n"
+"       on the next days, this event will be indicated on all the\n"
+"       corresponding days, and the beginning or ending hour will be\n"
+"       replaced by '..' if the event does not begin or end on the day.\n"
+"     o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
+"       description prompt, without any description, no item will be\n"
+"       added.\n"
+"     o do not forget to save the calendar data to retrieve the new\n"
+"       event next time you launch Calcurse."
 msgstr ""
 "Die 'A'-Taste erlaubt Ihnen in Abhängigkeit vom gewählten Panel der\n"
 "Aufgaben- oder Terminliste einen Eintrag hinzuzufügen.\n"
@@ -848,11 +875,12 @@ msgstr ""
 "        o Versäumen Sie nicht Ihre Kalenderdaten abzuspeichern, wenn Sie\n"
 "          beim nächsten Start von Calcurse Ihre Eingaben behalten möchten."
 
-#: src/help.c:396
+#: src/help.c:401
 msgid "Edit Item:\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:398
+#: src/help.c:403
+#, fuzzy
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -863,12 +891,12 @@ msgid ""
 "its actual value, and you will be able to change it as you like.\n"
 "\n"
 "Notes:\n"
-"       o if you choose to edit the item repetition properties, you will\n"
-"         be asked to re-enter all of the repetition characteristics\n"
-"         (repetition type, frequence, and ending date). Moreover, the\n"
-"         previous data concerning the deleted occurences will be lost.\n"
-"       o do not forget to save the calendar data to retrieve the\n"
-"         modified properties next time you launch Calcurse."
+"     o if you choose to edit the item repetition properties, you will\n"
+"       be asked to re-enter all of the repetition characteristics\n"
+"       (repetition type, frequence, and ending date). Moreover, the\n"
+"       previous data concerning the deleted occurences will be lost.\n"
+"     o do not forget to save the calendar data to retrieve the\n"
+"       modified properties next time you launch Calcurse."
 msgstr ""
 "Drücken Sie 'E' um den momentan ausgewählten Eintrag zu bearbeiten.\n"
 "Abhängig vom Eintragstyp (Termin, Ereignis oder Aufgabe) und der ange-\n"
@@ -888,12 +916,12 @@ msgstr ""
 "       o Vergessen Sie nicht zu speichern damit die vorgenommenen Ver-\n"
 "         änderungen beim nächsten Start von Calcurse erhalten bleiben."
 
-#: src/help.c:413
+#: src/help.c:418
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:415
+#: src/help.c:420
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -904,45 +932,45 @@ msgid ""
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
-"       o if the 'VISUAL' environment variable is set, then this will be\n"
-"         the default editor to be called.\n"
-"       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
-"         will be used as the default editor.\n"
-"       o if none of the above environment variables is set, then\n"
-"         '/usr/bin/vi' will be used.\n"
+"     o if the 'VISUAL' environment variable is set, then this will be\n"
+"       the default editor to be called.\n"
+"     o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+"       will be used as the default editor.\n"
+"     o if none of the above environment variables is set, then\n"
+"       '/usr/bin/vi' will be used.\n"
 "\n"
 "Once the item note is edited and saved, quit your favorite editor.\n"
 "You will then go back to Calcurse, and the '>' sign will appear in front\n"
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:434
+#: src/help.c:439
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:436
+#: src/help.c:441
 msgid ""
 "Pressing the '>' key allows you to view a note which was previously\n"
 "attached to an item (an item which owns a note has a '>' sign in front\n"
 "of it). This command only permits to view the note, not to\n"
 "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the 'N' key\n"
+"Once you highlighted an item with a note attached to it, and the '>' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
-"       o if the 'PAGER' environment variable is set, then this will be\n"
-"         the default viewer to be called.\n"
-"       o if the above environment variable is not set, then\n"
-"         '/usr/bin/less' will be used.\n"
+"     o if the 'PAGER' environment variable is set, then this will be\n"
+"       the default viewer to be called.\n"
+"     o if the above environment variable is not set, then\n"
+"       '/usr/bin/less' will be used.\n"
 "As for the 'N' key, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:450
+#: src/help.c:456
 msgid "Priority:\n"
 msgstr "Priorität:\n"
 
-#: src/help.c:452
+#: src/help.c:458
 msgid ""
 "Pressing '+' or '-' allows you to change the priority of the currently\n"
 "selected item in the ToDo list. Priorities are represented by the number\n"
@@ -973,11 +1001,11 @@ msgstr ""
 "Dringlichkeit. Die Plazierung des Eintrags im Aufgaben-Panel verringert\n"
 "sich abhängig von der Dringlichkeit der sich darunterbefindlichen Einträge."
 
-#: src/help.c:464
+#: src/help.c:472
 msgid "Repeat:\n"
 msgstr "Wiederholen:\n"
 
-#: src/help.c:466
+#: src/help.c:474
 msgid ""
 "Pressing 'R' allows you to repeat an event or an appointment. You must\n"
 "first select the item to be repeated by moving inside the appointment\n"
@@ -1039,11 +1067,11 @@ msgstr ""
 "         zeugen. Beispielsweise ist es möglich, nur ein einziges Vor-\n"
 "         kommen eines wiederkehrenden Eintrags zu löschen."
 
-#: src/help.c:490
+#: src/help.c:498
 msgid "Flag Item:\n"
 msgstr "Zusatzsymbol\n"
 
-#: src/help.c:492
+#: src/help.c:500
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1055,11 +1083,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:500
+#: src/help.c:508
 msgid "Config:\n"
 msgstr "Einstellungen:\n"
 
-#: src/help.c:502
+#: src/help.c:510
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1095,11 +1123,11 @@ msgstr ""
 "Vergessen Sie bitte nicht Ihre Kalenderdaten abzuspeichern, um sie beim\n"
 "nächsten Start von Calcurse wieder zu erhalten."
 
-#: src/help.c:513
+#: src/help.c:521
 msgid "General keybindings:\n"
 msgstr "Allgemeingültige Tasten:\n"
 
-#: src/help.c:515
+#: src/help.c:523
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1137,11 +1165,11 @@ msgstr ""
 " '^K' : -1 Woche           -> Ansteuern der vorangegangen Woche\n"
 " '^J' : +1 Woche           -> Ansteuern der folgenden Woche"
 
-#: src/help.c:531
+#: src/help.c:539
 msgid "OtherCmd:\n"
 msgstr "WeitereBefehle:\n"
 
-#: src/help.c:533
+#: src/help.c:541
 msgid ""
 "Pressing 'O' allows you to switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
@@ -1158,13 +1186,14 @@ msgstr ""
 "Drücken Sie 'O' erneut sobald Sie die letzte Seite erreicht haben um\n"
 "wieder auf die erste Seite zu gelangen."
 
-#: src/help.c:540
+#: src/help.c:548
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - textbasierender Terminkalender"
 
-#: src/help.c:542
+#: src/help.c:550
+#, fuzzy
 msgid ""
-"Copyright (c) 2004-2007 Frederic Culot\n"
+"Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1196,98 +1225,98 @@ msgstr ""
 "Senden Sie Ihre Kritik oder Kommentare an : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:59
+#: src/io.c:61
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: src/io.c:60
+#: src/io.c:62
 msgid "Loading..."
 msgstr "Lade..."
 
-#: src/io.c:61
+#: src/io.c:63
 msgid "Exporting..."
 msgstr "Exportiere..."
 
-#: src/io.c:124
+#: src/io.c:126
 msgid "Choose the file used to export calcurse data:"
 msgstr "Wählen Sie die Datei in die exportiert werden soll:"
 
-#: src/io.c:126
+#: src/io.c:128
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 "Auf die Datei kann nicht zugegriffen werden, bitte einen anderen Dateinamen "
 "eingeben."
 
-#: src/io.c:128 src/recur.c:626
+#: src/io.c:129 src/recur.c:660
 msgid "Press [ENTER] to continue."
 msgstr "[EINGABE] um fortzufahren."
 
-#: src/io.c:345
+#: src/io.c:365
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr "%s existiert nicht, jetzt erzeugen [y oder n] ? "
 
-#: src/io.c:350 src/io.c:367
+#: src/io.c:371 src/io.c:391
 #, c-format
 msgid "aborting...\n"
 msgstr "abbrechen...\n"
 
-#: src/io.c:361
+#: src/io.c:385
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s erfolgreich erzeugt\n"
 
-#: src/io.c:362
+#: src/io.c:386
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starte interaktiven Modus...\n"
 
-#: src/io.c:397
+#: src/io.c:422
 msgid "Problems accessing data file ..."
 msgstr "Probleme beim Zugriff auf Benutzerdaten ..."
 
-#: src/io.c:400
+#: src/io.c:433
 msgid "The data files were successfully saved"
 msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
 
-#: src/io.c:560
+#: src/io.c:612
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr ""
 "SCHWERER FEHLER in io_load_app: falsches Format für den Termin oder das "
 "Ereignis\n"
 
-#: src/io.c:579
+#: src/io.c:633
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr ""
 "SCHWERER FEHLER in io_load_app: syntaktischer Fehler im Datumseintrag\n"
 
-#: src/io.c:594
+#: src/io.c:649
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr ""
 "SCHWERER FEHLER in load_app: weder ein Ereignis noch einen Termin gefunden\n"
 
-#: src/io.c:706
+#: src/io.c:793
 msgid "Failed to open todo file"
 msgstr "Aufgabendatei kann nicht geöffnet werden"
 
-#: src/io.c:757 src/io.c:775
+#: src/io.c:855 src/io.c:875
 #, fuzzy, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/io.c:814
+#: src/io.c:914
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Willkommen zu Calcurse. Nicht vorhandene Benutzerdaten werden erzeugt."
 
-#: src/io.c:815
+#: src/io.c:915
 msgid "Data files found. Data will be loaded now."
 msgstr "Benutzerdaten gefunden. Daten werden geladen."
 
-#: src/io.c:833
+#: src/io.c:935
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
 
-#: src/io.c:834
+#: src/io.c:936
 msgid "The data were successfully exported"
 msgstr "Die Daten wurden erfolgreich exportiert"
 
@@ -1295,144 +1324,146 @@ msgstr "Die Daten wurden erfolgreich exportiert"
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/notify.c:139
+#: src/notify.c:138
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/notify.c:434
+#: src/notify.c:451
 msgid "notify-bar_show = "
 msgstr "Benachrichtigungszeile_anzeigen = "
 
-#: src/notify.c:435
+#: src/notify.c:452
 msgid "notify-bar_date = "
 msgstr "Benachrichtigungszeile_Datum = "
 
-#: src/notify.c:436
+#: src/notify.c:453
 msgid "notify-bar_clock = "
 msgstr "Benachrichtigungszeile_Uhrzeit = "
 
-#: src/notify.c:437
+#: src/notify.c:454
 msgid "notify-bar_warning = "
 msgstr "Benachrichtigungszeile_Alarm = "
 
-#: src/notify.c:438
+#: src/notify.c:455
 msgid "notify-bar_command = "
 msgstr "Benachrichtigungszeile_Befehl = "
 
-#: src/notify.c:441
+#: src/notify.c:458
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(Ist JA gewählt, wird die Benachrichtigungszeile nicht angezeigt)"
 
-#: src/notify.c:444
+#: src/notify.c:460
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Datumsformatierung innerhalb der Benachrichtigungszeile.)"
 
-#: src/notify.c:447
+#: src/notify.c:463
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Uhrzeitformatierung innerhalb der Benachrichtigungszeile.)"
 
-#: src/notify.c:450
+#: src/notify.c:466
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "Nutzer auf einen Termin innerhalb der nächsten "
 "'Benachrichtigungszeile_Alarm' hinweisen"
 
-#: src/notify.c:454
+#: src/notify.c:469
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Befehl um Benutzer auf einen bevorstehenden Termin hinzuweisen)"
 
-#: src/notify.c:507
-msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
-msgstr "Geben Sie das Datumsformat an (vgl. 'man 3 strftime')"
-
-#: src/notify.c:509
+#: src/notify.c:526
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr "Geben Sie das Zeitformat an (vgl. 'man 3 strftime')"
 
-#: src/notify.c:511
+#: src/notify.c:528
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 "Geben Sie die Anzahl der Sekunden ein (0, um keine Hinweis zu erhalten)."
 
-#: src/notify.c:512
+#: src/notify.c:529
 msgid "Enter the notification command "
 msgstr "Geben Sie den Befehl für Ihre Notiz ein "
 
-#: src/notify.c:516
+#: src/notify.c:533
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | Optionen der Benachrichtigungszeile"
 
-#: src/recur.c:127
+#: src/recur.c:131
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "SCHWERER FEHLER in recur_def2char: unbekannter Typ\n"
 
-#: src/recur.c:158
+#: src/recur.c:163
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "SCHWERER FEHLER in recur_char2def: unbekanntes Zeichen\n"
 
-#: src/recur.c:281
+#: src/recur.c:299
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr ""
 "SCHWERER FEHLER in recur_event_scan: fehlerhaftes Datum für das Ereignis\n"
 
-#: src/recur.c:399
+#: src/recur.c:421
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
 
-#: src/recur.c:522
+#: src/recur.c:554
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr "SCHWERER FEHLER in recur_event_erase: Ereignis nicht vorhanden\n"
 
-#: src/recur.c:591
+#: src/recur.c:626
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr "SCHWERER FEHLER in recur_apoint_erase: Termin nicht vorhanden\n"
 
-#: src/recur.c:614
+#: src/recur.c:650
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Art der Wiederholung: (D) täglich, (W)öchentlich, (M)onatlich, (Y) jährlich"
 
-#: src/recur.c:617
+#: src/recur.c:652
 msgid "Enter the repetition frequence:"
 msgstr "Geben Sie das Wiederholungsintervall an:"
 
-#: src/recur.c:621
-msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
+#: src/recur.c:655
+#, fuzzy, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr "Ende der Wiederholung : [MM/TT/JJJJ] bzw. '0' für keine Begrenzung"
 
-#: src/recur.c:625
+#: src/recur.c:658
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetetition"
+msgstr "Mögliche Eingaben sind [MM/TT/JJJJ] oder '0' für unbegrenzt."
+
+#: src/recur.c:659
 msgid "This item is already a repeated one."
 msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
 
-#: src/recur.c:628
+#: src/recur.c:662
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
 
-#: src/recur.c:717
+#: src/recur.c:776
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "SCHWERER FEHLER in recur_repeat_item: falscher Eintragstyp\n"
 
-#: src/recur.c:744
+#: src/recur.c:805
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr ""
 "SCHWERER FEHLER in recur_exc_scan: syntaktischer Fehler im Datumseintrag\n"
 
-#: src/recur.c:811
+#: src/recur.c:880
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr "SCHWERER FEHLER in recur_get_apoint: Eintrag nicht vorhanden\n"
 
-#: src/recur.c:832
+#: src/recur.c:904
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr "SCHWERER FEHLER in recur_get_event: Eintrag nicht vorhanden\n"
 
-#: src/recur.c:865
+#: src/recur.c:940
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 "SCHWERER FEHLER in recur_apoint_switch_notify: Eintrag nicht vorhanden\n"
 
-#: src/todo.c:137
+#: src/todo.c:138
 msgid "Enter the new ToDo item : "
 msgstr "Geben Sie die neue Aufgabe ein : "
 
@@ -1440,45 +1471,45 @@ msgstr "Geben Sie die neue Aufgabe ein : "
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr "Dringlichkeit der Aufgabe [1 (höchste) - 9 (niedrigste)] :"
 
-#: src/todo.c:189
+#: src/todo.c:192
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:198
+#: src/todo.c:201
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:225
+#: src/todo.c:230
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:235
+#: src/todo.c:240
 msgid "Do you really want to delete this task ?"
 msgstr "Möchten Sie wirklich diese Aufgabe löschen ?"
 
-#: src/todo.c:237
+#: src/todo.c:242
 #, fuzzy
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/todo.c:240
+#: src/todo.c:244
 #, fuzzy
 msgid "[t/n] "
 msgstr "[a/o]"
 
-#: src/todo.c:312
+#: src/todo.c:328
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "SCHWERER FEHLER in todo_get_position: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:337
+#: src/todo.c:360
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "SCHWERER FEHLER in todo_chg_priority: Aktion nicht gefunden\n"
 
-#: src/todo.c:352
+#: src/todo.c:375
 msgid "Enter the new ToDo description :"
 msgstr "Geben Sie die neue Beschreibung der Aufgabe ein: "
 
@@ -1494,224 +1525,224 @@ msgstr "calcurse wird jetzt beendet..."
 msgid "Please report the following bug:"
 msgstr "Bitte den folgenden Programmfehler melden:"
 
-#: src/utils.c:137
+#: src/utils.c:140
 msgid "Press any key to continue..."
 msgstr "Eine beliebige Taste um fortzufahren..."
 
-#: src/utils.c:360
+#: src/utils.c:378
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "SCHWERER FEHLER in updatestring: Nicht genügend Speicher"
 
-#: src/utils.c:400
+#: src/utils.c:420
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/utils.c:401
+#: src/utils.c:421
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/utils.c:402
+#: src/utils.c:422
 msgid "Save"
 msgstr "Speichern"
 
-#: src/utils.c:403
+#: src/utils.c:423
 msgid "Export"
 msgstr "Exportieren"
 
-#: src/utils.c:404
+#: src/utils.c:424
 msgid "Add Item"
 msgstr "Neuer Eintrag"
 
-#: src/utils.c:405
+#: src/utils.c:425
 msgid "Del Item"
 msgstr "LöscheEintrag"
 
-#: src/utils.c:406
+#: src/utils.c:426
 msgid "Edit Itm"
 msgstr "Bearb. Eintrag"
 
-#: src/utils.c:407
+#: src/utils.c:427
 msgid "Flag Itm"
 msgstr "Zusatzsymbol"
 
-#: src/utils.c:408 src/utils.c:422
+#: src/utils.c:428 src/utils.c:442
 msgid "-+1 Day"
 msgstr "-/+1 Tag"
 
-#: src/utils.c:409 src/utils.c:423
+#: src/utils.c:429 src/utils.c:443
 msgid "-+1 Week"
 msgstr "-/+ Woche"
 
-#: src/utils.c:410
+#: src/utils.c:430
 msgid "Up/Down"
 msgstr "Auf/Ab"
 
-#: src/utils.c:411
+#: src/utils.c:431
 msgid "Repeat"
 msgstr "Wiederholen"
 
-#: src/utils.c:412
+#: src/utils.c:432
 msgid "Priority"
 msgstr "Priorität"
 
-#: src/utils.c:413
+#: src/utils.c:433
 msgid "Chg View"
 msgstr "Ändere Ansicht"
 
-#: src/utils.c:414
+#: src/utils.c:434
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: src/utils.c:415
+#: src/utils.c:435
 msgid "Config"
 msgstr "Einstellung"
 
-#: src/utils.c:416
+#: src/utils.c:436
 msgid "View"
 msgstr "Ansicht"
 
-#: src/utils.c:417
+#: src/utils.c:437
 msgid "Redraw"
 msgstr "Neu aufbauen"
 
-#: src/utils.c:418
+#: src/utils.c:438
 msgid "Add Appt"
 msgstr "Neuer Termin"
 
-#: src/utils.c:419
+#: src/utils.c:439
 msgid "Add Todo"
 msgstr "Neue Aufgabe"
 
-#: src/utils.c:420
+#: src/utils.c:440
 #, fuzzy
 msgid "EditNote"
 msgstr "Bearb. Eintrag\n"
 
-#: src/utils.c:421
+#: src/utils.c:441
 #, fuzzy
 msgid "ViewNote"
 msgstr "Ansicht"
 
-#: src/utils.c:424
+#: src/utils.c:444
 msgid "OtherCmd"
 msgstr "Zus. Befehle"
 
-#: src/utils.c:488
+#: src/utils.c:509
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
 
-#: src/utils.c:743
+#: src/utils.c:725
 msgid "Appointment"
 msgstr "Termin"
 
-#: src/utils.c:766
+#: src/utils.c:751
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "SCHWERER FEHLER in other_status_page: unbekanntes Panel\n"
 
-#: src/utils.c:834
+#: src/utils.c:825
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/utils.c:836
+#: src/utils.c:827
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "SCHWERER FEHLER in updatestring: Nicht genügend Speicher"
 
-#: src/utils.c:857
+#: src/utils.c:849
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:860
+#: src/utils.c:854
 msgid "no"
 msgstr "nein"
 
-#: src/utils.c:863
+#: src/utils.c:858
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Option nicht definiert - Problem in print_option_incolor()"
 
-#: src/utils.c:900
+#: src/utils.c:895
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:914
+#: src/utils.c:909
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/vars.c:48
+#: src/vars.c:49
 msgid "January"
 msgstr "Januar"
 
-#: src/vars.c:49
+#: src/vars.c:50
 msgid "February"
 msgstr "Februar"
 
-#: src/vars.c:50
+#: src/vars.c:51
 msgid "March"
 msgstr "März"
 
-#: src/vars.c:51
+#: src/vars.c:52
 msgid "April"
 msgstr "April"
 
-#: src/vars.c:52
+#: src/vars.c:53
 msgid "May"
 msgstr "Mai"
 
-#: src/vars.c:53
+#: src/vars.c:54
 msgid "June"
 msgstr "Juni"
 
-#: src/vars.c:54
+#: src/vars.c:55
 msgid "July"
 msgstr "Juli"
 
-#: src/vars.c:55
+#: src/vars.c:56
 msgid "August"
 msgstr "August"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "September"
 msgstr "September"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "October"
 msgstr "Oktober"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "November"
 msgstr "November"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "December"
 msgstr "Dezember"
 
-#: src/vars.c:62 src/vars.c:69
+#: src/vars.c:64 src/vars.c:71
 msgid "Sun"
 msgstr " So"
 
-#: src/vars.c:63
+#: src/vars.c:65
 msgid "Mon"
 msgstr " Mo"
 
-#: src/vars.c:64
+#: src/vars.c:66
 msgid "Tue"
 msgstr " Di"
 
-#: src/vars.c:65
+#: src/vars.c:67
 msgid "Wed"
 msgstr " Mi"
 
-#: src/vars.c:66
+#: src/vars.c:68
 msgid "Thu"
 msgstr " Do"
 
-#: src/vars.c:67
+#: src/vars.c:69
 msgid "Fri"
 msgstr " Fr"
 
-#: src/vars.c:68
+#: src/vars.c:70
 msgid "Sat"
 msgstr " Sa"
 
@@ -1731,10 +1762,22 @@ msgstr "Termine"
 msgid "ToDo"
 msgstr "Aufgaben"
 
-#: src/wins.c:341
+#: src/wins.c:417
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "SCHWERER FEHLER in wins_update: kein Fenster gewählt\n"
 
+#~ msgid "CalCurse %s | help"
+#~ msgstr "Calcurse %s | Hilfe"
+
+#~ msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+#~ msgstr "Mögliche Formate für das Argument sind : 'MM/TT/JJJJ' oder 'n'\n"
+
+#~ msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
+#~ msgstr "Gewünschtes Datum: [EINGABE für heute] : MM/TT/JJJJ"
+
+#~ msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
+#~ msgstr "Geben Sie das neue Enddatum ein: [MM/TT/JJ] oder '0'"
+
 #~ msgid "FATAL ERROR in wins_prop: property unknown\n"
 #~ msgstr "SCHWERER FEHLER in wins_prop: unbekannt\n"
 
diff --git a/po/en.po b/po/en.po
index ed39fbf..45b3e2c 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,4 +1,4 @@
-# 	$calcurse: en.po,v 1.6 2008/03/02 08:50:17 culot Exp $
+# 	$calcurse: en.po,v 1.7 2008/04/20 13:52:06 culot Exp $
 #
 # English/GB translation of calcurse.
 # Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.4\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-02-16 12:26+0100\n"
+"POT-Creation-Date: 2008-04-20 11:16+0200\n"
 "PO-Revision-Date: 2006-07-03 00:05+0100\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: English/GB <en_GB@li.org>\n"
@@ -19,86 +19,87 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:117
+#: src/apoint.c:119
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 
-#: src/apoint.c:118
+#: src/apoint.c:122
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 
-#: src/apoint.c:119
+#: src/apoint.c:123
 msgid "Enter description :"
 msgstr "Enter description :"
 
-#: src/apoint.c:120
+#: src/apoint.c:125
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 
-#: src/apoint.c:121
+#: src/apoint.c:127
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 
-#: src/apoint.c:122 src/day.c:500 src/day.c:525 src/day.c:583
+#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
 msgid "Press [Enter] to continue"
 msgstr "Press [Enter] to continue"
 
-#: src/apoint.c:215
+#: src/apoint.c:230
 msgid "Do you really want to delete this item ?"
 msgstr "Do you really want to delete this item ?"
 
-#: src/apoint.c:216
+#: src/apoint.c:231
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/apoint.c:359 src/recur.c:239
+#: src/apoint.c:386 src/recur.c:252
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "FATAL ERROR in apoint_scan: date error in the appointment\n"
 
-#: src/apoint.c:381
+#: src/apoint.c:411
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/apoint.c:421
+#: src/apoint.c:454
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/apoint.c:573
+#: src/apoint.c:615
 #, fuzzy
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
 #: src/args.c:51
 #, fuzzy
-msgid "Usage: calcurse [-h|-v] [-x] [-an] [-t[num]] [-d date|num] [-c file]\n"
+msgid ""
+"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
 
-#: src/args.c:60
+#: src/args.c:59
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Try 'calcurse -h' for more information.\n"
 
-#: src/args.c:73
+#: src/args.c:71
 #, fuzzy
 msgid ""
 "\n"
-"Copyright (c) 2004-2007 Frederic Culot.\n"
+"Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 "\n"
 "Copyright (c) 2004-2006 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 
-#: src/args.c:77 src/args.c:122
+#: src/args.c:74 src/args.c:121
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - text-based organizer\n"
 
-#: src/args.c:90
+#: src/args.c:87
 #, fuzzy
 msgid ""
 "\n"
@@ -125,6 +126,10 @@ msgid ""
 "  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
 "\tis the remaining time before this next appointment.\n"
 "\n"
+"  -N, --note\n"
+"\twhen used with the '-a' or '-t' flag, also print note content\n"
+"\tif one is associated with the displayed item.\n"
+"\n"
 "  -t[num], --todo[=num]\n"
 "\tprint todo list and exit. If the optional number [num] is given,\n"
 "\tthen only todos having a priority equal to [num] will be returned.\n"
@@ -156,24 +161,24 @@ msgstr ""
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 
-#: src/args.c:143
+#: src/args.c:169
+msgid "No note file found\n"
+msgstr ""
+
+#: src/args.c:191
 msgid "to do:\n"
 msgstr "to do:\n"
 
-#: src/args.c:175
+#: src/args.c:225
 #, fuzzy
 msgid "next appointment:\n"
 msgstr "Appointment :"
 
-#: src/args.c:365
+#: src/args.c:449
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr "Argument to the '-d' flag is not valid\n"
 
-#: src/args.c:367
-msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#: src/args.c:369
+#: src/args.c:455
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -181,7 +186,7 @@ msgstr ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 
-#: src/args.c:372
+#: src/args.c:458
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 
@@ -197,304 +202,318 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Do you really want to quit ?"
 
-#: src/calcurse.c:234
+#: src/calcurse.c:239
 msgid "To do :"
 msgstr "To do :"
 
-#: src/calendar.c:129
+#: src/calendar.c:132
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:343
+#: src/calendar.c:347
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:344 src/custom.c:211 src/io.c:401 src/io.c:707 src/io.c:816
-#: src/io.c:835
+#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
+#: src/io.c:937
 msgid "Press [ENTER] to continue"
 msgstr "Press [ENTER] to continue"
 
-#: src/calendar.c:346
-#, fuzzy
-msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
-msgstr "Enter the day to go to [ENTER for today] : dd/mm/yyyy"
-
-#: src/custom.c:46
+#: src/custom.c:47
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:66
+#: src/custom.c:67
 #, fuzzy
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:68
+#: src/custom.c:69
 #, fuzzy
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "FATAL ERROR in load_app: wrong format in the appointment or event\n"
 
-#: src/custom.c:70
+#: src/custom.c:71
 #, fuzzy
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:78
+#: src/custom.c:81
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 
-#: src/custom.c:210
+#: src/custom.c:217
 msgid "Failed to open config file"
 msgstr "Failed to open config file"
 
-#: src/custom.c:289
+#: src/custom.c:311
 #, fuzzy
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:343
+#: src/custom.c:369
 msgid "Exit"
 msgstr "Exit"
 
-#: src/custom.c:344
+#: src/custom.c:370
 msgid "General"
 msgstr "General"
 
-#: src/custom.c:345
+#: src/custom.c:371
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:346
+#: src/custom.c:372
 msgid "Color"
 msgstr "Colour"
 
-#: src/custom.c:347
+#: src/custom.c:373
 msgid "Notify"
 msgstr ""
 
-#: src/custom.c:359
+#: src/custom.c:386
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Pick the desired layout on next screen [press ENTER]"
 
-#: src/custom.c:360
+#: src/custom.c:388
 #, fuzzy
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)"
 
-#: src/custom.c:362
+#: src/custom.c:390
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr ""
 
-#: src/custom.c:364
+#: src/custom.c:392
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr ""
 
-#: src/custom.c:417
+#: src/custom.c:446
 msgid "Foreground"
 msgstr ""
 
-#: src/custom.c:418
+#: src/custom.c:447
 msgid "Background"
 msgstr ""
 
-#: src/custom.c:419
+#: src/custom.c:448
 msgid "(terminal's default)"
 msgstr ""
 
-#: src/custom.c:422
+#: src/custom.c:451
 msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
 msgstr ""
 
-#: src/custom.c:424
+#: src/custom.c:453
 msgid "('0' for no color, 'Q' to exit) :"
 msgstr ""
 
-#: src/custom.c:455
+#: src/custom.c:487
 #, fuzzy, c-format
 msgid "CalCurse %s | color theme"
 msgstr "CalCurse %s | help"
 
-#: src/custom.c:644
+#: src/custom.c:680
 #, fuzzy
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/custom.c:672
+#: src/custom.c:711
 msgid "auto_save = "
 msgstr "auto_save = "
 
-#: src/custom.c:673
+#: src/custom.c:712
 msgid "confirm_quit = "
 msgstr "confirm_quit = "
 
-#: src/custom.c:674
+#: src/custom.c:713
 msgid "confirm_delete = "
 msgstr "confirm_delete = "
 
-#: src/custom.c:675
+#: src/custom.c:714
 msgid "skip_system_dialogs = "
 msgstr "skip_system_dialogues = "
 
-#: src/custom.c:676
+#: src/custom.c:715
 msgid "skip_progress_bar = "
 msgstr "skip_progress_bar = "
 
-#: src/custom.c:677
+#: src/custom.c:716
 msgid "week_begins_on_monday = "
 msgstr "week_begins_on_monday = "
 
-#: src/custom.c:686
+#: src/custom.c:717
+msgid "output_datefmt = "
+msgstr ""
+
+#: src/custom.c:718
+msgid "input_datefmt = "
+msgstr ""
+
+#: src/custom.c:724
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(if set to YES, automatic save is done when quitting)"
 
-#: src/custom.c:692
+#: src/custom.c:729
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(if set to YES, confirmation is required before quitting)"
 
-#: src/custom.c:698
+#: src/custom.c:734
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(if set to YES, confirmation is required before deleting an event)"
 
-#: src/custom.c:704
+#: src/custom.c:741
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 
-#: src/custom.c:710
+#: src/custom.c:748
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr "(if set to YES, progress bar will not be displayed when saving data)"
 
-#: src/custom.c:716
+#: src/custom.c:755
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 "(if set to YES, monday is the first day of the week, otherwise it is sunday)"
 
-#: src/custom.c:728 src/notify.c:505
+#: src/custom.c:763
+msgid "(Format of the date to be displayed in non-interactive mode)"
+msgstr ""
+
+#: src/custom.c:769
+msgid "(Format to be used when entering a date: "
+msgstr ""
+
+#: src/custom.c:770
+msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
+msgstr ""
+
+#: src/custom.c:795 src/notify.c:522
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Enter an option number to change its value [Q to quit] "
 
-#: src/custom.c:733
+#: src/custom.c:797 src/notify.c:524
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
+#: src/custom.c:799
+msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
+msgstr ""
+
+#: src/custom.c:805
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | general options"
 
-#: src/day.c:438
+#: src/day.c:456
 #, fuzzy
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/day.c:441
+#: src/day.c:459
 msgid "Event :"
 msgstr "Event :"
 
-#: src/day.c:445
+#: src/day.c:462
 msgid "Appointment :"
 msgstr "Appointment :"
 
-#: src/day.c:499
+#: src/day.c:517
 #, fuzzy
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 
-#: src/day.c:502
+#: src/day.c:519
 #, fuzzy
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 
-#: src/day.c:524 src/day.c:579
+#: src/day.c:543 src/day.c:601
 msgid "Invalid time: start time must be before end time!"
 msgstr ""
 
-#: src/day.c:562
+#: src/day.c:585
 #, fuzzy
 msgid "Enter the new item description:"
 msgstr "Enter description :"
 
-#: src/day.c:574
+#: src/day.c:597
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:576 src/recur.c:615
+#: src/day.c:599 src/recur.c:651
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:577 src/recur.c:619
+#: src/day.c:600 src/recur.c:653
 #, fuzzy
 msgid "The frequence you entered is not valid."
 msgstr "The day you entered is not valid"
 
-#: src/day.c:580 src/recur.c:622
+#: src/day.c:602 src/recur.c:656
 #, fuzzy
 msgid "The entered date is not valid."
 msgstr "The day you entered is not valid"
 
-#: src/day.c:581 src/recur.c:624
-#, fuzzy
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#: src/day.c:600
+#: src/day.c:628
 msgid "Enter the new repetition frequence:"
 msgstr ""
 
-#: src/day.c:618
-msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
-msgstr ""
-
-#: src/day.c:692
+#: src/day.c:737
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr ""
 
-#: src/day.c:714
+#: src/day.c:758
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 
-#: src/day.c:738
+#: src/day.c:783
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr ""
 
-#: src/day.c:770
+#: src/day.c:816
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 
-#: src/day.c:773
+#: src/day.c:819
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 
-#: src/day.c:775
+#: src/day.c:821
 msgid "[i/n] "
 msgstr ""
 
-#: src/day.c:776
+#: src/day.c:822
 msgid "[a/o] "
 msgstr ""
 
-#: src/event.c:113
+#: src/event.c:118
 msgid "FATAL ERROR in event_scan: date error in the event\n"
 msgstr "FATAL ERROR in event_scan: date error in the event\n"
 
-#: src/event.c:135
+#: src/event.c:143
 #, fuzzy
 msgid "FATAL ERROR in event_get: no such item\n"
 msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 
-#: src/event.c:166
+#: src/event.c:178
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 
-#: src/help.c:109
-#, c-format
-msgid "CalCurse %s | help"
+#: src/help.c:119
+#, fuzzy, c-format
+msgid "Calcurse %s | help"
 msgstr "CalCurse %s | help"
 
-#: src/help.c:267
+#: src/help.c:272
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Welcome to Calcurse. This is the main help screen.\n"
 
-#: src/help.c:269
+#: src/help.c:274
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -528,11 +547,11 @@ msgstr ""
 "\n"
 "       Credits:  Press '@' for credits."
 
-#: src/help.c:282
+#: src/help.c:287
 msgid "Save:\n"
 msgstr "Save:\n"
 
-#: src/help.c:284
+#: src/help.c:289
 #, fuzzy
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
@@ -559,11 +578,11 @@ msgstr ""
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
 
-#: src/help.c:294
+#: src/help.c:299
 msgid "Export:\n"
 msgstr ""
 
-#: src/help.c:296
+#: src/help.c:301
 msgid ""
 "Pressing 'X' exports the Calcurse data to iCalendar format.\n"
 "\n"
@@ -576,11 +595,11 @@ msgid ""
 "events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:303
+#: src/help.c:308
 msgid "Displacement keys:\n"
 msgstr "Displacement keys:\n"
 
-#: src/help.c:305
+#: src/help.c:310
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -612,17 +631,18 @@ msgstr ""
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
 
-#: src/help.c:317
+#: src/help.c:322
 msgid "View:\n"
 msgstr "View:\n"
 
-#: src/help.c:319
+#: src/help.c:324
+#, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-"space to display it. If that is the case, the description will be\n"
+" space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
 "description, just press 'V' and a popup window will appear, containing\n"
 "the whole event.\n"
@@ -642,11 +662,11 @@ msgstr ""
 "Press any key to close the popup window and go back to the main\n"
 "Calcurse screen."
 
-#: src/help.c:329
+#: src/help.c:335
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:331
+#: src/help.c:337
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -672,11 +692,11 @@ msgstr ""
 "change while pressing 'Tab', so you always know what action can be\n"
 "performed on the selected panel."
 
-#: src/help.c:341
+#: src/help.c:347
 msgid "Goto:\n"
 msgstr "Goto:\n"
 
-#: src/help.c:343
+#: src/help.c:349
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -692,11 +712,11 @@ msgstr ""
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
 "system current date and you will be taken to that date."
 
-#: src/help.c:349
+#: src/help.c:355
 msgid "Delete:\n"
 msgstr "Delete:\n"
 
-#: src/help.c:351
+#: src/help.c:357
 #, fuzzy
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
@@ -725,11 +745,11 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve the modifications\n"
 "next time you launch Calcurse."
 
-#: src/help.c:363
+#: src/help.c:369
 msgid "Add:\n"
 msgstr "Add:\n"
 
-#: src/help.c:365
+#: src/help.c:371
 #, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -757,15 +777,15 @@ msgid ""
 "pressing 'A'.\n"
 "\n"
 "Notes:\n"
-"       o if an appointment lasts for such a long time that it continues\n"
-"         on the next days, this event will be indicated on all the\n"
-"         corresponding days, and the beginning or ending hour will be\n"
-"         replaced by '..' if the event does not begin or end on the day.\n"
-"       o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-"         description prompt, without any description, no item will be\n"
-"         added.\n"
-"       o do not forget to save the calendar data to retrieve the new\n"
-"         event next time you launch Calcurse."
+"     o if an appointment lasts for such a long time that it continues\n"
+"       on the next days, this event will be indicated on all the\n"
+"       corresponding days, and the beginning or ending hour will be\n"
+"       replaced by '..' if the event does not begin or end on the day.\n"
+"     o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
+"       description prompt, without any description, no item will be\n"
+"       added.\n"
+"     o do not forget to save the calendar data to retrieve the new\n"
+"       event next time you launch Calcurse."
 msgstr ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
@@ -798,12 +818,12 @@ msgstr ""
 "       o do not forget to save the calendar data to retrieve the new\n"
 "         event next time you launch Calcurse."
 
-#: src/help.c:396
+#: src/help.c:401
 #, fuzzy
 msgid "Edit Item:\n"
 msgstr "Add Item"
 
-#: src/help.c:398
+#: src/help.c:403
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -814,20 +834,20 @@ msgid ""
 "its actual value, and you will be able to change it as you like.\n"
 "\n"
 "Notes:\n"
-"       o if you choose to edit the item repetition properties, you will\n"
-"         be asked to re-enter all of the repetition characteristics\n"
-"         (repetition type, frequence, and ending date). Moreover, the\n"
-"         previous data concerning the deleted occurences will be lost.\n"
-"       o do not forget to save the calendar data to retrieve the\n"
-"         modified properties next time you launch Calcurse."
+"     o if you choose to edit the item repetition properties, you will\n"
+"       be asked to re-enter all of the repetition characteristics\n"
+"       (repetition type, frequence, and ending date). Moreover, the\n"
+"       previous data concerning the deleted occurences will be lost.\n"
+"     o do not forget to save the calendar data to retrieve the\n"
+"       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:413
+#: src/help.c:418
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Add Item"
 
-#: src/help.c:415
+#: src/help.c:420
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -838,45 +858,45 @@ msgid ""
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
-"       o if the 'VISUAL' environment variable is set, then this will be\n"
-"         the default editor to be called.\n"
-"       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
-"         will be used as the default editor.\n"
-"       o if none of the above environment variables is set, then\n"
-"         '/usr/bin/vi' will be used.\n"
+"     o if the 'VISUAL' environment variable is set, then this will be\n"
+"       the default editor to be called.\n"
+"     o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+"       will be used as the default editor.\n"
+"     o if none of the above environment variables is set, then\n"
+"       '/usr/bin/vi' will be used.\n"
 "\n"
 "Once the item note is edited and saved, quit your favorite editor.\n"
 "You will then go back to Calcurse, and the '>' sign will appear in front\n"
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:434
+#: src/help.c:439
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "View:\n"
 
-#: src/help.c:436
+#: src/help.c:441
 msgid ""
 "Pressing the '>' key allows you to view a note which was previously\n"
 "attached to an item (an item which owns a note has a '>' sign in front\n"
 "of it). This command only permits to view the note, not to\n"
 "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the 'N' key\n"
+"Once you highlighted an item with a note attached to it, and the '>' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
-"       o if the 'PAGER' environment variable is set, then this will be\n"
-"         the default viewer to be called.\n"
-"       o if the above environment variable is not set, then\n"
-"         '/usr/bin/less' will be used.\n"
+"     o if the 'PAGER' environment variable is set, then this will be\n"
+"       the default viewer to be called.\n"
+"     o if the above environment variable is not set, then\n"
+"       '/usr/bin/less' will be used.\n"
 "As for the 'N' key, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:450
+#: src/help.c:456
 msgid "Priority:\n"
 msgstr ""
 
-#: src/help.c:452
+#: src/help.c:458
 msgid ""
 "Pressing '+' or '-' allows you to change the priority of the currently\n"
 "selected item in the ToDo list. Priorities are represented by the number\n"
@@ -893,12 +913,12 @@ msgid ""
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:464
+#: src/help.c:472
 #, fuzzy
 msgid "Repeat:\n"
 msgstr "Redraw:\n"
 
-#: src/help.c:466
+#: src/help.c:474
 msgid ""
 "Pressing 'R' allows you to repeat an event or an appointment. You must\n"
 "first select the item to be repeated by moving inside the appointment\n"
@@ -929,12 +949,12 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:490
+#: src/help.c:498
 #, fuzzy
 msgid "Flag Item:\n"
 msgstr "Add Item"
 
-#: src/help.c:492
+#: src/help.c:500
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -946,11 +966,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:500
+#: src/help.c:508
 msgid "Config:\n"
 msgstr "Config:\n"
 
-#: src/help.c:502
+#: src/help.c:510
 #, fuzzy
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
@@ -983,11 +1003,11 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 
-#: src/help.c:513
+#: src/help.c:521
 msgid "General keybindings:\n"
 msgstr ""
 
-#: src/help.c:515
+#: src/help.c:523
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1007,11 +1027,11 @@ msgid ""
 " '^J' : +1 Week         -> move to next week"
 msgstr ""
 
-#: src/help.c:531
+#: src/help.c:539
 msgid "OtherCmd:\n"
 msgstr ""
 
-#: src/help.c:533
+#: src/help.c:541
 msgid ""
 "Pressing 'O' allows you to switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
@@ -1021,14 +1041,14 @@ msgid ""
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:540
+#: src/help.c:548
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - text-based organizer"
 
-#: src/help.c:542
+#: src/help.c:550
 #, fuzzy
 msgid ""
-"Copyright (c) 2004-2007 Frederic Culot\n"
+"Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1060,98 +1080,98 @@ msgstr ""
 "Send your feedback or comments to : calcurse@culot.org\n"
 "Calcurse home page : http://culot.org/calcurse"
 
-#: src/io.c:59
+#: src/io.c:61
 msgid "Saving..."
 msgstr "Saving..."
 
-#: src/io.c:60
+#: src/io.c:62
 msgid "Loading..."
 msgstr "Loading..."
 
-#: src/io.c:61
+#: src/io.c:63
 #, fuzzy
 msgid "Exporting..."
 msgstr "aborting...\n"
 
-#: src/io.c:124
+#: src/io.c:126
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:126
+#: src/io.c:128
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:128 src/recur.c:626
+#: src/io.c:129 src/recur.c:660
 #, fuzzy
 msgid "Press [ENTER] to continue."
 msgstr "Press [ENTER] to continue"
 
-#: src/io.c:345
+#: src/io.c:365
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr "%s does not exist, create it now [y or n] ? "
 
-#: src/io.c:350 src/io.c:367
+#: src/io.c:371 src/io.c:391
 #, c-format
 msgid "aborting...\n"
 msgstr "aborting...\n"
 
-#: src/io.c:361
+#: src/io.c:385
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s successfully created\n"
 
-#: src/io.c:362
+#: src/io.c:386
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starting interactive mode...\n"
 
-#: src/io.c:397
+#: src/io.c:422
 msgid "Problems accessing data file ..."
 msgstr "Problems accessing data file ..."
 
-#: src/io.c:400
+#: src/io.c:433
 msgid "The data files were successfully saved"
 msgstr "The data files were successfully saved"
 
-#: src/io.c:560
+#: src/io.c:612
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr "FATAL ERROR in load_app: wrong format in the appointment or event\n"
 
-#: src/io.c:579
+#: src/io.c:633
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
 
-#: src/io.c:594
+#: src/io.c:649
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr "FATAL ERROR in load_app: no event nor appointment found\n"
 
-#: src/io.c:706
+#: src/io.c:793
 msgid "Failed to open todo file"
 msgstr "Failed to open todo file"
 
-#: src/io.c:757 src/io.c:775
+#: src/io.c:855 src/io.c:875
 #, fuzzy, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/io.c:814
+#: src/io.c:914
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welcome to Calcurse. Missing data files were created."
 
-#: src/io.c:815
+#: src/io.c:915
 msgid "Data files found. Data will be loaded now."
 msgstr "Data files found. Data will be loaded now."
 
-#: src/io.c:833
+#: src/io.c:935
 #, fuzzy
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/io.c:834
+#: src/io.c:936
 #, fuzzy
 msgid "The data were successfully exported"
 msgstr "The data files were successfully saved"
@@ -1161,150 +1181,152 @@ msgstr "The data files were successfully saved"
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/notify.c:139
+#: src/notify.c:138
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/notify.c:434
+#: src/notify.c:451
 msgid "notify-bar_show = "
 msgstr ""
 
-#: src/notify.c:435
+#: src/notify.c:452
 msgid "notify-bar_date = "
 msgstr ""
 
-#: src/notify.c:436
+#: src/notify.c:453
 msgid "notify-bar_clock = "
 msgstr ""
 
-#: src/notify.c:437
+#: src/notify.c:454
 msgid "notify-bar_warning = "
 msgstr ""
 
-#: src/notify.c:438
+#: src/notify.c:455
 msgid "notify-bar_command = "
 msgstr ""
 
-#: src/notify.c:441
+#: src/notify.c:458
 #, fuzzy
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(if set to YES, progress bar will not be displayed when saving data)"
 
-#: src/notify.c:444
+#: src/notify.c:460
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:447
+#: src/notify.c:463
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:450
+#: src/notify.c:466
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 
-#: src/notify.c:454
+#: src/notify.c:469
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr ""
 
-#: src/notify.c:507
-msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-
-#: src/notify.c:509
+#: src/notify.c:526
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/notify.c:511
+#: src/notify.c:528
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 
-#: src/notify.c:512
+#: src/notify.c:529
 msgid "Enter the notification command "
 msgstr ""
 
-#: src/notify.c:516
+#: src/notify.c:533
 #, fuzzy, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | general options"
 
-#: src/recur.c:127
+#: src/recur.c:131
 #, fuzzy
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:158
+#: src/recur.c:163
 #, fuzzy
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:281
+#: src/recur.c:299
 #, fuzzy
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr "FATAL ERROR in event_scan: date error in the event\n"
 
-#: src/recur.c:399
+#: src/recur.c:421
 #, fuzzy
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:522
+#: src/recur.c:554
 #, fuzzy
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 
-#: src/recur.c:591
+#: src/recur.c:626
 #, fuzzy
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/recur.c:614
+#: src/recur.c:650
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:617
+#: src/recur.c:652
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:621
-msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
-msgstr ""
+#: src/recur.c:655
+#, fuzzy, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
 
-#: src/recur.c:625
+#: src/recur.c:658
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetetition"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+#: src/recur.c:659
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:628
+#: src/recur.c:662
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:717
+#: src/recur.c:776
 #, fuzzy
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:744
+#: src/recur.c:805
 #, fuzzy
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
 
-#: src/recur.c:811
+#: src/recur.c:880
 #, fuzzy
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/recur.c:832
+#: src/recur.c:904
 #, fuzzy
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 
-#: src/recur.c:865
+#: src/recur.c:940
 #, fuzzy
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/todo.c:137
+#: src/todo.c:138
 msgid "Enter the new ToDo item : "
 msgstr "Enter the new ToDo item : "
 
@@ -1312,43 +1334,43 @@ msgstr "Enter the new ToDo item : "
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 
-#: src/todo.c:189
+#: src/todo.c:192
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:198
+#: src/todo.c:201
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:225
+#: src/todo.c:230
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:235
+#: src/todo.c:240
 msgid "Do you really want to delete this task ?"
 msgstr "Do you really want to delete this task ?"
 
-#: src/todo.c:237
+#: src/todo.c:242
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 
-#: src/todo.c:240
+#: src/todo.c:244
 msgid "[t/n] "
 msgstr ""
 
-#: src/todo.c:312
+#: src/todo.c:328
 #, fuzzy
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:337
+#: src/todo.c:360
 #, fuzzy
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:352
+#: src/todo.c:375
 #, fuzzy
 msgid "Enter the new ToDo description :"
 msgstr "Enter the new ToDo item : "
@@ -1365,232 +1387,232 @@ msgstr ""
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:137
+#: src/utils.c:140
 msgid "Press any key to continue..."
 msgstr "Press any key to continue..."
 
-#: src/utils.c:360
+#: src/utils.c:378
 #, fuzzy
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:400
+#: src/utils.c:420
 msgid "Help"
 msgstr "Help"
 
-#: src/utils.c:401
+#: src/utils.c:421
 msgid "Quit"
 msgstr "Quit"
 
-#: src/utils.c:402
+#: src/utils.c:422
 msgid "Save"
 msgstr "Save"
 
-#: src/utils.c:403
+#: src/utils.c:423
 msgid "Export"
 msgstr ""
 
-#: src/utils.c:404
+#: src/utils.c:424
 msgid "Add Item"
 msgstr "Add Item"
 
-#: src/utils.c:405
+#: src/utils.c:425
 msgid "Del Item"
 msgstr "Del Item"
 
-#: src/utils.c:406
+#: src/utils.c:426
 #, fuzzy
 msgid "Edit Itm"
 msgstr "Add Item"
 
-#: src/utils.c:407
+#: src/utils.c:427
 #, fuzzy
 msgid "Flag Itm"
 msgstr "Del Item"
 
-#: src/utils.c:408 src/utils.c:422
+#: src/utils.c:428 src/utils.c:442
 #, fuzzy
 msgid "-+1 Day"
 msgstr "-/+1 Day"
 
-#: src/utils.c:409 src/utils.c:423
+#: src/utils.c:429 src/utils.c:443
 #, fuzzy
 msgid "-+1 Week"
 msgstr "-/+1 Week"
 
-#: src/utils.c:410
+#: src/utils.c:430
 msgid "Up/Down"
 msgstr "Up/Down"
 
-#: src/utils.c:411
+#: src/utils.c:431
 msgid "Repeat"
 msgstr ""
 
-#: src/utils.c:412
+#: src/utils.c:432
 msgid "Priority"
 msgstr ""
 
-#: src/utils.c:413
+#: src/utils.c:433
 msgid "Chg View"
 msgstr "Chg View"
 
-#: src/utils.c:414
+#: src/utils.c:434
 #, fuzzy
 msgid "Go to"
 msgstr "Goto:\n"
 
-#: src/utils.c:415
+#: src/utils.c:435
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:416
+#: src/utils.c:436
 msgid "View"
 msgstr "View"
 
-#: src/utils.c:417
+#: src/utils.c:437
 msgid "Redraw"
 msgstr "Redraw"
 
-#: src/utils.c:418
+#: src/utils.c:438
 #, fuzzy
 msgid "Add Appt"
 msgstr "Add Item"
 
-#: src/utils.c:419
+#: src/utils.c:439
 msgid "Add Todo"
 msgstr ""
 
-#: src/utils.c:420
+#: src/utils.c:440
 #, fuzzy
 msgid "EditNote"
 msgstr "Add Item"
 
-#: src/utils.c:421
+#: src/utils.c:441
 #, fuzzy
 msgid "ViewNote"
 msgstr "View"
 
-#: src/utils.c:424
+#: src/utils.c:444
 msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:488
+#: src/utils.c:509
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATAL ERROR in date2sec: failure in mktime\n"
 
-#: src/utils.c:743
+#: src/utils.c:725
 msgid "Appointment"
 msgstr "Appointment"
 
-#: src/utils.c:766
+#: src/utils.c:751
 #, fuzzy
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/utils.c:834
+#: src/utils.c:825
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/utils.c:836
+#: src/utils.c:827
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:857
+#: src/utils.c:849
 msgid "yes"
 msgstr "yes"
 
-#: src/utils.c:860
+#: src/utils.c:854
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:863
+#: src/utils.c:858
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "option not defined - Problem in print_option_incolor()"
 
-#: src/utils.c:900
+#: src/utils.c:895
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:914
+#: src/utils.c:909
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/vars.c:48
+#: src/vars.c:49
 msgid "January"
 msgstr "January"
 
-#: src/vars.c:49
+#: src/vars.c:50
 msgid "February"
 msgstr "February"
 
-#: src/vars.c:50
+#: src/vars.c:51
 msgid "March"
 msgstr "March"
 
-#: src/vars.c:51
+#: src/vars.c:52
 msgid "April"
 msgstr "April"
 
-#: src/vars.c:52
+#: src/vars.c:53
 msgid "May"
 msgstr "May"
 
-#: src/vars.c:53
+#: src/vars.c:54
 msgid "June"
 msgstr "June"
 
-#: src/vars.c:54
+#: src/vars.c:55
 msgid "July"
 msgstr "July"
 
-#: src/vars.c:55
+#: src/vars.c:56
 msgid "August"
 msgstr "August"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "September"
 msgstr "September"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "October"
 msgstr "October"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "November"
 msgstr "November"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "December"
 msgstr "December"
 
-#: src/vars.c:62 src/vars.c:69
+#: src/vars.c:64 src/vars.c:71
 msgid "Sun"
 msgstr "Sun"
 
-#: src/vars.c:63
+#: src/vars.c:65
 msgid "Mon"
 msgstr "Mon"
 
-#: src/vars.c:64
+#: src/vars.c:66
 msgid "Tue"
 msgstr "Tue"
 
-#: src/vars.c:65
+#: src/vars.c:67
 msgid "Wed"
 msgstr "Wed"
 
-#: src/vars.c:66
+#: src/vars.c:68
 msgid "Thu"
 msgstr "Thu"
 
-#: src/vars.c:67
+#: src/vars.c:69
 msgid "Fri"
 msgstr "Fri"
 
-#: src/vars.c:68
+#: src/vars.c:70
 msgid "Sat"
 msgstr "Sat"
 
@@ -1609,11 +1631,21 @@ msgstr "Appointments"
 msgid "ToDo"
 msgstr "ToDo"
 
-#: src/wins.c:341
+#: src/wins.c:417
 #, fuzzy
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
+#~ msgid "CalCurse %s | help"
+#~ msgstr "CalCurse %s | help"
+
+#~ msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+#~ msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+#, fuzzy
+#~ msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
+#~ msgstr "Enter the day to go to [ENTER for today] : dd/mm/yyyy"
+
 #, fuzzy
 #~ msgid "FATAL ERROR in wins_prop: property unknown\n"
 #~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
diff --git a/po/es.po b/po/es.po
index ebe4a65..d68d3ab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# 	$calcurse: es.po,v 1.7 2008/03/02 08:50:17 culot Exp $
+# 	$calcurse: es.po,v 1.8 2008/04/20 13:52:06 culot Exp $
 #
 # Spanish translations for calcurse package.
 # Copyright (c) Jose Lopez <testinground@gmail.com> 2006 Free Software Foundation, Inc.
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calcurse 1.8\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-02-16 12:26+0100\n"
+"POT-Creation-Date: 2008-04-20 11:16+0200\n"
 "PO-Revision-Date: 2006-09-10 08:06+0200\n"
 "Last-Translator: Jose Lopez <testinground@gmail.com>\n"
 "Language-Team: Jose Lopez <testinground@gmail.com>\n"
@@ -17,88 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:117
+#: src/apoint.c:119
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "¿ Hora de inicio ? ([hh:mm]), ([h:mm]) o <ENTER> para un evento de todo el\n"
 "dia :"
 
-#: src/apoint.c:118
+#: src/apoint.c:122
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Introduce la hora final ([hh:mm]) o ([h:mm]) o duracion (en minutos) :"
 
-#: src/apoint.c:119
+#: src/apoint.c:123
 msgid "Enter description :"
 msgstr "Introduce la descripcion :"
 
-#: src/apoint.c:120
+#: src/apoint.c:125
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Has introducido una fecha de inicio no valida, debe ser [h:mm] o [hh:mm]"
 
-#: src/apoint.c:121
+#: src/apoint.c:127
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 "Has introducido una hora final no valida, debe ser [h:mm] o [hh:mm] o [mm]"
 
-#: src/apoint.c:122 src/day.c:500 src/day.c:525 src/day.c:583
+#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
 msgid "Press [Enter] to continue"
 msgstr "Pulsa [INTRO] para continuar"
 
-#: src/apoint.c:215
+#: src/apoint.c:230
 msgid "Do you really want to delete this item ?"
 msgstr "¿Seguro que quieres borrar este elemento?"
 
-#: src/apoint.c:216
+#: src/apoint.c:231
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "ERROR FATAL en del_item: no exite ese tipo\n"
 
-#: src/apoint.c:359 src/recur.c:239
+#: src/apoint.c:386 src/recur.c:252
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "ERROR FATAL en apoint_scan: error en la fecha de la cita\n"
 
-#: src/apoint.c:381
+#: src/apoint.c:411
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "ERROR FATAL en del_item: no exite ese tipo\n"
 
-#: src/apoint.c:421
+#: src/apoint.c:454
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "ERROR FATAL en apoint_delete_bynum: no existe la cita\n"
 
-#: src/apoint.c:573
+#: src/apoint.c:615
 #, fuzzy
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "ERROR FATAL en apoint_switch_notify: no existe la cita\n"
 
 #: src/args.c:51
-msgid "Usage: calcurse [-h|-v] [-x] [-an] [-t[num]] [-d date|num] [-c file]\n"
+#, fuzzy
+msgid ""
+"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr ""
 "Uso: calcurse [-h|-v] [-x] [-an] [-t[numero] [-d fecha|numero] [-c archivo]\n"
 
-#: src/args.c:60
+#: src/args.c:59
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Prueba con 'calcurse -h' para mas informacion.\n"
 
-#: src/args.c:73
+#: src/args.c:71
+#, fuzzy
 msgid ""
 "\n"
-"Copyright (c) 2004-2007 Frederic Culot.\n"
+"Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 "\n"
 "Copyright (c) 2004-2007 Frederic Culot.\n"
 "Esto es software libre; ver codigo fuente para las condiciones de copia.\n"
 
-#: src/args.c:77 src/args.c:122
+#: src/args.c:74 src/args.c:121
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr " Calcurse %s - organizador basado en modo texto\n"
 
-#: src/args.c:90
+#: src/args.c:87
+#, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -124,6 +128,10 @@ msgid ""
 "  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
 "\tis the remaining time before this next appointment.\n"
 "\n"
+"  -N, --note\n"
+"\twhen used with the '-a' or '-t' flag, also print note content\n"
+"\tif one is associated with the displayed item.\n"
+"\n"
 "  -t[num], --todo[=num]\n"
 "\tprint todo list and exit. If the optional number [num] is given,\n"
 "\tthen only todos having a priority equal to [num] will be returned.\n"
@@ -181,23 +189,23 @@ msgstr ""
 "man.\n"
 "Emails de errores y comentarios a <calcurse@culot.org>.\n"
 
-#: src/args.c:143
+#: src/args.c:169
+msgid "No note file found\n"
+msgstr ""
+
+#: src/args.c:191
 msgid "to do:\n"
 msgstr "Tareas pendientes:\n"
 
-#: src/args.c:175
+#: src/args.c:225
 msgid "next appointment:\n"
 msgstr "Proxima cita:\n"
 
-#: src/args.c:365
+#: src/args.c:449
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr "El argumento pasado a la opcion -d no es valido\n"
 
-#: src/args.c:367
-msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-msgstr "Los formatos posibles para este argumento son: 'mm/dd/aaaa' o 'n'\n"
-
-#: src/args.c:369
+#: src/args.c:455
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -206,7 +214,7 @@ msgstr ""
 "Para mas informacion, pulsa '?' dentro de Calcurse, o lee la pagina del "
 "man.\n"
 
-#: src/args.c:372
+#: src/args.c:458
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Informes de errores o comentarios a <calcurse@culot.org>.\n"
 
@@ -222,308 +230,326 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "¿Estas seguro de que quieres salir?"
 
-#: src/calcurse.c:234
+#: src/calcurse.c:239
 msgid "To do :"
 msgstr "Tareas pendientes :"
 
-#: src/calendar.c:129
+#: src/calendar.c:132
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:343
+#: src/calendar.c:347
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:344 src/custom.c:211 src/io.c:401 src/io.c:707 src/io.c:816
-#: src/io.c:835
+#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
+#: src/io.c:937
 msgid "Press [ENTER] to continue"
 msgstr "Pulsa [INTRO] para continuar"
 
-#: src/calendar.c:346
-msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
-msgstr "Introduce el dia al que deseas ir [INTRO para hoy] : mm/dd/aaaa"
-
-#: src/custom.c:46
+#: src/custom.c:47
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "ERROR FATAL en fill_config_var: formato de la variable erroneo.\n"
 
-#: src/custom.c:66
+#: src/custom.c:67
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "ERROR FATAL en custom_load_color: numero de color erroneo.\n"
 
-#: src/custom.c:68
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "ERROR FATAL en custom_load_color: nombre de color erroneo\n"
 
-#: src/custom.c:70
+#: src/custom.c:71
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color: formato de configuracion de la variable "
 "erroneo.\n"
 
-#: src/custom.c:78
+#: src/custom.c:81
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color : sin colores en el archivo de "
 "configuracion.\n"
 
-#: src/custom.c:210
+#: src/custom.c:217
 msgid "Failed to open config file"
 msgstr "Fallo al abrir el fichero de configuradion (config)"
 
-#: src/custom.c:289
+#: src/custom.c:311
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color: formato de configuracion de la variable "
 "erroneo.\n"
 
-#: src/custom.c:343
+#: src/custom.c:369
 msgid "Exit"
 msgstr "Salir"
 
-#: src/custom.c:344
+#: src/custom.c:370
 msgid "General"
 msgstr "General"
 
-#: src/custom.c:345
+#: src/custom.c:371
 msgid "Layout"
 msgstr "Disposicion"
 
-#: src/custom.c:346
+#: src/custom.c:372
 msgid "Color"
 msgstr "Color"
 
-#: src/custom.c:347
+#: src/custom.c:373
 msgid "Notify"
 msgstr "Notificaciones"
 
-#: src/custom.c:359
+#: src/custom.c:386
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Selecciona la disposicion deseada en la proxima pantalla [pulsa INTRO]"
 
-#: src/custom.c:360
+#: src/custom.c:388
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('E'= citas y Eventos, 'C'= Calendario, 'T'= Tareas pendientes)"
 
-#: src/custom.c:362
+#: src/custom.c:390
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    EC       ET       CE       TE       TC       TE       CT       ET"
 
-#: src/custom.c:364
+#: src/custom.c:392
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]ET    [2]EC     [3]TE   [4]CE    [5]TE    [6]TC    [7]ET    [8]CT"
 
-#: src/custom.c:417
+#: src/custom.c:446
 msgid "Foreground"
 msgstr "Color del texto"
 
-#: src/custom.c:418
+#: src/custom.c:447
 msgid "Background"
 msgstr "Color del fondo"
 
-#: src/custom.c:419
+#: src/custom.c:448
 msgid "(terminal's default)"
 msgstr "(el del terminal por defecto)"
 
-#: src/custom.c:422
+#: src/custom.c:451
 msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
 msgstr ""
 "Usa 'X' o la barra espaciadora para seleccionar un color, 'H/L' 'J/K' o\n"
 "las teclas de las flechas para moverte"
 
-#: src/custom.c:424
+#: src/custom.c:453
 msgid "('0' for no color, 'Q' to exit) :"
 msgstr "('0' para no color, 'Q' para salir) :"
 
-#: src/custom.c:455
+#: src/custom.c:487
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | color del tema"
 
-#: src/custom.c:644
+#: src/custom.c:680
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
 
-#: src/custom.c:672
+#: src/custom.c:711
 msgid "auto_save = "
 msgstr " auto_guardar = "
 
-#: src/custom.c:673
+#: src/custom.c:712
 msgid "confirm_quit = "
 msgstr "confirmar_salir = "
 
-#: src/custom.c:674
+#: src/custom.c:713
 msgid "confirm_delete = "
 msgstr "confirmar_borrar = "
 
-#: src/custom.c:675
+#: src/custom.c:714
 msgid "skip_system_dialogs = "
 msgstr "saltar_dialogos_sistema = "
 
-#: src/custom.c:676
+#: src/custom.c:715
 msgid "skip_progress_bar = "
 msgstr "saltar_barra_progreso = "
 
-#: src/custom.c:677
+#: src/custom.c:716
 msgid "week_begins_on_monday = "
 msgstr "empezar_semana_en_lunes = "
 
-#: src/custom.c:686
+#: src/custom.c:717
+msgid "output_datefmt = "
+msgstr ""
+
+#: src/custom.c:718
+msgid "input_datefmt = "
+msgstr ""
+
+#: src/custom.c:724
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(si se fija en SI, se guardan automaticamente los datos al salir)"
 
-#: src/custom.c:692
+#: src/custom.c:729
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(si se fija en SI, se requiere confirmacion antes de salir)"
 
-#: src/custom.c:698
+#: src/custom.c:734
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(si se fija en SI, se requiere confirmacion antes de borrar un evento)"
 
-#: src/custom.c:704
+#: src/custom.c:741
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(si se fija en SI, no se mostraran los mensajes de carga y guardado de los "
 "datos)"
 
-#: src/custom.c:710
+#: src/custom.c:748
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 "(si se fija en SI, no se mostrara la barra de progreso al salvar los datos)"
 
-#: src/custom.c:716
+#: src/custom.c:755
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 "(si se fija en SI, el Lunes sera el primer dia de la semana, sino el Domingo)"
 
-#: src/custom.c:728 src/notify.c:505
+#: src/custom.c:763
+#, fuzzy
+msgid "(Format of the date to be displayed in non-interactive mode)"
+msgstr "(Formato de la fecha dentro de la barra de notificaciones)"
+
+#: src/custom.c:769
+msgid "(Format to be used when entering a date: "
+msgstr ""
+
+#: src/custom.c:770
+msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
+msgstr ""
+
+#: src/custom.c:795 src/notify.c:522
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Introduce un numero para cambiar su valor [Q para salir] "
 
-#: src/custom.c:733
+#: src/custom.c:797 src/notify.c:524
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+"Introduce el formato de la fecha (ver 'man 3 strftime' para los formatos\n"
+"posibles) "
+
+#: src/custom.c:799
+msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
+msgstr ""
+
+#: src/custom.c:805
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "Calcurse %s | opciones generales"
 
-#: src/day.c:438
+#: src/day.c:456
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "ERROR FATAL en day_popup_item:  no existe ese tipo\n"
 
-#: src/day.c:441
+#: src/day.c:459
 msgid "Event :"
 msgstr "Evento :"
 
-#: src/day.c:445
+#: src/day.c:462
 msgid "Appointment :"
 msgstr "Cita :"
 
-#: src/day.c:499
+#: src/day.c:517
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Introduce la nueva hora ([hh:mm] o [h:mm]) :"
 
-#: src/day.c:502
+#: src/day.c:519
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "Has introducido una hora no valida, debe ser [h:mm] o [hh:mm]"
 
-#: src/day.c:524 src/day.c:579
+#: src/day.c:543 src/day.c:601
 msgid "Invalid time: start time must be before end time!"
 msgstr "Hora no valida: La hora de inicio debe ser anterior a la hora final!"
 
-#: src/day.c:562
+#: src/day.c:585
 msgid "Enter the new item description:"
 msgstr "Introduce la descripcion del nuevo elemento:"
 
-#: src/day.c:574
+#: src/day.c:597
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr "Tipo de repeticion: (D) diario, (W) semanal, (M) mensual, (Y) anual?"
 
-#: src/day.c:576 src/recur.c:615
+#: src/day.c:599 src/recur.c:651
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y] "
 
-#: src/day.c:577 src/recur.c:619
+#: src/day.c:600 src/recur.c:653
 msgid "The frequence you entered is not valid."
 msgstr "La frecuencia que has introducido no es valida."
 
-#: src/day.c:580 src/recur.c:622
+#: src/day.c:602 src/recur.c:656
 msgid "The entered date is not valid."
 msgstr "La fecha introducida no es valida."
 
-#: src/day.c:581 src/recur.c:624
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr ""
-"Los formatos posibles son [mm/dd/aaaa] o '0' para una repeticion infinita"
-
-#: src/day.c:600
+#: src/day.c:628
 msgid "Enter the new repetition frequence:"
 msgstr "Introduce la nueva frecuencia de repeticion:"
 
-#: src/day.c:618
-msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
-msgstr "Introduce la nueva fecha final: [mm/dd/aaaa] o '0'"
-
-#: src/day.c:692
+#: src/day.c:737
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Editar: (1)Descripcion o (2)Repeticion?"
 
-#: src/day.c:714
+#: src/day.c:758
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 "Editar: (1)Hora de inicio, (2)Hora final, (3)Descripcion o (4)Repeticion?"
 
-#: src/day.c:738
+#: src/day.c:783
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Editar: (1)Hora de inicio, (2)Hora final o (3)Descripcion?"
 
-#: src/day.c:770
+#: src/day.c:816
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/day.c:773
+#: src/day.c:819
 #, fuzzy
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/day.c:775
+#: src/day.c:821
 #, fuzzy
 msgid "[i/n] "
 msgstr "[a/o] "
 
-#: src/day.c:776
+#: src/day.c:822
 msgid "[a/o] "
 msgstr "[a/o] "
 
-#: src/event.c:113
+#: src/event.c:118
 msgid "FATAL ERROR in event_scan: date error in the event\n"
 msgstr "ERROR FATAL en event_scan: error en la fecha del evento\n"
 
-#: src/event.c:135
+#: src/event.c:143
 #, fuzzy
 msgid "FATAL ERROR in event_get: no such item\n"
 msgstr "ERROR FATAL en recur_get_event: no existe el evento\n"
 
-#: src/event.c:166
+#: src/event.c:178
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "ERROR FATAL en event_delete_bynum: no existe ese tipo\n"
 
-#: src/help.c:109
-#, c-format
-msgid "CalCurse %s | help"
+#: src/help.c:119
+#, fuzzy, c-format
+msgid "Calcurse %s | help"
 msgstr "Calcurse %s | ayuda"
 
-#: src/help.c:267
+#: src/help.c:272
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Bienvenid@ a Calcurse. Esta es la pantalla de ayuda inicial.\n"
 
-#: src/help.c:269
+#: src/help.c:274
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -563,11 +589,11 @@ msgstr ""
 "\n"
 "                  Creditos: Pulsa @ para ver los creditos."
 
-#: src/help.c:282
+#: src/help.c:287
 msgid "Save:\n"
 msgstr "Guardar:\n"
 
-#: src/help.c:284
+#: src/help.c:289
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -593,11 +619,11 @@ msgstr ""
 "En el menu de configuracion, puedes elegir guardar los datos\n"
 "de Calcurse automaticamente antes de salir."
 
-#: src/help.c:294
+#: src/help.c:299
 msgid "Export:\n"
 msgstr "Exportar:\n"
 
-#: src/help.c:296
+#: src/help.c:301
 msgid ""
 "Pressing 'X' exports the Calcurse data to iCalendar format.\n"
 "\n"
@@ -619,11 +645,11 @@ msgstr ""
 "Todos los datos de Calcurse son exportados en el siguiente orden:\n"
 "eventos, citas y tareas pendientes.\n"
 
-#: src/help.c:303
+#: src/help.c:308
 msgid "Displacement keys:\n"
 msgstr "Teclas de desplazamiento:\n"
 
-#: src/help.c:305
+#: src/help.c:310
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -655,17 +681,18 @@ msgstr ""
 "pendientes (respectivamente K o flecha arriba, y J o flecha abajo) te\n"
 "permite seleccionar un elemento de esas listas."
 
-#: src/help.c:317
+#: src/help.c:322
 msgid "View:\n"
 msgstr "Ver:\n"
 
-#: src/help.c:319
+#: src/help.c:324
+#, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-"space to display it. If that is the case, the description will be\n"
+" space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
 "description, just press 'V' and a popup window will appear, containing\n"
 "the whole event.\n"
@@ -681,11 +708,11 @@ msgstr ""
 "al final aparece '...'. Para poder leer la descripcion completa, solo pulsa\n"
 "'V' y aparecera una nueva ventana que contendra el evento completo."
 
-#: src/help.c:329
+#: src/help.c:335
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:331
+#: src/help.c:337
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -708,11 +735,11 @@ msgstr ""
 "pendientes, primero debes cambiar a ese panel pulsando la tecla 'Tab'\n"
 "(tabulador). Asi siempre sabes que accion puede realizarse en cada panel."
 
-#: src/help.c:341
+#: src/help.c:347
 msgid "Goto:\n"
 msgstr "Ir a:\n"
 
-#: src/help.c:343
+#: src/help.c:349
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -728,11 +755,11 @@ msgstr ""
 "especificar una fecha, Calcurse comprueba la fecha actual del sistema y\n"
 "te llevara hasta esa fecha."
 
-#: src/help.c:349
+#: src/help.c:355
 msgid "Delete:\n"
 msgstr "Borrar:\n"
 
-#: src/help.c:351
+#: src/help.c:357
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -760,11 +787,12 @@ msgstr ""
 "No olvides salvar los datos del calendario antes de salir para mantener\n"
 "las modificaciones la proxima vez que inicies Calcurse."
 
-#: src/help.c:363
+#: src/help.c:369
 msgid "Add:\n"
 msgstr "Añadir:\n"
 
-#: src/help.c:365
+#: src/help.c:371
+#, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
@@ -791,15 +819,15 @@ msgid ""
 "pressing 'A'.\n"
 "\n"
 "Notes:\n"
-"       o if an appointment lasts for such a long time that it continues\n"
-"         on the next days, this event will be indicated on all the\n"
-"         corresponding days, and the beginning or ending hour will be\n"
-"         replaced by '..' if the event does not begin or end on the day.\n"
-"       o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-"         description prompt, without any description, no item will be\n"
-"         added.\n"
-"       o do not forget to save the calendar data to retrieve the new\n"
-"         event next time you launch Calcurse."
+"     o if an appointment lasts for such a long time that it continues\n"
+"       on the next days, this event will be indicated on all the\n"
+"       corresponding days, and the beginning or ending hour will be\n"
+"       replaced by '..' if the event does not begin or end on the day.\n"
+"     o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
+"       description prompt, without any description, no item will be\n"
+"       added.\n"
+"     o do not forget to save the calendar data to retrieve the new\n"
+"       event next time you launch Calcurse."
 msgstr ""
 "Pulsando 'A' te permite añadir un elemento a la lista de tareas pendientes\n"
 "o a la de citas y eventos, dependiendo del panel que tengas seleccionado\n"
@@ -842,11 +870,12 @@ msgstr ""
 "mantener\n"
 "         las modificaciones la proxima vez que inicies Calcurse."
 
-#: src/help.c:396
+#: src/help.c:401
 msgid "Edit Item:\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:398
+#: src/help.c:403
+#, fuzzy
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -857,12 +886,12 @@ msgid ""
 "its actual value, and you will be able to change it as you like.\n"
 "\n"
 "Notes:\n"
-"       o if you choose to edit the item repetition properties, you will\n"
-"         be asked to re-enter all of the repetition characteristics\n"
-"         (repetition type, frequence, and ending date). Moreover, the\n"
-"         previous data concerning the deleted occurences will be lost.\n"
-"       o do not forget to save the calendar data to retrieve the\n"
-"         modified properties next time you launch Calcurse."
+"     o if you choose to edit the item repetition properties, you will\n"
+"       be asked to re-enter all of the repetition characteristics\n"
+"       (repetition type, frequence, and ending date). Moreover, the\n"
+"       previous data concerning the deleted occurences will be lost.\n"
+"     o do not forget to save the calendar data to retrieve the\n"
+"       modified properties next time you launch Calcurse."
 msgstr ""
 "Pulsando 'E' te permite editar el elemento que esta actualmente "
 "seleccionado.\n"
@@ -882,12 +911,12 @@ msgstr ""
 "propiedades\n"
 "         modificadas se muestren la proxima vez que arranques Calcurse."
 
-#: src/help.c:413
+#: src/help.c:418
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:415
+#: src/help.c:420
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -898,45 +927,45 @@ msgid ""
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
-"       o if the 'VISUAL' environment variable is set, then this will be\n"
-"         the default editor to be called.\n"
-"       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
-"         will be used as the default editor.\n"
-"       o if none of the above environment variables is set, then\n"
-"         '/usr/bin/vi' will be used.\n"
+"     o if the 'VISUAL' environment variable is set, then this will be\n"
+"       the default editor to be called.\n"
+"     o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+"       will be used as the default editor.\n"
+"     o if none of the above environment variables is set, then\n"
+"       '/usr/bin/vi' will be used.\n"
 "\n"
 "Once the item note is edited and saved, quit your favorite editor.\n"
 "You will then go back to Calcurse, and the '>' sign will appear in front\n"
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:434
+#: src/help.c:439
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "Ver:\n"
 
-#: src/help.c:436
+#: src/help.c:441
 msgid ""
 "Pressing the '>' key allows you to view a note which was previously\n"
 "attached to an item (an item which owns a note has a '>' sign in front\n"
 "of it). This command only permits to view the note, not to\n"
 "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the 'N' key\n"
+"Once you highlighted an item with a note attached to it, and the '>' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
-"       o if the 'PAGER' environment variable is set, then this will be\n"
-"         the default viewer to be called.\n"
-"       o if the above environment variable is not set, then\n"
-"         '/usr/bin/less' will be used.\n"
+"     o if the 'PAGER' environment variable is set, then this will be\n"
+"       the default viewer to be called.\n"
+"     o if the above environment variable is not set, then\n"
+"       '/usr/bin/less' will be used.\n"
 "As for the 'N' key, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:450
+#: src/help.c:456
 msgid "Priority:\n"
 msgstr "Prioridad:\n"
 
-#: src/help.c:452
+#: src/help.c:458
 msgid ""
 "Pressing '+' or '-' allows you to change the priority of the currently\n"
 "selected item in the ToDo list. Priorities are represented by the number\n"
@@ -969,11 +998,11 @@ msgstr ""
 "La posicion de la tarea puede tambien variar dependiendo de los elementos\n"
 "que tenga por debajo."
 
-#: src/help.c:464
+#: src/help.c:472
 msgid "Repeat:\n"
 msgstr "Repetir:\n"
 
-#: src/help.c:466
+#: src/help.c:474
 msgid ""
 "Pressing 'R' allows you to repeat an event or an appointment. You must\n"
 "first select the item to be repeated by moving inside the appointment\n"
@@ -1033,11 +1062,11 @@ msgstr ""
 "          configuraciones complejas, de esta forma es posible borrar solo\n"
 "          una recurrencia o todo un elemento repetido."
 
-#: src/help.c:490
+#: src/help.c:498
 msgid "Flag Item:\n"
 msgstr "Marcar elemento:\n"
 
-#: src/help.c:492
+#: src/help.c:500
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1057,11 +1086,11 @@ msgstr ""
 "configuracion te deja elegir el comando que se lanzara para avisarte\n"
 "de la proximidad de una cita y con que antelacion se te avisara."
 
-#: src/help.c:500
+#: src/help.c:508
 msgid "Config:\n"
 msgstr "Config:\n"
 
-#: src/help.c:502
+#: src/help.c:510
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1099,11 +1128,11 @@ msgstr ""
 "No olvides guardar los datos del calendario para mantener tu configuracion\n"
 "la proxima vez que inicies Calcurse."
 
-#: src/help.c:513
+#: src/help.c:521
 msgid "General keybindings:\n"
 msgstr "Teclas generales\n"
 
-#: src/help.c:515
+#: src/help.c:523
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1140,11 +1169,11 @@ msgstr ""
 " '^K' : -1 Semana          -> moverte a la semana anterior\n"
 " '^J' : +1 Semana          -> moverte a la semana siguiente"
 
-#: src/help.c:531
+#: src/help.c:539
 msgid "OtherCmd:\n"
 msgstr "Otros comandos\n"
 
-#: src/help.c:533
+#: src/help.c:541
 msgid ""
 "Pressing 'O' allows you to switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
@@ -1160,13 +1189,14 @@ msgstr ""
 "Una vez alcances la ultima pagina de la barra de estado, pulsa 'O' de nuevo\n"
 "para volver a la primera pagina."
 
-#: src/help.c:540
+#: src/help.c:548
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - organizador basado en modo texto"
 
-#: src/help.c:542
+#: src/help.c:550
+#, fuzzy
 msgid ""
-"Copyright (c) 2004-2007 Frederic Culot\n"
+"Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1199,95 +1229,95 @@ msgstr ""
 "Envia tus impresiones y comentarios a: calcurse@culot.org\n"
 "Pagina web de Calcurse : http://culot.org/calcurse"
 
-#: src/io.c:59
+#: src/io.c:61
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: src/io.c:60
+#: src/io.c:62
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/io.c:61
+#: src/io.c:63
 msgid "Exporting..."
 msgstr "Exportando..."
 
-#: src/io.c:124
+#: src/io.c:126
 msgid "Choose the file used to export calcurse data:"
 msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
 
-#: src/io.c:126
+#: src/io.c:128
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "El archivo no es accesible, por favor elige otro nombre de archivo."
 
-#: src/io.c:128 src/recur.c:626
+#: src/io.c:129 src/recur.c:660
 msgid "Press [ENTER] to continue."
 msgstr "Pulsa [INTRO] para continuar."
 
-#: src/io.c:345
+#: src/io.c:365
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr "%s no existe, crearlo ahora [y o n] ?"
 
-#: src/io.c:350 src/io.c:367
+#: src/io.c:371 src/io.c:391
 #, c-format
 msgid "aborting...\n"
 msgstr "abortando...\n"
 
-#: src/io.c:361
+#: src/io.c:385
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s creado con exito\n"
 
-#: src/io.c:362
+#: src/io.c:386
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "arrancando modo interactivo...\n"
 
-#: src/io.c:397
+#: src/io.c:422
 msgid "Problems accessing data file ..."
 msgstr "Problemas al acceder al fichero de datos..."
 
-#: src/io.c:400
+#: src/io.c:433
 msgid "The data files were successfully saved"
 msgstr "Los archivos de datos se han salvado con exito"
 
-#: src/io.c:560
+#: src/io.c:612
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr "ERROR FATAL en load_app: formato incorrecto en la cita o evento\n"
 
-#: src/io.c:579
+#: src/io.c:633
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr "ERROR FATAL en load_app: error de sintaxis en la fecha del elemento\n"
 
-#: src/io.c:594
+#: src/io.c:649
 #, fuzzy
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr "ERROR FATAL en load_app: no se encontro cita ni evento\n"
 
-#: src/io.c:706
+#: src/io.c:793
 msgid "Failed to open todo file"
 msgstr "Fallo al abrir el archivo del ToDo"
 
-#: src/io.c:757 src/io.c:775
+#: src/io.c:855 src/io.c:875
 #, fuzzy, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/io.c:814
+#: src/io.c:914
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Bienvenid@ a Calcurse. Se crearon los archivos de datos que faltaban."
 
-#: src/io.c:815
+#: src/io.c:915
 msgid "Data files found. Data will be loaded now."
 msgstr "Archivos de datos encontrados. Ahora se cargaran los datos."
 
-#: src/io.c:833
+#: src/io.c:935
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
 
-#: src/io.c:834
+#: src/io.c:936
 msgid "The data were successfully exported"
 msgstr "Los datos se han exportado correctamente"
 
@@ -1296,148 +1326,149 @@ msgstr "Los datos se han exportado correctamente"
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/notify.c:139
+#: src/notify.c:138
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "ERROR FATAL in notify_launch_cmd: no se puede lanzar el comando\n"
 
-#: src/notify.c:434
+#: src/notify.c:451
 msgid "notify-bar_show = "
 msgstr "mostrar-barra-notificaciones = "
 
-#: src/notify.c:435
+#: src/notify.c:452
 msgid "notify-bar_date = "
 msgstr "fecha_barra-notificaciones = "
 
-#: src/notify.c:436
+#: src/notify.c:453
 msgid "notify-bar_clock = "
 msgstr "hora_barra-notificaciones = "
 
-#: src/notify.c:437
+#: src/notify.c:454
 msgid "notify-bar_warning = "
 msgstr "alarma_barra-notificaciones = "
 
-#: src/notify.c:438
+#: src/notify.c:455
 msgid "notify-bar_command = "
 msgstr "comando_barra-notificaciones = "
 
-#: src/notify.c:441
+#: src/notify.c:458
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(si se fija en SI, se mostrara la barra de notificaciones)"
 
-#: src/notify.c:444
+#: src/notify.c:460
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Formato de la fecha dentro de la barra de notificaciones)"
 
-#: src/notify.c:447
+#: src/notify.c:463
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Formato de la hora dentro de la barra de notificaciones)"
 
-#: src/notify.c:450
+#: src/notify.c:466
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "(Alarma de cita en los proximos 'alarma_barra-notificaciones' segundos)"
 
-#: src/notify.c:454
+#: src/notify.c:469
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Comando usado para notificar al usuario una cita proxima)"
 
-#: src/notify.c:507
-msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-"Introduce el formato de la fecha (ver 'man 3 strftime' para los formatos\n"
-"posibles) "
-
-#: src/notify.c:509
+#: src/notify.c:526
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 "Introduce el formato de la hora (ver 'man 3 strftime' para los formatos\n"
 "posibles) "
 
-#: src/notify.c:511
+#: src/notify.c:528
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 "Introduce el numero de segundos (con 0 no se avisara antes de una cita)"
 
-#: src/notify.c:512
+#: src/notify.c:529
 msgid "Enter the notification command "
 msgstr "Introduce el comando de notificacion"
 
-#: src/notify.c:516
+#: src/notify.c:533
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "Calcurse %s | opciones de la barra de notificaciones"
 
-#: src/recur.c:127
+#: src/recur.c:131
 #, fuzzy
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
 
-#: src/recur.c:158
+#: src/recur.c:163
 #, fuzzy
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
 
-#: src/recur.c:281
+#: src/recur.c:299
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr "ERROR FATAL en recur_event_scan: error de fecha en el evento\n"
 
-#: src/recur.c:399
+#: src/recur.c:421
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
 
-#: src/recur.c:522
+#: src/recur.c:554
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr "ERROR FATAL en recur_event_erase: no existe el evento\n"
 
-#: src/recur.c:591
+#: src/recur.c:626
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr "ERROR FATAL en recur_apoint_erase: no existe esa cita\n"
 
-#: src/recur.c:614
+#: src/recur.c:650
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr "¿Tipo de repeticion: [D] diario, [W] semanal, [M] mensual, [Y] anual?"
 
-#: src/recur.c:617
+#: src/recur.c:652
 msgid "Enter the repetition frequence:"
 msgstr "Introduce la frecuencia de repeticion:"
 
-#: src/recur.c:621
-msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
+#: src/recur.c:655
+#, fuzzy, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr ""
 "Introduce la fecha final: [mm/dd/aaaa] o '0' para una repeticion infinita"
 
-#: src/recur.c:625
+#: src/recur.c:658
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetetition"
+msgstr ""
+"Los formatos posibles son [mm/dd/aaaa] o '0' para una repeticion infinita"
+
+#: src/recur.c:659
 msgid "This item is already a repeated one."
 msgstr "Este elemento es ya un elemento repetido."
 
-#: src/recur.c:628
+#: src/recur.c:662
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "La fecha que has introducido es anterior a la de inicio del elemento."
 
-#: src/recur.c:717
+#: src/recur.c:776
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "ERROR FATAL en recur_repeat_item: tipo de elemento erroneo\n"
 
-#: src/recur.c:744
+#: src/recur.c:805
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr ""
 "ERROR FATAL en recur_exc_scan: error de sintaxis en la fecha del elemento\n"
 
-#: src/recur.c:811
+#: src/recur.c:880
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr "ERROR FATAL en recur_get_apoint: no existe el elemento\n"
 
-#: src/recur.c:832
+#: src/recur.c:904
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr "ERROR FATAL en recur_get_event: no existe el evento\n"
 
-#: src/recur.c:865
+#: src/recur.c:940
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "ERROR FATAL en recur_apoint_switch_notify: no existe el elemento\n"
 
-#: src/todo.c:137
+#: src/todo.c:138
 msgid "Enter the new ToDo item : "
 msgstr "Introduce una nueva tarea pendiente :"
 
@@ -1446,45 +1477,45 @@ msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 "Introduce la prioridad de la tarea [1 (la mas alta) - 9 (la mas baja)] :"
 
-#: src/todo.c:189
+#: src/todo.c:192
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:198
+#: src/todo.c:201
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:225
+#: src/todo.c:230
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:235
+#: src/todo.c:240
 msgid "Do you really want to delete this task ?"
 msgstr "¿Seguro que quieres borrar esta tarea ?"
 
-#: src/todo.c:237
+#: src/todo.c:242
 #, fuzzy
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/todo.c:240
+#: src/todo.c:244
 #, fuzzy
 msgid "[t/n] "
 msgstr "[a/o] "
 
-#: src/todo.c:312
+#: src/todo.c:328
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "ERROR FATAL en todo_get_position: tarea no encontrada\n"
 
-#: src/todo.c:337
+#: src/todo.c:360
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "ERROR FATAL en todo_chg_priority: no existe esa accion\n"
 
-#: src/todo.c:352
+#: src/todo.c:375
 msgid "Enter the new ToDo description :"
 msgstr "Introduce la descripcion de la nueva tarea :"
 
@@ -1500,226 +1531,226 @@ msgstr ""
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:137
+#: src/utils.c:140
 msgid "Press any key to continue..."
 msgstr "Pulsa cualquier tecla para continuar..."
 
-#: src/utils.c:360
+#: src/utils.c:378
 #, fuzzy
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
 
-#: src/utils.c:400
+#: src/utils.c:420
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/utils.c:401
+#: src/utils.c:421
 msgid "Quit"
 msgstr "Salir"
 
-#: src/utils.c:402
+#: src/utils.c:422
 msgid "Save"
 msgstr "Guardar"
 
-#: src/utils.c:403
+#: src/utils.c:423
 msgid "Export"
 msgstr "Exportar"
 
-#: src/utils.c:404
+#: src/utils.c:424
 msgid "Add Item"
 msgstr "Añadir elemento"
 
-#: src/utils.c:405
+#: src/utils.c:425
 msgid "Del Item"
 msgstr "Borrar elemento"
 
-#: src/utils.c:406
+#: src/utils.c:426
 msgid "Edit Itm"
 msgstr "Editar elemento"
 
-#: src/utils.c:407
+#: src/utils.c:427
 msgid "Flag Itm"
 msgstr "Marcar elemento"
 
-#: src/utils.c:408 src/utils.c:422
+#: src/utils.c:428 src/utils.c:442
 msgid "-+1 Day"
 msgstr "-+1 Dia"
 
-#: src/utils.c:409 src/utils.c:423
+#: src/utils.c:429 src/utils.c:443
 msgid "-+1 Week"
 msgstr "-+1 Semana"
 
-#: src/utils.c:410
+#: src/utils.c:430
 msgid "Up/Down"
 msgstr "Arriba/Abajo"
 
-#: src/utils.c:411
+#: src/utils.c:431
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/utils.c:412
+#: src/utils.c:432
 msgid "Priority"
 msgstr "Prioridad"
 
-#: src/utils.c:413
+#: src/utils.c:433
 msgid "Chg View"
 msgstr "Cambiar vista"
 
-#: src/utils.c:414
+#: src/utils.c:434
 msgid "Go to"
 msgstr "Ir a"
 
-#: src/utils.c:415
+#: src/utils.c:435
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:416
+#: src/utils.c:436
 msgid "View"
 msgstr "Vista"
 
-#: src/utils.c:417
+#: src/utils.c:437
 msgid "Redraw"
 msgstr "Redibujar"
 
-#: src/utils.c:418
+#: src/utils.c:438
 msgid "Add Appt"
 msgstr "Añadir Cita"
 
-#: src/utils.c:419
+#: src/utils.c:439
 msgid "Add Todo"
 msgstr "Añadir tarea"
 
-#: src/utils.c:420
+#: src/utils.c:440
 #, fuzzy
 msgid "EditNote"
 msgstr "Editar elemento:\n"
 
-#: src/utils.c:421
+#: src/utils.c:441
 #, fuzzy
 msgid "ViewNote"
 msgstr "Vista"
 
-#: src/utils.c:424
+#: src/utils.c:444
 msgid "OtherCmd"
 msgstr "Otros comandos"
 
-#: src/utils.c:488
+#: src/utils.c:509
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
 
-#: src/utils.c:743
+#: src/utils.c:725
 msgid "Appointment"
 msgstr "Cita"
 
-#: src/utils.c:766
+#: src/utils.c:751
 #, fuzzy
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
 
-#: src/utils.c:834
+#: src/utils.c:825
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/utils.c:836
+#: src/utils.c:827
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
 
-#: src/utils.c:857
+#: src/utils.c:849
 msgid "yes"
 msgstr "si"
 
-#: src/utils.c:860
+#: src/utils.c:854
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:863
+#: src/utils.c:858
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "opcion no definida - Problema en print_option_incolor()"
 
-#: src/utils.c:900
+#: src/utils.c:895
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:914
+#: src/utils.c:909
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/vars.c:48
+#: src/vars.c:49
 msgid "January"
 msgstr "Enero"
 
-#: src/vars.c:49
+#: src/vars.c:50
 msgid "February"
 msgstr "Febrero"
 
-#: src/vars.c:50
+#: src/vars.c:51
 msgid "March"
 msgstr "Marzo"
 
-#: src/vars.c:51
+#: src/vars.c:52
 msgid "April"
 msgstr "Abril"
 
-#: src/vars.c:52
+#: src/vars.c:53
 msgid "May"
 msgstr "Mayo"
 
-#: src/vars.c:53
+#: src/vars.c:54
 msgid "June"
 msgstr "Junio"
 
-#: src/vars.c:54
+#: src/vars.c:55
 msgid "July"
 msgstr "Julio"
 
-#: src/vars.c:55
+#: src/vars.c:56
 msgid "August"
 msgstr "Agosto"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "September"
 msgstr "Septiembre"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "October"
 msgstr "Octubre"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "November"
 msgstr "Noviembre"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "December"
 msgstr "Diciembre"
 
-#: src/vars.c:62 src/vars.c:69
+#: src/vars.c:64 src/vars.c:71
 msgid "Sun"
 msgstr "Dom"
 
-#: src/vars.c:63
+#: src/vars.c:65
 msgid "Mon"
 msgstr "Lun"
 
-#: src/vars.c:64
+#: src/vars.c:66
 msgid "Tue"
 msgstr "Mar"
 
-#: src/vars.c:65
+#: src/vars.c:67
 msgid "Wed"
 msgstr "Mie"
 
-#: src/vars.c:66
+#: src/vars.c:68
 msgid "Thu"
 msgstr "Jue"
 
-#: src/vars.c:67
+#: src/vars.c:69
 msgid "Fri"
 msgstr "Vie"
 
-#: src/vars.c:68
+#: src/vars.c:70
 msgid "Sat"
 msgstr "Sab"
 
@@ -1738,11 +1769,23 @@ msgstr "Citas y eventos"
 msgid "ToDo"
 msgstr "Tareas pendientes"
 
-#: src/wins.c:341
+#: src/wins.c:417
 #, fuzzy
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "ERROR FATAL en update_windows: no hay ventana seleccionada\n"
 
+#~ msgid "CalCurse %s | help"
+#~ msgstr "Calcurse %s | ayuda"
+
+#~ msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+#~ msgstr "Los formatos posibles para este argumento son: 'mm/dd/aaaa' o 'n'\n"
+
+#~ msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
+#~ msgstr "Introduce el dia al que deseas ir [INTRO para hoy] : mm/dd/aaaa"
+
+#~ msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
+#~ msgstr "Introduce la nueva fecha final: [mm/dd/aaaa] o '0'"
+
 #, fuzzy
 #~ msgid "FATAL ERROR in wins_prop: property unknown\n"
 #~ msgstr "ERROR FATAL en day_popup_item:  no existe ese tipo\n"
diff --git a/po/nl.po b/po/nl.po
index 7466ef7..02aa431 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# 	$calcurse: nl.po,v 1.4 2008/03/02 08:50:17 culot Exp $
+# 	$calcurse: nl.po,v 1.5 2008/04/20 13:52:06 culot Exp $
 #
 # Dutch translations for calcurse package.
 # Copyright (C) 2007-2008 Jeremy Roon <p.roon@chello.nl>
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 2.0\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-02-16 12:26+0100\n"
+"POT-Creation-Date: 2008-04-20 11:16+0200\n"
 "PO-Revision-Date: 2007-01-06 13:52+0200\n"
 "Last-Translator: Jeremy Roon\n"
 "Language-Team:  Jeremy Roon <p.roon@chello.nl>\n"
@@ -18,81 +18,85 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/apoint.c:117
+#: src/apoint.c:119
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Voer aanvangstijd in ([hh:mm] of [h:mm]), laat leeg voor de gehele dag:"
 
-#: src/apoint.c:118
+#: src/apoint.c:122
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Voer de eindtijd in ([hh:mm] of [h:mm]) of duur (in minuten) :"
 
-#: src/apoint.c:119
+#: src/apoint.c:123
 msgid "Enter description :"
 msgstr "Voer beschrijving in :"
 
-#: src/apoint.c:120
+#: src/apoint.c:125
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr "De aanvangstijd is ongeldig! Formaat kan [h:mm] of [hh:mm] zijn"
 
-#: src/apoint.c:121
+#: src/apoint.c:127
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr "De eindtijd is ongeldig! Formaat kan [h:mm] of [hh:mm] of [mm] zijn"
 
-#: src/apoint.c:122 src/day.c:500 src/day.c:525 src/day.c:583
+#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
 msgid "Press [Enter] to continue"
 msgstr "Druk op [Enter] om door te gaan)"
 
-#: src/apoint.c:215
+#: src/apoint.c:230
 msgid "Do you really want to delete this item ?"
 msgstr "Wilt u werkelijk dit item wissen ?"
 
-#: src/apoint.c:216
+#: src/apoint.c:231
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "FATALE FOUT in apoint_delete: Type bestaat niet\n"
 
-#: src/apoint.c:359 src/recur.c:239
+#: src/apoint.c:386 src/recur.c:252
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "FATALE FOUT in apoint_scan: datafout in de afspraak\n"
 
-#: src/apoint.c:381
+#: src/apoint.c:411
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "FATALE FOUT in apoint_get: item bestaat niet\n"
 
-#: src/apoint.c:421
+#: src/apoint.c:454
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "FATALE FOUT in apoint_delete_bynum: Afspraak bestaat niet"
 
-#: src/apoint.c:573
+#: src/apoint.c:615
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "FATALE FOUT in apoint_switch_notify: Afspraak bestaat niet"
 
 #: src/args.c:51
-msgid "Usage: calcurse [-h|-v] [-x] [-an] [-t[num]] [-d date|num] [-c file]\n"
+#, fuzzy
+msgid ""
+"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr ""
 "Gebruik: calcurse [-h | -v] [-x] [-an] [-t[nr]] [-d datum|nr] [-c bestand]\n"
 
-#: src/args.c:60
+#: src/args.c:59
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Gebruik 'calcurse -h', voor meer informatie.\n"
 
-#: src/args.c:73
+#: src/args.c:71
+#, fuzzy
 msgid ""
 "\n"
-"Copyright (c) 2004-2007 Frederic Culot.\n"
+"Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 "\n"
 "Copyright (c) 2004-2007 Frederic Culot.\n"
 "Dit is vrije Software; kijk in de broncode voor kopieervoorwaarden.\n"
 
-#: src/args.c:77 src/args.c:122
+#: src/args.c:74 src/args.c:121
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - tekst-gebaseerde organizer\n"
 
-#: src/args.c:90
+#: src/args.c:87
+#, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -118,6 +122,10 @@ msgid ""
 "  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
 "\tis the remaining time before this next appointment.\n"
 "\n"
+"  -N, --note\n"
+"\twhen used with the '-a' or '-t' flag, also print note content\n"
+"\tif one is associated with the displayed item.\n"
+"\n"
 "  -t[num], --todo[=num]\n"
 "\tprint todo list and exit. If the optional number [num] is given,\n"
 "\tthen only todos having a priority equal to [num] will be returned.\n"
@@ -170,23 +178,23 @@ msgstr ""
 "Typ '?' in Calcurse voor meer informatie, of lees de man-pagina.\n"
 "Mail a.u.b. foutrapporten en suggesties naar <calcurse@culot.org>.\n"
 
-#: src/args.c:143
+#: src/args.c:169
+msgid "No note file found\n"
+msgstr ""
+
+#: src/args.c:191
 msgid "to do:\n"
 msgstr "Taken:\n"
 
-#: src/args.c:175
+#: src/args.c:225
 msgid "next appointment:\n"
 msgstr "Volgende afspraak :\n"
 
-#: src/args.c:365
+#: src/args.c:449
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr "Argument van '-d' is niet geldig.\n"
 
-#: src/args.c:367
-msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-msgstr "Mogelijke formaatopties zijn : 'mm/dd/jjjj' of 'n'\n"
-
-#: src/args.c:369
+#: src/args.c:455
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Typ '?' in Calcurse voor meer informatie, of lees de man-pagina.\n"
 
-#: src/args.c:372
+#: src/args.c:458
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Mail foutrapporten en suggesties naar <calcurse@culot.org>.\n"
 
@@ -210,15 +218,15 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Wilt u werkelijk het programma verlaten?"
 
-#: src/calcurse.c:234
+#: src/calcurse.c:239
 msgid "To do :"
 msgstr "Taken :"
 
-#: src/calendar.c:129
+#: src/calendar.c:132
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FOUT in calender_set_first_day_of_week\n"
 
-#: src/calendar.c:343
+#: src/calendar.c:347
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
@@ -226,281 +234,298 @@ msgstr ""
 "De ingevoerde datum is ongeldig (voer datum tussen 01/01/1902 en 12/31/2037) "
 "in"
 
-#: src/calendar.c:344 src/custom.c:211 src/io.c:401 src/io.c:707 src/io.c:816
-#: src/io.c:835
+#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
+#: src/io.c:937
 msgid "Press [ENTER] to continue"
 msgstr "Druk op [ENTER] om door te gaan)"
 
-#: src/calendar.c:346
-msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
-msgstr "Gewenste datum?: [ENTER voor vandaag] : mm/dd/jjjj"
-
-#: src/custom.c:46
+#: src/custom.c:47
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "FATALE FOUT in fill_config_var: fout formaat configuratievariabele.\n"
 
-#: src/custom.c:66
+#: src/custom.c:67
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "FATALE FOUT in custom_load_color: ongeldig kleurnummer.\n"
 
-#: src/custom.c:68
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "FATALE FOUT in custom_load_color: ongeldige kleurnaam.\n"
 
-#: src/custom.c:70
+#: src/custom.c:71
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "FATALE FOUT in custom_load_color: ongeldig formaat configuratievariabele.\n"
 
-#: src/custom.c:78
+#: src/custom.c:81
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "FATALE FOUT in custom_load_color: ontbrekende kleuren configuratiebestand.\n"
 
-#: src/custom.c:210
+#: src/custom.c:217
 msgid "Failed to open config file"
 msgstr "Kan het configuratiebestand niet openen"
 
-#: src/custom.c:289
+#: src/custom.c:311
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr "FATALE FOUT in custom_load_conf: onbekende configuratievariabele.\n"
 
-#: src/custom.c:343
+#: src/custom.c:369
 msgid "Exit"
 msgstr "Einde"
 
-#: src/custom.c:344
+#: src/custom.c:370
 msgid "General"
 msgstr "Algemeen"
 
-#: src/custom.c:345
+#: src/custom.c:371
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:346
+#: src/custom.c:372
 msgid "Color"
 msgstr "Kleur"
 
-#: src/custom.c:347
+#: src/custom.c:373
 msgid "Notify"
 msgstr "Info"
 
-#: src/custom.c:359
+#: src/custom.c:386
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Kies de gewenste layout in het volgende venster [druk op ENTER]"
 
-#: src/custom.c:360
+#: src/custom.c:388
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('A'= Afspraken panel, 'K'= Kalender panel, 'T'= taken panel)"
 
-#: src/custom.c:362
+#: src/custom.c:390
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    AK       AT       KA       TA       TK       TA       KT       AT"
 
-#: src/custom.c:364
+#: src/custom.c:392
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]AT    [2]AK    [3]TA    [4]KA    [5]TA    [6]TK    [7]AT    [8]KT"
 
-#: src/custom.c:417
+#: src/custom.c:446
 msgid "Foreground"
 msgstr "Voorgrond"
 
-#: src/custom.c:418
+#: src/custom.c:447
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/custom.c:419
+#: src/custom.c:448
 msgid "(terminal's default)"
 msgstr "standaard van terminal"
 
-#: src/custom.c:422
+#: src/custom.c:451
 msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
 msgstr ""
 "'X' of SPATIE voor kleurselectie, 'h/l' 'j/k' of pijltjes verplaatsen cursor"
 
-#: src/custom.c:424
+#: src/custom.c:453
 msgid "('0' for no color, 'Q' to exit) :"
 msgstr "('0' voor geen kleur, 'Q' voor einde) :"
 
-#: src/custom.c:455
+#: src/custom.c:487
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | kleurschema"
 
-#: src/custom.c:644
+#: src/custom.c:680
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "FATALE FOUT in custom_color_theme_name: kleur onbekend\n"
 
-#: src/custom.c:672
+#: src/custom.c:711
 msgid "auto_save = "
 msgstr "automatisch_opslaan = "
 
-#: src/custom.c:673
+#: src/custom.c:712
 msgid "confirm_quit = "
 msgstr "einde_bevestigen = "
 
-#: src/custom.c:674
+#: src/custom.c:713
 msgid "confirm_delete = "
 msgstr "bevestig_verwijderen= "
 
-#: src/custom.c:675
+#: src/custom.c:714
 msgid "skip_system_dialogs = "
 msgstr "overslaan_systeem_dialoog = "
 
-#: src/custom.c:676
+#: src/custom.c:715
 msgid "skip_progress_bar = "
 msgstr "overslaan_progressie_balk = "
 
-#: src/custom.c:677
+#: src/custom.c:716
 msgid "week_begins_on_monday = "
 msgstr "week_begint_op_maandag = "
 
-#: src/custom.c:686
+#: src/custom.c:717
+msgid "output_datefmt = "
+msgstr ""
+
+#: src/custom.c:718
+msgid "input_datefmt = "
+msgstr ""
+
+#: src/custom.c:724
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(Bij JA, wordt er automatisch opgeslagen bij einde programma)"
 
-#: src/custom.c:692
+#: src/custom.c:729
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(Bij JA, wordt er een bevestiging gevraagd bij eindigen programma"
 
-#: src/custom.c:698
+#: src/custom.c:734
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(Bij JA, is een bevestiging nodig voor het wissen van een gebeurtenis)"
 
-#: src/custom.c:704
+#: src/custom.c:741
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(Bij JA, worden geen mededelingen getoond bij het laden/opslaan van data)"
 
-#: src/custom.c:710
+#: src/custom.c:748
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr "(Bij JA, wordt geen progressiebalk getoond bij het opslaan van data)"
 
-#: src/custom.c:716
+#: src/custom.c:755
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr "(Bij JA, is maandag de eerste weekdag, anders zondag)"
 
-#: src/custom.c:728 src/notify.c:505
+#: src/custom.c:763
+#, fuzzy
+msgid "(Format of the date to be displayed in non-interactive mode)"
+msgstr "(Formaat van de datum in de informatiebalk.)"
+
+#: src/custom.c:769
+msgid "(Format to be used when entering a date: "
+msgstr ""
+
+#: src/custom.c:770
+msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
+msgstr ""
+
+#: src/custom.c:795 src/notify.c:522
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Geef een nummer om de waarde te veranderen [Q om te stoppen]"
 
-#: src/custom.c:733
+#: src/custom.c:797 src/notify.c:524
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr "Geef het formaat van de datum (zie 'man 3 strftime')"
+
+#: src/custom.c:799
+msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
+msgstr ""
+
+#: src/custom.c:805
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | algemene Opties"
 
-#: src/day.c:438
+#: src/day.c:456
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "FATALE FOUT in day_popup_item: onbekend itemtype\n"
 
-#: src/day.c:441
+#: src/day.c:459
 msgid "Event :"
 msgstr "Gebeurtenis :"
 
-#: src/day.c:445
+#: src/day.c:462
 msgid "Appointment :"
 msgstr "Afspraak :"
 
-#: src/day.c:499
+#: src/day.c:517
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Voer nieuwe tijd in: ([hh:mm] of [h:mm]):"
 
-#: src/day.c:502
+#: src/day.c:519
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "Ongeldige tijd ingevoerd! Mogelijke formaten zijn: [h:mm] of [hh:mm]"
 
-#: src/day.c:524 src/day.c:579
+#: src/day.c:543 src/day.c:601
 msgid "Invalid time: start time must be before end time!"
 msgstr "Ongeldige tijd: aanvangstijd moet voor eindtijd zijn!"
 
-#: src/day.c:562
+#: src/day.c:585
 msgid "Enter the new item description:"
 msgstr "Voer een nieuwe beschrijving in:"
 
-#: src/day.c:574
+#: src/day.c:597
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Voer type herhaling in: (D)agelijks, (W)ekelijks, (M)aandelijks, (Y) "
 "jaarlijks"
 
-#: src/day.c:576 src/recur.c:615
+#: src/day.c:599 src/recur.c:651
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y]"
 
-#: src/day.c:577 src/recur.c:619
+#: src/day.c:600 src/recur.c:653
 msgid "The frequence you entered is not valid."
 msgstr "Het ingevoerde interval is ongeldig."
 
-#: src/day.c:580 src/recur.c:622
+#: src/day.c:602 src/recur.c:656
 msgid "The entered date is not valid."
 msgstr "De ingevoerde datum is ongeldig."
 
-#: src/day.c:581 src/recur.c:624
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr "Mogelijk formaat is: [mm/dd/jjjj] of '0' voor oneindig."
-
-#: src/day.c:600
+#: src/day.c:628
 msgid "Enter the new repetition frequence:"
 msgstr "Voer herhalingsinterval in:"
 
-#: src/day.c:618
-msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
-msgstr "Nieuw einde van de herhaling: [mm/dd/jjjj] of '0' voor oneindig"
-
-#: src/day.c:692
+#: src/day.c:737
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Wijzig: (1)Beschrijving of (2)Herhaling"
 
-#: src/day.c:714
+#: src/day.c:758
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr "Wijzig: (1)Aanvang (2)Einde (3)Beschrijving of (4)Herhaling"
 
-#: src/day.c:738
+#: src/day.c:783
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Wijzig: (1)Aanvang (2)Einde of (3)Beschrijving?"
 
-#: src/day.c:770
+#: src/day.c:816
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Dit is een herhalende afspraak. (a)lle afspraken of alleen (o) deze wissen ?"
 
-#: src/day.c:773
+#: src/day.c:819
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Dit item heeft een bijgesloten noot. (i)tem wissen of alleen de (n)oot?"
 
-#: src/day.c:775
+#: src/day.c:821
 msgid "[i/n] "
 msgstr "[i/n]"
 
-#: src/day.c:776
+#: src/day.c:822
 msgid "[a/o] "
 msgstr "[a/o]"
 
-#: src/event.c:113
+#: src/event.c:118
 msgid "FATAL ERROR in event_scan: date error in the event\n"
 msgstr "FATALE FOUT in event_scan: datumfout in afspraak\n"
 
-#: src/event.c:135
+#: src/event.c:143
 msgid "FATAL ERROR in event_get: no such item\n"
 msgstr "FATALE FOUT in event_get: item bestaat niet\n"
 
-#: src/event.c:166
+#: src/event.c:178
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "FATALE FOUT in event_delete_bynum: Gebeurtenis bestaat niet\n"
 
-#: src/help.c:109
-#, c-format
-msgid "CalCurse %s | help"
+#: src/help.c:119
+#, fuzzy, c-format
+msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hulp"
 
-#: src/help.c:267
+#: src/help.c:272
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Welkom in Calcurse. Dit is het centrale hulpscherm.\n"
 
-#: src/help.c:269
+#: src/help.c:274
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -533,11 +558,11 @@ msgstr ""
 "\n"
 "        Auteurs:  Druk op '@' om de auteurs van Calcurse te zien."
 
-#: src/help.c:282
+#: src/help.c:287
 msgid "Save:\n"
 msgstr "Opslaan:\n"
 
-#: src/help.c:284
+#: src/help.c:289
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -563,11 +588,11 @@ msgstr ""
 "In het venster instellingen kan een optie gekozen worden, \n"
 "die de data automatisch opslaat bij het verlaten van Calcurse."
 
-#: src/help.c:294
+#: src/help.c:299
 msgid "Export:\n"
 msgstr "Exporteren:\n"
 
-#: src/help.c:296
+#: src/help.c:301
 msgid ""
 "Pressing 'X' exports the Calcurse data to iCalendar format.\n"
 "\n"
@@ -589,11 +614,11 @@ msgstr ""
 "Alle data wordt geëxporteerd, in deze volgorde:\n"
 "gebeurtenissen, afspraken, taken.\n"
 
-#: src/help.c:303
+#: src/help.c:308
 msgid "Displacement keys:\n"
 msgstr "Navigatietoetsen:\n"
 
-#: src/help.c:305
+#: src/help.c:310
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -625,17 +650,18 @@ msgstr ""
 "de op-en-neer toetsen (resp. k of pijl-omhoog, en j of pijl-beneden)\n"
 "een item uit de lijst kiezen."
 
-#: src/help.c:317
+#: src/help.c:322
 msgid "View:\n"
 msgstr "Bekijk:\n"
 
-#: src/help.c:319
+#: src/help.c:324
+#, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-"space to display it. If that is the case, the description will be\n"
+" space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
 "description, just press 'V' and a popup window will appear, containing\n"
 "the whole event.\n"
@@ -655,11 +681,11 @@ msgstr ""
 "Druk op een willekeurige toets om dit venster te sluiten en terug te \n"
 "keren naar het standaard Calcurse venster."
 
-#: src/help.c:329
+#: src/help.c:335
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:331
+#: src/help.c:337
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -684,11 +710,11 @@ msgstr ""
 "acties mee verandert, zodat altijd te zien is, welke acties gedaan kunnen \n"
 "worden in het actieve panel."
 
-#: src/help.c:341
+#: src/help.c:347
 msgid "Goto:\n"
 msgstr "Ga naar:\n"
 
-#: src/help.c:343
+#: src/help.c:349
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -704,11 +730,11 @@ msgstr ""
 "Indien men op [ENTER] drukt zonder een datum te geven, zal Calcurse \n"
 "naar de huidige dag gaan die op het systeem is insteld."
 
-#: src/help.c:349
+#: src/help.c:355
 msgid "Delete:\n"
 msgstr "Wissen:\n"
 
-#: src/help.c:351
+#: src/help.c:357
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -738,11 +764,12 @@ msgstr ""
 "Vergeet niet om de kalenderdata op te slaan, als je de veranderingen \n"
 "wilt behouden."
 
-#: src/help.c:363
+#: src/help.c:369
 msgid "Add:\n"
 msgstr "Toevoegen:\n"
 
-#: src/help.c:365
+#: src/help.c:371
+#, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
@@ -769,15 +796,15 @@ msgid ""
 "pressing 'A'.\n"
 "\n"
 "Notes:\n"
-"       o if an appointment lasts for such a long time that it continues\n"
-"         on the next days, this event will be indicated on all the\n"
-"         corresponding days, and the beginning or ending hour will be\n"
-"         replaced by '..' if the event does not begin or end on the day.\n"
-"       o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-"         description prompt, without any description, no item will be\n"
-"         added.\n"
-"       o do not forget to save the calendar data to retrieve the new\n"
-"         event next time you launch Calcurse."
+"     o if an appointment lasts for such a long time that it continues\n"
+"       on the next days, this event will be indicated on all the\n"
+"       corresponding days, and the beginning or ending hour will be\n"
+"       replaced by '..' if the event does not begin or end on the day.\n"
+"     o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
+"       description prompt, without any description, no item will be\n"
+"       added.\n"
+"     o do not forget to save the calendar data to retrieve the new\n"
+"       event next time you launch Calcurse."
 msgstr ""
 "Je kunt zowel een taak als afspraak toevoegen met de 'A'-toets, \n"
 "afhankelijk in welk panel je staat als je op 'A' drukt.\n"
@@ -809,11 +836,12 @@ msgstr ""
 "        o vergeet niet kalenderdata op te slaan, als de nieuwe items voor\n"
 "          de volgende start van Calcurse behouden moeten blijven."
 
-#: src/help.c:396
+#: src/help.c:401
 msgid "Edit Item:\n"
 msgstr "Item wijzigen:\n"
 
-#: src/help.c:398
+#: src/help.c:403
+#, fuzzy
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -824,12 +852,12 @@ msgid ""
 "its actual value, and you will be able to change it as you like.\n"
 "\n"
 "Notes:\n"
-"       o if you choose to edit the item repetition properties, you will\n"
-"         be asked to re-enter all of the repetition characteristics\n"
-"         (repetition type, frequence, and ending date). Moreover, the\n"
-"         previous data concerning the deleted occurences will be lost.\n"
-"       o do not forget to save the calendar data to retrieve the\n"
-"         modified properties next time you launch Calcurse."
+"     o if you choose to edit the item repetition properties, you will\n"
+"       be asked to re-enter all of the repetition characteristics\n"
+"       (repetition type, frequence, and ending date). Moreover, the\n"
+"       previous data concerning the deleted occurences will be lost.\n"
+"     o do not forget to save the calendar data to retrieve the\n"
+"       modified properties next time you launch Calcurse."
 msgstr ""
 "Het huidige geselecteerde item kan met 'E' worden gewijzigd.\n"
 "Afhankelijke van het type item (afspraak, gebeurtenis of taak), en of \n"
@@ -848,11 +876,12 @@ msgstr ""
 "       o vergeet niet kalenderdata op te slaan, als de nieuwe items voor\n"
 "         de volgende start van Calcurse behouden moeten blijven."
 
-#: src/help.c:413
+#: src/help.c:418
 msgid "EditNote:\n"
 msgstr "WzgNoot:\n"
 
-#: src/help.c:415
+#: src/help.c:420
+#, fuzzy
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -863,12 +892,12 @@ msgid ""
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
-"       o if the 'VISUAL' environment variable is set, then this will be\n"
-"         the default editor to be called.\n"
-"       o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
-"         will be used as the default editor.\n"
-"       o if none of the above environment variables is set, then\n"
-"         '/usr/bin/vi' will be used.\n"
+"     o if the 'VISUAL' environment variable is set, then this will be\n"
+"       the default editor to be called.\n"
+"     o if 'VISUAL' is not set, then the 'EDITOR' environment variable\n"
+"       will be used as the default editor.\n"
+"     o if none of the above environment variables is set, then\n"
+"       '/usr/bin/vi' will be used.\n"
 "\n"
 "Once the item note is edited and saved, quit your favorite editor.\n"
 "You will then go back to Calcurse, and the '>' sign will appear in front\n"
@@ -893,23 +922,24 @@ msgstr ""
 "Je keert dan terug naar Calcurse, en er zal een '>' verschijnen voor\n"
 "het geselecteerde item, wat betekent dat er een noot bijgesloten is."
 
-#: src/help.c:434
+#: src/help.c:439
 msgid "ViewNote:\n"
 msgstr "BekijkNoot:\n"
 
-#: src/help.c:436
+#: src/help.c:441
+#, fuzzy
 msgid ""
 "Pressing the '>' key allows you to view a note which was previously\n"
 "attached to an item (an item which owns a note has a '>' sign in front\n"
 "of it). This command only permits to view the note, not to\n"
 "edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the 'N' key\n"
+"Once you highlighted an item with a note attached to it, and the '>' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
-"       o if the 'PAGER' environment variable is set, then this will be\n"
-"         the default viewer to be called.\n"
-"       o if the above environment variable is not set, then\n"
-"         '/usr/bin/less' will be used.\n"
+"     o if the 'PAGER' environment variable is set, then this will be\n"
+"       the default viewer to be called.\n"
+"     o if the above environment variable is not set, then\n"
+"       '/usr/bin/less' will be used.\n"
 "As for the 'N' key, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
@@ -926,11 +956,11 @@ msgstr ""
 "\t  er gebruik gemaakt worden van '/usr/bin/less'.\n"
 "Als de pager wordt afgesloten, keer je terug naar Calcurse."
 
-#: src/help.c:450
+#: src/help.c:456
 msgid "Priority:\n"
 msgstr "Prioriteit:\n"
 
-#: src/help.c:452
+#: src/help.c:458
 msgid ""
 "Pressing '+' or '-' allows you to change the priority of the currently\n"
 "selected item in the ToDo list. Priorities are represented by the number\n"
@@ -961,11 +991,11 @@ msgstr ""
 "'-' te drukken. Ook hier kan de plaats van de taak veranderen, afhankelijk \n"
 "van de prioriteiten van de onderstaande taken."
 
-#: src/help.c:464
+#: src/help.c:472
 msgid "Repeat:\n"
 msgstr "Herhalen:\n"
 
-#: src/help.c:466
+#: src/help.c:474
 msgid ""
 "Pressing 'R' allows you to repeat an event or an appointment. You must\n"
 "first select the item to be repeated by moving inside the appointment\n"
@@ -1023,11 +1053,11 @@ msgstr ""
 "         schema's gemaakt worden, omdat het mogelijk is om slechts \n"
 "         een herhaling van meerdere herhaalde items te wissen."
 
-#: src/help.c:490
+#: src/help.c:498
 msgid "Flag Item:\n"
 msgstr "Vlag Item:\n"
 
-#: src/help.c:492
+#: src/help.c:500
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1047,11 +1077,11 @@ msgstr ""
 "om de gebruiker te waarschuwen over de op handen zijnde afspraak, en hoe \n"
 "lang van te voren dit gebeurt."
 
-#: src/help.c:500
+#: src/help.c:508
 msgid "Config:\n"
 msgstr "Instellingen:\n"
 
-#: src/help.c:502
+#: src/help.c:510
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1085,11 +1115,11 @@ msgstr ""
 "Vergeet niet kalenderdata op te slaan, als de nieuwe configuratie voor\n"
 "de volgende start van Calcurse behouden moeten blijven."
 
-#: src/help.c:513
+#: src/help.c:521
 msgid "General keybindings:\n"
 msgstr "Algemene toetsen:\n"
 
-#: src/help.c:515
+#: src/help.c:523
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1125,11 +1155,11 @@ msgstr ""
 " '^K' : -1 week            -> Ga naar de vorige week\n"
 " '^J' : +1 week            -> Ga naar de volgende week"
 
-#: src/help.c:531
+#: src/help.c:539
 msgid "OtherCmd:\n"
 msgstr "AndereCmd:\n"
 
-#: src/help.c:533
+#: src/help.c:541
 msgid ""
 "Pressing 'O' allows you to switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
@@ -1145,13 +1175,14 @@ msgstr ""
 "Zodra het laatste scherm is bereikt, ga je naar het eerste scherm \n"
 "terug, als er weer op 'O' wordt gedrukt."
 
-#: src/help.c:540
+#: src/help.c:548
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - tekst-gebaseerde organizer"
 
-#: src/help.c:542
+#: src/help.c:550
+#, fuzzy
 msgid ""
-"Copyright (c) 2004-2007 Frederic Culot\n"
+"Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1183,92 +1214,92 @@ msgstr ""
 "Zendt kritiek of commentaar aan : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:59
+#: src/io.c:61
 msgid "Saving..."
 msgstr "Opslaan..."
 
-#: src/io.c:60
+#: src/io.c:62
 msgid "Loading..."
 msgstr "Laden..."
 
-#: src/io.c:61
+#: src/io.c:63
 msgid "Exporting..."
 msgstr "Exporteren..."
 
-#: src/io.c:124
+#: src/io.c:126
 msgid "Choose the file used to export calcurse data:"
 msgstr "Kies het bestand om calcurse data naar te exporteren:"
 
-#: src/io.c:126
+#: src/io.c:128
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
 
-#: src/io.c:128 src/recur.c:626
+#: src/io.c:129 src/recur.c:660
 msgid "Press [ENTER] to continue."
 msgstr "[ENTER]-toets om door te gaan."
 
-#: src/io.c:345
+#: src/io.c:365
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr "%s bestaat niet, nu aanmaken [j of n] ? "
 
-#: src/io.c:350 src/io.c:367
+#: src/io.c:371 src/io.c:391
 #, c-format
 msgid "aborting...\n"
 msgstr "afbreken...\n"
 
-#: src/io.c:361
+#: src/io.c:385
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s met succes aangemaakt\n"
 
-#: src/io.c:362
+#: src/io.c:386
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "interactieve modus gestart...\n"
 
-#: src/io.c:397
+#: src/io.c:422
 msgid "Problems accessing data file ..."
 msgstr "Probleem bij benaderen databestand ..."
 
-#: src/io.c:400
+#: src/io.c:433
 msgid "The data files were successfully saved"
 msgstr "De databestanden zijn met succes opgeslagen"
 
-#: src/io.c:560
+#: src/io.c:612
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr "FATALE FOUT in io_load_app: fout formaat in afspraak of gebeurtenis\n"
 
-#: src/io.c:579
+#: src/io.c:633
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr "FATALE FOUT in io_load_app: fout in syntax itemdatum\n"
 
-#: src/io.c:594
+#: src/io.c:649
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr "FATALE FOUT in io_load_app: geen afspraak/gebeurtenis gevonden\n"
 
-#: src/io.c:706
+#: src/io.c:793
 msgid "Failed to open todo file"
 msgstr "Kan takenbestand niet openen"
 
-#: src/io.c:757 src/io.c:775
+#: src/io.c:855 src/io.c:875
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "FATALE FOUT: kan %s niet aanmaken: %s\n"
 
-#: src/io.c:814
+#: src/io.c:914
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welkom bij Calcurse. De missende databestanden zijn aangemaakt."
 
-#: src/io.c:815
+#: src/io.c:915
 msgid "Data files found. Data will be loaded now."
 msgstr "Databestanden gevonden. Data wordt geladen."
 
-#: src/io.c:833
+#: src/io.c:935
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
 
-#: src/io.c:834
+#: src/io.c:936
 msgid "The data were successfully exported"
 msgstr "De data is met succes geëxporteerd"
 
@@ -1276,139 +1307,141 @@ msgstr "De data is met succes geëxporteerd"
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "FATALE FOUT in launch_cmd: probleem met fork"
 
-#: src/notify.c:139
+#: src/notify.c:138
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "FATALE FOUT in launch_cmd: kan gebruikerscommando niet starten"
 
-#: src/notify.c:434
+#: src/notify.c:451
 msgid "notify-bar_show = "
 msgstr "informatiebalk_toon = "
 
-#: src/notify.c:435
+#: src/notify.c:452
 msgid "notify-bar_date = "
 msgstr "informatiebalk_datum = "
 
-#: src/notify.c:436
+#: src/notify.c:453
 msgid "notify-bar_clock = "
 msgstr "informatiebalk_tijd= "
 
-#: src/notify.c:437
+#: src/notify.c:454
 msgid "notify-bar_warning = "
 msgstr "informatiebalk_waarschuwing = "
 
-#: src/notify.c:438
+#: src/notify.c:455
 msgid "notify-bar_command = "
 msgstr "informatiebalk_commando = "
 
-#: src/notify.c:441
+#: src/notify.c:458
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(Bij JA, wordt de informatiebalk weergegeven)"
 
-#: src/notify.c:444
+#: src/notify.c:460
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Formaat van de datum in de informatiebalk.)"
 
-#: src/notify.c:447
+#: src/notify.c:463
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Formaat van de tijd in de informatiebalk.)"
 
-#: src/notify.c:450
+#: src/notify.c:466
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "Meldt gebruiker dat er een afspraak binnen 'informatiebalk_waarschuwing' "
 "seconden is"
 
-#: src/notify.c:454
+#: src/notify.c:469
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Commando dat melding geeft van op handen zijnde afspraak)"
 
-#: src/notify.c:507
-msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
-msgstr "Geef het formaat van de datum (zie 'man 3 strftime')"
-
-#: src/notify.c:509
+#: src/notify.c:526
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr "Geef het formaat van de tijd (zie 'man 3 strftime')"
 
-#: src/notify.c:511
+#: src/notify.c:528
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr "Geef het aantal seconden (0 voor geen waarschuwing voor een afspraak)."
 
-#: src/notify.c:512
+#: src/notify.c:529
 msgid "Enter the notification command "
 msgstr "Geef het meldingscommando "
 
-#: src/notify.c:516
+#: src/notify.c:533
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | Informatiebalk-opties"
 
-#: src/recur.c:127
+#: src/recur.c:131
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "FATALE FOUT in recur_def2char: herhaal type onbekend\n"
 
-#: src/recur.c:158
+#: src/recur.c:163
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "FATALE FOUT in recur_char2def: onbekend karakter\n"
 
-#: src/recur.c:281
+#: src/recur.c:299
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr "FATALE FOUT in recur_event_scan: datumfout in de gebeurtenis\n"
 
-#: src/recur.c:399
+#: src/recur.c:421
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "FATALE FOUT in recur_item_inday: type item onbekend\n"
 
-#: src/recur.c:522
+#: src/recur.c:554
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr "FATALE FOUT in recur_event_erase: gebeurtenis bestaat niet\n"
 
-#: src/recur.c:591
+#: src/recur.c:626
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr "FATALE FOUT in recur_apoint_erase: afspraak bestaat niet\n"
 
-#: src/recur.c:614
+#: src/recur.c:650
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr "Type herhaling: (D)agelijks, (W)ekelijks, (M)aandelijks, (Y) jaarlijks"
 
-#: src/recur.c:617
+#: src/recur.c:652
 msgid "Enter the repetition frequence:"
 msgstr "Geef de herhalingsinterval:"
 
-#: src/recur.c:621
-msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
+#: src/recur.c:655
+#, fuzzy, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr "Geef einddatum: [mm/dd/jjjj] of '0' voor oneindige herhaling"
 
-#: src/recur.c:625
+#: src/recur.c:658
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetetition"
+msgstr "Mogelijk formaat is: [mm/dd/jjjj] of '0' voor oneindig."
+
+#: src/recur.c:659
 msgid "This item is already a repeated one."
 msgstr "Dit item wordt al herhaald."
 
-#: src/recur.c:628
+#: src/recur.c:662
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "Sorry, de ingevoerde datum is ouder dan de aanvangstijd."
 
-#: src/recur.c:717
+#: src/recur.c:776
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "FATALE FOUT in recur_repeat_item: fout item type\n"
 
-#: src/recur.c:744
+#: src/recur.c:805
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr "FATALE FOUT in recur_exc_scan: fout in syntax itemdatum\n"
 
-#: src/recur.c:811
+#: src/recur.c:880
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr "FATALE FOUT in recur_get_apoint: item bestaat niet\n"
 
-#: src/recur.c:832
+#: src/recur.c:904
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr "FATALE FOUT in recur_get_event: item bestaat niet\n"
 
-#: src/recur.c:865
+#: src/recur.c:940
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATALE FOUT in recur_apoint_switch_notify: item bestaat niet\n"
 
-#: src/todo.c:137
+#: src/todo.c:138
 msgid "Enter the new ToDo item : "
 msgstr "Voer de nieuwe taak in : "
 
@@ -1416,39 +1449,39 @@ msgstr "Voer de nieuwe taak in : "
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr "Geef taakprioriteit [1 (hoogste) - 9 (laagste)] :"
 
-#: src/todo.c:189
+#: src/todo.c:192
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "FATALE FOUT in todo_delete_note: geen noot aanwezig\n"
 
-#: src/todo.c:198
+#: src/todo.c:201
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "FATALE FOUT in todo_delete_note_bynum: taak bestaat niet\n"
 
-#: src/todo.c:225
+#: src/todo.c:230
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "FATALE FOUT in todo_delete_bynum: taak bestaat niet\n"
 
-#: src/todo.c:235
+#: src/todo.c:240
 msgid "Do you really want to delete this task ?"
 msgstr "Wilt u werkelijk deze taak wissen ?"
 
-#: src/todo.c:237
+#: src/todo.c:242
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr "Dit item heeft een noot bijgesloten. Wis (t)aak of alleen de (n)oot?"
 
-#: src/todo.c:240
+#: src/todo.c:244
 msgid "[t/n] "
 msgstr "[t/n]"
 
-#: src/todo.c:312
+#: src/todo.c:328
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "FATALE FOUT in todo_get_position: taak bestaat niet\n"
 
-#: src/todo.c:337
+#: src/todo.c:360
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "FATALE FOUT in todo_chg_priority: actie bestaat niet\n"
 
-#: src/todo.c:352
+#: src/todo.c:375
 msgid "Enter the new ToDo description :"
 msgstr "Voer de nieuwe taakbeschrijving in : "
 
@@ -1464,219 +1497,219 @@ msgstr "calcurse eindigt nu..."
 msgid "Please report the following bug:"
 msgstr "Rapporteer aub de volgende fout:"
 
-#: src/utils.c:137
+#: src/utils.c:140
 msgid "Press any key to continue..."
 msgstr "Druk op een toets om door te gaan..."
 
-#: src/utils.c:360
+#: src/utils.c:378
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "FATALE FOUT in updatestring: te weinig geheugen"
 
-#: src/utils.c:400
+#: src/utils.c:420
 msgid "Help"
 msgstr "Hulp"
 
-#: src/utils.c:401
+#: src/utils.c:421
 msgid "Quit"
 msgstr "Einde"
 
-#: src/utils.c:402
+#: src/utils.c:422
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/utils.c:403
+#: src/utils.c:423
 msgid "Export"
 msgstr "Export"
 
-#: src/utils.c:404
+#: src/utils.c:424
 msgid "Add Item"
 msgstr "Nieuw Itm"
 
-#: src/utils.c:405
+#: src/utils.c:425
 msgid "Del Item"
 msgstr "Wis Item"
 
-#: src/utils.c:406
+#: src/utils.c:426
 msgid "Edit Itm"
 msgstr "Wzg Itm"
 
-#: src/utils.c:407
+#: src/utils.c:427
 msgid "Flag Itm"
 msgstr "Vlag Itm"
 
-#: src/utils.c:408 src/utils.c:422
+#: src/utils.c:428 src/utils.c:442
 msgid "-+1 Day"
 msgstr "-/+1 Dag"
 
-#: src/utils.c:409 src/utils.c:423
+#: src/utils.c:429 src/utils.c:443
 msgid "-+1 Week"
 msgstr "-/+ Week"
 
-#: src/utils.c:410
+#: src/utils.c:430
 msgid "Up/Down"
 msgstr "Op/Neer"
 
-#: src/utils.c:411
+#: src/utils.c:431
 msgid "Repeat"
 msgstr "Herhalen"
 
-#: src/utils.c:412
+#: src/utils.c:432
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: src/utils.c:413
+#: src/utils.c:433
 msgid "Chg View"
 msgstr "Wzg focus"
 
-#: src/utils.c:414
+#: src/utils.c:434
 msgid "Go to"
 msgstr "Ga naar"
 
-#: src/utils.c:415
+#: src/utils.c:435
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:416
+#: src/utils.c:436
 msgid "View"
 msgstr "Bekijken"
 
-#: src/utils.c:417
+#: src/utils.c:437
 msgid "Redraw"
 msgstr "Ververs"
 
-#: src/utils.c:418
+#: src/utils.c:438
 msgid "Add Appt"
 msgstr "Nieuw Afspr"
 
-#: src/utils.c:419
+#: src/utils.c:439
 msgid "Add Todo"
 msgstr "Nieuw Taak"
 
-#: src/utils.c:420
+#: src/utils.c:440
 msgid "EditNote"
 msgstr "WzgNoot"
 
-#: src/utils.c:421
+#: src/utils.c:441
 msgid "ViewNote"
 msgstr "BekijkNoot"
 
-#: src/utils.c:424
+#: src/utils.c:444
 msgid "OtherCmd"
 msgstr "AnderCmd"
 
-#: src/utils.c:488
+#: src/utils.c:509
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATALE FOUT in date2sec: fout in mktime\n"
 
-#: src/utils.c:743
+#: src/utils.c:725
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: src/utils.c:766
+#: src/utils.c:751
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "FATALE FOUT in other_status_page: onbekend panel\n"
 
-#: src/utils.c:834
+#: src/utils.c:825
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATALE FOUT in mystrtol: kan string niet omzetten"
 
-#: src/utils.c:836
+#: src/utils.c:827
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATALE FOUT in mystrtol: nummer buiten bereik"
 
-#: src/utils.c:857
+#: src/utils.c:849
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:860
+#: src/utils.c:854
 msgid "no"
 msgstr "nee"
 
-#: src/utils.c:863
+#: src/utils.c:858
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Optie ongedefinieerd - Probleem in print_option_incolor()"
 
-#: src/utils.c:900
+#: src/utils.c:895
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr "FATALE FOUT: tijdelijk bestand kan niet worden aangemaakt!"
 
-#: src/utils.c:914
+#: src/utils.c:909
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATALE FOUT in erase_note: kan noot niet verwijderen\n"
 
-#: src/vars.c:48
+#: src/vars.c:49
 msgid "January"
 msgstr "januari"
 
-#: src/vars.c:49
+#: src/vars.c:50
 msgid "February"
 msgstr "februari"
 
-#: src/vars.c:50
+#: src/vars.c:51
 msgid "March"
 msgstr "maart"
 
-#: src/vars.c:51
+#: src/vars.c:52
 msgid "April"
 msgstr "april"
 
-#: src/vars.c:52
+#: src/vars.c:53
 msgid "May"
 msgstr "mei"
 
-#: src/vars.c:53
+#: src/vars.c:54
 msgid "June"
 msgstr "juni"
 
-#: src/vars.c:54
+#: src/vars.c:55
 msgid "July"
 msgstr "juli"
 
-#: src/vars.c:55
+#: src/vars.c:56
 msgid "August"
 msgstr "augustus"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "September"
 msgstr "september"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "October"
 msgstr "oktober"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "November"
 msgstr "november"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "December"
 msgstr "december"
 
-#: src/vars.c:62 src/vars.c:69
+#: src/vars.c:64 src/vars.c:71
 msgid "Sun"
 msgstr " zo"
 
-#: src/vars.c:63
+#: src/vars.c:65
 msgid "Mon"
 msgstr " ma"
 
-#: src/vars.c:64
+#: src/vars.c:66
 msgid "Tue"
 msgstr " di"
 
-#: src/vars.c:65
+#: src/vars.c:67
 msgid "Wed"
 msgstr " wo"
 
-#: src/vars.c:66
+#: src/vars.c:68
 msgid "Thu"
 msgstr " do"
 
-#: src/vars.c:67
+#: src/vars.c:69
 msgid "Fri"
 msgstr " vr"
 
-#: src/vars.c:68
+#: src/vars.c:70
 msgid "Sat"
 msgstr " za"
 
@@ -1695,10 +1728,22 @@ msgstr "Afspraken"
 msgid "ToDo"
 msgstr "Taken"
 
-#: src/wins.c:341
+#: src/wins.c:417
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "Fatale fout in wins_update: geen venster geselecteerd\n"
 
+#~ msgid "CalCurse %s | help"
+#~ msgstr "Calcurse %s | Hulp"
+
+#~ msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+#~ msgstr "Mogelijke formaatopties zijn : 'mm/dd/jjjj' of 'n'\n"
+
+#~ msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
+#~ msgstr "Gewenste datum?: [ENTER voor vandaag] : mm/dd/jjjj"
+
+#~ msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
+#~ msgstr "Nieuw einde van de herhaling: [mm/dd/jjjj] of '0' voor oneindig"
+
 #~ msgid "FATAL ERROR in wins_prop: property unknown\n"
 #~ msgstr "FATALE FOUT in wins_prop: onbekende eigenschap\n"