french translation updated. Switched to 2.2_beta

6 files changed, 1358 insertions, 707 deletions

diff --git a/po/calcurse.pot b/po/calcurse.pot
index 99b2bd5..42c6f8a 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-05-17 12:15+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+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"
@@ -67,26 +67,28 @@ msgstr ""
 
 #: src/args.c:51
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr ""
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr ""
 
-#: src/args.c:71
+#: src/args.c:72
 msgid ""
 "\n"
 "Copyright (c) 2004-2008 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr ""
 
-#: src/args.c:87
+#: src/args.c:88
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -98,7 +100,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -106,57 +112,85 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 
-#: src/args.c:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr ""
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr ""
 
-#: src/args.c:225
+#: src/args.c:239
 msgid "next appointment:\n"
 msgstr ""
 
-#: src/args.c:449
-msgid "Argument to the '-d' flag is not valid\n"
-msgstr ""
-
-#: src/args.c:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 msgstr ""
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 
+#: src/args.c:487
+msgid "Argument to the '-d' flag is not valid\n"
+msgstr ""
+
+#: src/args.c:550
+msgid "Argument is not valid\n"
+msgstr ""
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr ""
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr ""
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr ""
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -167,7 +201,7 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr ""
 
-#: src/calcurse.c:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr ""
 
@@ -175,14 +209,14 @@ msgstr ""
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr ""
 
@@ -215,7 +249,7 @@ msgstr ""
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 
-#: src/custom.c:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr ""
 
@@ -398,15 +432,15 @@ msgstr ""
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 msgid "The frequence you entered is not valid."
 msgstr ""
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 msgid "The entered date is not valid."
 msgstr ""
 
@@ -459,11 +493,11 @@ msgstr ""
 msgid "Calcurse %s | help"
 msgstr ""
 
-#: src/help.c:272
+#: src/help.c:275
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr ""
 
-#: src/help.c:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -482,11 +516,11 @@ msgid ""
 "       Credits:  Press '@' for credits."
 msgstr ""
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:292
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -501,28 +535,36 @@ msgid ""
 "automatically before quitting."
 msgstr ""
 
-#: src/help.c:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr ""
 
-#: src/help.c:301
+#: src/help.c:304
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr ""
 
-#: src/help.c:310
+#: src/help.c:319
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -535,16 +577,20 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
 msgstr ""
 
-#: src/help.c:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr ""
 
-#: src/help.c:324
+#: src/help.c:336
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
@@ -559,11 +605,11 @@ msgid ""
 "Calcurse screen."
 msgstr ""
 
-#: src/help.c:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr ""
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -578,25 +624,28 @@ msgid ""
 "performed on the selected panel."
 msgstr ""
 
-#: src/help.c:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr ""
 
-#: src/help.c:349
+#: src/help.c:361
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 
-#: src/help.c:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr ""
 
-#: src/help.c:357
+#: src/help.c:371
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -614,11 +663,11 @@ msgid ""
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr ""
 
-#: src/help.c:371
+#: src/help.c:385
 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"
@@ -656,11 +705,11 @@ msgid ""
 "       event next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:401
+#: src/help.c:415
 msgid "Edit Item:\n"
 msgstr ""
 
-#: src/help.c:403
+#: src/help.c:417
 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"
@@ -679,11 +728,11 @@ msgid ""
 "       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:418
+#: src/help.c:432
 msgid "EditNote:\n"
 msgstr ""
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -706,11 +755,11 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:439
+#: src/help.c:453
 msgid "ViewNote:\n"
 msgstr ""
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -727,11 +776,11 @@ msgid ""
 "Calcurse."
 msgstr ""
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr ""
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -748,11 +797,11 @@ msgid ""
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:472
+#: src/help.c:486
 msgid "Repeat:\n"
 msgstr ""
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -783,11 +832,11 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:498
+#: src/help.c:512
 msgid "Flag Item:\n"
 msgstr ""
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -799,11 +848,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr ""
 
-#: src/help.c:510
+#: src/help.c:524
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -822,11 +871,11 @@ msgid ""
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr ""
 
-#: src/help.c:523
+#: src/help.c:537
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -843,14 +892,15 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr ""
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -860,11 +910,11 @@ msgid ""
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr ""
 
-#: src/help.c:550
+#: src/help.c:565
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
@@ -883,95 +933,123 @@ msgid ""
 "Calcurse home page : http://culot.org/calcurse"
 msgstr ""
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr ""
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr ""
 
-#: src/io.c:63
+#: src/io.c:103
 msgid "Exporting..."
 msgstr ""
 
-#: src/io.c:126
+#: src/io.c:157
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:128
+#: src/io.c:159
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 msgid "Press [ENTER] to continue."
 msgstr ""
 
-#: src/io.c:365
+#: src/io.c:223
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr ""
+
+#: src/io.c:262
+msgid "Week"
+msgstr ""
+
+#: src/io.c:382
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr ""
+
+#: src/io.c:518
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr ""
+
+#: src/io.c:647
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr ""
 
-#: src/io.c:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr ""
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr ""
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr ""
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr ""
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr ""
 
-#: src/io.c:612
+#: src/io.c:896
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr ""
 
-#: src/io.c:633
+#: src/io.c:917
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr ""
 
-#: src/io.c:649
+#: src/io.c:933
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr ""
 
-#: src/io.c:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr ""
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr ""
 
-#: src/io.c:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr ""
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr ""
 
-#: src/io.c:935
+#: src/io.c:1219
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr ""
 
-#: src/io.c:936
+#: src/io.c:1220
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr ""
+
+#: src/io.c:1221
 msgid "The data were successfully exported"
 msgstr ""
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr ""
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr ""
+
 #: src/notify.c:135
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr ""
@@ -1050,61 +1128,61 @@ msgstr ""
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr ""
 
-#: src/recur.c:419
+#: src/recur.c:437
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr ""
 
-#: src/recur.c:552
+#: src/recur.c:570
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr ""
 
-#: src/recur.c:624
+#: src/recur.c:642
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr ""
 
-#: src/recur.c:648
+#: src/recur.c:666
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, c-format
 msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr ""
 
-#: src/recur.c:656
+#: src/recur.c:674
 #, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr ""
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:660
+#: src/recur.c:678
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:774
+#: src/recur.c:792
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr ""
 
-#: src/recur.c:803
+#: src/recur.c:821
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr ""
 
-#: src/recur.c:878
+#: src/recur.c:896
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr ""
 
-#: src/recur.c:902
+#: src/recur.c:920
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr ""
 
-#: src/recur.c:938
+#: src/recur.c:956
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 
@@ -1264,43 +1342,59 @@ msgstr ""
 msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr ""
+
+#: src/utils.c:446
+msgid "beg Week"
+msgstr ""
+
+#: src/utils.c:447
+msgid "end Week"
+msgstr ""
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr ""
 
-#: src/utils.c:725
+#: src/utils.c:587
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr ""
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr ""
 
-#: src/utils.c:751
+#: src/utils.c:754
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr ""
 
-#: src/utils.c:825
+#: src/utils.c:824
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr ""
 
-#: src/utils.c:827
+#: src/utils.c:826
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr ""
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr ""
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr ""
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr ""
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:909
+#: src/utils.c:908
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index d9050ef..9ac8f5f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# 	$calcurse: de.po,v 1.15 2008/08/03 18:41:55 culot Exp $
+# 	$calcurse: de.po,v 1.16 2008/08/12 15:57:05 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-05-17 12:15+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+0200\n"
 "PO-Revision-Date: 2007-09-02 18:06+0200\n"
 "Last-Translator: Michael\n"
 "Language-Team:  Michael Schulz <bloodshower@freenet.de>\n"
@@ -76,15 +76,17 @@ msgstr "SCHWERER FEHLER in apoint_switch_notify: Termin nicht vorhanden"
 #: src/args.c:51
 #, fuzzy
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr ""
 "Aufruf: calcurse [-h|-v] [-x] [-an] [-t[Nr]] [-d Datum|Nr] [-c Datei]\n"
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Versuche Sie 'calcurse -h', um weitere Informationen zu erhalten.\n"
 
-#: src/args.c:71
+#: src/args.c:72
 #, fuzzy
 msgid ""
 "\n"
@@ -95,12 +97,12 @@ msgstr ""
 "Copyright (c) 2004-2007 Frederic Culot.\n"
 "Dies ist freie Software; lesen Sie den Programmcode zu näheren Details.\n"
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - textbasierender Terminkalender\n"
 
-#: src/args.c:87
+#: src/args.c:88
 #, fuzzy
 msgid ""
 "\n"
@@ -113,7 +115,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -121,26 +127,38 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -187,23 +205,19 @@ msgstr ""
 "Bitte melden Sie Fehler und Vorschläge an <calcurse@culot.org>.\n"
 "\n"
 
-#: src/args.c:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr ""
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr "Aufgaben:\n"
 
-#: src/args.c:225
+#: src/args.c:239
 msgid "next appointment:\n"
 msgstr "nächster Termin :\n"
 
-#: 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:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -211,11 +225,32 @@ msgstr ""
 "\n"
 "Für nähere Informationen bitte '?' eingeben oder lesen Sie die manpage!\n"
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr ""
 "Bitte melden Sie Programmfehler und Vorschläge an <calcurse@culot.org>\n"
 
+#: src/args.c:487
+msgid "Argument to the '-d' flag is not valid\n"
+msgstr "Argument von '-d' ist nicht gültig.\n"
+
+#: src/args.c:550
+#, fuzzy
+msgid "Argument is not valid\n"
+msgstr "Argument von '-d' ist nicht gültig.\n"
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr ""
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr ""
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr ""
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -229,7 +264,7 @@ 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:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr "Aufgaben :"
 
@@ -237,14 +272,14 @@ msgstr "Aufgaben :"
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FEHLER in calendar_set_first_day_of week\n"
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr "[EINGABE]-Taste um fortzufahren"
 
@@ -284,7 +319,7 @@ msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_conf: unbekannte Konfigurationsvariable.\n"
 
-#: src/custom.c:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr "Beenden"
 
@@ -482,15 +517,15 @@ msgstr ""
 "Art der neuen Wiederholung: (D) täglich, (W)öchentlich, (M)onatlich, (Y) "
 "jährlich"
 
-#: src/day.c:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr "[T/W/M/J]"
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 msgid "The frequence you entered is not valid."
 msgstr "Das eingegebene Intervall ist ungültig."
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 msgid "The entered date is not valid."
 msgstr "Das eingegebene Datum ist ungültig."
 
@@ -550,11 +585,11 @@ msgstr "SCHWERER FEHLER in event_delete_bynum: Ereignis nicht vorhanden\n"
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hilfe"
 
-#: src/help.c:272
+#: src/help.c:275
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Willkommen zu Calcurse. Dies ist Hauptseite der Hilfe.\n"
 
-#: src/help.c:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -587,11 +622,11 @@ msgstr ""
 "\n"
 "        Autoren:  Betätigen Sie '@' um die Autoren von Calcurse zu sehen."
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr "Speichern:\n"
 
-#: src/help.c:289
+#: src/help.c:292
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -617,19 +652,28 @@ 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:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr "Exportieren:\n"
 
-#: src/help.c:301
+#: src/help.c:304
+#, fuzzy
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
@@ -644,11 +688,12 @@ msgstr ""
 "Alle calcurse Daten sind in folgender Anordung exportiert worden:\n"
 "Ereignisse, Termine, Aufgaben.\n"
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr "Navigations-Tasten:\n"
 
-#: src/help.c:310
+#: src/help.c:319
+#, fuzzy
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -661,6 +706,10 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
@@ -680,11 +729,11 @@ 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:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:324
+#: src/help.c:336
 #, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -711,11 +760,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:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr "Tabulator:\n"
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -744,18 +793,22 @@ msgstr ""
 "Aktionen\n"
 "auf dem gewählten Panel durchgeführt werden können."
 
-#: src/help.c:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr "Gehe zu:\n"
 
-#: src/help.c:349
+#: src/help.c:361
+#, fuzzy
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 "Die Taste 'G' erlaubt Ihnen, einen anzugebenden Tag im Kalender direkt "
 "anzusteuern.\n"
@@ -766,11 +819,11 @@ msgstr ""
 "das aktuelle\n"
 "Systemdatum und wählt automatisch diesen Tag aus."
 
-#: src/help.c:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr "Löschen:\n"
 
-#: src/help.c:357
+#: src/help.c:371
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -799,11 +852,11 @@ msgstr ""
 "Ihre vorgenommenen Veränderungen beim nächsten Start von Calcurse ver-\n"
 "lorengehen."
 
-#: src/help.c:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr "Hinzufügen:\n"
 
-#: src/help.c:371
+#: src/help.c:385
 #, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -875,11 +928,11 @@ 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:401
+#: src/help.c:415
 msgid "Edit Item:\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:403
+#: src/help.c:417
 #, fuzzy
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
@@ -916,12 +969,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:418
+#: src/help.c:432
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -944,12 +997,12 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:439
+#: src/help.c:453
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -966,11 +1019,11 @@ msgid ""
 "Calcurse."
 msgstr ""
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr "Priorität:\n"
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -1001,11 +1054,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:472
+#: src/help.c:486
 msgid "Repeat:\n"
 msgstr "Wiederholen:\n"
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -1067,11 +1120,11 @@ msgstr ""
 "         zeugen. Beispielsweise ist es möglich, nur ein einziges Vor-\n"
 "         kommen eines wiederkehrenden Eintrags zu löschen."
 
-#: src/help.c:498
+#: src/help.c:512
 msgid "Flag Item:\n"
 msgstr "Zusatzsymbol\n"
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1083,11 +1136,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr "Einstellungen:\n"
 
-#: src/help.c:510
+#: src/help.c:524
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1123,11 +1176,12 @@ msgstr ""
 "Vergessen Sie bitte nicht Ihre Kalenderdaten abzuspeichern, um sie beim\n"
 "nächsten Start von Calcurse wieder zu erhalten."
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr "Allgemeingültige Tasten:\n"
 
-#: src/help.c:523
+#: src/help.c:537
+#, fuzzy
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1144,7 +1198,8 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 "Tastenbelegungen, die in sämtliche Panels aufgerufen werden können,\n"
 "werden Allgemeingültige Tasten genannt. Diese werden in Verbindung\n"
@@ -1165,11 +1220,11 @@ msgstr ""
 " '^K' : -1 Woche           -> Ansteuern der vorangegangen Woche\n"
 " '^J' : +1 Woche           -> Ansteuern der folgenden Woche"
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr "WeitereBefehle:\n"
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -1186,11 +1241,11 @@ 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:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - textbasierender Terminkalender"
 
-#: src/help.c:550
+#: src/help.c:565
 #, fuzzy
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1225,101 +1280,134 @@ msgstr ""
 "Senden Sie Ihre Kritik oder Kommentare an : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr "Lade..."
 
-#: src/io.c:63
+#: src/io.c:103
 msgid "Exporting..."
 msgstr "Exportiere..."
 
-#: src/io.c:126
+#: src/io.c:157
 msgid "Choose the file used to export calcurse data:"
 msgstr "Wählen Sie die Datei in die exportiert werden soll:"
 
-#: src/io.c:128
+#: src/io.c:159
 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:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 msgid "Press [ENTER] to continue."
 msgstr "[EINGABE] um fortzufahren."
 
-#: src/io.c:365
+#: src/io.c:223
+#, fuzzy
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
+
+#: src/io.c:262
+#, fuzzy
+msgid "Week"
+msgstr "-/+ Woche"
+
+#: src/io.c:382
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr "SCHWERER FEHLER in recur_event_erase: Ereignis nicht vorhanden\n"
+
+#: src/io.c:518
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr "SCHWERER FEHLER in recur_apoint_erase: Termin nicht vorhanden\n"
+
+#: src/io.c:647
 #, 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:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr "abbrechen...\n"
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s erfolgreich erzeugt\n"
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starte interaktiven Modus...\n"
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr "Probleme beim Zugriff auf Benutzerdaten ..."
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
 
-#: src/io.c:612
+#: src/io.c:896
 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:633
+#: src/io.c:917
 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:649
+#: src/io.c:933
 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:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr "Aufgabendatei kann nicht geöffnet werden"
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, 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:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Willkommen zu Calcurse. Nicht vorhandene Benutzerdaten werden erzeugt."
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr "Benutzerdaten gefunden. Daten werden geladen."
 
-#: src/io.c:935
+#: src/io.c:1219
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
 
-#: src/io.c:936
+#: src/io.c:1220
+#, fuzzy
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
+
+#: src/io.c:1221
 msgid "The data were successfully exported"
 msgstr "Die Daten wurden erfolgreich exportiert"
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr ""
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr ""
+
 #: src/notify.c:135
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
@@ -1402,63 +1490,63 @@ 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:419
+#: src/recur.c:437
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
 
-#: src/recur.c:552
+#: src/recur.c:570
 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:624
+#: src/recur.c:642
 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:648
+#: src/recur.c:666
 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:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr "Geben Sie das Wiederholungsintervall an:"
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, 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:656
+#: src/recur.c:674
 #, fuzzy, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr "Mögliche Eingaben sind [MM/TT/JJJJ] oder '0' für unbegrenzt."
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
 
-#: src/recur.c:660
+#: src/recur.c:678
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
 
-#: src/recur.c:774
+#: src/recur.c:792
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "SCHWERER FEHLER in recur_repeat_item: falscher Eintragstyp\n"
 
-#: src/recur.c:803
+#: src/recur.c:821
 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:878
+#: src/recur.c:896
 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:902
+#: src/recur.c:920
 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:938
+#: src/recur.c:956
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 "SCHWERER FEHLER in recur_apoint_switch_notify: Eintrag nicht vorhanden\n"
@@ -1627,45 +1715,64 @@ msgstr "Ansicht"
 msgid "OtherCmd"
 msgstr "Zus. Befehle"
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr ""
+
+#: src/utils.c:446
+#, fuzzy
+msgid "beg Week"
+msgstr "-/+ Woche"
+
+#: src/utils.c:447
+#, fuzzy
+msgid "end Week"
+msgstr "-/+ Woche"
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
 
-#: src/utils.c:725
+#: src/utils.c:587
+#, fuzzy
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr "Termin"
 
-#: src/utils.c:751
+#: src/utils.c:754
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "SCHWERER FEHLER in other_status_page: unbekanntes Panel\n"
 
-#: src/utils.c:825
+#: src/utils.c:824
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/utils.c:827
+#: src/utils.c:826
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "SCHWERER FEHLER in updatestring: Nicht genügend Speicher"
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr "nein"
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Option nicht definiert - Problem in print_option_incolor()"
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:909
+#: src/utils.c:908
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
diff --git a/po/en.po b/po/en.po
index df843eb..14f7477 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,4 +1,4 @@
-# 	$calcurse: en.po,v 1.10 2008/08/03 18:41:55 culot Exp $
+# 	$calcurse: en.po,v 1.11 2008/08/12 15:57:05 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-05-17 12:15+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+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"
@@ -76,14 +76,16 @@ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 #: src/args.c:51
 #, fuzzy
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Try 'calcurse -h' for more information.\n"
 
-#: src/args.c:71
+#: src/args.c:72
 #, fuzzy
 msgid ""
 "\n"
@@ -94,12 +96,12 @@ msgstr ""
 "Copyright (c) 2004-2006 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - text-based organizer\n"
 
-#: src/args.c:87
+#: src/args.c:88
 #, fuzzy
 msgid ""
 "\n"
@@ -112,7 +114,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -120,26 +126,38 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -161,24 +179,20 @@ 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:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr ""
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr "to do:\n"
 
-#: src/args.c:225
+#: src/args.c:239
 #, fuzzy
 msgid "next appointment:\n"
 msgstr "Appointment :"
 
-#: 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:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -186,10 +200,31 @@ msgstr ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 
+#: src/args.c:487
+msgid "Argument to the '-d' flag is not valid\n"
+msgstr "Argument to the '-d' flag is not valid\n"
+
+#: src/args.c:550
+#, fuzzy
+msgid "Argument is not valid\n"
+msgstr "Argument to the '-d' flag is not valid\n"
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr ""
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr ""
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr ""
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -202,7 +237,7 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Do you really want to quit ?"
 
-#: src/calcurse.c:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr "To do :"
 
@@ -210,14 +245,14 @@ msgstr "To do :"
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr "Press [ENTER] to continue"
 
@@ -254,7 +289,7 @@ msgstr "Failed to open config file"
 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:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr "Exit"
 
@@ -445,16 +480,16 @@ msgstr "Enter description :"
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 #, fuzzy
 msgid "The frequence you entered is not valid."
 msgstr "The day you entered is not valid"
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 #, fuzzy
 msgid "The entered date is not valid."
 msgstr "The day you entered is not valid"
@@ -509,11 +544,11 @@ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 msgid "Calcurse %s | help"
 msgstr "CalCurse %s | help"
 
-#: src/help.c:272
+#: src/help.c:275
 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:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -547,11 +582,11 @@ msgstr ""
 "\n"
 "       Credits:  Press '@' for credits."
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr "Save:\n"
 
-#: src/help.c:289
+#: src/help.c:292
 #, fuzzy
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
@@ -578,28 +613,37 @@ msgstr ""
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
 
-#: src/help.c:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr ""
 
-#: src/help.c:301
+#: src/help.c:304
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr "Displacement keys:\n"
 
-#: src/help.c:310
+#: src/help.c:319
+#, fuzzy
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -612,6 +656,10 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
@@ -631,11 +679,11 @@ msgstr ""
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
 
-#: src/help.c:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr "View:\n"
 
-#: src/help.c:324
+#: src/help.c:336
 #, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -662,11 +710,11 @@ msgstr ""
 "Press any key to close the popup window and go back to the main\n"
 "Calcurse screen."
 
-#: src/help.c:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -692,18 +740,22 @@ msgstr ""
 "change while pressing 'Tab', so you always know what action can be\n"
 "performed on the selected panel."
 
-#: src/help.c:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr "Goto:\n"
 
-#: src/help.c:349
+#: src/help.c:361
+#, fuzzy
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -712,11 +764,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:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr "Delete:\n"
 
-#: src/help.c:357
+#: src/help.c:371
 #, fuzzy
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
@@ -745,11 +797,11 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve the modifications\n"
 "next time you launch Calcurse."
 
-#: src/help.c:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr "Add:\n"
 
-#: src/help.c:371
+#: src/help.c:385
 #, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -818,12 +870,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:401
+#: src/help.c:415
 #, fuzzy
 msgid "Edit Item:\n"
 msgstr "Add Item"
 
-#: src/help.c:403
+#: src/help.c:417
 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"
@@ -842,12 +894,12 @@ msgid ""
 "       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:418
+#: src/help.c:432
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Add Item"
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -870,12 +922,12 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:439
+#: src/help.c:453
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "View:\n"
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -892,11 +944,11 @@ msgid ""
 "Calcurse."
 msgstr ""
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr ""
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -913,12 +965,12 @@ msgid ""
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:472
+#: src/help.c:486
 #, fuzzy
 msgid "Repeat:\n"
 msgstr "Redraw:\n"
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -949,12 +1001,12 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:498
+#: src/help.c:512
 #, fuzzy
 msgid "Flag Item:\n"
 msgstr "Add Item"
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -966,11 +1018,11 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr "Config:\n"
 
-#: src/help.c:510
+#: src/help.c:524
 #, fuzzy
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
@@ -1003,11 +1055,11 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr ""
 
-#: src/help.c:523
+#: src/help.c:537
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1024,14 +1076,15 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr ""
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -1041,11 +1094,11 @@ msgid ""
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - text-based organizer"
 
-#: src/help.c:550
+#: src/help.c:565
 #, fuzzy
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1080,102 +1133,135 @@ msgstr ""
 "Send your feedback or comments to : calcurse@culot.org\n"
 "Calcurse home page : http://culot.org/calcurse"
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr "Saving..."
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr "Loading..."
 
-#: src/io.c:63
+#: src/io.c:103
 #, fuzzy
 msgid "Exporting..."
 msgstr "aborting...\n"
 
-#: src/io.c:126
+#: src/io.c:157
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:128
+#: src/io.c:159
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 #, fuzzy
 msgid "Press [ENTER] to continue."
 msgstr "Press [ENTER] to continue"
 
-#: src/io.c:365
+#: src/io.c:223
+#, fuzzy
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:262
+#, fuzzy
+msgid "Week"
+msgstr "-/+1 Week"
+
+#: src/io.c:382
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
+
+#: src/io.c:518
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
+
+#: src/io.c:647
 #, 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:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr "aborting...\n"
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s successfully created\n"
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starting interactive mode...\n"
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr "Problems accessing data file ..."
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr "The data files were successfully saved"
 
-#: src/io.c:612
+#: src/io.c:896
 #, 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:633
+#: src/io.c:917
 #, 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:649
+#: src/io.c:933
 #, 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:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr "Failed to open todo file"
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, 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:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welcome to Calcurse. Missing data files were created."
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr "Data files found. Data will be loaded now."
 
-#: src/io.c:935
+#: src/io.c:1219
 #, 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:936
+#: src/io.c:1220
+#, fuzzy
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:1221
 #, fuzzy
 msgid "The data were successfully exported"
 msgstr "The data files were successfully saved"
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr ""
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr ""
+
 #: src/notify.c:135
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not fork"
@@ -1260,68 +1346,68 @@ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 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:419
+#: src/recur.c:437
 #, 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:552
+#: src/recur.c:570
 #, 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:624
+#: src/recur.c:642
 #, 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:648
+#: src/recur.c:666
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, 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:656
+#: src/recur.c:674
 #, fuzzy, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:660
+#: src/recur.c:678
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:774
+#: src/recur.c:792
 #, 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:803
+#: src/recur.c:821
 #, 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:878
+#: src/recur.c:896
 #, 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:902
+#: src/recur.c:920
 #, 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:938
+#: src/recur.c:956
 #, fuzzy
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
@@ -1496,46 +1582,65 @@ msgstr "View"
 msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr ""
+
+#: src/utils.c:446
+#, fuzzy
+msgid "beg Week"
+msgstr "-/+1 Week"
+
+#: src/utils.c:447
+#, fuzzy
+msgid "end Week"
+msgstr "-/+1 Week"
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATAL ERROR in date2sec: failure in mktime\n"
 
-#: src/utils.c:725
+#: src/utils.c:587
+#, fuzzy
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr "FATAL ERROR in date2sec: failure in mktime\n"
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr "Appointment"
 
-#: src/utils.c:751
+#: src/utils.c:754
 #, 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:825
+#: src/utils.c:824
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/utils.c:827
+#: src/utils.c:826
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr "yes"
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "option not defined - Problem in print_option_incolor()"
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:909
+#: src/utils.c:908
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
diff --git a/po/es.po b/po/es.po
index 6a0250e..5b3922a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# 	$calcurse: es.po,v 1.11 2008/08/03 18:41:55 culot Exp $
+# 	$calcurse: es.po,v 1.12 2008/08/12 15:57:05 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-05-17 12:15+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+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"
@@ -77,15 +77,17 @@ msgstr "ERROR FATAL en apoint_switch_notify: no existe la cita\n"
 #: src/args.c:51
 #, fuzzy
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr ""
 "Uso: calcurse [-h|-v] [-x] [-an] [-t[numero] [-d fecha|numero] [-c archivo]\n"
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Prueba con 'calcurse -h' para mas informacion.\n"
 
-#: src/args.c:71
+#: src/args.c:72
 #, fuzzy
 msgid ""
 "\n"
@@ -96,12 +98,12 @@ msgstr ""
 "Copyright (c) 2004-2007 Frederic Culot.\n"
 "Esto es software libre; ver codigo fuente para las condiciones de copia.\n"
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr " Calcurse %s - organizador basado en modo texto\n"
 
-#: src/args.c:87
+#: src/args.c:88
 #, fuzzy
 msgid ""
 "\n"
@@ -114,7 +116,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -122,26 +128,38 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -189,23 +207,19 @@ msgstr ""
 "man.\n"
 "Emails de errores y comentarios a <calcurse@culot.org>.\n"
 
-#: src/args.c:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr ""
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr "Tareas pendientes:\n"
 
-#: src/args.c:225
+#: src/args.c:239
 msgid "next appointment:\n"
 msgstr "Proxima cita:\n"
 
-#: 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:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -214,10 +228,31 @@ msgstr ""
 "Para mas informacion, pulsa '?' dentro de Calcurse, o lee la pagina del "
 "man.\n"
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Informes de errores o comentarios a <calcurse@culot.org>.\n"
 
+#: src/args.c:487
+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:550
+#, fuzzy
+msgid "Argument is not valid\n"
+msgstr "El argumento pasado a la opcion -d no es valido\n"
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr ""
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr ""
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr ""
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -230,7 +265,7 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "¿Estas seguro de que quieres salir?"
 
-#: src/calcurse.c:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr "Tareas pendientes :"
 
@@ -238,14 +273,14 @@ msgstr "Tareas pendientes :"
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr "Pulsa [INTRO] para continuar"
 
@@ -284,7 +319,7 @@ msgstr ""
 "ERROR FATAL en custom_load_color: formato de configuracion de la variable "
 "erroneo.\n"
 
-#: src/custom.c:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr "Salir"
 
@@ -476,15 +511,15 @@ msgstr "Introduce la descripcion del nuevo elemento:"
 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:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y] "
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 msgid "The frequence you entered is not valid."
 msgstr "La frecuencia que has introducido no es valida."
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 msgid "The entered date is not valid."
 msgstr "La fecha introducida no es valida."
 
@@ -545,11 +580,11 @@ msgstr "ERROR FATAL en event_delete_bynum: no existe ese tipo\n"
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | ayuda"
 
-#: src/help.c:272
+#: src/help.c:275
 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:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -589,11 +624,11 @@ msgstr ""
 "\n"
 "                  Creditos: Pulsa @ para ver los creditos."
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr "Guardar:\n"
 
-#: src/help.c:289
+#: src/help.c:292
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -619,19 +654,28 @@ msgstr ""
 "En el menu de configuracion, puedes elegir guardar los datos\n"
 "de Calcurse automaticamente antes de salir."
 
-#: src/help.c:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr "Exportar:\n"
 
-#: src/help.c:301
+#: src/help.c:304
+#, fuzzy
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
@@ -645,11 +689,12 @@ msgstr ""
 "Todos los datos de Calcurse son exportados en el siguiente orden:\n"
 "eventos, citas y tareas pendientes.\n"
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr "Teclas de desplazamiento:\n"
 
-#: src/help.c:310
+#: src/help.c:319
+#, fuzzy
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -662,6 +707,10 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
@@ -681,11 +730,11 @@ msgstr ""
 "pendientes (respectivamente K o flecha arriba, y J o flecha abajo) te\n"
 "permite seleccionar un elemento de esas listas."
 
-#: src/help.c:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr "Ver:\n"
 
-#: src/help.c:324
+#: src/help.c:336
 #, fuzzy
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -708,11 +757,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:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -735,18 +784,22 @@ 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:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr "Ir a:\n"
 
-#: src/help.c:349
+#: src/help.c:361
+#, fuzzy
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 "Pulsando 'G' te permite saltar a un dia concreto en el calendario.\n"
 "\n"
@@ -755,11 +808,11 @@ msgstr ""
 "especificar una fecha, Calcurse comprueba la fecha actual del sistema y\n"
 "te llevara hasta esa fecha."
 
-#: src/help.c:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr "Borrar:\n"
 
-#: src/help.c:357
+#: src/help.c:371
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -787,11 +840,11 @@ 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:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr "Añadir:\n"
 
-#: src/help.c:371
+#: src/help.c:385
 #, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -870,11 +923,11 @@ msgstr ""
 "mantener\n"
 "         las modificaciones la proxima vez que inicies Calcurse."
 
-#: src/help.c:401
+#: src/help.c:415
 msgid "Edit Item:\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:403
+#: src/help.c:417
 #, fuzzy
 msgid ""
 "Pressing 'E' allows you to edit the item which is currently selected.\n"
@@ -911,12 +964,12 @@ msgstr ""
 "propiedades\n"
 "         modificadas se muestren la proxima vez que arranques Calcurse."
 
-#: src/help.c:418
+#: src/help.c:432
 #, fuzzy
 msgid "EditNote:\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -939,12 +992,12 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:439
+#: src/help.c:453
 #, fuzzy
 msgid "ViewNote:\n"
 msgstr "Ver:\n"
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -961,11 +1014,11 @@ msgid ""
 "Calcurse."
 msgstr ""
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr "Prioridad:\n"
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -998,11 +1051,11 @@ msgstr ""
 "La posicion de la tarea puede tambien variar dependiendo de los elementos\n"
 "que tenga por debajo."
 
-#: src/help.c:472
+#: src/help.c:486
 msgid "Repeat:\n"
 msgstr "Repetir:\n"
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -1062,11 +1115,11 @@ msgstr ""
 "          configuraciones complejas, de esta forma es posible borrar solo\n"
 "          una recurrencia o todo un elemento repetido."
 
-#: src/help.c:498
+#: src/help.c:512
 msgid "Flag Item:\n"
 msgstr "Marcar elemento:\n"
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1086,11 +1139,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:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr "Config:\n"
 
-#: src/help.c:510
+#: src/help.c:524
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1128,11 +1181,12 @@ msgstr ""
 "No olvides guardar los datos del calendario para mantener tu configuracion\n"
 "la proxima vez que inicies Calcurse."
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr "Teclas generales\n"
 
-#: src/help.c:523
+#: src/help.c:537
+#, fuzzy
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1149,7 +1203,8 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 "Algunas teclas pueden utilizarse independientemente del panel que este\n"
 "seleccionado. Estas se llaman teclas generales e involucran a la tecla\n"
@@ -1169,11 +1224,11 @@ msgstr ""
 " '^K' : -1 Semana          -> moverte a la semana anterior\n"
 " '^J' : +1 Semana          -> moverte a la semana siguiente"
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr "Otros comandos\n"
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -1189,11 +1244,11 @@ 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:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - organizador basado en modo texto"
 
-#: src/help.c:550
+#: src/help.c:565
 #, fuzzy
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1229,98 +1284,131 @@ msgstr ""
 "Envia tus impresiones y comentarios a: calcurse@culot.org\n"
 "Pagina web de Calcurse : http://culot.org/calcurse"
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/io.c:63
+#: src/io.c:103
 msgid "Exporting..."
 msgstr "Exportando..."
 
-#: src/io.c:126
+#: src/io.c:157
 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:128
+#: src/io.c:159
 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:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 msgid "Press [ENTER] to continue."
 msgstr "Pulsa [INTRO] para continuar."
 
-#: src/io.c:365
+#: src/io.c:223
+#, fuzzy
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
+
+#: src/io.c:262
+#, fuzzy
+msgid "Week"
+msgstr "-+1 Semana"
+
+#: src/io.c:382
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr "ERROR FATAL en recur_event_erase: no existe el evento\n"
+
+#: src/io.c:518
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr "ERROR FATAL en recur_apoint_erase: no existe esa cita\n"
+
+#: src/io.c:647
 #, 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:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr "abortando...\n"
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s creado con exito\n"
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "arrancando modo interactivo...\n"
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr "Problemas al acceder al fichero de datos..."
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr "Los archivos de datos se han salvado con exito"
 
-#: src/io.c:612
+#: src/io.c:896
 #, 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:633
+#: src/io.c:917
 #, 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:649
+#: src/io.c:933
 #, 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:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr "Fallo al abrir el archivo del ToDo"
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, 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:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Bienvenid@ a Calcurse. Se crearon los archivos de datos que faltaban."
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr "Archivos de datos encontrados. Ahora se cargaran los datos."
 
-#: src/io.c:935
+#: src/io.c:1219
 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:936
+#: src/io.c:1220
+#, fuzzy
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
+
+#: src/io.c:1221
 msgid "The data were successfully exported"
 msgstr "Los datos se han exportado correctamente"
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr ""
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr ""
+
 #: src/notify.c:135
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not fork"
@@ -1407,64 +1495,64 @@ msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
 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:419
+#: src/recur.c:437
 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:552
+#: src/recur.c:570
 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:624
+#: src/recur.c:642
 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:648
+#: src/recur.c:666
 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:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr "Introduce la frecuencia de repeticion:"
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, 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:656
+#: src/recur.c:674
 #, fuzzy, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr ""
 "Los formatos posibles son [mm/dd/aaaa] o '0' para una repeticion infinita"
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr "Este elemento es ya un elemento repetido."
 
-#: src/recur.c:660
+#: src/recur.c:678
 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:774
+#: src/recur.c:792
 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:803
+#: src/recur.c:821
 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:878
+#: src/recur.c:896
 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:902
+#: src/recur.c:920
 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:938
+#: src/recur.c:956
 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"
 
@@ -1634,46 +1722,65 @@ msgstr "Vista"
 msgid "OtherCmd"
 msgstr "Otros comandos"
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr ""
+
+#: src/utils.c:446
+#, fuzzy
+msgid "beg Week"
+msgstr "-+1 Semana"
+
+#: src/utils.c:447
+#, fuzzy
+msgid "end Week"
+msgstr "-+1 Semana"
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
 
-#: src/utils.c:725
+#: src/utils.c:587
+#, fuzzy
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr "Cita"
 
-#: src/utils.c:751
+#: src/utils.c:754
 #, 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:825
+#: src/utils.c:824
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/utils.c:827
+#: src/utils.c:826
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr "si"
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "opcion no definida - Problema en print_option_incolor()"
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:909
+#: src/utils.c:908
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
diff --git a/po/fr.po b/po/fr.po
index fe06bac..04dc8e4 100755
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,4 +1,4 @@
-# 	$calcurse: fr.po,v 1.21 2008/08/03 18:41:55 culot Exp $
+# 	$calcurse: fr.po,v 1.22 2008/08/12 15:57:05 culot Exp $
 #
 # French translations for calcurse package.
 # Copyright (C) 2004-2008 Frederic Culot <frederic@culot.org>
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 2.1\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-05-17 12:15+0200\n"
-"PO-Revision-Date: 2008-05-03 21:33+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"PO-Revision-Date: 2008-08-12 17:51+0200\n"
 "Last-Translator: Frederic Culot <frederic@culot.org>\n"
 "Language-Team: French <calcurse-i18n@culot.org>\n"
 "MIME-Version: 1.0\n"
@@ -73,16 +73,19 @@ msgstr "ERREUR FATALE dans apoint_switch_notify: l'élement n'existe pas"
 
 #: src/args.c:51
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr ""
-"Utilisation: calcurse [-h|-v] [-x] [-N] [-an] [-t[nb]] [-d date|nb] [-c "
-"fichier]\n"
+"Utilisation: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                      [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                      [-c<fichier> | -D<dir>]\n"
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Tapez 'calcurse -h' pour plus d'informations.\n"
 
-#: src/args.c:71
+#: src/args.c:72
 msgid ""
 "\n"
 "Copyright (c) 2004-2008 Frederic Culot.\n"
@@ -93,12 +96,12 @@ msgstr ""
 "Ceci est un logiciel libre; voir les sources pour les conditions de "
 "diffusion.\n"
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - organiseur personnel en mode texte\n"
 
-#: src/args.c:87
+#: src/args.c:88
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -110,7 +113,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -118,26 +125,38 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -158,8 +177,8 @@ msgstr ""
 "  -a, --appointment\n"
 " \tafficher les rendez-vous et évenements de la journée et quitter.\n"
 "\n"
-"  -d <date|nb>, --day <date|nb>\n"
-"\tafficher les rendez-vous et évenements pour la <date> ou les <nb>\n"
+"  -d <date|num>, --day <date|num>\n"
+"\tafficher les rendez-vous et évenements pour la <date> ou les <num>\n"
 "\tjours à venir. Les formats possibles sont: 'mm/jj/aaaa' ou 'n'.\n"
 "\n"
 "  -n, --next\n"
@@ -171,6 +190,18 @@ msgstr ""
 "        '-a' ou '-t', les notes associées aux élements seront également\n"
 "        affichées.\n"
 "\n"
+"  -r[num], --range[=num]\n"
+"        afficher les rendez-vous et évenements pour [num] jours puis "
+"quitter.\n"
+"        Si l'option [num] n'est pas donnée, une plage d'un jour est "
+"considérée.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"        afficher les rendez-vous et évenements à partir de [date] puis "
+"quitter.\n"
+"        Si aucune [date] n'est indiquée, le jour courant est pris par "
+"défaut.\n"
+"\n"
 "  -t[nb], --todo[=nb]\n"
 "\tafficher la liste des tâches et quitter. Si le nombre optionnel [nb]\n"
 "\test donné, alors seulement les tâches ayant une priorité égale à [nb]\n"
@@ -178,34 +209,33 @@ msgstr ""
 "\tRemarque: [nb] doit être compris entre 1 (priorité la plus grande),\n"
 "\tet 9 (priorité la moins grande).\n"
 "\n"
-"  -x, --export\n"
-"\texporter les données utilisateur au format iCalendar. Les évènements,\n"
+"  -x[format], --export[=format]\n"
+"\texporter les données utilisateur au format spécifié. Les évènements,\n"
 "\trendez-vous et tâches sont convertis et affichés sur la sortie standard.\n"
+"        Deux formats d'export sont possibles : 'ical' et 'pcal'.\n"
+"        Si le format n'est pas spécifié, 'ical' est la valeur prise par "
+"défaut.\n"
 "\tRemarque: pour sauvegarder les données exportées dans un fichier, il\n"
 "\test nécessaire de rediriger la sortie standard comme dans l'exemple\n"
-"\tsuivant: calcurse --export > mon_fichier.ics\n"
+"\tsuivant: calcurse --export > mon_fichier.dat\n"
 "\n"
 "Pour plus d'informations, tapez '?' dans Calcurse, ou lisez la page de "
 "manuel.\n"
 "Envoyez vos rapports de bogues et suggestions à <calcurse@culot.org>.\n"
 
-#: src/args.c:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr "Fichier note non trouvé\n"
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr "à faire:\n"
 
-#: src/args.c:225
+#: src/args.c:239
 msgid "next appointment:\n"
 msgstr "prochain rendez-vous:\n"
 
-#: src/args.c:449
-msgid "Argument to the '-d' flag is not valid\n"
-msgstr "L'argument de l'option '-d' n'est pas valide\n"
-
-#: src/args.c:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -214,10 +244,30 @@ msgstr ""
 "Pour plus d'informations, tapez '?' dans Calcurse, ou lisez la page de "
 "manuel.\n"
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Envoyez vos rapports de bogues ou suggestions à <calcurse@culot.org>\n"
 
+#: src/args.c:487
+msgid "Argument to the '-d' flag is not valid\n"
+msgstr "L'argument de l'option '-d' n'est pas valide\n"
+
+#: src/args.c:550
+msgid "Argument is not valid\n"
+msgstr "L'argument n'est pas valide\n"
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr "Le format de l'argument pour -r et --range est: 'n'\n"
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr "L'argument pour '-x' doit être soit 'ical' soit 'pcal'\n"
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr "Les options '-D' et '-c' ne peuvent pas être utilisées en même temps\n"
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -230,7 +280,7 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Voulez-vous vraiment quitter ?"
 
-#: src/calcurse.c:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr "Tâche :"
 
@@ -238,7 +288,7 @@ msgstr "Tâche :"
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "ERREUR dans calendar_set_first_day_of_week\n"
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
@@ -246,8 +296,8 @@ msgstr ""
 "Le jour entré est invalide (il devrait être entre le 01/01/1902 et\n"
 "le 31/12/2037)"
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr "Appuyez sur [ENTREE] pour continuer"
 
@@ -284,7 +334,7 @@ msgstr "Impossible d'ouvrir le fichier de configuration"
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr "ERREUR FATALE dans custom_load_conf: variable inconnue.\n"
 
-#: src/custom.c:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr "Quitter"
 
@@ -477,15 +527,15 @@ msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Entrez le nouveau type: (D) journ., (W) hebdo., (M) mensuel, (Y) annuel"
 
-#: src/day.c:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y] "
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 msgid "The frequence you entered is not valid."
 msgstr "La fréquence que vous avez entrée n'est pas valide"
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 msgid "The entered date is not valid."
 msgstr "Le jour que vous avez entré n'est pas valide."
 
@@ -542,11 +592,11 @@ msgstr "ERREUR FATALE dans event_delete_bynum: aucun évenement correspondant\n"
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | aide"
 
-#: src/help.c:272
+#: src/help.c:275
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Bienvenue dans Calcurse. Vous êtes dans l'écran principal.\n"
 
-#: src/help.c:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -583,11 +633,11 @@ msgstr ""
 "         Auteurs:  Appuyez sur '@' pour obtenir l'écran présentant les \n"
 "                   auteurs de Calcurse."
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr "Sauvegarde:\n"
 
-#: src/help.c:289
+#: src/help.c:292
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -613,38 +663,54 @@ msgstr ""
 "Dans le menu de configuration, vous pouvez choisir de sauvegarder les\n"
 "données automatiquement avant de quitter."
 
-#: src/help.c:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr "Exporter:\n"
 
-#: src/help.c:301
+#: src/help.c:304
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
-"Appuyer sur 'X' permet d'exporter les données de l'utilisateur au format\n"
-"iCalendar.\n"
+"Appuyer sur 'X' vous amène au sous-menu relatif à l'export des données\n"
+"calcurse. A partir de ce sous-menu, vous pouvez sélectionner le format\n"
+"d'export des données, à savoir soit 'ical' soit 'pcal'.\n"
+"Choisir un de ces formats permet d'exporter les données de l'utilisateur \n"
+"au format ialendar ou pcal.\n"
 "\n"
 "Il faut pour cela spécifier le fichier dans lequel enregistrer les\n"
 "données à exporter. Par défaut, ce fichier est le suivant:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"pour un export au format ical, et:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"pour un export au format pcal.\n"
 "Toutes les données utilisateurs seront exportées, dans l'ordre suivant:\n"
 "évenements, rendez-vous, tâches.\n"
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr "Touches de déplacement:\n"
 
-#: src/help.c:310
+#: src/help.c:319
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -657,6 +723,10 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
@@ -672,15 +742,19 @@ msgstr ""
 "                              J v  \n"
 "                  aller à la semaine suivante\n"
 "\n"
+"De plus, lorsque le panneau du calendrier est sélectionné, la touche '0'\n"
+"vous permet d'aller au premier jour de la semaine, et la touche '$' vous\n"
+"permet de sélectionner le dernier jour de la semaine.\n"
+"\n"
 "Lorsque le panneau des rendez-vous ou celui des tâches est sélectionné,\n"
 "les touches haut et bas (respectivement K ou flèche haut, et J ou\n"
 "flèche bas) vous permettent de sélectionner un élément de ce panneau."
 
-#: src/help.c:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr "Visualiser:\n"
 
-#: src/help.c:324
+#: src/help.c:336
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
@@ -707,11 +781,11 @@ msgstr ""
 "la description de l'élément et revenir à l'affichage principal de\n"
 "Calcurse."
 
-#: src/help.c:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr "Tabulation:\n"
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -741,18 +815,21 @@ msgstr ""
 "toujours savoir quelles actions sont accessibles à partir du\n"
 "panneau actuellement sélectionné."
 
-#: src/help.c:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr "Aller à:\n"
 
-#: src/help.c:349
+#: src/help.c:361
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 "Appuyer sur 'G' permet de se rendre rapidement à un jour donné dans\n"
 "le calendrier.\n"
@@ -761,13 +838,17 @@ msgstr ""
 "touches de déplacement dans le panneau du calendrier pour se rendre\n"
 "au jour voulu.\n"
 "Si vous appuyez sur [ENTREE] sans spécifier de date, vous serez\n"
-"directement placé à la date du jour."
+"directement placé à la date du jour.\n"
+"\n"
+"Il est à noter que si l'on appuie sur la combinaison de touches ^G \n"
+"(Control + G), le jour courant sera sélectionné dans le calendrier,\n"
+"et ce quelque soit le panneau actif."
 
-#: src/help.c:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr "Effacer:\n"
 
-#: src/help.c:357
+#: src/help.c:371
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -799,11 +880,11 @@ msgstr ""
 "N'oubliez pas de sauvegarder les données du calendrier pour\n"
 "retrouver vos modifications au prochain lancement de Calcurse."
 
-#: src/help.c:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr "Ajouter:\n"
 
-#: src/help.c:371
+#: src/help.c:385
 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"
@@ -876,11 +957,11 @@ msgstr ""
 "          sera annulé.\n"
 "        o N'oubliez pas de sauvegarder vos nouvelles données."
 
-#: src/help.c:401
+#: src/help.c:415
 msgid "Edit Item:\n"
 msgstr "Editer:\n"
 
-#: src/help.c:403
+#: src/help.c:417
 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"
@@ -917,11 +998,11 @@ msgstr ""
 "       o n'oubliez pas de sauvegarder les données du calendrier pour\n"
 "         retrouver vos modifications au prochain lancement de calcurse."
 
-#: src/help.c:418
+#: src/help.c:432
 msgid "EditNote:\n"
 msgstr "Editer:\n"
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -964,11 +1045,11 @@ msgstr ""
 "de quitter l'éditeur externe pour revenir à Calcurse. Le signe '>'\n"
 "apparaîtra alors devant l'élement auquel la note a été ajoutée."
 
-#: src/help.c:439
+#: src/help.c:453
 msgid "ViewNote:\n"
 msgstr "Visualiser:\n"
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -1000,11 +1081,11 @@ msgstr ""
 "Comme pour la touche 'N', il faut quitter le visualiseur pour revenir\n"
 "dans Calcurse. "
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr "Priorité\n"
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -1038,11 +1119,11 @@ msgstr ""
 "de l'élément pourra également changer en fonction de la priorité des\n"
 "éléments placés en dessous de lui."
 
-#: src/help.c:472
+#: src/help.c:486
 msgid "Repeat:\n"
 msgstr "Répéter:\n"
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -1101,11 +1182,11 @@ msgstr ""
 "         possible d'effacer les occurences des éléments répétés une par\n"
 "         une."
 
-#: src/help.c:498
+#: src/help.c:512
 msgid "Flag Item:\n"
 msgstr "Marquer un rendez-vous:\n"
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1126,11 +1207,11 @@ msgstr ""
 "de modifier la commande à executer dans le menu de configuration, et de\n"
 "spécifier combien de temps à l'avance cette commande devra être lancée."
 
-#: src/help.c:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr "Configuration:\n"
 
-#: src/help.c:510
+#: src/help.c:524
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1164,11 +1245,11 @@ msgstr ""
 "N'oubliez pas de sauvegarder les données pour retrouver votre\n"
 "configuration au prochain lancement de Calcurse."
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr "Raccourcis clavier globaux:\n"
 
-#: src/help.c:523
+#: src/help.c:537
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1185,7 +1266,8 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 "Certains raccourcis clavier s'appliquent quel que soit le panneau\n"
 "sélectionné. Ce sont les raccourcis globaux et ils font appel à\n"
@@ -1202,13 +1284,14 @@ msgstr ""
 " '^H' : -1 Jour         -> aller au jour précédent\n"
 " '^L' : +1 Jour         -> aller au jour suivant\n"
 " '^K' : -1 Sem.         -> aller à la semaine précédente\n"
-" '^J' : +1 Sem.         -> aller à la semaine suivante"
+" '^J' : +1 Sem.         -> aller à la semaine suivante\n"
+" '^G' : Aujourd'hui     -> aller au jour courant"
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr "Autres Commandes:\n"
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -1225,11 +1308,11 @@ msgstr ""
 "Une fois que la dernière page a été atteinte, appuyer une nouvelle\n"
 "fois sur 'O' vous ramènera automatiquement à la première page."
 
-#: src/help.c:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - organiseur personnel en mode texte"
 
-#: src/help.c:550
+#: src/help.c:565
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
@@ -1263,98 +1346,128 @@ msgstr ""
 "Envoyez vos remarques ou commentaires à : calcurse@culot.org\n"
 "Page web de Calcurse : http://culot.org/calcurse"
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: src/io.c:63
+#: src/io.c:103
 msgid "Exporting..."
 msgstr "Export..."
 
-#: src/io.c:126
+#: src/io.c:157
 msgid "Choose the file used to export calcurse data:"
 msgstr "Choisissez le fichier dans lequel exporter les données:"
 
-#: src/io.c:128
+#: src/io.c:159
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Le fichier ne peut être ouvert, veuillez entrer un nouveau nom."
 
-#: src/io.c:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 msgid "Press [ENTER] to continue."
 msgstr "Appuyez sur [ENTREE] pour continuer."
 
-#: src/io.c:365
+#: src/io.c:223
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr "ERREUR FATALE dans foreach_date_dump: type de répétition incohérent\n"
+
+#: src/io.c:262
+msgid "Week"
+msgstr "Semaine"
+
+#: src/io.c:382
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr ""
+"ERREUR FATALE dans pcal_export_recur_events: type de répétition incohérent\n"
+
+#: src/io.c:518
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr ""
+"ERREUR FATALE dans pcal_export_recur_apoint: type de répétition incohérent\n"
+
+#: src/io.c:647
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr "%s n'existe pas, le créer maintenant [y ou n] ? "
 
-#: src/io.c:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr "annulation...\n"
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s correctement créé\n"
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "lancement du mode intéractif...\n"
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr "Problème d'accession aux fichiers de données ..."
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr "Les données ont été correctement enregistrées"
 
-#: src/io.c:612
+#: src/io.c:896
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr ""
 "ERREUR FATALE dans io_load_app: mauvais format dans le rendez-vous ou "
 "l'évenement\n"
 
-#: src/io.c:633
+#: src/io.c:917
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr "ERREUR FATALE dans io_load_app: mauvais format de date\n"
 
-#: src/io.c:649
+#: src/io.c:933
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr ""
 "ERREUR FATALE dans io_load_app: aucun évenement ou rendez-vous trouvé\n"
 
-#: src/io.c:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr "Problème d'ouverture du fichier des tâches"
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "ERREUR FATALE: impossibilité de créer %s: %s\n"
 
-#: src/io.c:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Bienvenue dans Calcurse. Les fichiers manquants ont été créés."
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr "Fichiers de données trouvés. Les données seront chargées."
 
-#: src/io.c:935
+#: src/io.c:1219
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "ERREUR FATALE dans io_export_data: mauvais mode d'export\n"
 
-#: src/io.c:936
+#: src/io.c:1220
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr "ERREUR FATALE dans io_export_data: mauvais mode d'export\n"
+
+#: src/io.c:1221
 msgid "The data were successfully exported"
 msgstr "Les données ont été correctement exportées"
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr "Ical"
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr "Pcal"
+
 #: src/notify.c:135
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "ERREUR FATALE dans launch_cmd: impossibilité de forker"
@@ -1436,61 +1549,61 @@ msgstr "ERREUR FATALE dans recur_char2def: caractère inconnu\n"
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr "ERREUR FATALE dans event_scan: date erronée dans l'évenement\n"
 
-#: src/recur.c:419
+#: src/recur.c:437
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/recur.c:552
+#: src/recur.c:570
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr "ERREUR FATALE dans event_delete_bynum: aucun évenement correspondant\n"
 
-#: src/recur.c:624
+#: src/recur.c:642
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr "ERREUR FATALE dans apoint_delete_bynum: l'élement n'existe pas\n"
 
-#: src/recur.c:648
+#: src/recur.c:666
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr "Entrez le type: (D) journ., (W) hebdo., (M) mensuel, (Y) annuel"
 
-#: src/recur.c:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr "Entrez la fréquence de répétition:"
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, c-format
 msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr "Entrez la date de fin: [%s] ou '0' pour répéter indéfiniment"
 
-#: src/recur.c:656
+#: src/recur.c:674
 #, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr "Les formats autorisés sont [%s] ou '0' pour une répétition sans fin"
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr "Cet élément est déjà recurrent."
 
-#: src/recur.c:660
+#: src/recur.c:678
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "La date que vous avez entrée est antérieure à la date de l'élément!"
 
-#: src/recur.c:774
+#: src/recur.c:792
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/recur.c:803
+#: src/recur.c:821
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr "ERREUR FATALE dans load_app: mauvais format de date\n"
 
-#: src/recur.c:878
+#: src/recur.c:896
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr "ERREUR FATALE dans recur_get_apoint: l'élement n'existe pas\n"
 
-#: src/recur.c:902
+#: src/recur.c:920
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr "ERREUR FATALE dans recur_get_event: aucun évenement correspondant\n"
 
-#: src/recur.c:938
+#: src/recur.c:956
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 "ERREUR FATALE dans recur_apoint_switch_notify: l'élement n'existe pas\n"
@@ -1654,43 +1767,59 @@ msgstr "VoirNote"
 msgid "OtherCmd"
 msgstr "Autres"
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr "Aujourd."
+
+#: src/utils.c:446
+msgid "beg Week"
+msgstr "deb Sem."
+
+#: src/utils.c:447
+msgid "end Week"
+msgstr "fin Sem."
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "ERREUR FATALE dans date2sec: dysfonctionnement dans mktime\n"
 
-#: src/utils.c:725
+#: src/utils.c:587
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr "ERREUR FATALE dans date_sec_change: dysfonctionnement dans mktime\n"
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: src/utils.c:751
+#: src/utils.c:754
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "ERREUR FATALE dans other_status_page: panneau inconnu\n"
 
-#: src/utils.c:825
+#: src/utils.c:824
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "ERREUR FATALE dans mystrtol: impossibilité de convertir la chaîne"
 
-#: src/utils.c:827
+#: src/utils.c:826
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "ERREUR FATALE dans mystrtol: le nombre est hors plage valide"
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr "oui"
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr "non"
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Problème dans print_option_incolor(): option non définié"
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr "ERREUR FATALE: le fichier temporaire n'a pu être créé"
 
-#: src/utils.c:909
+#: src/utils.c:908
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "ERREUR FATALE dans erase_note: impossibilité de supprimer la note\n"
 
diff --git a/po/nl.po b/po/nl.po
index ec4bc68..06ee404 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# 	$calcurse: nl.po,v 1.8 2008/08/03 18:41:55 culot Exp $
+# 	$calcurse: nl.po,v 1.9 2008/08/12 15:57:05 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.1\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-05-17 12:15+0200\n"
+"POT-Creation-Date: 2008-08-12 17:34+0200\n"
 "PO-Revision-Date: 2008-05-03 21:35+0200\n"
 "Last-Translator: Jeremy Roon\n"
 "Language-Team:  Jeremy Roon <p.roon@chello.nl>\n"
@@ -69,17 +69,20 @@ msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "FATALE FOUT in apoint_switch_notify: Afspraak bestaat niet"
 
 #: src/args.c:51
+#, fuzzy
 msgid ""
-"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file> | -D<dir>]\n"
 msgstr ""
 "Gebruik:calcurse [-h|-v] [-x] [-N] [-an] [-t[nr]] [-d datum|nr] [-c "
 "bestand]\n"
 
-#: src/args.c:59
+#: src/args.c:60
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Gebruik 'calcurse -h', voor meer informatie.\n"
 
-#: src/args.c:71
+#: src/args.c:72
 msgid ""
 "\n"
 "Copyright (c) 2004-2008 Frederic Culot.\n"
@@ -89,12 +92,13 @@ msgstr ""
 "Copyright (c) 2004-2008 Frederic Culot.\n"
 "Dit is vrije Software; kijk in de broncode voor kopieervoorwaarden.\n"
 
-#: src/args.c:74 src/args.c:121
+#: src/args.c:75 src/args.c:135
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - tekst-gebaseerde organizer\n"
 
-#: src/args.c:87
+#: src/args.c:88
+#, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -106,7 +110,11 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use.\n"
+"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\n"
+"  -D <dir>, --directory <dir>\n"
+"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
 "  -a, --appointment\n"
@@ -114,26 +122,38 @@ msgid ""
 "\n"
 "  -d <date|num>, --day <date|num>\n"
 "\tprint events and appointments for <date> or <num> upcoming days and\n"
-"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\texit. To specify both a starting date and a range, use the\n"
+"\t'--startday' and the '--range' option.\n"
 "\n"
 "  -n, --next\n"
-"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\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"
+"  -r[num], --range[=num]\n"
+"\tprint events and appointments for the [num] number of days\n"
+"\tand exit. If no [num] is given, a range of 1 day is considered.\n"
+"\n"
+"  -s[date], --startday[=date]\n"
+"\tprint events and appointments from [date] and exit.\n"
+"\tIf no [date] is given, the current day is considered.\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"
 "\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
-"  -x, --export\n"
-"\texport user data to iCalendar format. Events, appointments and\n"
+"  -x[format], --export[=format]\n"
+"\texport user data to the specified format. Events, appointments and\n"
 "\ttodos are converted and echoed to stdout.\n"
+"\tTwo possible formats are available: 'ical' and 'pcal'.\n"
+"\tIf the optional argument format is not given, ical format is\n"
+"\tselected by default.\n"
 "\tnote: redirect standard output to export data to a file,\n"
-"\tby issuing a command such as: calcurse --export > my_data.ics\n"
+"\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -181,23 +201,19 @@ 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:169
+#: src/args.c:183
 msgid "No note file found\n"
 msgstr ""
 
-#: src/args.c:191
+#: src/args.c:205
 msgid "to do:\n"
 msgstr "Taken:\n"
 
-#: src/args.c:225
+#: src/args.c:239
 msgid "next appointment:\n"
 msgstr "Volgende afspraak :\n"
 
-#: 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:455
+#: src/args.c:408
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -205,10 +221,31 @@ msgstr ""
 "\n"
 "Typ '?' in Calcurse voor meer informatie, of lees de man-pagina.\n"
 
-#: src/args.c:458
+#: src/args.c:410
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Mail foutrapporten en suggesties naar <calcurse@culot.org>.\n"
 
+#: src/args.c:487
+msgid "Argument to the '-d' flag is not valid\n"
+msgstr "Argument van '-d' is niet geldig.\n"
+
+#: src/args.c:550
+#, fuzzy
+msgid "Argument is not valid\n"
+msgstr "Argument van '-d' is niet geldig.\n"
+
+#: src/args.c:555
+msgid "Argument format for -r and --range is: 'n'\n"
+msgstr ""
+
+#: src/args.c:689
+msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
+msgstr ""
+
+#: src/args.c:721
+msgid "Options '-D' and '-c' cannot be used at the same time\n"
+msgstr ""
+
 #: src/calcurse.c:68
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
@@ -221,7 +258,7 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Wilt u werkelijk het programma verlaten?"
 
-#: src/calcurse.c:236
+#: src/calcurse.c:240
 msgid "To do :"
 msgstr "Taken :"
 
@@ -229,7 +266,7 @@ msgstr "Taken :"
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FOUT in calender_set_first_day_of_week\n"
 
-#: src/calendar.c:347
+#: src/calendar.c:357
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
@@ -237,8 +274,8 @@ msgstr ""
 "De ingevoerde datum is ongeldig (voer datum tussen 01/01/1902 en 12/31/2037) "
 "in"
 
-#: src/calendar.c:349 src/custom.c:218 src/io.c:434 src/io.c:794 src/io.c:916
-#: src/io.c:937
+#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
+#: src/io.c:1200 src/io.c:1222
 msgid "Press [ENTER] to continue"
 msgstr "Druk op [ENTER] om door te gaan)"
 
@@ -273,7 +310,7 @@ msgstr "Kan het configuratiebestand niet openen"
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr "FATALE FOUT in custom_load_conf: onbekende configuratievariabele.\n"
 
-#: src/custom.c:369
+#: src/custom.c:369 src/io.c:1289
 msgid "Exit"
 msgstr "Einde"
 
@@ -460,15 +497,15 @@ msgstr ""
 "Voer type herhaling in: (D)agelijks, (W)ekelijks, (M)aandelijks, (Y) "
 "jaarlijks"
 
-#: src/day.c:599 src/recur.c:649
+#: src/day.c:599 src/recur.c:667
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y]"
 
-#: src/day.c:600 src/recur.c:651
+#: src/day.c:600 src/recur.c:669
 msgid "The frequence you entered is not valid."
 msgstr "Het ingevoerde interval is ongeldig."
 
-#: src/day.c:602 src/recur.c:654
+#: src/day.c:602 src/recur.c:672
 msgid "The entered date is not valid."
 msgstr "De ingevoerde datum is ongeldig."
 
@@ -523,11 +560,11 @@ msgstr "FATALE FOUT in event_delete_bynum: Gebeurtenis bestaat niet\n"
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hulp"
 
-#: src/help.c:272
+#: src/help.c:275
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Welkom in Calcurse. Dit is het centrale hulpscherm.\n"
 
-#: src/help.c:274
+#: src/help.c:277
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -560,11 +597,11 @@ msgstr ""
 "\n"
 "        Auteurs:  Druk op '@' om de auteurs van Calcurse te zien."
 
-#: src/help.c:287
+#: src/help.c:290
 msgid "Save:\n"
 msgstr "Opslaan:\n"
 
-#: src/help.c:289
+#: src/help.c:292
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -590,19 +627,28 @@ msgstr ""
 "In het venster instellingen kan een optie gekozen worden, \n"
 "die de data automatisch opslaat bij het verlaten van Calcurse."
 
-#: src/help.c:299
+#: src/help.c:302
 msgid "Export:\n"
 msgstr "Exporteren:\n"
 
-#: src/help.c:301
+#: src/help.c:304
+#, fuzzy
 msgid ""
-"Pressing 'X' exports the Calcurse data to iCalendar format.\n"
+"Pressing 'X' leads to the export submenu, from which you can choose\n"
+"between two different export formats: 'ical' and 'pcal'.\n"
+"Choosing one of those formats lets you export the Calcurse data to\n"
+"icalendar or pcal format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
 "\n"
 "     ~/calcurse.ics\n"
 "\n"
+"for an ical export, and:\n"
+"\n"
+"     ~/calcurse.txt\n"
+"\n"
+"for a pcal export.\n"
 "All of the calcurse data are exported, in the following order:\n"
 "events, appointments, todos.\n"
 msgstr ""
@@ -616,11 +662,12 @@ msgstr ""
 "Alle data wordt geëxporteerd, in deze volgorde:\n"
 "gebeurtenissen, afspraken, taken.\n"
 
-#: src/help.c:308
+#: src/help.c:317
 msgid "Displacement keys:\n"
 msgstr "Navigatietoetsen:\n"
 
-#: src/help.c:310
+#: src/help.c:319
+#, fuzzy
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -633,6 +680,10 @@ msgid ""
 "                              J v  \n"
 "                       move to next week\n"
 "\n"
+"Moreover, while inside the calendar panel, the '0' (zero) key moves\n"
+"to the first day of the week, and the '$' key selects the last day of\n"
+"the week.\n"
+"\n"
 "When the Appointment or ToDo panel is selected, the up and down keys\n"
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
@@ -652,11 +703,11 @@ 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:322
+#: src/help.c:334
 msgid "View:\n"
 msgstr "Bekijk:\n"
 
-#: src/help.c:324
+#: src/help.c:336
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
@@ -682,11 +733,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:335
+#: src/help.c:347
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:337
+#: src/help.c:349
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -711,18 +762,22 @@ msgstr ""
 "acties mee verandert, zodat altijd te zien is, welke acties gedaan kunnen \n"
 "worden in het actieve panel."
 
-#: src/help.c:347
+#: src/help.c:359
 msgid "Goto:\n"
 msgstr "Ga naar:\n"
 
-#: src/help.c:349
+#: src/help.c:361
+#, fuzzy
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
 "Using this command, you do not need to travel to that day using\n"
 "the displacement keys inside the calendar panel.\n"
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
-"system current date and you will be taken to that date."
+"system current date and you will be taken to that date.\n"
+"\n"
+"Notice that pressing ^G (Control + G), whatever panel is\n"
+"selected, will select current day in the calendar."
 msgstr ""
 "Met de 'G'-toets, gaat men naar een specifieke datum in de kalender.\n"
 "\n"
@@ -731,11 +786,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:355
+#: src/help.c:369
 msgid "Delete:\n"
 msgstr "Wissen:\n"
 
-#: src/help.c:357
+#: src/help.c:371
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
 "\n"
@@ -765,11 +820,11 @@ msgstr ""
 "Vergeet niet om de kalenderdata op te slaan, als je de veranderingen \n"
 "wilt behouden."
 
-#: src/help.c:369
+#: src/help.c:383
 msgid "Add:\n"
 msgstr "Toevoegen:\n"
 
-#: src/help.c:371
+#: src/help.c:385
 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"
@@ -836,11 +891,11 @@ 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:401
+#: src/help.c:415
 msgid "Edit Item:\n"
 msgstr "Item wijzigen:\n"
 
-#: src/help.c:403
+#: src/help.c:417
 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"
@@ -875,11 +930,11 @@ 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:418
+#: src/help.c:432
 msgid "EditNote:\n"
 msgstr "WzgNoot:\n"
 
-#: src/help.c:420
+#: src/help.c:434
 msgid ""
 "Pressing 'N' allows you to attach a note to any type of item, or to\n"
 "edit an already existing note.\n"
@@ -920,11 +975,11 @@ 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:439
+#: src/help.c:453
 msgid "ViewNote:\n"
 msgstr "BekijkNoot:\n"
 
-#: src/help.c:441
+#: src/help.c:455
 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"
@@ -953,11 +1008,11 @@ msgstr ""
 "       er gebruik gemaakt worden van '/usr/bin/less'.\n"
 "Als de pager wordt afgesloten, keer je terug naar Calcurse."
 
-#: src/help.c:456
+#: src/help.c:470
 msgid "Priority:\n"
 msgstr "Prioriteit:\n"
 
-#: src/help.c:458
+#: src/help.c:472
 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"
@@ -988,11 +1043,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:472
+#: src/help.c:486
 msgid "Repeat:\n"
 msgstr "Herhalen:\n"
 
-#: src/help.c:474
+#: src/help.c:488
 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"
@@ -1050,11 +1105,11 @@ msgstr ""
 "         schema's gemaakt worden, omdat het mogelijk is om slechts \n"
 "         een herhaling van meerdere herhaalde items te wissen."
 
-#: src/help.c:498
+#: src/help.c:512
 msgid "Flag Item:\n"
 msgstr "Vlag Item:\n"
 
-#: src/help.c:500
+#: src/help.c:514
 msgid ""
 "Pressing '!' toggles an appointment's 'important' flag.\n"
 "\n"
@@ -1074,11 +1129,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:508
+#: src/help.c:522
 msgid "Config:\n"
 msgstr "Instellingen:\n"
 
-#: src/help.c:510
+#: src/help.c:524
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -1112,11 +1167,12 @@ msgstr ""
 "Vergeet niet kalenderdata op te slaan, als de nieuwe configuratie voor\n"
 "de volgende start van Calcurse behouden moeten blijven."
 
-#: src/help.c:521
+#: src/help.c:535
 msgid "General keybindings:\n"
 msgstr "Algemene toetsen:\n"
 
-#: src/help.c:523
+#: src/help.c:537
+#, fuzzy
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1133,7 +1189,8 @@ msgid ""
 " '^H' : -1 Day          -> move to previous day\n"
 " '^L' : +1 Day          -> move to next day\n"
 " '^K' : -1 Week         -> move to previous week\n"
-" '^J' : +1 Week         -> move to next week"
+" '^J' : +1 Week         -> move to next week\n"
+" '^G' : Goto today      -> move to current day"
 msgstr ""
 "De werking van toetsen hangt af van welk panel is geselecteerd. \n"
 "Deze worden algemene toetsen genoemt, en worden samen met de \n"
@@ -1152,11 +1209,11 @@ msgstr ""
 " '^K' : -1 week            -> Ga naar de vorige week\n"
 " '^J' : +1 week            -> Ga naar de volgende week"
 
-#: src/help.c:539
+#: src/help.c:554
 msgid "OtherCmd:\n"
 msgstr "AndereCmd:\n"
 
-#: src/help.c:541
+#: src/help.c:556
 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"
@@ -1172,11 +1229,11 @@ 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:548
+#: src/help.c:563
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - tekst-gebaseerde organizer"
 
-#: src/help.c:550
+#: src/help.c:565
 msgid ""
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
@@ -1210,95 +1267,128 @@ msgstr ""
 "Zendt kritiek of commentaar aan : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:61
+#: src/io.c:101
 msgid "Saving..."
 msgstr "Opslaan..."
 
-#: src/io.c:62
+#: src/io.c:102
 msgid "Loading..."
 msgstr "Laden..."
 
-#: src/io.c:63
+#: src/io.c:103
 msgid "Exporting..."
 msgstr "Exporteren..."
 
-#: src/io.c:126
+#: src/io.c:157
 msgid "Choose the file used to export calcurse data:"
 msgstr "Kies het bestand om calcurse data naar te exporteren:"
 
-#: src/io.c:128
+#: src/io.c:159
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
 
-#: src/io.c:129 src/recur.c:658
+#: src/io.c:160 src/recur.c:676
 msgid "Press [ENTER] to continue."
 msgstr "[ENTER]-toets om door te gaan."
 
-#: src/io.c:365
+#: src/io.c:223
+#, fuzzy
+msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
+msgstr "FATALE FOUT in recur_item_inday: type item onbekend\n"
+
+#: src/io.c:262
+#, fuzzy
+msgid "Week"
+msgstr "-/+ Week"
+
+#: src/io.c:382
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
+msgstr "FATALE FOUT in recur_event_erase: gebeurtenis bestaat niet\n"
+
+#: src/io.c:518
+#, fuzzy
+msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
+msgstr "FATALE FOUT in recur_apoint_erase: afspraak bestaat niet\n"
+
+#: src/io.c:647
 #, 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:371 src/io.c:391
+#: src/io.c:654 src/io.c:674
 #, c-format
 msgid "aborting...\n"
 msgstr "afbreken...\n"
 
-#: src/io.c:385
+#: src/io.c:668
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s met succes aangemaakt\n"
 
-#: src/io.c:386
+#: src/io.c:669
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "interactieve modus gestart...\n"
 
-#: src/io.c:422
+#: src/io.c:706
 msgid "Problems accessing data file ..."
 msgstr "Probleem bij benaderen databestand ..."
 
-#: src/io.c:433
+#: src/io.c:717
 msgid "The data files were successfully saved"
 msgstr "De databestanden zijn met succes opgeslagen"
 
-#: src/io.c:612
+#: src/io.c:896
 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:633
+#: src/io.c:917
 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:649
+#: src/io.c:933
 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:793
+#: src/io.c:1077
 msgid "Failed to open todo file"
 msgstr "Kan takenbestand niet openen"
 
-#: src/io.c:855 src/io.c:875
+#: src/io.c:1139 src/io.c:1159
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "FATALE FOUT: kan %s niet aanmaken: %s\n"
 
-#: src/io.c:914
+#: src/io.c:1198
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welkom bij Calcurse. De missende databestanden zijn aangemaakt."
 
-#: src/io.c:915
+#: src/io.c:1199
 msgid "Data files found. Data will be loaded now."
 msgstr "Databestanden gevonden. Data wordt geladen."
 
-#: src/io.c:935
+#: src/io.c:1219
 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:936
+#: src/io.c:1220
+#, fuzzy
+msgid "FATAL ERROR in io_export_data: unknown export type\n"
+msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
+
+#: src/io.c:1221
 msgid "The data were successfully exported"
 msgstr "De data is met succes geëxporteerd"
 
+#: src/io.c:1290
+msgid "Ical"
+msgstr ""
+
+#: src/io.c:1291
+msgid "Pcal"
+msgstr ""
+
 #: src/notify.c:135
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "FATALE FOUT in launch_cmd: probleem met fork"
@@ -1379,61 +1469,61 @@ msgstr "FATALE FOUT in recur_char2def: onbekend karakter\n"
 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:419
+#: src/recur.c:437
 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:552
+#: src/recur.c:570
 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:624
+#: src/recur.c:642
 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:648
+#: src/recur.c:666
 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:650
+#: src/recur.c:668
 msgid "Enter the repetition frequence:"
 msgstr "Geef de herhalingsinterval:"
 
-#: src/recur.c:653
+#: src/recur.c:671
 #, c-format
 msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr "Geef einddatum: [%s] of '0' voor oneindige herhaling"
 
-#: src/recur.c:656
+#: src/recur.c:674
 #, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr "Mogelijk formaat is: [%s] of '0' voor oneindig."
 
-#: src/recur.c:657
+#: src/recur.c:675
 msgid "This item is already a repeated one."
 msgstr "Dit item wordt al herhaald."
 
-#: src/recur.c:660
+#: src/recur.c:678
 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:774
+#: src/recur.c:792
 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:803
+#: src/recur.c:821
 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:878
+#: src/recur.c:896
 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:902
+#: src/recur.c:920
 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:938
+#: src/recur.c:956
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATALE FOUT in recur_apoint_switch_notify: item bestaat niet\n"
 
@@ -1593,43 +1683,62 @@ msgstr "BekijkNoot"
 msgid "OtherCmd"
 msgstr "AnderCmd"
 
-#: src/utils.c:509
+#: src/utils.c:445
+msgid "Today"
+msgstr ""
+
+#: src/utils.c:446
+#, fuzzy
+msgid "beg Week"
+msgstr "-/+ Week"
+
+#: src/utils.c:447
+#, fuzzy
+msgid "end Week"
+msgstr "-/+ Week"
+
+#: src/utils.c:512
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATALE FOUT in date2sec: fout in mktime\n"
 
-#: src/utils.c:725
+#: src/utils.c:587
+#, fuzzy
+msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
+msgstr "FATALE FOUT in date2sec: fout in mktime\n"
+
+#: src/utils.c:728
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: src/utils.c:751
+#: src/utils.c:754
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "FATALE FOUT in other_status_page: onbekend panel\n"
 
-#: src/utils.c:825
+#: src/utils.c:824
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATALE FOUT in mystrtol: kan string niet omzetten"
 
-#: src/utils.c:827
+#: src/utils.c:826
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATALE FOUT in mystrtol: nummer buiten bereik"
 
-#: src/utils.c:849
+#: src/utils.c:848
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:854
+#: src/utils.c:853
 msgid "no"
 msgstr "nee"
 
-#: src/utils.c:858
+#: src/utils.c:857
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Optie ongedefinieerd - Probleem in print_option_incolor()"
 
-#: src/utils.c:895
+#: src/utils.c:894
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr "FATALE FOUT: tijdelijk bestand kan niet worden aangemaakt!"
 
-#: src/utils.c:909
+#: src/utils.c:908
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATALE FOUT in erase_note: kan noot niet verwijderen\n"