prefer overridability and let people choose their own CFLAGS

6 files changed, 4019 insertions, 2852 deletions

diff --git a/po/calcurse.pot b/po/calcurse.pot
index 28180f6..395824d 100755
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: calcurse 2.4_beta\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,52 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr ""
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr ""
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr ""
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr ""
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr ""
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr ""
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr ""
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr ""
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr ""
 
@@ -204,278 +204,344 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr ""
 
-#: src/calcurse.c:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr ""
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr ""
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr ""
 
-#: src/custom.c:67
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr ""
 
-#: src/custom.c:69
+#: src/custom.c:71
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr ""
 
-#: src/custom.c:71
+#: src/custom.c:73
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr ""
 
-#: src/custom.c:311
+#: src/custom.c:313
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 
-#: src/custom.c:369 src/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr ""
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr ""
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr ""
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr ""
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr ""
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr ""
 
-#: src/custom.c:388
+#: src/custom.c:392
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr ""
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr ""
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr ""
 
-#: src/custom.c:446
-msgid "Foreground"
+#: src/custom.c:439
+msgid "Select"
 msgstr ""
 
-#: src/custom.c:447
-msgid "Background"
+#: src/custom.c:440
+msgid "No color"
 msgstr ""
 
-#: src/custom.c:448
-msgid "(terminal's default)"
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
+msgstr ""
+
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+msgid "Down"
+msgstr ""
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
+msgstr ""
+
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
+msgstr ""
+
+#: src/custom.c:469
+msgid "Foreground"
 msgstr ""
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#: src/custom.c:470
+msgid "Background"
 msgstr ""
 
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
+#: src/custom.c:471
+msgid "(terminal's default)"
 msgstr ""
 
-#: src/custom.c:487
+#: src/custom.c:507
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr ""
 
-#: src/custom.c:680
+#: src/custom.c:690
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr ""
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr ""
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr ""
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr ""
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr ""
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr ""
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr ""
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr ""
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr ""
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr ""
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr ""
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr ""
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 
-#: src/custom.c:763
+#: src/custom.c:776
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr ""
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr ""
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr ""
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr ""
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr ""
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr ""
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+msgid "Add key"
+msgstr ""
+
+#: src/custom.c:972
+msgid "Del key"
+msgstr ""
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr ""
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr ""
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr ""
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr ""
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr ""
 
-#: src/day.c:517
+#: src/day.c:518
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr ""
 
-#: src/day.c:519
+#: src/day.c:520
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr ""
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr ""
 
-#: src/day.c:585
+#: src/day.c:586
 msgid "Enter the new item description:"
 msgstr ""
 
-#: src/day.c:597
+#: src/day.c:598
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:599 src/recur.c:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 msgid "The frequence you entered is not valid."
 msgstr ""
 
-#: src/day.c:602 src/recur.c:672
+#: src/day.c:603 src/recur.c:673
 msgid "The entered date is not valid."
 msgstr ""
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr ""
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr ""
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr ""
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 
-#: src/day.c:819
+#: src/day.c:820
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 
-#: src/day.c:821
+#: src/day.c:822
 msgid "[i/n] "
 msgstr ""
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr ""
 
@@ -491,63 +557,67 @@ msgstr ""
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr ""
 
-#: src/help.c:120
+#: src/help.c:149
 #, c-format
 msgid "Calcurse %s | help"
 msgstr ""
 
-#: src/help.c:280
+#: src/help.c:313
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr ""
 
-#: src/help.c:282
+#: src/help.c:315
+#, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
 "\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
 "\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
 "\n"
-"       Credits:  Press '@' for credits."
+"      Credits:  Press '%s' for credits."
 msgstr ""
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+msgid "Save\n"
 msgstr ""
 
-#: src/help.c:297
+#: src/help.c:336
+#, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"The data is splitted into three different files which contain :\n"
-"\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
 msgstr ""
 
-#: src/help.c:307
-msgid "Import:\n"
+#: src/help.c:347
+msgid "Import\n"
 msgstr ""
 
-#: src/help.c:309
+#: src/help.c:349
+#, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -563,16 +633,18 @@ msgid ""
 "the item could not be imported.\n"
 msgstr ""
 
-#: src/help.c:325
-msgid "Export:\n"
+#: src/help.c:365
+msgid "Export\n"
 msgstr ""
 
-#: src/help.c:327
+#: src/help.c:367
+#, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -584,98 +656,107 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+msgid "Displacement keys\n"
 msgstr ""
 
-#: src/help.c:342
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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:357
-msgid "View:\n"
+#: src/help.c:412
+msgid "View\n"
 msgstr ""
 
-#: src/help.c:359
+#: src/help.c:414
+#, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
 "Calcurse screen."
 msgstr ""
 
-#: src/help.c:370
-msgid "Tab:\n"
+#: src/help.c:425
+msgid "Tab\n"
 msgstr ""
 
-#: src/help.c:372
+#: src/help.c:427
+#, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 
-#: src/help.c:382
-msgid "Goto:\n"
+#: src/help.c:440
+msgid "Goto\n"
 msgstr ""
 
-#: src/help.c:384
+#: src/help.c:442
+#, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', whatever panel is\n"
 "selected, will select current day in the calendar."
 msgstr ""
 
-#: src/help.c:392
-msgid "Delete:\n"
+#: src/help.c:451
+msgid "Delete\n"
 msgstr ""
 
-#: src/help.c:394
+#: src/help.c:453
+#, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -691,23 +772,24 @@ msgid ""
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:406
-msgid "Add:\n"
+#: src/help.c:465
+msgid "Add\n"
 msgstr ""
 
-#: src/help.c:408
+#: src/help.c:467
+#, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -719,7 +801,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -733,13 +815,14 @@ msgid ""
 "       event next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:438
-msgid "Edit Item:\n"
+#: src/help.c:502
+msgid "Edit Item\n"
 msgstr ""
 
-#: src/help.c:440
+#: src/help.c:504
+#, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -756,18 +839,18 @@ msgid ""
 "       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:455
-msgid "EditNote:\n"
+#: src/help.c:519
+msgid "EditNote\n"
 msgstr ""
 
-#: src/help.c:457
+#: src/help.c:521
+#, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -783,58 +866,63 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:476
-msgid "ViewNote:\n"
+#: src/help.c:540
+msgid "ViewNote\n"
 msgstr ""
 
-#: src/help.c:478
+#: src/help.c:542
+#, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+msgid "Priority\n"
 msgstr ""
 
-#: src/help.c:495
+#: src/help.c:561
+#, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:509
-msgid "Repeat:\n"
+#: src/help.c:577
+msgid "Repeat\n"
 msgstr ""
 
-#: src/help.c:511
+#: src/help.c:579
+#, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -860,14 +948,14 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:535
-msgid "Flag Item:\n"
+#: src/help.c:604
+msgid "Flag Item\n"
 msgstr ""
 
-#: src/help.c:537
+#: src/help.c:606
+#, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -876,74 +964,76 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:545
-msgid "Config:\n"
+#: src/help.c:614
+msgid "Config\n"
 msgstr ""
 
-#: src/help.c:547
+#: src/help.c:616
+#, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+msgid "Generic keybindings\n"
 msgstr ""
 
-#: src/help.c:560
+#: src/help.c:631
+#, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : Goto today      -> move to current day"
 msgstr ""
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+msgid "OtherCmd\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:656
+#, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr ""
 
-#: src/help.c:588
+#: src/help.c:667
+#, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -961,673 +1051,736 @@ msgid ""
 "Calcurse home page : http://culot.org/calcurse"
 msgstr ""
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr ""
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr ""
 
-#: src/io.c:130
+#: src/io.c:143
 msgid "Exporting..."
 msgstr ""
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 msgid "Press [ENTER] to continue."
 msgstr ""
 
-#: src/io.c:250
+#: src/io.c:273
 msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
 msgstr ""
 
-#: src/io.c:289
+#: src/io.c:312
 msgid "Week"
 msgstr ""
 
-#: src/io.c:409
+#: src/io.c:432
 msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
 msgstr ""
 
-#: src/io.c:545
+#: src/io.c:568
 msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
 msgstr ""
 
-#: src/io.c:674
+#: src/io.c:699
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
 msgstr ""
 
-#: src/io.c:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr ""
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr ""
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr ""
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr ""
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr ""
 
-#: src/io.c:927
+#: src/io.c:963
 msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
 msgstr ""
 
-#: src/io.c:948
+#: src/io.c:984
 msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
 msgstr ""
 
-#: src/io.c:964
+#: src/io.c:1000
 msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
 msgstr ""
 
-#: src/io.c:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr ""
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr ""
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+msgid "Key label not recognized"
+msgstr ""
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr ""
 
-#: src/io.c:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr ""
 
-#: src/io.c:1230
+#: src/io.c:1445
 msgid "Data files found. Data will be loaded now."
 msgstr ""
 
-#: src/io.c:1250
+#: src/io.c:1465
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr ""
 
-#: src/io.c:1251
+#: src/io.c:1466
 msgid "FATAL ERROR in io_export_data: unknown export type\n"
 msgstr ""
 
-#: src/io.c:1252
+#: src/io.c:1467
 msgid "The data were successfully exported"
 msgstr ""
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr ""
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr ""
 
-#: src/io.c:1364
+#: src/io.c:1580
 msgid "ERROR in ical_log: unknown ical type"
 msgstr ""
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr ""
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr ""
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr ""
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr ""
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr ""
 
-#: src/io.c:1991
+#: src/io.c:2207
 msgid "could not get entire item description."
 msgstr ""
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr ""
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr ""
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr ""
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr ""
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr ""
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 msgid "could not retrieve item summary."
 msgstr ""
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr ""
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr ""
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr ""
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr ""
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr ""
 
-#: src/io.c:2319
+#: src/io.c:2535
 msgid "Enter the file name to import data from:"
 msgstr ""
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr ""
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr ""
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr ""
 
-#: src/io.c:2375
+#: src/io.c:2590
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr ""
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr ""
 
-#: src/io.c:2388
+#: src/io.c:2603
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr ""
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2684
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr ""
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
+#: src/io.c:2714
+msgid "No log file to display!"
 msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr ""
 
-#: src/notify.c:135
+#: src/notify.c:136
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr ""
 
-#: src/notify.c:138
+#: src/notify.c:139
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr ""
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr ""
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr ""
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr ""
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr ""
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr ""
 
-#: src/notify.c:456
+#: src/notify.c:457
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr ""
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr ""
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr ""
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr ""
 
-#: src/recur.c:129
+#: src/recur.c:130
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr ""
 
-#: src/recur.c:161
+#: src/recur.c:162
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr ""
 
-#: src/recur.c:297
+#: src/recur.c:298
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr ""
 
-#: src/recur.c:437
+#: src/recur.c:438
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr ""
 
-#: src/recur.c:570
+#: src/recur.c:571
 msgid "FATAL ERROR in recur_event_erase: no such event\n"
 msgstr ""
 
-#: src/recur.c:642
+#: src/recur.c:643
 msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
 msgstr ""
 
-#: src/recur.c:666
+#: src/recur.c:667
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, c-format
 msgid "Enter the ending date: [%s] or '0' for an endless repetition"
 msgstr ""
 
-#: src/recur.c:674
+#: src/recur.c:675
 #, c-format
 msgid "Possible formats are [%s] or '0' for an endless repetition"
 msgstr ""
 
-#: src/recur.c:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:678
+#: src/recur.c:679
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:792
+#: src/recur.c:793
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr ""
 
-#: src/recur.c:821
+#: src/recur.c:822
 msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
 msgstr ""
 
-#: src/recur.c:896
+#: src/recur.c:897
 msgid "FATAL ERROR in recur_get_apoint: no such item\n"
 msgstr ""
 
-#: src/recur.c:920
+#: src/recur.c:921
 msgid "FATAL ERROR in recur_get_event: no such item\n"
 msgstr ""
 
-#: src/recur.c:956
+#: src/recur.c:957
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr ""
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 
-#: src/todo.c:192
+#: src/todo.c:193
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr ""
 
-#: src/todo.c:201
+#: src/todo.c:202
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr ""
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr ""
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr ""
 
-#: src/todo.c:242
+#: src/todo.c:243
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 
-#: src/todo.c:244
+#: src/todo.c:245
 msgid "[t/n] "
 msgstr ""
 
-#: src/todo.c:328
+#: src/todo.c:329
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr ""
 
-#: src/todo.c:360
+#: src/todo.c:361
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr ""
 
-#: src/todo.c:375
+#: src/todo.c:376
 msgid "Enter the new ToDo description :"
 msgstr ""
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr ""
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr ""
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/utils.c:402
+#: src/utils.c:412
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr ""
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr ""
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr ""
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr ""
 
-#: src/utils.c:447
-msgid "Export"
+#: src/utils.c:459
+msgid "Chg View"
 msgstr ""
 
-#: src/utils.c:448
+#: src/utils.c:460
 msgid "Import"
 msgstr ""
 
-#: src/utils.c:449
-msgid "Add Item"
+#: src/utils.c:461
+msgid "Export"
 msgstr ""
 
-#: src/utils.c:450
-msgid "Del Item"
+#: src/utils.c:462
+msgid "Go to"
 msgstr ""
 
-#: src/utils.c:451
-msgid "Edit Itm"
+#: src/utils.c:463
+msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:452
-msgid "Flag Itm"
+#: src/utils.c:464
+msgid "Config"
 msgstr ""
 
-#: src/utils.c:453 src/utils.c:467
-msgid "-+1 Day"
+#: src/utils.c:465
+msgid "Redraw"
 msgstr ""
 
-#: src/utils.c:454 src/utils.c:468
-msgid "-+1 Week"
+#: src/utils.c:466
+msgid "Add Appt"
 msgstr ""
 
-#: src/utils.c:455
-msgid "Up/Down"
+#: src/utils.c:467
+msgid "Add Todo"
 msgstr ""
 
-#: src/utils.c:456
-msgid "Repeat"
+#: src/utils.c:468
+msgid "+1 Day"
 msgstr ""
 
-#: src/utils.c:457
-msgid "Priority"
+#: src/utils.c:469
+msgid "-1 Day"
 msgstr ""
 
-#: src/utils.c:458
-msgid "Chg View"
+#: src/utils.c:470
+msgid "+1 Week"
 msgstr ""
 
-#: src/utils.c:459
-msgid "Go to"
+#: src/utils.c:471
+msgid "-1 Week"
 msgstr ""
 
-#: src/utils.c:460
-msgid "Config"
+#: src/utils.c:472
+msgid "Today"
 msgstr ""
 
-#: src/utils.c:461
-msgid "View"
+#: src/utils.c:477
+msgid "beg Week"
 msgstr ""
 
-#: src/utils.c:462
-msgid "Redraw"
+#: src/utils.c:478
+msgid "end Week"
 msgstr ""
 
-#: src/utils.c:463
-msgid "Add Appt"
+#: src/utils.c:479
+msgid "Add Item"
 msgstr ""
 
-#: src/utils.c:464
-msgid "Add Todo"
+#: src/utils.c:480
+msgid "Del Item"
 msgstr ""
 
-#: src/utils.c:465
-msgid "EditNote"
+#: src/utils.c:481
+msgid "Edit Itm"
 msgstr ""
 
-#: src/utils.c:466
-msgid "ViewNote"
+#: src/utils.c:482
+msgid "View"
 msgstr ""
 
-#: src/utils.c:469
-msgid "OtherCmd"
+#: src/utils.c:483
+msgid "Flag Itm"
 msgstr ""
 
-#: src/utils.c:470
-msgid "Today"
+#: src/utils.c:484
+msgid "Repeat"
 msgstr ""
 
-#: src/utils.c:471
-msgid "beg Week"
+#: src/utils.c:485
+msgid "EditNote"
 msgstr ""
 
-#: src/utils.c:472
-msgid "end Week"
+#: src/utils.c:486
+msgid "ViewNote"
+msgstr ""
+
+#: src/utils.c:487
+msgid "Prio.+"
+msgstr ""
+
+#: src/utils.c:488
+msgid "Prio.-"
 msgstr ""
 
-#: src/utils.c:537
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr ""
 
-#: src/utils.c:612
+#: src/utils.c:609
 msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
 msgstr ""
 
-#: src/utils.c:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr ""
 
-#: src/utils.c:779
+#: src/utils.c:776
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr ""
 
-#: src/utils.c:849
+#: src/utils.c:846
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr ""
 
-#: src/utils.c:851
+#: src/utils.c:848
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr ""
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr ""
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr ""
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr ""
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:933
+#: src/utils.c:930
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr ""
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr ""
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr ""
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr ""
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr ""
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr ""
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr ""
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr ""
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr ""
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr ""
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr ""
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr ""
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr ""
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr ""
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr ""
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr ""
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr ""
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr ""
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr ""
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index a98c5fa..e4fc6a1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# 	$calcurse: de.po,v 1.19 2008/09/29 06:27:53 culot Exp $
+# 	$calcurse: de.po,v 1.20 2008/12/08 20:49:48 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-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: 2007-09-02 18:06+0200\n"
 "Last-Translator: Michael\n"
 "Language-Team:  Michael Schulz <bloodshower@freenet.de>\n"
@@ -18,58 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Geben Sie den Beginn ein ([SS:MM] oder [S:MM]), keine Eingabe für ein "
 "ganztägiges Ereignis:"
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Geben Sie das Ende ein ([SS:MM] oder [S:MM]) oder Dauer (in Minuten) :"
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr "Geben Sie eine Beschreibung ein :"
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Sie gaben einen ungültigen Startzeitpunkt an! Format [S:MM] oder [SS:MM]."
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 "Sie gaben einen ungültigen Endzeitpunkt an! Format [S:MM] oder [SS:MM] oder "
 "[MM]."
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr "[EINGABE]-Taste um fortzufahren"
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr "Möchten Sie wirklich diesen Eintrag löschen ?"
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "SCHWERER FEHLER in apoint_delete: Typ nicht gefunden\n"
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "SCHWERER FEHLER in apoint_scan: Termin hat fehlerhafte Zeit\n"
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "SCHWERER FEHLER in apoint_delete: Typ nicht gefunden\n"
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "SCHWERER FEHLER in apoint_delete_bynum: Termin nicht vorhanden"
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "SCHWERER FEHLER in apoint_switch_notify: Termin nicht vorhanden"
 
@@ -267,306 +267,374 @@ 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:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr "Aufgaben :"
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FEHLER in calendar_set_first_day_of week\n"
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr "[EINGABE]-Taste um fortzufahren"
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr ""
 "SCHWERER FEHLER in fill_config_var: falsches Format der "
 "Konfigurationsvariable.\n"
 
-#: src/custom.c:67
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "SCHWERER FEHLER in custom_load_color: falsche Farbennummer.\n"
 
-#: src/custom.c:69
+#: src/custom.c:71
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "SCHWERER FEHLER in custom_load_color: falscher Farbenname.\n"
 
-#: src/custom.c:71
+#: src/custom.c:73
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_color: falsches Format der "
 "Konfigurationsvariable.\n"
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "SCHWERER FEHLER in custom_load_color: keine Farben in der config-Datei "
 "gefunden.\n"
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr "Kann die Konfigurationsdatei nicht öffnen"
 
-#: src/custom.c:311
+#: src/custom.c:313
 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/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr "Allgemein"
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr "Farbe"
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr "Benachrichtigung"
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Wählen Sie das gewünschte Layout im nächsten Fenster [EINGABE]"
 
-#: src/custom.c:388
+#: src/custom.c:392
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('T'= Terminpanel, 'K'= Kalenderpanel, 'A'= Aufgabenpanel)"
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    TK       TA       KT       AT       AK       AT       KA       TA"
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]TA    [2]TK    [3]AT    [4]KT    [5]AT    [6]AK    [7]TA    [8]KA"
 
-#: src/custom.c:446
+#: src/custom.c:439
+msgid "Select"
+msgstr ""
+
+#: src/custom.c:440
+#, fuzzy
+msgid "No color"
+msgstr "Farbe"
+
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
+msgstr ""
+
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+#, fuzzy
+msgid "Down"
+msgstr "Auf/Ab"
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
+msgstr ""
+
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
+msgstr ""
+
+#: src/custom.c:469
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: src/custom.c:447
+#: src/custom.c:470
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/custom.c:448
+#: src/custom.c:471
 msgid "(terminal's default)"
 msgstr "(Standartwert des Terminals)"
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
-msgstr ""
-"Zum Auswählen bitte 'X' oder LEERTASTE, zum Bewegen bitte 'H/L' 'J/K' oder "
-"Pfeiltasten"
-
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
-msgstr "('0' für keine Farbe, 'Q' zum Beenden) :"
-
-#: src/custom.c:487
+#: src/custom.c:507
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | Farbwerte"
 
-#: src/custom.c:680
+#: src/custom.c:690
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "SCHWERER FEHLER in custom_color_theme_name: unbekannte Farbe\n"
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr "automatisches_speichern = "
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr "Beenden_bestätigen = "
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr "Löschen_bestätigen = "
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr "Systemdialoge_überspringen = "
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr "Fortschrittsanzeige_überspringen = "
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr "Wochenbeginn_am_Montag = "
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr ""
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr ""
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(ist JA gewählt, wird beim Beenden automatisch gespeichert)"
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr ""
 "(ist JA gewählt, ist eine Bestätigung erforderlich, um das Programm zu "
 "beenden)"
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr ""
 "(ist JA gewählt, ist eine Bestätigung erforderlich, um ein Ereignis zu "
 "löschen)"
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(ist JA gewählt, werden Mitteilungen über geladene und gespeicherte Daten "
 "nicht angezeigt)"
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 "(ist JA gewählt, wird der Fortschrittsbalken während des Speicherns der "
 "Daten nicht angezeigt.)"
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr "(ist JA gewählt, beginnt die Woche am Montag, ansonsten am Sonntag)"
 
-#: src/custom.c:763
+#: src/custom.c:776
 #, fuzzy
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr "(Datumsformatierung innerhalb der Benachrichtigungszeile.)"
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr ""
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr ""
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr ""
 "Bitte eine Optionsnummer eingeben, um den Wert zu ändern [Q um zu beenden]"
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr "Geben Sie das Datumsformat an (vgl. 'man 3 strftime')"
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr ""
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | allgemeine Optionen"
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+#, fuzzy
+msgid "Add key"
+msgstr "Neuer Eintrag"
+
+#: src/custom.c:972
+#, fuzzy
+msgid "Del key"
+msgstr "LöscheEintrag"
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, fuzzy, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr "CalCurse %s | allgemeine Optionen"
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, fuzzy, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "SCHWERER FEHLER in day_popup_item: unbekannter Eintragstyp\n"
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr "Ereignis :"
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr "Termin :"
 
-#: src/day.c:517
+#: src/day.c:518
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Neue Uhrzeit: ([SS:MM] oder [S:MM]):"
 
-#: src/day.c:519
+#: src/day.c:520
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Ungültige Zeitangabe! Verwenden Sie das folgende Format: [S:MM] oder [SS:MM]"
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr "Ungültige Zeitangabe: Der Startzeitpunkt muss vor dem Ende liegen!"
 
-#: src/day.c:585
+#: src/day.c:586
 msgid "Enter the new item description:"
 msgstr "Geben Sie eine neue Beschreibung ein:"
 
-#: src/day.c:597
+#: src/day.c:598
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Art der neuen Wiederholung: (D) täglich, (W)öchentlich, (M)onatlich, (Y) "
 "jährlich"
 
-#: src/day.c:599 src/recur.c:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr "[T/W/M/J]"
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 msgid "The frequence you entered is not valid."
 msgstr "Das eingegebene Intervall ist ungültig."
 
-#: src/day.c:602 src/recur.c:672
+#: src/day.c:603 src/recur.c:673
 msgid "The entered date is not valid."
 msgstr "Das eingegebene Datum ist ungültig."
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr "Geben Sie das neue Wiederholungsintervall an:"
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Bearbeite: (1)Beschreibung oder (2)Wiederholung?"
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr "Bearbeite: (1)Beginn (2)Ende (3)Beschreibung oder (4)Wiederholung?"
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Bearbeite: (1)Beginn (2)Ende oder (3)Beschreibung?"
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/day.c:819
+#: src/day.c:820
 #, fuzzy
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/day.c:821
+#: src/day.c:822
 #, fuzzy
 msgid "[i/n] "
 msgstr "[a/o]"
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr "[a/o]"
 
@@ -583,32 +651,35 @@ msgstr "SCHWERER FEHLER in recur_get_event: Eintrag nicht vorhanden\n"
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "SCHWERER FEHLER in event_delete_bynum: Ereignis nicht vorhanden\n"
 
-#: src/help.c:120
+#: src/help.c:149
 #, fuzzy, c-format
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hilfe"
 
-#: src/help.c:280
+#: src/help.c:313
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Willkommen zu Calcurse. Dies ist Hauptseite der Hilfe.\n"
 
-#: src/help.c:282
+#: src/help.c:315
+#, fuzzy, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
 "\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
 "\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
 "\n"
-"       Credits:  Press '@' for credits."
+"      Credits:  Press '%s' for credits."
 msgstr ""
 "     Navigieren:  Benutzen Sie STRG-P oder STRG-N um den Text in der Hilfe\n"
 "                  aufwärts oder abwärts zu bewegen, falls erforderlich.\n"
@@ -625,20 +696,22 @@ msgstr ""
 "\n"
 "        Autoren:  Betätigen Sie '@' um die Autoren von Calcurse zu sehen."
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+#, fuzzy
+msgid "Save\n"
 msgstr "Speichern:\n"
 
-#: src/help.c:297
+#: src/help.c:336
+#, fuzzy, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"The data is splitted into three different files which contain :\n"
-"\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
@@ -655,17 +728,17 @@ 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:307
+#: src/help.c:347
 #, fuzzy
-msgid "Import:\n"
+msgid "Import\n"
 msgstr "Exportieren:\n"
 
-#: src/help.c:309
+#: src/help.c:349
+#, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -681,17 +754,19 @@ msgid ""
 "the item could not be imported.\n"
 msgstr ""
 
-#: src/help.c:325
-msgid "Export:\n"
+#: src/help.c:365
+#, fuzzy
+msgid "Export\n"
 msgstr "Exportieren:\n"
 
-#: src/help.c:327
-#, fuzzy
+#: src/help.c:367
+#, fuzzy, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -703,8 +778,9 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 "Mit 'X' exportieren Sie die Calcurse Daten in das iCalendar-Format.\n"
 "\n"
@@ -717,61 +793,52 @@ msgstr ""
 "Alle calcurse Daten sind in folgender Anordung exportiert worden:\n"
 "Ereignisse, Termine, Aufgaben.\n"
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+#, fuzzy
+msgid "Displacement keys\n"
 msgstr "Navigations-Tasten:\n"
 
-#: src/help.c:342
-#, fuzzy
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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 ""
-"Sie können entweder die Tasten 'H','J','K','L' oder die Pfeiltasten \n"
-"'<','v','^',>'benutzen, um sich im Kalender zu bewegen.\n"
-"\n"
-"Das folgende Schema erläutert wie :\n"
-"\n"
-"                    zur vorigen Woche bewegen\n"
-"                              K ^  \n"
-"zum vorigen Tag bewegen  H <       > L   zum nächsten Tag bewegen\n"
-"                              J v  \n"
-"                    zur nächsten Woche bewegen\n"
-"\n"
-"Wenn das Terminpanel oder das Aufgabenpanel gewählt wurde, erlauben\n"
-"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:357
-msgid "View:\n"
+#: src/help.c:412
+#, fuzzy
+msgid "View\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:359
-#, fuzzy
+#: src/help.c:414
+#, fuzzy, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
@@ -789,22 +856,24 @@ msgstr ""
 "Betätigen Sie eine beliebige Taste um das Fenster zu schließen und zum\n"
 "Hauptfenster des Programms zurückzukehren."
 
-#: src/help.c:370
-msgid "Tab:\n"
+#: src/help.c:425
+#, fuzzy
+msgid "Tab\n"
 msgstr "Tabulator:\n"
 
-#: src/help.c:372
+#: src/help.c:427
+#, fuzzy, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 "Die 'Tab'-Taste erlaubt Ihnen zwischen den Panels zu wählen.\n"
@@ -822,21 +891,22 @@ msgstr ""
 "Aktionen\n"
 "auf dem gewählten Panel durchgeführt werden können."
 
-#: src/help.c:382
-msgid "Goto:\n"
+#: src/help.c:440
+#, fuzzy
+msgid "Goto\n"
 msgstr "Gehe zu:\n"
 
-#: src/help.c:384
-#, fuzzy
+#: src/help.c:442
+#, fuzzy, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', whatever panel is\n"
 "selected, will select current day in the calendar."
 msgstr ""
 "Die Taste 'G' erlaubt Ihnen, einen anzugebenden Tag im Kalender direkt "
@@ -848,13 +918,15 @@ msgstr ""
 "das aktuelle\n"
 "Systemdatum und wählt automatisch diesen Tag aus."
 
-#: src/help.c:392
-msgid "Delete:\n"
+#: src/help.c:451
+#, fuzzy
+msgid "Delete\n"
 msgstr "Löschen:\n"
 
-#: src/help.c:394
+#: src/help.c:453
+#, fuzzy, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -881,24 +953,25 @@ msgstr ""
 "Ihre vorgenommenen Veränderungen beim nächsten Start von Calcurse ver-\n"
 "lorengehen."
 
-#: src/help.c:406
-msgid "Add:\n"
+#: src/help.c:465
+#, fuzzy
+msgid "Add\n"
 msgstr "Hinzufügen:\n"
 
-#: src/help.c:408
-#, fuzzy
+#: src/help.c:467
+#, fuzzy, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -910,7 +983,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -957,14 +1030,15 @@ 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:438
-msgid "Edit Item:\n"
+#: src/help.c:502
+#, fuzzy
+msgid "Edit Item\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:440
-#, fuzzy
+#: src/help.c:504
+#, fuzzy, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -998,19 +1072,19 @@ msgstr ""
 "       o Vergessen Sie nicht zu speichern damit die vorgenommenen Ver-\n"
 "         änderungen beim nächsten Start von Calcurse erhalten bleiben."
 
-#: src/help.c:455
+#: src/help.c:519
 #, fuzzy
-msgid "EditNote:\n"
+msgid "EditNote\n"
 msgstr "Bearb. Eintrag\n"
 
-#: src/help.c:457
+#: src/help.c:521
+#, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -1026,46 +1100,50 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:476
+#: src/help.c:540
 #, fuzzy
-msgid "ViewNote:\n"
+msgid "ViewNote\n"
 msgstr "Ansicht:\n"
 
-#: src/help.c:478
+#: src/help.c:542
+#, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+#, fuzzy
+msgid "Priority\n"
 msgstr "Priorität:\n"
 
-#: src/help.c:495
+#: src/help.c:561
+#, fuzzy, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 "Drücken Sie '+' oder '-' um die Dringlichkeit des aktuell ausgewählten\n"
@@ -1083,16 +1161,19 @@ 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:509
-msgid "Repeat:\n"
+#: src/help.c:577
+#, fuzzy
+msgid "Repeat\n"
 msgstr "Wiederholen:\n"
 
-#: src/help.c:511
+#: src/help.c:579
+#, fuzzy, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -1149,14 +1230,15 @@ msgstr ""
 "         zeugen. Beispielsweise ist es möglich, nur ein einziges Vor-\n"
 "         kommen eines wiederkehrenden Eintrags zu löschen."
 
-#: src/help.c:535
-msgid "Flag Item:\n"
+#: src/help.c:604
+#, fuzzy
+msgid "Flag Item\n"
 msgstr "Zusatzsymbol\n"
 
-#: src/help.c:537
+#: src/help.c:606
+#, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -1165,24 +1247,25 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:545
-msgid "Config:\n"
+#: src/help.c:614
+#, fuzzy
+msgid "Config\n"
 msgstr "Einstellungen:\n"
 
-#: src/help.c:547
+#: src/help.c:616
+#, fuzzy, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
@@ -1205,30 +1288,29 @@ msgstr ""
 "Vergessen Sie bitte nicht Ihre Kalenderdaten abzuspeichern, um sie beim\n"
 "nächsten Start von Calcurse wieder zu erhalten."
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+#, fuzzy
+msgid "Generic keybindings\n"
 msgstr "Allgemeingültige Tasten:\n"
 
-#: src/help.c:560
-#, fuzzy
+#: src/help.c:631
+#, fuzzy, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : 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"
@@ -1249,17 +1331,19 @@ msgstr ""
 " '^K' : -1 Woche           -> Ansteuern der vorangegangen Woche\n"
 " '^J' : +1 Woche           -> Ansteuern der folgenden Woche"
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+#, fuzzy
+msgid "OtherCmd\n"
 msgstr "WeitereBefehle:\n"
 
-#: src/help.c:579
+#: src/help.c:656
+#, fuzzy, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 "Mit Hilfe der Taste 'O' kann zwischen den verschiedenen Hilfeseiten\n"
@@ -1270,13 +1354,14 @@ msgstr ""
 "Drücken Sie 'O' erneut sobald Sie die letzte Seite erreicht haben um\n"
 "wieder auf die erste Seite zu gelangen."
 
-#: src/help.c:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - textbasierender Terminkalender"
 
-#: src/help.c:588
-#, fuzzy
+#: src/help.c:667
+#, fuzzy, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -1309,712 +1394,780 @@ msgstr ""
 "Senden Sie Ihre Kritik oder Kommentare an : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr "Lade..."
 
-#: src/io.c:130
+#: src/io.c:143
 msgid "Exporting..."
 msgstr "Exportiere..."
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 msgid "Choose the file used to export calcurse data:"
 msgstr "Wählen Sie die Datei in die exportiert werden soll:"
 
-#: src/io.c:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 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:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 msgid "Press [ENTER] to continue."
 msgstr "[EINGABE] um fortzufahren."
 
-#: src/io.c:250
+#: src/io.c:273
 #, 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:289
+#: src/io.c:312
 #, fuzzy
 msgid "Week"
 msgstr "-/+ Woche"
 
-#: src/io.c:409
+#: src/io.c:432
 #, 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:545
+#: src/io.c:568
 #, 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:674
+#: src/io.c:699
 #, 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:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr "abbrechen...\n"
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s erfolgreich erzeugt\n"
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starte interaktiven Modus...\n"
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr "Probleme beim Zugriff auf Benutzerdaten ..."
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
 
-#: src/io.c:927
+#: src/io.c:963
 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:948
+#: src/io.c:984
 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:964
+#: src/io.c:1000
 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:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr "Aufgabendatei kann nicht geöffnet werden"
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+#, fuzzy
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+msgid "Key label not recognized"
+msgstr ""
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, 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:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Willkommen zu Calcurse. Nicht vorhandene Benutzerdaten werden erzeugt."
 
-#: src/io.c:1230
+#: src/io.c:1445
 msgid "Data files found. Data will be loaded now."
 msgstr "Benutzerdaten gefunden. Daten werden geladen."
 
-#: src/io.c:1250
+#: src/io.c:1465
 msgid "FATAL ERROR in io_export_data: wrong export mode\n"
 msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
 
-#: src/io.c:1251
+#: src/io.c:1466
 #, 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:1252
+#: src/io.c:1467
 msgid "The data were successfully exported"
 msgstr "Die Daten wurden erfolgreich exportiert"
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr ""
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr ""
 
-#: src/io.c:1364
+#: src/io.c:1580
 #, fuzzy
 msgid "ERROR in ical_log: unknown ical type"
 msgstr "SCHWERER FEHLER in day_popup_item: unbekannter Eintragstyp\n"
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr ""
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr ""
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr ""
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr ""
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr ""
 
-#: src/io.c:1991
+#: src/io.c:2207
 #, fuzzy
 msgid "could not get entire item description."
 msgstr "Geben Sie eine neue Beschreibung ein:"
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr ""
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr ""
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr ""
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr ""
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr ""
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 #, fuzzy
 msgid "could not retrieve item summary."
 msgstr "Geben Sie eine neue Beschreibung ein:"
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr ""
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr ""
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr ""
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr ""
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr ""
 
-#: src/io.c:2319
+#: src/io.c:2535
 #, fuzzy
 msgid "Enter the file name to import data from:"
 msgstr "Wählen Sie die Datei in die exportiert werden soll:"
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr ""
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr ""
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr ""
 
-#: src/io.c:2375
+#: src/io.c:2590
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr ""
 
-#: src/io.c:2388
+#: src/io.c:2603
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2684
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr ""
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
+#: src/io.c:2714
+msgid "No log file to display!"
 msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr ""
 
-#: src/notify.c:135
+#: src/notify.c:136
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/notify.c:138
+#: src/notify.c:139
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr "Benachrichtigungszeile_anzeigen = "
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr "Benachrichtigungszeile_Datum = "
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr "Benachrichtigungszeile_Uhrzeit = "
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr "Benachrichtigungszeile_Alarm = "
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr "Benachrichtigungszeile_Befehl = "
 
-#: src/notify.c:456
+#: src/notify.c:457
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(Ist JA gewählt, wird die Benachrichtigungszeile nicht angezeigt)"
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Datumsformatierung innerhalb der Benachrichtigungszeile.)"
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Uhrzeitformatierung innerhalb der Benachrichtigungszeile.)"
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "Nutzer auf einen Termin innerhalb der nächsten "
 "'Benachrichtigungszeile_Alarm' hinweisen"
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Befehl um Benutzer auf einen bevorstehenden Termin hinzuweisen)"
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr "Geben Sie das Zeitformat an (vgl. 'man 3 strftime')"
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 "Geben Sie die Anzahl der Sekunden ein (0, um keine Hinweis zu erhalten)."
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr "Geben Sie den Befehl für Ihre Notiz ein "
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | Optionen der Benachrichtigungszeile"
 
-#: src/recur.c:129
+#: src/recur.c:130
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "SCHWERER FEHLER in recur_def2char: unbekannter Typ\n"
 
-#: src/recur.c:161
+#: src/recur.c:162
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "SCHWERER FEHLER in recur_char2def: unbekanntes Zeichen\n"
 
-#: src/recur.c:297
+#: src/recur.c:298
 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:437
+#: src/recur.c:438
 msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
 msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
 
-#: src/recur.c:570
+#: src/recur.c:571
 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:642
+#: src/recur.c:643
 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:666
+#: src/recur.c:667
 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:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr "Geben Sie das Wiederholungsintervall an:"
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, 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:674
+#: src/recur.c:675
 #, 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:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
 
-#: src/recur.c:678
+#: src/recur.c:679
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
 
-#: src/recur.c:792
+#: src/recur.c:793
 msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
 msgstr "SCHWERER FEHLER in recur_repeat_item: falscher Eintragstyp\n"
 
-#: src/recur.c:821
+#: src/recur.c:822
 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:896
+#: src/recur.c:897
 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:920
+#: src/recur.c:921
 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:956
+#: src/recur.c:957
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr ""
 "SCHWERER FEHLER in recur_apoint_switch_notify: Eintrag nicht vorhanden\n"
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr "Geben Sie die neue Aufgabe ein : "
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr "Dringlichkeit der Aufgabe [1 (höchste) - 9 (niedrigste)] :"
 
-#: src/todo.c:192
+#: src/todo.c:193
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:201
+#: src/todo.c:202
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "SCHWERER FEHLER in todo_delete_bynum: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr "Möchten Sie wirklich diese Aufgabe löschen ?"
 
-#: src/todo.c:242
+#: src/todo.c:243
 #, fuzzy
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 "Es handelt sich um einen wiederkehrenden Termin. (a)lle Termine oder nur (o) "
 "diesen löschen ?"
 
-#: src/todo.c:244
+#: src/todo.c:245
 #, fuzzy
 msgid "[t/n] "
 msgstr "[a/o]"
 
-#: src/todo.c:328
+#: src/todo.c:329
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "SCHWERER FEHLER in todo_get_position: Aufgabe nicht gefunden\n"
 
-#: src/todo.c:360
+#: src/todo.c:361
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "SCHWERER FEHLER in todo_chg_priority: Aktion nicht gefunden\n"
 
-#: src/todo.c:375
+#: src/todo.c:376
 msgid "Enter the new ToDo description :"
 msgstr "Geben Sie die neue Beschreibung der Aufgabe ein: "
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr "INTERNER FEHLER"
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr "calcurse wird jetzt beendet..."
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr "Bitte den folgenden Programmfehler melden:"
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr "Eine beliebige Taste um fortzufahren..."
 
-#: src/utils.c:402
+#: src/utils.c:412
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "SCHWERER FEHLER in updatestring: Nicht genügend Speicher"
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr "Speichern"
 
-#: src/utils.c:447
-msgid "Export"
-msgstr "Exportieren"
+#: src/utils.c:459
+msgid "Chg View"
+msgstr "Ändere Ansicht"
 
-#: src/utils.c:448
+#: src/utils.c:460
 #, fuzzy
 msgid "Import"
 msgstr "Exportieren"
 
-#: src/utils.c:449
-msgid "Add Item"
-msgstr "Neuer Eintrag"
-
-#: src/utils.c:450
-msgid "Del Item"
-msgstr "LöscheEintrag"
-
-#: src/utils.c:451
-msgid "Edit Itm"
-msgstr "Bearb. Eintrag"
-
-#: src/utils.c:452
-msgid "Flag Itm"
-msgstr "Zusatzsymbol"
-
-#: src/utils.c:453 src/utils.c:467
-msgid "-+1 Day"
-msgstr "-/+1 Tag"
-
-#: src/utils.c:454 src/utils.c:468
-msgid "-+1 Week"
-msgstr "-/+ Woche"
-
-#: src/utils.c:455
-msgid "Up/Down"
-msgstr "Auf/Ab"
-
-#: src/utils.c:456
-msgid "Repeat"
-msgstr "Wiederholen"
-
-#: src/utils.c:457
-msgid "Priority"
-msgstr "Priorität"
-
-#: src/utils.c:458
-msgid "Chg View"
-msgstr "Ändere Ansicht"
+#: src/utils.c:461
+msgid "Export"
+msgstr "Exportieren"
 
-#: src/utils.c:459
+#: src/utils.c:462
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: src/utils.c:460
+#: src/utils.c:463
+msgid "OtherCmd"
+msgstr "Zus. Befehle"
+
+#: src/utils.c:464
 msgid "Config"
 msgstr "Einstellung"
 
-#: src/utils.c:461
-msgid "View"
-msgstr "Ansicht"
-
-#: src/utils.c:462
+#: src/utils.c:465
 msgid "Redraw"
 msgstr "Neu aufbauen"
 
-#: src/utils.c:463
+#: src/utils.c:466
 msgid "Add Appt"
 msgstr "Neuer Termin"
 
-#: src/utils.c:464
+#: src/utils.c:467
 msgid "Add Todo"
 msgstr "Neue Aufgabe"
 
-#: src/utils.c:465
-#, fuzzy
-msgid "EditNote"
-msgstr "Bearb. Eintrag\n"
-
-#: src/utils.c:466
+#: src/utils.c:468
 #, fuzzy
-msgid "ViewNote"
-msgstr "Ansicht"
+msgid "+1 Day"
+msgstr "-/+1 Tag"
 
 #: src/utils.c:469
-msgid "OtherCmd"
-msgstr "Zus. Befehle"
+#, fuzzy
+msgid "-1 Day"
+msgstr "-/+1 Tag"
 
 #: src/utils.c:470
+#, fuzzy
+msgid "+1 Week"
+msgstr "-/+ Woche"
+
+#: src/utils.c:471
+#, fuzzy
+msgid "-1 Week"
+msgstr "-/+ Woche"
+
+#: src/utils.c:472
 msgid "Today"
 msgstr ""
 
-#: src/utils.c:471
+#: src/utils.c:477
 #, fuzzy
 msgid "beg Week"
 msgstr "-/+ Woche"
 
-#: src/utils.c:472
+#: src/utils.c:478
 #, fuzzy
 msgid "end Week"
 msgstr "-/+ Woche"
 
-#: src/utils.c:537
+#: src/utils.c:479
+msgid "Add Item"
+msgstr "Neuer Eintrag"
+
+#: src/utils.c:480
+msgid "Del Item"
+msgstr "LöscheEintrag"
+
+#: src/utils.c:481
+msgid "Edit Itm"
+msgstr "Bearb. Eintrag"
+
+#: src/utils.c:482
+msgid "View"
+msgstr "Ansicht"
+
+#: src/utils.c:483
+msgid "Flag Itm"
+msgstr "Zusatzsymbol"
+
+#: src/utils.c:484
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#: src/utils.c:485
+#, fuzzy
+msgid "EditNote"
+msgstr "Bearb. Eintrag\n"
+
+#: src/utils.c:486
+#, fuzzy
+msgid "ViewNote"
+msgstr "Ansicht"
+
+#: src/utils.c:487
+msgid "Prio.+"
+msgstr ""
+
+#: src/utils.c:488
+msgid "Prio.-"
+msgstr ""
+
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
 
-#: src/utils.c:612
+#: src/utils.c:609
 #, fuzzy
 msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
 msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
 
-#: src/utils.c:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr "Termin"
 
-#: src/utils.c:779
+#: src/utils.c:776
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "SCHWERER FEHLER in other_status_page: unbekanntes Panel\n"
 
-#: src/utils.c:849
+#: src/utils.c:846
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/utils.c:851
+#: src/utils.c:848
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "SCHWERER FEHLER in updatestring: Nicht genügend Speicher"
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr "nein"
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Option nicht definiert - Problem in print_option_incolor()"
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:933
+#: src/utils.c:930
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausführen"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr "Januar"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr "Februar"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr "März"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr "April"
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr "Mai"
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr "Juni"
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr "Juli"
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr "August"
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr "September"
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr "Oktober"
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr "November"
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr "Dezember"
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr " So"
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr " Mo"
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr " Di"
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr " Mi"
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr " Do"
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr " Fr"
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr " Sa"
 
@@ -2038,6 +2191,54 @@ msgstr "Aufgaben"
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "SCHWERER FEHLER in wins_update: kein Fenster gewählt\n"
 
+#~ msgid ""
+#~ "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#~ msgstr ""
+#~ "Zum Auswählen bitte 'X' oder LEERTASTE, zum Bewegen bitte 'H/L' 'J/K' "
+#~ "oder Pfeiltasten"
+
+#~ msgid "('0' for no color, 'Q' to exit) :"
+#~ msgstr "('0' für keine Farbe, 'Q' zum Beenden) :"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              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 ""
+#~ "Sie können entweder die Tasten 'H','J','K','L' oder die Pfeiltasten \n"
+#~ "'<','v','^',>'benutzen, um sich im Kalender zu bewegen.\n"
+#~ "\n"
+#~ "Das folgende Schema erläutert wie :\n"
+#~ "\n"
+#~ "                    zur vorigen Woche bewegen\n"
+#~ "                              K ^  \n"
+#~ "zum vorigen Tag bewegen  H <       > L   zum nächsten Tag bewegen\n"
+#~ "                              J v  \n"
+#~ "                    zur nächsten Woche bewegen\n"
+#~ "\n"
+#~ "Wenn das Terminpanel oder das Aufgabenpanel gewählt wurde, erlauben\n"
+#~ "die Auf-und Abtasten (respektive K bzw. Pfeil auf und J bzw. Pfeil ab)\n"
+#~ "die Auswahl eines Eintrags aus dieser Liste."
+
+#~ msgid "Priority"
+#~ msgstr "Priorität"
+
 #~ msgid "CalCurse %s | help"
 #~ msgstr "Calcurse %s | Hilfe"
 
diff --git a/po/en.po b/po/en.po
index 6bbf5f7..9d9a3aa 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,17 +1,17 @@
-# 	$calcurse: en.po,v 1.14 2008/09/29 06:27:53 culot Exp $
+# 	$calcurse: en.po,v 1.15 2008/12/08 20:49:48 culot Exp $
 #
 # English/GB translation of calcurse.
 # Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
 # This file is distributed under the same license as the calcurse package.
 # Neil Williams <linux@codehelp.co.uk>, 2006.
 # , fuzzy
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.4\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: 2006-07-03 00:05+0100\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: English/GB <en_GB@li.org>\n"
@@ -19,56 +19,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr "Enter description :"
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr "Press [Enter] to continue"
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr "Do you really want to delete this item ?"
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "FATAL ERROR in apoint_scan: date error in the appointment\n"
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 #, fuzzy
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
@@ -240,292 +240,362 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Do you really want to quit ?"
 
-#: src/calcurse.c:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr "To do :"
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr "Press [ENTER] to continue"
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:67
+#: src/custom.c:69
 #, fuzzy
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:69
+#: src/custom.c:71
 #, fuzzy
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "FATAL ERROR in load_app: wrong format in the appointment or event\n"
 
-#: src/custom.c:71
+#: src/custom.c:73
 #, fuzzy
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr "Failed to open config file"
 
-#: src/custom.c:311
+#: src/custom.c:313
 #, fuzzy
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 
-#: src/custom.c:369 src/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr "Exit"
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr "General"
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr "Colour"
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr ""
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Pick the desired layout on next screen [press ENTER]"
 
-#: src/custom.c:388
+#: src/custom.c:392
 #, fuzzy
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)"
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr ""
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr ""
 
-#: src/custom.c:446
-msgid "Foreground"
+#: src/custom.c:439
+msgid "Select"
 msgstr ""
 
-#: src/custom.c:447
-msgid "Background"
+#: src/custom.c:440
+#, fuzzy
+msgid "No color"
+msgstr "Colour"
+
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
 msgstr ""
 
-#: src/custom.c:448
-msgid "(terminal's default)"
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+#, fuzzy
+msgid "Down"
+msgstr "Up/Down"
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
 msgstr ""
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
 msgstr ""
 
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
+#: src/custom.c:469
+msgid "Foreground"
+msgstr ""
+
+#: src/custom.c:470
+msgid "Background"
+msgstr ""
+
+#: src/custom.c:471
+msgid "(terminal's default)"
 msgstr ""
 
-#: src/custom.c:487
+#: src/custom.c:507
 #, fuzzy, c-format
 msgid "CalCurse %s | color theme"
 msgstr "CalCurse %s | help"
 
-#: src/custom.c:680
+#: src/custom.c:690
 #, fuzzy
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr "auto_save = "
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr "confirm_quit = "
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr "confirm_delete = "
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr "skip_system_dialogues = "
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr "skip_progress_bar = "
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr "week_begins_on_monday = "
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr ""
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr ""
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(if set to YES, automatic save is done when quitting)"
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(if set to YES, confirmation is required before quitting)"
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(if set to YES, confirmation is required before deleting an event)"
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr "(if set to YES, progress bar will not be displayed when saving data)"
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 "(if set to YES, monday is the first day of the week, otherwise it is sunday)"
 
-#: src/custom.c:763
+#: src/custom.c:776
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr ""
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr ""
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr ""
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Enter an option number to change its value [Q to quit] "
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr ""
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | general options"
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+#, fuzzy
+msgid "Add key"
+msgstr "Add Item"
+
+#: src/custom.c:972
+#, fuzzy
+msgid "Del key"
+msgstr "Del Item"
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, fuzzy, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr "CalCurse %s | general options"
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr ""
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 #, fuzzy
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr "Event :"
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr "Appointment :"
 
-#: src/day.c:517
+#: src/day.c:518
 #, fuzzy
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 
-#: src/day.c:519
+#: src/day.c:520
 #, fuzzy
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr ""
 
-#: src/day.c:585
+#: src/day.c:586
 #, fuzzy
 msgid "Enter the new item description:"
 msgstr "Enter description :"
 
-#: src/day.c:597
+#: src/day.c:598
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/day.c:599 src/recur.c:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr ""
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 #, fuzzy
 msgid "The frequence you entered is not valid."
 msgstr "The day you entered is not valid"
 
-#: src/day.c:602 src/recur.c:672
+#: src/day.c:603 src/recur.c:673
 #, fuzzy
 msgid "The entered date is not valid."
 msgstr "The day you entered is not valid"
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr ""
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr ""
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr ""
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 
-#: src/day.c:819
+#: src/day.c:820
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 
-#: src/day.c:821
+#: src/day.c:822
 msgid "[i/n] "
 msgstr ""
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr ""
 
@@ -542,32 +612,35 @@ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
 
-#: src/help.c:120
+#: src/help.c:149
 #, fuzzy, c-format
 msgid "Calcurse %s | help"
 msgstr "CalCurse %s | help"
 
-#: src/help.c:280
+#: src/help.c:313
 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:282
+#: src/help.c:315
+#, fuzzy, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
 "\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
 "\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
 "\n"
-"       Credits:  Press '@' for credits."
+"      Credits:  Press '%s' for credits."
 msgstr ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -585,21 +658,22 @@ msgstr ""
 "\n"
 "       Credits:  Press '@' for credits."
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+#, fuzzy
+msgid "Save\n"
 msgstr "Save:\n"
 
-#: src/help.c:297
-#, fuzzy
+#: src/help.c:336
+#, fuzzy, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
-"\n"
-"The data is splitted into three different files which contain :\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
@@ -616,16 +690,16 @@ msgstr ""
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
 
-#: src/help.c:307
-msgid "Import:\n"
+#: src/help.c:347
+msgid "Import\n"
 msgstr ""
 
-#: src/help.c:309
+#: src/help.c:349
+#, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -641,16 +715,19 @@ msgid ""
 "the item could not be imported.\n"
 msgstr ""
 
-#: src/help.c:325
-msgid "Export:\n"
-msgstr ""
+#: src/help.c:365
+#, fuzzy
+msgid "Export\n"
+msgstr "aborting...\n"
 
-#: src/help.c:327
+#: src/help.c:367
+#, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -662,65 +739,57 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+#, fuzzy
+msgid "Displacement keys\n"
 msgstr "Displacement keys:\n"
 
-#: src/help.c:342
-#, fuzzy
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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 ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              J v  \n"
-"                       move to next 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."
 
-#: src/help.c:357
-msgid "View:\n"
+#: src/help.c:412
+#, fuzzy
+msgid "View\n"
 msgstr "View:\n"
 
-#: src/help.c:359
-#, fuzzy
+#: src/help.c:414
+#, fuzzy, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
@@ -738,22 +807,24 @@ msgstr ""
 "Press any key to close the popup window and go back to the main\n"
 "Calcurse screen."
 
-#: src/help.c:370
-msgid "Tab:\n"
+#: src/help.c:425
+#, fuzzy
+msgid "Tab\n"
 msgstr "Tab:\n"
 
-#: src/help.c:372
+#: src/help.c:427
+#, fuzzy, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 "Pressing 'Tab' allows you to switch between panels.\n"
@@ -768,21 +839,22 @@ msgstr ""
 "change while pressing 'Tab', so you always know what action can be\n"
 "performed on the selected panel."
 
-#: src/help.c:382
-msgid "Goto:\n"
+#: src/help.c:440
+#, fuzzy
+msgid "Goto\n"
 msgstr "Goto:\n"
 
-#: src/help.c:384
-#, fuzzy
+#: src/help.c:442
+#, fuzzy, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', 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"
@@ -792,14 +864,15 @@ 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:392
-msgid "Delete:\n"
+#: src/help.c:451
+#, fuzzy
+msgid "Delete\n"
 msgstr "Delete:\n"
 
-#: src/help.c:394
-#, fuzzy
+#: src/help.c:453
+#, fuzzy, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -825,24 +898,25 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve the modifications\n"
 "next time you launch Calcurse."
 
-#: src/help.c:406
-msgid "Add:\n"
+#: src/help.c:465
+#, fuzzy
+msgid "Add\n"
 msgstr "Add:\n"
 
-#: src/help.c:408
-#, fuzzy
+#: src/help.c:467
+#, fuzzy, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -854,7 +928,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -898,14 +972,15 @@ msgstr ""
 "       o do not forget to save the calendar data to retrieve the new\n"
 "         event next time you launch Calcurse."
 
-#: src/help.c:438
+#: src/help.c:502
 #, fuzzy
-msgid "Edit Item:\n"
+msgid "Edit Item\n"
 msgstr "Add Item"
 
-#: src/help.c:440
+#: src/help.c:504
+#, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -922,19 +997,19 @@ msgid ""
 "       modified properties next time you launch Calcurse."
 msgstr ""
 
-#: src/help.c:455
+#: src/help.c:519
 #, fuzzy
-msgid "EditNote:\n"
+msgid "EditNote\n"
 msgstr "Add Item"
 
-#: src/help.c:457
+#: src/help.c:521
+#, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -950,60 +1025,65 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:476
+#: src/help.c:540
 #, fuzzy
-msgid "ViewNote:\n"
+msgid "ViewNote\n"
 msgstr "View:\n"
 
-#: src/help.c:478
+#: src/help.c:542
+#, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+msgid "Priority\n"
 msgstr ""
 
-#: src/help.c:495
+#: src/help.c:561
+#, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 
-#: src/help.c:509
+#: src/help.c:577
 #, fuzzy
-msgid "Repeat:\n"
+msgid "Repeat\n"
 msgstr "Redraw:\n"
 
-#: src/help.c:511
+#: src/help.c:579
+#, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -1029,15 +1109,15 @@ msgid ""
 "         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:535
+#: src/help.c:604
 #, fuzzy
-msgid "Flag Item:\n"
+msgid "Flag Item\n"
 msgstr "Add Item"
 
-#: src/help.c:537
+#: src/help.c:606
+#, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -1046,25 +1126,25 @@ msgid ""
 "and how long before it he gets notified."
 msgstr ""
 
-#: src/help.c:545
-msgid "Config:\n"
+#: src/help.c:614
+#, fuzzy
+msgid "Config\n"
 msgstr "Config:\n"
 
-#: src/help.c:547
-#, fuzzy
+#: src/help.c:616
+#, fuzzy, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
@@ -1083,52 +1163,53 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+msgid "Generic keybindings\n"
 msgstr ""
 
-#: src/help.c:560
+#: src/help.c:631
+#, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : Goto today      -> move to current day"
 msgstr ""
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+msgid "OtherCmd\n"
 msgstr ""
 
-#: src/help.c:579
+#: src/help.c:656
+#, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 
-#: src/help.c:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - text-based organizer"
 
-#: src/help.c:588
-#, fuzzy
+#: src/help.c:667
+#, fuzzy, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -1161,725 +1242,791 @@ msgstr ""
 "Send your feedback or comments to : calcurse@culot.org\n"
 "Calcurse home page : http://culot.org/calcurse"
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr "Saving..."
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr "Loading..."
 
-#: src/io.c:130
+#: src/io.c:143
 #, fuzzy
 msgid "Exporting..."
 msgstr "aborting...\n"
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 msgid "Choose the file used to export calcurse data:"
 msgstr ""
 
-#: src/io.c:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#: src/io.c:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 #, fuzzy
 msgid "Press [ENTER] to continue."
 msgstr "Press [ENTER] to continue"
 
-#: src/io.c:250
+#: src/io.c:273
 #, 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:289
+#: src/io.c:312
 #, fuzzy
 msgid "Week"
 msgstr "-/+1 Week"
 
-#: src/io.c:409
+#: src/io.c:432
 #, 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:545
+#: src/io.c:568
 #, 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:674
+#: src/io.c:699
 #, 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:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr "aborting...\n"
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s successfully created\n"
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starting interactive mode...\n"
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr "Problems accessing data file ..."
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr "The data files were successfully saved"
 
-#: src/io.c:927
+#: src/io.c:963
 #, 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:948
+#: src/io.c:984
 #, 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:964
+#: src/io.c:1000
 #, 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:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr "Failed to open todo file"
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+#, fuzzy
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+msgid "Key label not recognized"
+msgstr ""
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, 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:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welcome to Calcurse. Missing data files were created."
 
-#: src/io.c:1230
+#: src/io.c:1445
 msgid "Data files found. Data will be loaded now."
 msgstr "Data files found. Data will be loaded now."
 
-#: src/io.c:1250
+#: src/io.c:1465
 #, 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:1251
+#: src/io.c:1466
 #, 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:1252
+#: src/io.c:1467
 #, fuzzy
 msgid "The data were successfully exported"
 msgstr "The data files were successfully saved"
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr ""
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr ""
 
-#: src/io.c:1364
+#: src/io.c:1580
 #, fuzzy
 msgid "ERROR in ical_log: unknown ical type"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr ""
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr ""
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr ""
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr ""
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr ""
 
-#: src/io.c:1991
+#: src/io.c:2207
 #, fuzzy
 msgid "could not get entire item description."
 msgstr "Enter description :"
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr ""
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr ""
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr ""
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr ""
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr ""
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 #, fuzzy
 msgid "could not retrieve item summary."
 msgstr "Enter description :"
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr ""
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr ""
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr ""
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr ""
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr ""
 
-#: src/io.c:2319
+#: src/io.c:2535
 msgid "Enter the file name to import data from:"
 msgstr ""
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr ""
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr ""
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr ""
 
-#: src/io.c:2375
+#: src/io.c:2590
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr ""
 
-#: src/io.c:2388
+#: src/io.c:2603
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2684
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr ""
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
+#: src/io.c:2714
+msgid "No log file to display!"
 msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr ""
 
-#: src/notify.c:135
+#: src/notify.c:136
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/notify.c:138
+#: src/notify.c:139
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr ""
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr ""
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr ""
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr ""
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr ""
 
-#: src/notify.c:456
+#: src/notify.c:457
 #, fuzzy
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(if set to YES, progress bar will not be displayed when saving data)"
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr ""
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr ""
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr ""
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, fuzzy, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | general options"
 
-#: src/recur.c:129
+#: src/recur.c:130
 #, fuzzy
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:161
+#: src/recur.c:162
 #, fuzzy
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/recur.c:297
+#: src/recur.c:298
 #, fuzzy
 msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
 msgstr "FATAL ERROR in event_scan: date error in the event\n"
 
-#: src/recur.c:437
+#: src/recur.c:438
 #, 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:570
+#: src/recur.c:571
 #, 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:642
+#: src/recur.c:643
 #, 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:666
+#: src/recur.c:667
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, 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:674
+#: src/recur.c:675
 #, 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:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:678
+#: src/recur.c:679
 msgid "Sorry, the date you entered is older than the item start time."
 msgstr ""
 
-#: src/recur.c:792
+#: src/recur.c:793
 #, 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:821
+#: src/recur.c:822
 #, 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:896
+#: src/recur.c:897
 #, 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:920
+#: src/recur.c:921
 #, 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:956
+#: src/recur.c:957
 #, fuzzy
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr "Enter the new ToDo item : "
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 
-#: src/todo.c:192
+#: src/todo.c:193
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:201
+#: src/todo.c:202
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr "Do you really want to delete this task ?"
 
-#: src/todo.c:242
+#: src/todo.c:243
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 
-#: src/todo.c:244
+#: src/todo.c:245
 msgid "[t/n] "
 msgstr ""
 
-#: src/todo.c:328
+#: src/todo.c:329
 #, fuzzy
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:360
+#: src/todo.c:361
 #, fuzzy
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/todo.c:375
+#: src/todo.c:376
 #, fuzzy
 msgid "Enter the new ToDo description :"
 msgstr "Enter the new ToDo item : "
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr ""
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr ""
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr "Press any key to continue..."
 
-#: src/utils.c:402
+#: src/utils.c:412
 #, fuzzy
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr "Help"
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr "Quit"
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr "Save"
 
-#: src/utils.c:447
+#: src/utils.c:459
+msgid "Chg View"
+msgstr "Chg View"
+
+#: src/utils.c:460
+msgid "Import"
+msgstr ""
+
+#: src/utils.c:461
 msgid "Export"
 msgstr ""
 
-#: src/utils.c:448
-msgid "Import"
+#: src/utils.c:462
+#, fuzzy
+msgid "Go to"
+msgstr "Goto:\n"
+
+#: src/utils.c:463
+msgid "OtherCmd"
 msgstr ""
 
-#: src/utils.c:449
-msgid "Add Item"
-msgstr "Add Item"
+#: src/utils.c:464
+msgid "Config"
+msgstr "Config"
 
-#: src/utils.c:450
-msgid "Del Item"
-msgstr "Del Item"
+#: src/utils.c:465
+msgid "Redraw"
+msgstr "Redraw"
 
-#: src/utils.c:451
+#: src/utils.c:466
 #, fuzzy
-msgid "Edit Itm"
+msgid "Add Appt"
 msgstr "Add Item"
 
-#: src/utils.c:452
+#: src/utils.c:467
+msgid "Add Todo"
+msgstr ""
+
+#: src/utils.c:468
 #, fuzzy
-msgid "Flag Itm"
-msgstr "Del Item"
+msgid "+1 Day"
+msgstr "-/+1 Day"
 
-#: src/utils.c:453 src/utils.c:467
+#: src/utils.c:469
 #, fuzzy
-msgid "-+1 Day"
+msgid "-1 Day"
 msgstr "-/+1 Day"
 
-#: src/utils.c:454 src/utils.c:468
+#: src/utils.c:470
 #, fuzzy
-msgid "-+1 Week"
+msgid "+1 Week"
 msgstr "-/+1 Week"
 
-#: src/utils.c:455
-msgid "Up/Down"
-msgstr "Up/Down"
-
-#: src/utils.c:456
-msgid "Repeat"
-msgstr ""
+#: src/utils.c:471
+#, fuzzy
+msgid "-1 Week"
+msgstr "-/+1 Week"
 
-#: src/utils.c:457
-msgid "Priority"
+#: src/utils.c:472
+msgid "Today"
 msgstr ""
 
-#: src/utils.c:458
-msgid "Chg View"
-msgstr "Chg View"
+#: src/utils.c:477
+#, fuzzy
+msgid "beg Week"
+msgstr "-/+1 Week"
 
-#: src/utils.c:459
+#: src/utils.c:478
 #, fuzzy
-msgid "Go to"
-msgstr "Goto:\n"
+msgid "end Week"
+msgstr "-/+1 Week"
 
-#: src/utils.c:460
-msgid "Config"
-msgstr "Config"
+#: src/utils.c:479
+msgid "Add Item"
+msgstr "Add Item"
 
-#: src/utils.c:461
+#: src/utils.c:480
+msgid "Del Item"
+msgstr "Del Item"
+
+#: src/utils.c:481
+#, fuzzy
+msgid "Edit Itm"
+msgstr "Add Item"
+
+#: src/utils.c:482
 msgid "View"
 msgstr "View"
 
-#: src/utils.c:462
-msgid "Redraw"
-msgstr "Redraw"
-
-#: src/utils.c:463
+#: src/utils.c:483
 #, fuzzy
-msgid "Add Appt"
-msgstr "Add Item"
+msgid "Flag Itm"
+msgstr "Del Item"
 
-#: src/utils.c:464
-msgid "Add Todo"
+#: src/utils.c:484
+msgid "Repeat"
 msgstr ""
 
-#: src/utils.c:465
+#: src/utils.c:485
 #, fuzzy
 msgid "EditNote"
 msgstr "Add Item"
 
-#: src/utils.c:466
+#: src/utils.c:486
 #, fuzzy
 msgid "ViewNote"
 msgstr "View"
 
-#: src/utils.c:469
-msgid "OtherCmd"
+#: src/utils.c:487
+msgid "Prio.+"
 msgstr ""
 
-#: src/utils.c:470
-msgid "Today"
+#: src/utils.c:488
+msgid "Prio.-"
 msgstr ""
 
-#: src/utils.c:471
-#, fuzzy
-msgid "beg Week"
-msgstr "-/+1 Week"
-
-#: src/utils.c:472
-#, fuzzy
-msgid "end Week"
-msgstr "-/+1 Week"
-
-#: src/utils.c:537
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATAL ERROR in date2sec: failure in mktime\n"
 
-#: src/utils.c:612
+#: src/utils.c:609
 #, fuzzy
 msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
 msgstr "FATAL ERROR in date2sec: failure in mktime\n"
 
-#: src/utils.c:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr "Appointment"
 
-#: src/utils.c:779
+#: src/utils.c:776
 #, 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:849
+#: src/utils.c:846
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/utils.c:851
+#: src/utils.c:848
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr "yes"
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "option not defined - Problem in print_option_incolor()"
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:933
+#: src/utils.c:930
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr "January"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr "February"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr "March"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr "April"
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr "May"
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr "June"
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr "July"
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr "August"
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr "September"
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr "October"
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr "November"
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr "December"
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr "Sun"
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr "Mon"
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr "Tue"
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr "Wed"
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr "Thu"
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr "Fri"
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr "Sat"
 
@@ -1903,6 +2050,42 @@ msgstr "ToDo"
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              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 ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              J v  \n"
+#~ "                       move to next 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."
+
 #~ msgid "CalCurse %s | help"
 #~ msgstr "CalCurse %s | help"
 
diff --git a/po/es.po b/po/es.po
index 19638fd..ec37756 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# 	$calcurse: es.po,v 1.15 2008/09/29 06:27:53 culot Exp $
+# 	$calcurse: es.po,v 1.16 2008/12/08 20:49:48 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-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: 2006-09-10 08:06+0200\n"
 "Last-Translator: Jose Lopez <testinground@gmail.com>\n"
 "Language-Team: Jose Lopez <testinground@gmail.com>\n"
@@ -17,59 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "¿ Hora de inicio ? ([hh:mm]), ([h:mm]) o <ENTER> para un evento de todo el\n"
 "dia :"
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Introduce la hora final ([hh:mm]) o ([h:mm]) o duracion (en minutos) :"
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr "Introduce la descripcion :"
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr ""
 "Has introducido una fecha de inicio no valida, debe ser [h:mm] o [hh:mm]"
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 "Has introducido una hora final no valida, debe ser [h:mm] o [hh:mm] o [mm]"
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr "Pulsa [INTRO] para continuar"
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr "¿Seguro que quieres borrar este elemento?"
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "ERROR FATAL en del_item: no exite ese tipo\n"
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "ERROR FATAL en apoint_scan: error en la fecha de la cita\n"
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 #, fuzzy
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "ERROR FATAL en del_item: no exite ese tipo\n"
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 #, fuzzy
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "ERROR FATAL en apoint_delete_bynum: no existe la cita\n"
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 #, fuzzy
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "ERROR FATAL en apoint_switch_notify: no existe la cita\n"
@@ -268,300 +268,368 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "¿Estas seguro de que quieres salir?"
 
-#: src/calcurse.c:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr "Tareas pendientes :"
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr ""
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
 msgstr ""
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr "Pulsa [INTRO] para continuar"
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "ERROR FATAL en fill_config_var: formato de la variable erroneo.\n"
 
-#: src/custom.c:67
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "ERROR FATAL en custom_load_color: numero de color erroneo.\n"
 
-#: src/custom.c:69
+#: src/custom.c:71
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "ERROR FATAL en custom_load_color: nombre de color erroneo\n"
 
-#: src/custom.c:71
+#: src/custom.c:73
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color: formato de configuracion de la variable "
 "erroneo.\n"
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color : sin colores en el archivo de "
 "configuracion.\n"
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr "Fallo al abrir el fichero de configuradion (config)"
 
-#: src/custom.c:311
+#: src/custom.c:313
 msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
 msgstr ""
 "ERROR FATAL en custom_load_color: formato de configuracion de la variable "
 "erroneo.\n"
 
-#: src/custom.c:369 src/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr "Salir"
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr "General"
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr "Disposicion"
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr "Color"
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr "Notificaciones"
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Selecciona la disposicion deseada en la proxima pantalla [pulsa INTRO]"
 
-#: src/custom.c:388
+#: src/custom.c:392
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('E'= citas y Eventos, 'C'= Calendario, 'T'= Tareas pendientes)"
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    EC       ET       CE       TE       TC       TE       CT       ET"
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]ET    [2]EC     [3]TE   [4]CE    [5]TE    [6]TC    [7]ET    [8]CT"
 
-#: src/custom.c:446
+#: src/custom.c:439
+msgid "Select"
+msgstr ""
+
+#: src/custom.c:440
+#, fuzzy
+msgid "No color"
+msgstr "Color"
+
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
+msgstr ""
+
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+#, fuzzy
+msgid "Down"
+msgstr "Arriba/Abajo"
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
+msgstr ""
+
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
+msgstr ""
+
+#: src/custom.c:469
 msgid "Foreground"
 msgstr "Color del texto"
 
-#: src/custom.c:447
+#: src/custom.c:470
 msgid "Background"
 msgstr "Color del fondo"
 
-#: src/custom.c:448
+#: src/custom.c:471
 msgid "(terminal's default)"
 msgstr "(el del terminal por defecto)"
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
-msgstr ""
-"Usa 'X' o la barra espaciadora para seleccionar un color, 'H/L' 'J/K' o\n"
-"las teclas de las flechas para moverte"
-
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
-msgstr "('0' para no color, 'Q' para salir) :"
-
-#: src/custom.c:487
+#: src/custom.c:507
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | color del tema"
 
-#: src/custom.c:680
+#: src/custom.c:690
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr " auto_guardar = "
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr "confirmar_salir = "
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr "confirmar_borrar = "
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr "saltar_dialogos_sistema = "
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr "saltar_barra_progreso = "
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr "empezar_semana_en_lunes = "
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr ""
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr ""
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(si se fija en SI, se guardan automaticamente los datos al salir)"
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(si se fija en SI, se requiere confirmacion antes de salir)"
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(si se fija en SI, se requiere confirmacion antes de borrar un evento)"
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(si se fija en SI, no se mostraran los mensajes de carga y guardado de los "
 "datos)"
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr ""
 "(si se fija en SI, no se mostrara la barra de progreso al salvar los datos)"
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 "(si se fija en SI, el Lunes sera el primer dia de la semana, sino el Domingo)"
 
-#: src/custom.c:763
+#: src/custom.c:776
 #, fuzzy
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr "(Formato de la fecha dentro de la barra de notificaciones)"
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr ""
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr ""
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Introduce un numero para cambiar su valor [Q para salir] "
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 "Introduce el formato de la fecha (ver 'man 3 strftime' para los formatos\n"
 "posibles) "
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr ""
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "Calcurse %s | opciones generales"
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+#, fuzzy
+msgid "Add key"
+msgstr "Añadir elemento"
+
+#: src/custom.c:972
+#, fuzzy
+msgid "Del key"
+msgstr "Borrar elemento"
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, fuzzy, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr "Calcurse %s | opciones generales"
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, fuzzy, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr "Este elemento es ya un elemento repetido."
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "ERROR FATAL en day_popup_item:  no existe ese tipo\n"
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr "Evento :"
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr "Cita :"
 
-#: src/day.c:517
+#: src/day.c:518
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Introduce la nueva hora ([hh:mm] o [h:mm]) :"
 
-#: src/day.c:519
+#: src/day.c:520
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "Has introducido una hora no valida, debe ser [h:mm] o [hh:mm]"
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr "Hora no valida: La hora de inicio debe ser anterior a la hora final!"
 
-#: src/day.c:585
+#: src/day.c:586
 msgid "Enter the new item description:"
 msgstr "Introduce la descripcion del nuevo elemento:"
 
-#: src/day.c:597
+#: src/day.c:598
 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:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y] "
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 msgid "The frequence you entered is not valid."
 msgstr "La frecuencia que has introducido no es valida."
 
-#: src/day.c:602 src/recur.c:672
+#: src/day.c:603 src/recur.c:673
 msgid "The entered date is not valid."
 msgstr "La fecha introducida no es valida."
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr "Introduce la nueva frecuencia de repeticion:"
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Editar: (1)Descripcion o (2)Repeticion?"
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 "Editar: (1)Hora de inicio, (2)Hora final, (3)Descripcion o (4)Repeticion?"
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Editar: (1)Hora de inicio, (2)Hora final o (3)Descripcion?"
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/day.c:819
+#: src/day.c:820
 #, fuzzy
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/day.c:821
+#: src/day.c:822
 #, fuzzy
 msgid "[i/n] "
 msgstr "[a/o] "
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr "[a/o] "
 
@@ -578,32 +646,35 @@ msgstr "ERROR FATAL en recur_get_event: no existe el evento\n"
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "ERROR FATAL en event_delete_bynum: no existe ese tipo\n"
 
-#: src/help.c:120
+#: src/help.c:149
 #, fuzzy, c-format
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | ayuda"
 
-#: src/help.c:280
+#: src/help.c:313
 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:282
+#: src/help.c:315
+#, fuzzy, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
 "\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
 "\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
 "\n"
-"       Credits:  Press '@' for credits."
+"      Credits:  Press '%s' for credits."
 msgstr ""
 "Moviendote por la pantalla: Pulsa CTRL-P o CTRL-N para subir o bajar\n"
 "                            el texto dentro de las pantallas de ayuda\n"
@@ -627,20 +698,22 @@ msgstr ""
 "\n"
 "                  Creditos: Pulsa @ para ver los creditos."
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+#, fuzzy
+msgid "Save\n"
 msgstr "Guardar:\n"
 
-#: src/help.c:297
+#: src/help.c:336
+#, fuzzy, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
-"\n"
-"The data is splitted into three different files which contain :\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
@@ -657,17 +730,17 @@ msgstr ""
 "En el menu de configuracion, puedes elegir guardar los datos\n"
 "de Calcurse automaticamente antes de salir."
 
-#: src/help.c:307
+#: src/help.c:347
 #, fuzzy
-msgid "Import:\n"
+msgid "Import\n"
 msgstr "Exportar:\n"
 
-#: src/help.c:309
+#: src/help.c:349
+#, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -683,17 +756,19 @@ msgid ""
 "the item could not be imported.\n"
 msgstr ""
 
-#: src/help.c:325
-msgid "Export:\n"
+#: src/help.c:365
+#, fuzzy
+msgid "Export\n"
 msgstr "Exportar:\n"
 
-#: src/help.c:327
-#, fuzzy
+#: src/help.c:367
+#, fuzzy, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -705,8 +780,9 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 "Pulsando 'X' exportas los datos de Calcurse a formato iCalendar.\n"
 "\n"
@@ -718,61 +794,52 @@ msgstr ""
 "Todos los datos de Calcurse son exportados en el siguiente orden:\n"
 "eventos, citas y tareas pendientes.\n"
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+#, fuzzy
+msgid "Displacement keys\n"
 msgstr "Teclas de desplazamiento:\n"
 
-#: src/help.c:342
-#, fuzzy
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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 ""
-"Puedes usar 'H', 'J', 'K', 'L' o las teclas de las flechas '<','v','^','>'\n"
-"para moverte dentro del calendario.\n"
-"\n"
-"El siguiente esquema explica como :\n"
-"\n"
-"                      moverte a la semana anterior\n"
-"                              K ^\n"
-"  moverte al dia anterior  H <     > L  moverte al dia siguiente\n"
-"                              J v\n"
-"                      moverte a la semana siguiente\n"
-"\n"
-"Cuando esta seleccionado el panel de citas y eventos o el panel de tareas\n"
-"pendientes (respectivamente K o flecha arriba, y J o flecha abajo) te\n"
-"permite seleccionar un elemento de esas listas."
 
-#: src/help.c:357
-msgid "View:\n"
+#: src/help.c:412
+#, fuzzy
+msgid "View\n"
 msgstr "Ver:\n"
 
-#: src/help.c:359
-#, fuzzy
+#: src/help.c:414
+#, fuzzy, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
@@ -786,22 +853,24 @@ 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:370
-msgid "Tab:\n"
+#: src/help.c:425
+#, fuzzy
+msgid "Tab\n"
 msgstr "Tab:\n"
 
-#: src/help.c:372
+#: src/help.c:427
+#, fuzzy, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 "Pulsando 'Tab'(tabulador) te permite cambiar de un panel a otro.\n"
@@ -813,21 +882,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:382
-msgid "Goto:\n"
+#: src/help.c:440
+#, fuzzy
+msgid "Goto\n"
 msgstr "Ir a:\n"
 
-#: src/help.c:384
-#, fuzzy
+#: src/help.c:442
+#, fuzzy, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', 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"
@@ -837,13 +907,15 @@ msgstr ""
 "especificar una fecha, Calcurse comprueba la fecha actual del sistema y\n"
 "te llevara hasta esa fecha."
 
-#: src/help.c:392
-msgid "Delete:\n"
+#: src/help.c:451
+#, fuzzy
+msgid "Delete\n"
 msgstr "Borrar:\n"
 
-#: src/help.c:394
+#: src/help.c:453
+#, fuzzy, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -869,24 +941,25 @@ 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:406
-msgid "Add:\n"
+#: src/help.c:465
+#, fuzzy
+msgid "Add\n"
 msgstr "Añadir:\n"
 
-#: src/help.c:408
-#, fuzzy
+#: src/help.c:467
+#, fuzzy, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -898,7 +971,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -952,14 +1025,15 @@ msgstr ""
 "mantener\n"
 "         las modificaciones la proxima vez que inicies Calcurse."
 
-#: src/help.c:438
-msgid "Edit Item:\n"
+#: src/help.c:502
+#, fuzzy
+msgid "Edit Item\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:440
-#, fuzzy
+#: src/help.c:504
+#, fuzzy, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -993,19 +1067,19 @@ msgstr ""
 "propiedades\n"
 "         modificadas se muestren la proxima vez que arranques Calcurse."
 
-#: src/help.c:455
+#: src/help.c:519
 #, fuzzy
-msgid "EditNote:\n"
+msgid "EditNote\n"
 msgstr "Editar elemento:\n"
 
-#: src/help.c:457
+#: src/help.c:521
+#, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -1021,46 +1095,50 @@ msgid ""
 "of the highlighted item, meaning there is a note attached to it."
 msgstr ""
 
-#: src/help.c:476
+#: src/help.c:540
 #, fuzzy
-msgid "ViewNote:\n"
+msgid "ViewNote\n"
 msgstr "Ver:\n"
 
-#: src/help.c:478
+#: src/help.c:542
+#, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+#, fuzzy
+msgid "Priority\n"
 msgstr "Prioridad:\n"
 
-#: src/help.c:495
+#: src/help.c:561
+#, fuzzy, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 "Pulsando '+' o '-' te permite cambiar la prioridad del elemento actualemte\n"
@@ -1080,16 +1158,19 @@ msgstr ""
 "La posicion de la tarea puede tambien variar dependiendo de los elementos\n"
 "que tenga por debajo."
 
-#: src/help.c:509
-msgid "Repeat:\n"
+#: src/help.c:577
+#, fuzzy
+msgid "Repeat\n"
 msgstr "Repetir:\n"
 
-#: src/help.c:511
+#: src/help.c:579
+#, fuzzy, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -1144,14 +1225,15 @@ msgstr ""
 "          configuraciones complejas, de esta forma es posible borrar solo\n"
 "          una recurrencia o todo un elemento repetido."
 
-#: src/help.c:535
-msgid "Flag Item:\n"
+#: src/help.c:604
+#, fuzzy
+msgid "Flag Item\n"
 msgstr "Marcar elemento:\n"
 
-#: src/help.c:537
+#: src/help.c:606
+#, fuzzy, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -1168,24 +1250,25 @@ 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:545
-msgid "Config:\n"
+#: src/help.c:614
+#, fuzzy
+msgid "Config\n"
 msgstr "Config:\n"
 
-#: src/help.c:547
+#: src/help.c:616
+#, fuzzy, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
@@ -1210,30 +1293,29 @@ msgstr ""
 "No olvides guardar los datos del calendario para mantener tu configuracion\n"
 "la proxima vez que inicies Calcurse."
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+#, fuzzy
+msgid "Generic keybindings\n"
 msgstr "Teclas generales\n"
 
-#: src/help.c:560
-#, fuzzy
+#: src/help.c:631
+#, fuzzy, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : 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"
@@ -1253,17 +1335,19 @@ msgstr ""
 " '^K' : -1 Semana          -> moverte a la semana anterior\n"
 " '^J' : +1 Semana          -> moverte a la semana siguiente"
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+#, fuzzy
+msgid "OtherCmd\n"
 msgstr "Otros comandos\n"
 
-#: src/help.c:579
+#: src/help.c:656
+#, fuzzy, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 "Pulsando 'O' te permite navegar entre las paginas de ayuda de la barra\n"
@@ -1273,13 +1357,14 @@ msgstr ""
 "Una vez alcances la ultima pagina de la barra de estado, pulsa 'O' de nuevo\n"
 "para volver a la primera pagina."
 
-#: src/help.c:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - organizador basado en modo texto"
 
-#: src/help.c:588
-#, fuzzy
+#: src/help.c:667
+#, fuzzy, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -1313,716 +1398,784 @@ msgstr ""
 "Envia tus impresiones y comentarios a: calcurse@culot.org\n"
 "Pagina web de Calcurse : http://culot.org/calcurse"
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/io.c:130
+#: src/io.c:143
 msgid "Exporting..."
 msgstr "Exportando..."
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 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:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 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:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 msgid "Press [ENTER] to continue."
 msgstr "Pulsa [INTRO] para continuar."
 
-#: src/io.c:250
+#: src/io.c:273
 #, 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:289
+#: src/io.c:312
 #, fuzzy
 msgid "Week"
 msgstr "-+1 Semana"
 
-#: src/io.c:409
+#: src/io.c:432
 #, 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:545
+#: src/io.c:568
 #, 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:674
+#: src/io.c:699
 #, 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:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr "abortando...\n"
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s creado con exito\n"
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "arrancando modo interactivo...\n"
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr "Problemas al acceder al fichero de datos..."
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr "Los archivos de datos se han salvado con exito"
 
-#: src/io.c:927
+#: src/io.c:963
 #, 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:948
+#: src/io.c:984
 #, 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:964
+#: src/io.c:1000
 #, 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:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr "Fallo al abrir el archivo del ToDo"
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+#, fuzzy
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+msgid "Key label not recognized"
+msgstr ""
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, 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:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Bienvenid@ a Calcurse. Se crearon los archivos de datos que faltaban."
 
-#: src/io.c:1230
+#: src/io.c:1445
 msgid "Data files found. Data will be loaded now."
 msgstr "Archivos de datos encontrados. Ahora se cargaran los datos."
 
-#: src/io.c:1250
+#: src/io.c:1465
 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:1251
+#: src/io.c:1466
 #, 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:1252
+#: src/io.c:1467
 msgid "The data were successfully exported"
 msgstr "Los datos se han exportado correctamente"
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr ""
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr ""
 
-#: src/io.c:1364
+#: src/io.c:1580
 #, fuzzy
 msgid "ERROR in ical_log: unknown ical type"
 msgstr "ERROR FATAL en day_popup_item:  no existe ese tipo\n"
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr ""
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr ""
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr ""
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr ""
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr ""
 
-#: src/io.c:1991
+#: src/io.c:2207
 #, fuzzy
 msgid "could not get entire item description."
 msgstr "Introduce la descripcion del nuevo elemento:"
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr ""
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr ""
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr ""
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr ""
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr ""
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 #, fuzzy
 msgid "could not retrieve item summary."
 msgstr "Introduce la descripcion del nuevo elemento:"
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr ""
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr ""
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr ""
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr ""
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr ""
 
-#: src/io.c:2319
+#: src/io.c:2535
 #, fuzzy
 msgid "Enter the file name to import data from:"
 msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr ""
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr ""
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr ""
 
-#: src/io.c:2375
+#: src/io.c:2590
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr ""
 
-#: src/io.c:2388
+#: src/io.c:2603
 #, fuzzy
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2684
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr ""
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
+#: src/io.c:2714
+msgid "No log file to display!"
 msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr ""
 
-#: src/notify.c:135
+#: src/notify.c:136
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/notify.c:138
+#: src/notify.c:139
 #, fuzzy
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "ERROR FATAL in notify_launch_cmd: no se puede lanzar el comando\n"
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr "mostrar-barra-notificaciones = "
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr "fecha_barra-notificaciones = "
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr "hora_barra-notificaciones = "
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr "alarma_barra-notificaciones = "
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr "comando_barra-notificaciones = "
 
-#: src/notify.c:456
+#: src/notify.c:457
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(si se fija en SI, se mostrara la barra de notificaciones)"
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Formato de la fecha dentro de la barra de notificaciones)"
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Formato de la hora dentro de la barra de notificaciones)"
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "(Alarma de cita en los proximos 'alarma_barra-notificaciones' segundos)"
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Comando usado para notificar al usuario una cita proxima)"
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 "Introduce el formato de la hora (ver 'man 3 strftime' para los formatos\n"
 "posibles) "
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr ""
 "Introduce el numero de segundos (con 0 no se avisara antes de una cita)"
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr "Introduce el comando de notificacion"
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "Calcurse %s | opciones de la barra de notificaciones"
 
-#: src/recur.c:129
+#: src/recur.c:130
 #, fuzzy
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
 
-#: src/recur.c:161
+#: src/recur.c:162
 #, fuzzy
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
 
-#: src/recur.c:297
+#: src/recur.c:298
 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:437
+#: src/recur.c:438
 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:570
+#: src/recur.c:571
 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:642
+#: src/recur.c:643
 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:666
+#: src/recur.c:667
 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:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr "Introduce la frecuencia de repeticion:"
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, 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:674
+#: src/recur.c:675
 #, 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:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr "Este elemento es ya un elemento repetido."
 
-#: src/recur.c:678
+#: src/recur.c:679
 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:792
+#: src/recur.c:793
 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:821
+#: src/recur.c:822
 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:896
+#: src/recur.c:897
 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:920
+#: src/recur.c:921
 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:956
+#: src/recur.c:957
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "ERROR FATAL en recur_apoint_switch_notify: no existe el elemento\n"
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr "Introduce una nueva tarea pendiente :"
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr ""
 "Introduce la prioridad de la tarea [1 (la mas alta) - 9 (la mas baja)] :"
 
-#: src/todo.c:192
+#: src/todo.c:193
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:201
+#: src/todo.c:202
 #, fuzzy
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "ERROR FATAL en todo_delete_bynum: no existe esa tarea\n"
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr "¿Seguro que quieres borrar esta tarea ?"
 
-#: src/todo.c:242
+#: src/todo.c:243
 #, fuzzy
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 "Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
 "(o) ?"
 
-#: src/todo.c:244
+#: src/todo.c:245
 #, fuzzy
 msgid "[t/n] "
 msgstr "[a/o] "
 
-#: src/todo.c:328
+#: src/todo.c:329
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "ERROR FATAL en todo_get_position: tarea no encontrada\n"
 
-#: src/todo.c:360
+#: src/todo.c:361
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "ERROR FATAL en todo_chg_priority: no existe esa accion\n"
 
-#: src/todo.c:375
+#: src/todo.c:376
 msgid "Enter the new ToDo description :"
 msgstr "Introduce la descripcion de la nueva tarea :"
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr ""
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr ""
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr ""
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr "Pulsa cualquier tecla para continuar..."
 
-#: src/utils.c:402
+#: src/utils.c:412
 #, fuzzy
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr "Salir"
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr "Guardar"
 
-#: src/utils.c:447
-msgid "Export"
-msgstr "Exportar"
+#: src/utils.c:459
+msgid "Chg View"
+msgstr "Cambiar vista"
 
-#: src/utils.c:448
+#: src/utils.c:460
 #, fuzzy
 msgid "Import"
 msgstr "Exportar"
 
-#: src/utils.c:449
-msgid "Add Item"
-msgstr "Añadir elemento"
-
-#: src/utils.c:450
-msgid "Del Item"
-msgstr "Borrar elemento"
-
-#: src/utils.c:451
-msgid "Edit Itm"
-msgstr "Editar elemento"
-
-#: src/utils.c:452
-msgid "Flag Itm"
-msgstr "Marcar elemento"
-
-#: src/utils.c:453 src/utils.c:467
-msgid "-+1 Day"
-msgstr "-+1 Dia"
-
-#: src/utils.c:454 src/utils.c:468
-msgid "-+1 Week"
-msgstr "-+1 Semana"
-
-#: src/utils.c:455
-msgid "Up/Down"
-msgstr "Arriba/Abajo"
-
-#: src/utils.c:456
-msgid "Repeat"
-msgstr "Repetir"
-
-#: src/utils.c:457
-msgid "Priority"
-msgstr "Prioridad"
-
-#: src/utils.c:458
-msgid "Chg View"
-msgstr "Cambiar vista"
+#: src/utils.c:461
+msgid "Export"
+msgstr "Exportar"
 
-#: src/utils.c:459
+#: src/utils.c:462
 msgid "Go to"
 msgstr "Ir a"
 
-#: src/utils.c:460
+#: src/utils.c:463
+msgid "OtherCmd"
+msgstr "Otros comandos"
+
+#: src/utils.c:464
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:461
-msgid "View"
-msgstr "Vista"
-
-#: src/utils.c:462
+#: src/utils.c:465
 msgid "Redraw"
 msgstr "Redibujar"
 
-#: src/utils.c:463
+#: src/utils.c:466
 msgid "Add Appt"
 msgstr "Añadir Cita"
 
-#: src/utils.c:464
+#: src/utils.c:467
 msgid "Add Todo"
 msgstr "Añadir tarea"
 
-#: src/utils.c:465
+#: src/utils.c:468
 #, fuzzy
-msgid "EditNote"
-msgstr "Editar elemento:\n"
-
-#: src/utils.c:466
-#, fuzzy
-msgid "ViewNote"
-msgstr "Vista"
+msgid "+1 Day"
+msgstr "-+1 Dia"
 
 #: src/utils.c:469
-msgid "OtherCmd"
-msgstr "Otros comandos"
+#, fuzzy
+msgid "-1 Day"
+msgstr "-+1 Dia"
 
 #: src/utils.c:470
+#, fuzzy
+msgid "+1 Week"
+msgstr "-+1 Semana"
+
+#: src/utils.c:471
+#, fuzzy
+msgid "-1 Week"
+msgstr "-+1 Semana"
+
+#: src/utils.c:472
 msgid "Today"
 msgstr ""
 
-#: src/utils.c:471
+#: src/utils.c:477
 #, fuzzy
 msgid "beg Week"
 msgstr "-+1 Semana"
 
-#: src/utils.c:472
+#: src/utils.c:478
 #, fuzzy
 msgid "end Week"
 msgstr "-+1 Semana"
 
-#: src/utils.c:537
+#: src/utils.c:479
+msgid "Add Item"
+msgstr "Añadir elemento"
+
+#: src/utils.c:480
+msgid "Del Item"
+msgstr "Borrar elemento"
+
+#: src/utils.c:481
+msgid "Edit Itm"
+msgstr "Editar elemento"
+
+#: src/utils.c:482
+msgid "View"
+msgstr "Vista"
+
+#: src/utils.c:483
+msgid "Flag Itm"
+msgstr "Marcar elemento"
+
+#: src/utils.c:484
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/utils.c:485
+#, fuzzy
+msgid "EditNote"
+msgstr "Editar elemento:\n"
+
+#: src/utils.c:486
+#, fuzzy
+msgid "ViewNote"
+msgstr "Vista"
+
+#: src/utils.c:487
+msgid "Prio.+"
+msgstr ""
+
+#: src/utils.c:488
+msgid "Prio.-"
+msgstr ""
+
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
 
-#: src/utils.c:612
+#: src/utils.c:609
 #, fuzzy
 msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
 msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
 
-#: src/utils.c:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr "Cita"
 
-#: src/utils.c:779
+#: src/utils.c:776
 #, 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:849
+#: src/utils.c:846
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/utils.c:851
+#: src/utils.c:848
 #, fuzzy
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr "si"
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr "no"
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "opcion no definida - Problema en print_option_incolor()"
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr ""
 
-#: src/utils.c:933
+#: src/utils.c:930
 #, fuzzy
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr "Enero"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr "Febrero"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr "Marzo"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr "Abril"
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr "Mayo"
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr "Junio"
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr "Julio"
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr "Agosto"
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr "Septiembre"
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr "Octubre"
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr "Noviembre"
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr "Diciembre"
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr "Dom"
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr "Lun"
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr "Mar"
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr "Mie"
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr "Jue"
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr "Vie"
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr "Sab"
 
@@ -2046,6 +2199,56 @@ msgstr "Tareas pendientes"
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "ERROR FATAL en update_windows: no hay ventana seleccionada\n"
 
+#~ msgid ""
+#~ "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#~ msgstr ""
+#~ "Usa 'X' o la barra espaciadora para seleccionar un color, 'H/L' 'J/K' o\n"
+#~ "las teclas de las flechas para moverte"
+
+#~ msgid "('0' for no color, 'Q' to exit) :"
+#~ msgstr "('0' para no color, 'Q' para salir) :"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              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 ""
+#~ "Puedes usar 'H', 'J', 'K', 'L' o las teclas de las flechas "
+#~ "'<','v','^','>'\n"
+#~ "para moverte dentro del calendario.\n"
+#~ "\n"
+#~ "El siguiente esquema explica como :\n"
+#~ "\n"
+#~ "                      moverte a la semana anterior\n"
+#~ "                              K ^\n"
+#~ "  moverte al dia anterior  H <     > L  moverte al dia siguiente\n"
+#~ "                              J v\n"
+#~ "                      moverte a la semana siguiente\n"
+#~ "\n"
+#~ "Cuando esta seleccionado el panel de citas y eventos o el panel de "
+#~ "tareas\n"
+#~ "pendientes (respectivamente K o flecha arriba, y J o flecha abajo) te\n"
+#~ "permite seleccionar un elemento de esas listas."
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
 #~ msgid "CalCurse %s | help"
 #~ msgstr "Calcurse %s | ayuda"
 
diff --git a/po/fr.po b/po/fr.po
index cab3bd7..c0d6e6c 100755
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,15 +1,15 @@
-# 	$calcurse: fr.po,v 1.25 2008/09/29 06:27:53 culot Exp $
+# 	$calcurse: fr.po,v 1.26 2008/12/08 20:49:48 culot Exp $
 #
 # French translations for calcurse package.
 # Copyright (C) 2004-2008 Frederic Culot <frederic@culot.org>
 # This file is distributed under the same license as the calcurse package.
 # Frederic Culot <frederic@culot.org>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 2.1\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: 2008-09-23 19:21+0200\n"
 "Last-Translator: Frederic Culot <frederic@culot.org>\n"
 "Language-Team: French <calcurse-i18n@culot.org>\n"
@@ -18,56 +18,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Entrez l'heure de début ([hh:mm] ou [h:mm]), laissez vide pour toute la "
 "journée:"
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Entrez l'heure de fin ([hh:mm] ou [h:mm]) ou la durée (en minutes):"
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr "Entrez la description :"
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr "Erreur dans le format de l'heure de début: doit être [h:mm] ou [hh:mm]"
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr ""
 "Erreur dans le format de l'heure de fin: doit être [h:mm] ou [hh:mm] ou [mm]"
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr "Appuyez sur [ENTREE] pour continuer"
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr "Voulez-vous vraiment effacer cet élement ?"
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "ERREUR FATALE dans apoint_delete: type inconnu\n"
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr ""
 "ERREUR FATALE dans apoint_scan: un rendez-vous contient une date erronée\n"
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "ERREUR FATALE dans apoint_get: element inconnu\n"
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "ERREUR FATALE dans apoint_delete_bynum: l'élement n'existe pas"
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "ERREUR FATALE dans apoint_switch_notify: l'élement n'existe pas"
 
@@ -287,15 +287,15 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Voulez-vous vraiment quitter ?"
 
-#: src/calcurse.c:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr "Tâche :"
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "ERREUR dans calendar_set_first_day_of_week\n"
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
@@ -303,282 +303,350 @@ msgstr ""
 "Le jour entré est invalide (il devrait être entre le 01/01/1902 et\n"
 "le 31/12/2037)"
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr "Appuyez sur [ENTREE] pour continuer"
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr ""
 "ERREUR FATALE dans fill_config_var: mauvais format dans la variable de "
 "configuration.\n"
 
-#: src/custom.c:67
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "ERREUR FATALE dans custom_load_color: mauvais numéro de couleur.\n"
 
-#: src/custom.c:69
+#: src/custom.c:71
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "ERREUR FATALE dans custom_load_color: mauvais nom de couleur.\n"
 
-#: src/custom.c:71
+#: src/custom.c:73
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "ERREUR FATALE dans custom_load_color: mauvais format dans la variable de "
 "configuration.\n"
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr "ERREUR FATALE dans custom_load_color: couleur non trouvée.\n"
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr "Impossible d'ouvrir le fichier de configuration"
 
-#: src/custom.c:311
+#: src/custom.c:313
 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/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr "Général"
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr "Ecran"
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr "Couleur"
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr "Notifier"
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Choisissez la disposition voulue dans l'écran suivant [pressez ENTREE]"
 
-#: src/custom.c:388
+#: src/custom.c:392
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr ""
 "('R'= panneau Rendez-vous, 'C'= panneau Calendrier, 'T'= panneau Tâches)"
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    RC       RT       CR       TR       TC       TR       CT       RT"
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]RT    [2]RC    [3]TR    [4]CR    [5]TR    [6]TC    [7]RT    [8]CT"
 
-#: src/custom.c:446
+#: src/custom.c:439
+msgid "Select"
+msgstr ""
+
+#: src/custom.c:440
+#, fuzzy
+msgid "No color"
+msgstr "Couleur"
+
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
+msgstr ""
+
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+#, fuzzy
+msgid "Down"
+msgstr "Haut/Bas"
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
+msgstr ""
+
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
+msgstr ""
+
+#: src/custom.c:469
 msgid "Foreground"
 msgstr "Avant plan"
 
-#: src/custom.c:447
+#: src/custom.c:470
 msgid "Background"
 msgstr "Arrière plan"
 
-#: src/custom.c:448
+#: src/custom.c:471
 msgid "(terminal's default)"
 msgstr "(couleur du terminal)"
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
-msgstr ""
-"Tapez 'X' ou ESPACE pour sélectionner, 'H/L' 'J/K' ou les flèches pour se "
-"déplacer"
-
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
-msgstr "('0' pour noir et blanc"
-
-#: src/custom.c:487
+#: src/custom.c:507
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | thème graphique"
 
-#: src/custom.c:680
+#: src/custom.c:690
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "ERREUR FATALE dans custom_color_theme_name: couleur inconnue\n"
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr "sauvegarde_automatique = "
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr "confirmer_pour_quitter = "
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr "confirmer_pour_effacer = "
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr "masquer_messages_système = "
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr "masquer_barre_progression = "
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr "semaine_commence_lundi = "
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr "format_date_sortie ="
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr "format_date_entrée"
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr ""
 "(si fixé à OUI, une sauvegarde est automatiquement effectuée en quittant)"
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(si fixé à OUI, il est nécessaire de confirmer pour quitter)"
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr ""
 "(si fixé à OUI, il est nécessaire de confirmer pour effacer un élement)"
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr "(si fixé à OUI, les messages d'accès fichiers ne seront pas affichés)"
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr "(si fixé à OUI, la barre ne sera pas affichée lors des sauvegardes)"
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr ""
 "(si fixé à OUI, la semaine débute le lundi, sinon elle débute le dimanche)"
 
-#: src/custom.c:763
+#: src/custom.c:776
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr "(Format de la date à afficher en mode non-intéractif)"
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr "(Format à utiliser pour entrer une date: "
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr "1-mm/jj/aaaa, 2-jj/mm/aaaa, 3-aaaa/mm/jj)"
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Entrez un numéro d'option pour changer sa valeur [Q pour quitter] "
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 "Entrez le format de la date (voir 'man 3 strftime' pour les formats "
 "possibles)"
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr "Entrez le format de date (1-mm/jj/aaaa, 2-jj/mm/aaaa, 3-aaaa/mm/jj) "
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | options générales"
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+#, fuzzy
+msgid "Add key"
+msgstr "Ajouter"
+
+#: src/custom.c:972
+#, fuzzy
+msgid "Del key"
+msgstr "Effacer"
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, fuzzy, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr "CalCurse %s | options générales"
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, fuzzy, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr "Cet élément est déjà recurrent."
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr "Evénement :"
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr "Rendez-vous :"
 
-#: src/day.c:517
+#: src/day.c:518
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Entrez la nouvelle heure de fin ([hh:mm] ou [h:mm]) :"
 
-#: src/day.c:519
+#: src/day.c:520
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "Erreur dans le format de l'heure: devrait être [h:mm] ou [hh:mm]"
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr ""
 "Entrée invalide: l'heure de début doit être antérieure à l'heure de fin!"
 
-#: src/day.c:585
+#: src/day.c:586
 msgid "Enter the new item description:"
 msgstr "Entrez la nouvelle description :"
 
-#: src/day.c:597
+#: src/day.c:598
 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:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y] "
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 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:672
+#: src/day.c:603 src/recur.c:673
 msgid "The entered date is not valid."
 msgstr "Le jour que vous avez entré n'est pas valide."
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr "Entrez la nouvelle fréquence de répétition:"
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Editer: (1)description ou (2)répétition?"
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr ""
 "Editer: (1)heure de début, (2)heure de fin, (3)description ou (4)répétition?"
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Editer: (1)heure de début, (2)heure de fin ou (3)description?"
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Cet élément est récurrent. Effacer (a) toutes les occurences ou (o) celle-"
 "ci ?"
 
-#: src/day.c:819
+#: src/day.c:820
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Une note est associée à cet élement. Effacer (i) l'élement ou (n) la note ?"
 
-#: src/day.c:821
+#: src/day.c:822
 msgid "[i/n] "
 msgstr "[i/n]"
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr "[a/o]"
 
@@ -594,32 +662,35 @@ msgstr "ERREUR FATALE dans event_get: aucun évenement correspondant\n"
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "ERREUR FATALE dans event_delete_bynum: aucun évenement correspondant\n"
 
-#: src/help.c:120
+#: src/help.c:149
 #, c-format
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | aide"
 
-#: src/help.c:280
+#: src/help.c:313
 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:282
+#: src/help.c:315
+#, fuzzy, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
-"\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
-"\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
-"\n"
-"       Credits:  Press '@' for credits."
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
+"\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
+"\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
+"\n"
+"      Credits:  Press '%s' for credits."
 msgstr ""
 "     Se déplacer:  Appuyez sur CTRL-P ou CTRL-N pour déplacer le texte \n"
 "                   vers le haut ou le bas à l'intérieur des écrans \n"
@@ -640,20 +711,22 @@ msgstr ""
 "         Auteurs:  Appuyez sur '@' pour obtenir l'écran présentant les \n"
 "                   auteurs de Calcurse."
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+#, fuzzy
+msgid "Save\n"
 msgstr "Sauvegarde:\n"
 
-#: src/help.c:297
+#: src/help.c:336
+#, fuzzy, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
-"\n"
-"The data is splitted into three different files which contain :\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
@@ -670,16 +743,17 @@ msgstr ""
 "Dans le menu de configuration, vous pouvez choisir de sauvegarder les\n"
 "données automatiquement avant de quitter."
 
-#: src/help.c:307
-msgid "Import:\n"
+#: src/help.c:347
+#, fuzzy
+msgid "Import\n"
 msgstr "Importer:\n"
 
-#: src/help.c:309
+#: src/help.c:349
+#, fuzzy, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -713,16 +787,19 @@ msgstr ""
 "trouver l'élément dans le fichier donné en entrée, ainsi que la\n"
 "description du problème qui a empeché l'import de cet élément.\n"
 
-#: src/help.c:325
-msgid "Export:\n"
+#: src/help.c:365
+#, fuzzy
+msgid "Export\n"
 msgstr "Exporter:\n"
 
-#: src/help.c:327
+#: src/help.c:367
+#, fuzzy, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -734,8 +811,9 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 "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"
@@ -756,63 +834,52 @@ msgstr ""
 "Toutes les données utilisateurs seront exportées, dans l'ordre suivant:\n"
 "évenements, rendez-vous, tâches.\n"
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+#, fuzzy
+msgid "Displacement keys\n"
 msgstr "Touches de déplacement:\n"
 
-#: src/help.c:342
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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 ""
-"Vous pouvez utiliser soit 'H','J','K','L', soit les touches fléchées\n"
-"'<','v','^',>' pour vous déplacer dans le calendrier.\n"
-"\n"
-"Le schéma suivant explique comment :\n"
-"\n"
-"                 aller à la semaine précédente\n"
-"                              K ^  \n"
-"aller au jour précédent  H <       > L   aller au jour suivant\n"
-"                              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:357
-msgid "View:\n"
+#: src/help.c:412
+#, fuzzy
+msgid "View\n"
 msgstr "Visualiser:\n"
 
-#: src/help.c:359
+#: src/help.c:414
+#, fuzzy, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
@@ -831,22 +898,24 @@ msgstr ""
 "la description de l'élément et revenir à l'affichage principal de\n"
 "Calcurse."
 
-#: src/help.c:370
-msgid "Tab:\n"
+#: src/help.c:425
+#, fuzzy
+msgid "Tab\n"
 msgstr "Tabulation:\n"
 
-#: src/help.c:372
+#: src/help.c:427
+#, fuzzy, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 "Appuyer sur 'Tab' permet de sélectionner circulairement un des\n"
@@ -865,20 +934,22 @@ msgstr ""
 "toujours savoir quelles actions sont accessibles à partir du\n"
 "panneau actuellement sélectionné."
 
-#: src/help.c:382
-msgid "Goto:\n"
+#: src/help.c:440
+#, fuzzy
+msgid "Goto\n"
 msgstr "Aller à:\n"
 
-#: src/help.c:384
+#: src/help.c:442
+#, fuzzy, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', 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"
@@ -894,13 +965,15 @@ msgstr ""
 "(Control + G), le jour courant sera sélectionné dans le calendrier,\n"
 "et ce quelque soit le panneau actif."
 
-#: src/help.c:392
-msgid "Delete:\n"
+#: src/help.c:451
+#, fuzzy
+msgid "Delete\n"
 msgstr "Effacer:\n"
 
-#: src/help.c:394
+#: src/help.c:453
+#, fuzzy, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -930,23 +1003,25 @@ msgstr ""
 "N'oubliez pas de sauvegarder les données du calendrier pour\n"
 "retrouver vos modifications au prochain lancement de Calcurse."
 
-#: src/help.c:406
-msgid "Add:\n"
+#: src/help.c:465
+#, fuzzy
+msgid "Add\n"
 msgstr "Ajouter:\n"
 
-#: src/help.c:408
+#: src/help.c:467
+#, fuzzy, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -958,7 +1033,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -1007,13 +1082,15 @@ msgstr ""
 "          sera annulé.\n"
 "        o N'oubliez pas de sauvegarder vos nouvelles données."
 
-#: src/help.c:438
-msgid "Edit Item:\n"
+#: src/help.c:502
+#, fuzzy
+msgid "Edit Item\n"
 msgstr "Editer:\n"
 
-#: src/help.c:440
+#: src/help.c:504
+#, fuzzy, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -1048,18 +1125,19 @@ 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:455
-msgid "EditNote:\n"
+#: src/help.c:519
+#, fuzzy
+msgid "EditNote\n"
 msgstr "Editer:\n"
 
-#: src/help.c:457
+#: src/help.c:521
+#, fuzzy, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -1095,24 +1173,26 @@ 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:476
-msgid "ViewNote:\n"
+#: src/help.c:540
+#, fuzzy
+msgid "ViewNote\n"
 msgstr "Visualiser:\n"
 
-#: src/help.c:478
+#: src/help.c:542
+#, fuzzy, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 "Appuyer sur '>' permet de visualiser la note associée à un élement\n"
@@ -1131,24 +1211,27 @@ msgstr ""
 "Comme pour la touche 'N', il faut quitter le visualiseur pour revenir\n"
 "dans Calcurse. "
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+#, fuzzy
+msgid "Priority\n"
 msgstr "Priorité\n"
 
-#: src/help.c:495
+#: src/help.c:561
+#, fuzzy, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 "En utilisant les touches '+/-', vous pouvez changer la priorité de\n"
@@ -1169,16 +1252,19 @@ 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:509
-msgid "Repeat:\n"
+#: src/help.c:577
+#, fuzzy
+msgid "Repeat\n"
 msgstr "Répéter:\n"
 
-#: src/help.c:511
+#: src/help.c:579
+#, fuzzy, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -1232,14 +1318,15 @@ msgstr ""
 "         possible d'effacer les occurences des éléments répétés une par\n"
 "         une."
 
-#: src/help.c:535
-msgid "Flag Item:\n"
+#: src/help.c:604
+#, fuzzy
+msgid "Flag Item\n"
 msgstr "Marquer un rendez-vous:\n"
 
-#: src/help.c:537
+#: src/help.c:606
+#, fuzzy, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -1257,24 +1344,25 @@ 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:545
-msgid "Config:\n"
+#: src/help.c:614
+#, fuzzy
+msgid "Config\n"
 msgstr "Configuration:\n"
 
-#: src/help.c:547
+#: src/help.c:616
+#, fuzzy, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
@@ -1295,29 +1383,29 @@ msgstr ""
 "N'oubliez pas de sauvegarder les données pour retrouver votre\n"
 "configuration au prochain lancement de Calcurse."
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+#, fuzzy
+msgid "Generic keybindings\n"
 msgstr "Raccourcis clavier globaux:\n"
 
-#: src/help.c:560
+#: src/help.c:631
+#, fuzzy, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : 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"
@@ -1337,17 +1425,19 @@ msgstr ""
 " '^J' : +1 Sem.         -> aller à la semaine suivante\n"
 " '^G' : Aujourd'hui     -> aller au jour courant"
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+#, fuzzy
+msgid "OtherCmd\n"
 msgstr "Autres Commandes:\n"
 
-#: src/help.c:579
+#: src/help.c:656
+#, fuzzy, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 "Appuyer sur 'O' permet de faire défiler les pages de la barre de\n"
@@ -1358,12 +1448,14 @@ 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:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - organiseur personnel en mode texte"
 
-#: src/help.c:588
+#: src/help.c:667
+#, fuzzy, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -1396,690 +1488,760 @@ msgstr ""
 "Envoyez vos remarques ou commentaires à : calcurse@culot.org\n"
 "Page web de Calcurse : http://culot.org/calcurse"
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: src/io.c:130
+#: src/io.c:143
 msgid "Exporting..."
 msgstr "Export..."
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 msgid "Choose the file used to export calcurse data:"
 msgstr "Choisissez le fichier dans lequel exporter les données:"
 
-#: src/io.c:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 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:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 msgid "Press [ENTER] to continue."
 msgstr "Appuyez sur [ENTREE] pour continuer."
 
-#: src/io.c:250
+#: src/io.c:273
 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:289
+#: src/io.c:312
 msgid "Week"
 msgstr "Semaine"
 
-#: src/io.c:409
+#: src/io.c:432
 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:545
+#: src/io.c:568
 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:674
+#: src/io.c:699
 #, 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:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr "annulation...\n"
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s correctement créé\n"
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "lancement du mode intéractif...\n"
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr "Problème d'accession aux fichiers de données ..."
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr "Les données ont été correctement enregistrées"
 
-#: src/io.c:927
+#: src/io.c:963
 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:948
+#: src/io.c:984
 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:964
+#: src/io.c:1000
 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:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr "Problème d'ouverture du fichier des tâches"
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+#, fuzzy
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr "ERREUR FATALE dans launch_cmd: impossibilité de forker"
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+#, fuzzy
+msgid "Key label not recognized"
+msgstr "la fréquence de répétition est inconnue."
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "ERREUR FATALE: impossibilité de créer %s: %s\n"
 
-#: src/io.c:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Bienvenue dans Calcurse. Les fichiers manquants ont été créés."
 
-#: src/io.c:1230
+#: src/io.c:1445
 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:1250
+#: src/io.c:1465
 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:1251
+#: src/io.c:1466
 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:1252
+#: src/io.c:1467
 msgid "The data were successfully exported"
 msgstr "Les données ont été correctement exportées"
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr "Ical"
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr "Pcal"
 
-#: src/io.c:1364
+#: src/io.c:1580
 msgid "ERROR in ical_log: unknown ical type"
 msgstr "ERREUR FATALE dans ical_log: type ical inconnu"
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr "la fréquence de répétition n'a pas été trouvée."
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr "la fréquence de répétition est inconnue."
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr "la règle de répétition est mal formée."
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr "les dates à ne pas répéter sont mal formées."
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 "Impossible de créer une nouvelle note pour enregistrer la déscription. "
 "Abandon...\n"
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr "Alerte: impossible d'ouvrir %s, abandon..."
 
-#: src/io.c:1991
+#: src/io.c:2207
 msgid "could not get entire item description."
 msgstr "impossible de trouver la description entière de l'élément."
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr "déscription mal formée."
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr "le rendez-vous n'a pas de date de début."
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr "impossible de calculer la durée (pas de date de fin)."
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr "L'élément a une durée négative."
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr "L'élément n'a pu être identifié."
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 msgid "could not retrieve item summary."
 msgstr "impossible de récupérer le résumé de l'évènement."
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr "impossible de récupérer l'heure de début de l'évènement."
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr "impossible de récupérer l'heure de fin de l'évènement."
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr "la durée de l'élément est mal formée."
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr ""
 "Le fichier ical semble erroné. La fin de l'élément n'a pas été trouvée."
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr "La priorité de l'élément est erronée (devrait être entre 1 et 9)."
 
-#: src/io.c:2319
+#: src/io.c:2535
 msgid "Enter the file name to import data from:"
 msgstr "Entrez le nom du fichier depuis lequel importer les données:"
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr "Rapport sur les données importées: %04d lignes lues "
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr "%d rdv / %d évnts / %d tâches / %d erronés "
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr "%d rdv / %d évnts / %d tâches / %d erronés ([ENTREE] pour continuer)"
 
-#: src/io.c:2375
+#: src/io.c:2590
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr "ERREUR FATALE dans io_import_data: mauvais mode d'import"
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr "ERREUR FATALE: le fichier d'entrée n'a pu être ouvert, abandon..."
 
-#: src/io.c:2388
+#: src/io.c:2603
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr "ERREUR FATALE dans io_import_data: mauvais mode d'import"
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 "Attention: l'en-tête ical est mal formé ou le numéro de version est mauvais. "
 "Abandon..."
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr "Certains éléments n'ont pu être importés, voir le fichier de log ?"
+
+#: src/io.c:2684
+#, fuzzy
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr "Attention: impossible d'effacer le fichier de log, abandon..."
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr "Attention: impossible d'ouvrir le fichier de log, abandon..."
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
-msgstr "Certains éléments n'ont pu être importés, voir le fichier de log ?"
+#: src/io.c:2714
+msgid "No log file to display!"
+msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, fuzzy, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr "Attention: impossible d'effacer le fichier de log, abandon..."
 
-#: src/notify.c:135
+#: src/notify.c:136
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "ERREUR FATALE dans launch_cmd: impossibilité de forker"
 
-#: src/notify.c:138
+#: src/notify.c:139
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "ERREUR FATALE dans launch_cmd: impossible de lancer la commande"
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr "barre-notification_afficher = "
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr "barre-notification_date = "
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr "barre-notification_heure = "
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr "barre-notification_alerte = "
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr "barre-notification_commande = "
 
-#: src/notify.c:456
+#: src/notify.c:457
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(si fixé à OUI, la barre de notification sera affichée)"
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Format de la date à afficher dans la barre de notification)"
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Format de l'heure à afficher dans la barre de notification)"
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr "(Alerte si il y a un rendez-vous dans ce prochain nombre de secondes)"
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr ""
 "(Commande utilisée pour prévenir l'utilisateur d'un nouveau rendez-vous)"
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr ""
 "Entrez le format de l'heure (voir 'man 3 strftime' pour les formats "
 "possibles)"
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr "Entrez le nombre de secondes (0 pour ne pas être alerté)"
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr "Entrez la commande de notification"
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | options de la barre de notification"
 
-#: src/recur.c:129
+#: src/recur.c:130
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "ERREUR FATALE dans recur_def2char: type inconnu\n"
 
-#: src/recur.c:161
+#: src/recur.c:162
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "ERREUR FATALE dans recur_char2def: caractère inconnu\n"
 
-#: src/recur.c:297
+#: src/recur.c:298
 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:437
+#: src/recur.c:438
 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:570
+#: src/recur.c:571
 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:642
+#: src/recur.c:643
 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:666
+#: src/recur.c:667
 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:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr "Entrez la fréquence de répétition:"
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, 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:674
+#: src/recur.c:675
 #, 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:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr "Cet élément est déjà recurrent."
 
-#: src/recur.c:678
+#: src/recur.c:679
 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:792
+#: src/recur.c:793
 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:821
+#: src/recur.c:822
 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:896
+#: src/recur.c:897
 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:920
+#: src/recur.c:921
 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:956
+#: src/recur.c:957
 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"
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr "Entrez la nouvelle tâche : "
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr "Entrez la priorité [1 (plus important) - 9 (moins important)] :"
 
-#: src/todo.c:192
+#: src/todo.c:193
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr ""
 "ERREUR FATALE dans todo_delete_note_by_num: aucune note correspondante\n"
 
-#: src/todo.c:201
+#: src/todo.c:202
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "ERREUR FATALE dans todo_delete_note_by_num: tâche non trouvée\n"
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr "Voulez-vous vraiment effacer cette tâche ?"
 
-#: src/todo.c:242
+#: src/todo.c:243
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr ""
 "Une note est attachée à cette tâche. Effacer (t) la tâche ou (n) la note "
 "seulement ?"
 
-#: src/todo.c:244
+#: src/todo.c:245
 msgid "[t/n] "
 msgstr "[t/n]"
 
-#: src/todo.c:328
+#: src/todo.c:329
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/todo.c:360
+#: src/todo.c:361
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "ERREUR FATALE dans todo_delete_by_num: aucune tâche correspondante\n"
 
-#: src/todo.c:375
+#: src/todo.c:376
 msgid "Enter the new ToDo description :"
 msgstr "Entrez la nouvelle description pour cette tâche : "
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr "ERREUR INTERNE"
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr "calcurse va maintenant quitter..."
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr "Merci de reporter le bogue suivant:"
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr "Appuyez sur une touche pour continuer..."
 
-#: src/utils.c:402
+#: src/utils.c:412
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "ERREUR FATALE dans updatestring: mémoire insuffisante"
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr "Aide"
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr "Sauver"
 
-#: src/utils.c:447
-msgid "Export"
-msgstr "Export"
+#: src/utils.c:459
+msgid "Chg View"
+msgstr "Chg Vue"
 
-#: src/utils.c:448
+#: src/utils.c:460
 msgid "Import"
 msgstr "Import"
 
-#: src/utils.c:449
-msgid "Add Item"
-msgstr "Ajouter"
-
-#: src/utils.c:450
-msgid "Del Item"
-msgstr "Effacer"
-
-#: src/utils.c:451
-msgid "Edit Itm"
-msgstr "Editer"
-
-#: src/utils.c:452
-msgid "Flag Itm"
-msgstr "Marq rdv"
-
-#: src/utils.c:453 src/utils.c:467
-msgid "-+1 Day"
-msgstr "-+1 Jour"
-
-#: src/utils.c:454 src/utils.c:468
-msgid "-+1 Week"
-msgstr "-+1 Sem."
-
-#: src/utils.c:455
-msgid "Up/Down"
-msgstr "Haut/Bas"
-
-#: src/utils.c:456
-msgid "Repeat"
-msgstr "Répéter"
-
-#: src/utils.c:457
-msgid "Priority"
-msgstr "Priorité"
-
-#: src/utils.c:458
-msgid "Chg View"
-msgstr "Chg Vue"
+#: src/utils.c:461
+msgid "Export"
+msgstr "Export"
 
-#: src/utils.c:459
+#: src/utils.c:462
 msgid "Go to"
 msgstr "Aller à"
 
-#: src/utils.c:460
+#: src/utils.c:463
+msgid "OtherCmd"
+msgstr "Autres"
+
+#: src/utils.c:464
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:461
-msgid "View"
-msgstr "Voir"
-
-#: src/utils.c:462
+#: src/utils.c:465
 msgid "Redraw"
 msgstr "Retracer"
 
-#: src/utils.c:463
+#: src/utils.c:466
 msgid "Add Appt"
 msgstr "Ajt rdv"
 
-#: src/utils.c:464
+#: src/utils.c:467
 msgid "Add Todo"
 msgstr "Ajt todo"
 
-#: src/utils.c:465
-msgid "EditNote"
-msgstr "EditNote"
-
-#: src/utils.c:466
-msgid "ViewNote"
-msgstr "VoirNote"
+#: src/utils.c:468
+#, fuzzy
+msgid "+1 Day"
+msgstr "-+1 Jour"
 
 #: src/utils.c:469
-msgid "OtherCmd"
-msgstr "Autres"
+#, fuzzy
+msgid "-1 Day"
+msgstr "-+1 Jour"
 
 #: src/utils.c:470
+#, fuzzy
+msgid "+1 Week"
+msgstr "-+1 Sem."
+
+#: src/utils.c:471
+#, fuzzy
+msgid "-1 Week"
+msgstr "-+1 Sem."
+
+#: src/utils.c:472
 msgid "Today"
 msgstr "Aujourd."
 
-#: src/utils.c:471
+#: src/utils.c:477
 msgid "beg Week"
 msgstr "deb Sem."
 
-#: src/utils.c:472
+#: src/utils.c:478
 msgid "end Week"
 msgstr "fin Sem."
 
-#: src/utils.c:537
+#: src/utils.c:479
+msgid "Add Item"
+msgstr "Ajouter"
+
+#: src/utils.c:480
+msgid "Del Item"
+msgstr "Effacer"
+
+#: src/utils.c:481
+msgid "Edit Itm"
+msgstr "Editer"
+
+#: src/utils.c:482
+msgid "View"
+msgstr "Voir"
+
+#: src/utils.c:483
+msgid "Flag Itm"
+msgstr "Marq rdv"
+
+#: src/utils.c:484
+msgid "Repeat"
+msgstr "Répéter"
+
+#: src/utils.c:485
+msgid "EditNote"
+msgstr "EditNote"
+
+#: src/utils.c:486
+msgid "ViewNote"
+msgstr "VoirNote"
+
+#: src/utils.c:487
+msgid "Prio.+"
+msgstr ""
+
+#: src/utils.c:488
+msgid "Prio.-"
+msgstr ""
+
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "ERREUR FATALE dans date2sec: dysfonctionnement dans mktime\n"
 
-#: src/utils.c:612
+#: src/utils.c:609
 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:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: src/utils.c:779
+#: src/utils.c:776
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "ERREUR FATALE dans other_status_page: panneau inconnu\n"
 
-#: src/utils.c:849
+#: src/utils.c:846
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "ERREUR FATALE dans mystrtol: impossibilité de convertir la chaîne"
 
-#: src/utils.c:851
+#: src/utils.c:848
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "ERREUR FATALE dans mystrtol: le nombre est hors plage valide"
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr "oui"
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr "non"
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Problème dans print_option_incolor(): option non définié"
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr "ERREUR FATALE: le fichier temporaire n'a pu être créé"
 
-#: src/utils.c:933
+#: src/utils.c:930
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "ERREUR FATALE dans erase_note: impossibilité de supprimer la note\n"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr "Janvier"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr "Février"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr "Mars"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr "Avril"
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr "Mai"
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr "Juin"
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr "Juillet"
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr "Août"
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr "Septembre"
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr "Octobre"
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr "Novembre"
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr "Décembre"
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr "Dim"
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr "Lun"
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr "Mar"
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr "Mer"
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr "Jeu"
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr "Ven"
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr "Sam"
 
@@ -2102,6 +2264,57 @@ msgstr "Tâches"
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "ERREUR FATALE dans wins_update: aucune fenêtre sélectionnée\n"
 
+#~ msgid ""
+#~ "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#~ msgstr ""
+#~ "Tapez 'X' ou ESPACE pour sélectionner, 'H/L' 'J/K' ou les flèches pour se "
+#~ "déplacer"
+
+#~ msgid "('0' for no color, 'Q' to exit) :"
+#~ msgstr "('0' pour noir et blanc"
+
+#~ msgid ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              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 ""
+#~ "Vous pouvez utiliser soit 'H','J','K','L', soit les touches fléchées\n"
+#~ "'<','v','^',>' pour vous déplacer dans le calendrier.\n"
+#~ "\n"
+#~ "Le schéma suivant explique comment :\n"
+#~ "\n"
+#~ "                 aller à la semaine précédente\n"
+#~ "                              K ^  \n"
+#~ "aller au jour précédent  H <       > L   aller au jour suivant\n"
+#~ "                              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."
+
+#~ msgid "Priority"
+#~ msgstr "Priorité"
+
 #~ msgid "item has no summary."
 #~ msgstr "L'élément n'a pas de résumé."
 
diff --git a/po/nl.po b/po/nl.po
index 7fb099a..a99e7ea 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# 	$calcurse: nl.po,v 1.13 2008/10/15 16:15:40 culot Exp $
+# 	$calcurse: nl.po,v 1.14 2008/12/08 20:49:48 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-09-28 20:02+0200\n"
+"POT-Creation-Date: 2008-12-08 21:37+0100\n"
 "PO-Revision-Date: 2008-10-14 20:54+0200\n"
 "Last-Translator: Jeremy Roon\n"
 "Language-Team:  Jeremy Roon <p.roon@chello.nl>\n"
@@ -18,53 +18,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/apoint.c:119
+#: src/apoint.c:120
 msgid ""
 "Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
 msgstr ""
 "Voer aanvangstijd in ([hh:mm] of [h:mm]), laat leeg voor de gehele dag:"
 
-#: src/apoint.c:122
+#: src/apoint.c:123
 msgid "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
 msgstr "Voer de eindtijd in ([hh:mm] of [h:mm]) of duur (in minuten) :"
 
-#: src/apoint.c:123
+#: src/apoint.c:124
 msgid "Enter description :"
 msgstr "Voer beschrijving in :"
 
-#: src/apoint.c:125
+#: src/apoint.c:126
 msgid "You entered an invalid start time, should be [h:mm] or [hh:mm]"
 msgstr "De aanvangstijd is ongeldig! Formaat kan [h:mm] of [hh:mm] zijn"
 
-#: src/apoint.c:127
+#: src/apoint.c:128
 msgid "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
 msgstr "De eindtijd is ongeldig! Formaat kan [h:mm] of [hh:mm] of [mm] zijn"
 
-#: src/apoint.c:128 src/day.c:518 src/day.c:544 src/day.c:605
+#: src/apoint.c:129 src/day.c:519 src/day.c:545 src/day.c:606
 msgid "Press [Enter] to continue"
 msgstr "Druk op [Enter] om door te gaan)"
 
-#: src/apoint.c:230
+#: src/apoint.c:231
 msgid "Do you really want to delete this item ?"
 msgstr "Wilt u werkelijk dit item wissen ?"
 
-#: src/apoint.c:231
+#: src/apoint.c:232
 msgid "FATAL ERROR in apoint_delete: no such type\n"
 msgstr "FATALE FOUT in apoint_delete: Type bestaat niet\n"
 
-#: src/apoint.c:386 src/recur.c:250
+#: src/apoint.c:387 src/recur.c:251
 msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
 msgstr "FATALE FOUT in apoint_scan: datafout in de afspraak\n"
 
-#: src/apoint.c:411
+#: src/apoint.c:412
 msgid "FATAL ERROR in apoint_get: no such item\n"
 msgstr "FATALE FOUT in apoint_get: item bestaat niet\n"
 
-#: src/apoint.c:454
+#: src/apoint.c:455
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
 msgstr "FATALE FOUT in apoint_delete_bynum: Afspraak bestaat niet"
 
-#: src/apoint.c:615
+#: src/apoint.c:616
 msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
 msgstr "FATALE FOUT in apoint_switch_notify: Afspraak bestaat niet"
 
@@ -277,15 +277,15 @@ msgstr ""
 msgid "Do you really want to quit ?"
 msgstr "Wilt u werkelijk het programma verlaten?"
 
-#: src/calcurse.c:240
+#: src/calcurse.c:241
 msgid "To do :"
 msgstr "Taken :"
 
-#: src/calendar.c:132
+#: src/calendar.c:133
 msgid "ERROR in calendar_set_first_day_of_week\n"
 msgstr "FOUT in calender_set_first_day_of_week\n"
 
-#: src/calendar.c:357
+#: src/calendar.c:358
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
 "12/31/2037)"
@@ -293,272 +293,341 @@ msgstr ""
 "De ingevoerde datum is ongeldig (voer datum tussen 01/01/1902 en 12/31/2037) "
 "in"
 
-#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
-#: src/io.c:1231 src/io.c:1253
+#: src/calendar.c:360 src/custom.c:220 src/io.c:770 src/io.c:1145
+#: src/io.c:1446 src/io.c:1468
 msgid "Press [ENTER] to continue"
 msgstr "Druk op [ENTER] om door te gaan)"
 
-#: src/custom.c:47
+#: src/custom.c:49
 msgid "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
 msgstr "FATALE FOUT in fill_config_var: fout formaat configuratievariabele.\n"
 
-#: src/custom.c:67
+#: src/custom.c:69
 msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
 msgstr "FATALE FOUT in custom_load_color: ongeldig kleurnummer.\n"
 
-#: src/custom.c:69
+#: src/custom.c:71
 msgid "FATAL ERROR in custom_load_color: wrong color name.\n"
 msgstr "FATALE FOUT in custom_load_color: ongeldige kleurnaam.\n"
 
-#: src/custom.c:71
+#: src/custom.c:73
 msgid ""
 "FATAL ERROR in custom_load_color: wrong configuration variable format.\n"
 msgstr ""
 "FATALE FOUT in custom_load_color: ongeldig formaat configuratievariabele.\n"
 
-#: src/custom.c:81
+#: src/custom.c:83
 msgid "FATAL ERROR in custom_load_color: missing colors in config file.\n"
 msgstr ""
 "FATALE FOUT in custom_load_color: ontbrekende kleuren configuratiebestand.\n"
 
-#: src/custom.c:217
+#: src/custom.c:219
 msgid "Failed to open config file"
 msgstr "Kan het configuratiebestand niet openen"
 
-#: src/custom.c:311
+#: src/custom.c:313
 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/io.c:1320
+#: src/custom.c:372 src/custom.c:438 src/custom.c:969 src/io.c:1535
 msgid "Exit"
 msgstr "Einde"
 
-#: src/custom.c:370
+#: src/custom.c:373
 msgid "General"
 msgstr "Algemeen"
 
-#: src/custom.c:371
+#: src/custom.c:374
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:372
+#: src/custom.c:375
 msgid "Color"
 msgstr "Kleur"
 
-#: src/custom.c:373
+#: src/custom.c:376
 msgid "Notify"
 msgstr "Info"
 
-#: src/custom.c:386
+#: src/custom.c:377
+msgid "Keys"
+msgstr ""
+
+#: src/custom.c:390
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Kies de gewenste layout in het volgende venster [druk op ENTER]"
 
-#: src/custom.c:388
+#: src/custom.c:392
 msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('A'= Afspraken panel, 'K'= Kalender panel, 'T'= taken panel)"
 
-#: src/custom.c:390
+#: src/custom.c:394
 msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
 msgstr "    AK       AT       KA       TA       TK       TA       KT       AT"
 
-#: src/custom.c:392
+#: src/custom.c:396
 msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
 msgstr " [1]AT    [2]AK    [3]TA    [4]KA    [5]TA    [6]TK    [7]AT    [8]KT"
 
-#: src/custom.c:446
+#: src/custom.c:439
+msgid "Select"
+msgstr ""
+
+#: src/custom.c:440
+#, fuzzy
+msgid "No color"
+msgstr "Kleur"
+
+#: src/custom.c:441 src/custom.c:973 src/utils.c:473
+msgid "Up"
+msgstr ""
+
+#: src/custom.c:442 src/custom.c:974 src/utils.c:474
+#, fuzzy
+msgid "Down"
+msgstr "Op/Neer"
+
+#: src/custom.c:443 src/utils.c:475
+msgid "Left"
+msgstr ""
+
+#: src/custom.c:444 src/utils.c:476
+msgid "Right"
+msgstr ""
+
+#: src/custom.c:469
 msgid "Foreground"
 msgstr "Voorgrond"
 
-#: src/custom.c:447
+#: src/custom.c:470
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/custom.c:448
+#: src/custom.c:471
 msgid "(terminal's default)"
 msgstr "standaard van terminal"
 
-#: src/custom.c:451
-msgid "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
-msgstr ""
-"'X' of SPATIE voor kleurselectie, 'h/l' 'j/k' of pijltjes verplaatsen cursor"
-
-#: src/custom.c:453
-msgid "('0' for no color, 'Q' to exit) :"
-msgstr "('0' voor geen kleur, 'Q' voor einde) :"
-
-#: src/custom.c:487
+#: src/custom.c:507
 #, c-format
 msgid "CalCurse %s | color theme"
 msgstr "Calcurse %s | kleurschema"
 
-#: src/custom.c:680
+#: src/custom.c:690
 msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
 msgstr "FATALE FOUT in custom_color_theme_name: kleur onbekend\n"
 
-#: src/custom.c:711
+#: src/custom.c:721
 msgid "auto_save = "
 msgstr "automatisch_opslaan = "
 
-#: src/custom.c:712
+#: src/custom.c:722
 msgid "confirm_quit = "
 msgstr "einde_bevestigen = "
 
-#: src/custom.c:713
+#: src/custom.c:723
 msgid "confirm_delete = "
 msgstr "bevestig_verwijderen= "
 
-#: src/custom.c:714
+#: src/custom.c:724
 msgid "skip_system_dialogs = "
 msgstr "overslaan_systeem_dialoog = "
 
-#: src/custom.c:715
+#: src/custom.c:725
 msgid "skip_progress_bar = "
 msgstr "overslaan_progressie_balk = "
 
-#: src/custom.c:716
+#: src/custom.c:726
 msgid "week_begins_on_monday = "
 msgstr "week_begint_op_maandag = "
 
-#: src/custom.c:717
+#: src/custom.c:727
 msgid "output_datefmt = "
 msgstr "output_datefmt = "
 
-#: src/custom.c:718
+#: src/custom.c:728
 msgid "input_datefmt = "
 msgstr "input_datefmt = "
 
-#: src/custom.c:724
+#: src/custom.c:735
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(Bij JA, wordt er automatisch opgeslagen bij einde programma)"
 
-#: src/custom.c:729
+#: src/custom.c:741
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(Bij JA, wordt er een bevestiging gevraagd bij eindigen programma"
 
-#: src/custom.c:734
+#: src/custom.c:747
 msgid "(if set to YES, confirmation is required before deleting an event)"
 msgstr "(Bij JA, is een bevestiging nodig voor het wissen van een gebeurtenis)"
 
-#: src/custom.c:741
+#: src/custom.c:754
 msgid ""
 "(if set to YES, messages about loaded and saved data will not be displayed)"
 msgstr ""
 "(Bij JA, worden geen mededelingen getoond bij het laden/opslaan van data)"
 
-#: src/custom.c:748
+#: src/custom.c:761
 msgid "(if set to YES, progress bar will not be displayed when saving data)"
 msgstr "(Bij JA, wordt geen progressiebalk getoond bij het opslaan van data)"
 
-#: src/custom.c:755
+#: src/custom.c:768
 msgid "(if set to YES, monday is the first day of the week, else it is sunday)"
 msgstr "(Bij JA, is maandag de eerste weekdag, anders zondag)"
 
-#: src/custom.c:763
+#: src/custom.c:776
 msgid "(Format of the date to be displayed in non-interactive mode)"
 msgstr "(Formaat van de datum in niet-interactieve modus)"
 
-#: src/custom.c:769
+#: src/custom.c:782
 msgid "(Format to be used when entering a date: "
 msgstr "Het te gebruiken formaat bij datuminvoer: "
 
-#: src/custom.c:770
+#: src/custom.c:783
 msgid " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 msgstr " 1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd)"
 
-#: src/custom.c:795 src/notify.c:520
+#: src/custom.c:808 src/notify.c:521
 msgid "Enter an option number to change its value [Q to quit] "
 msgstr "Geef een nummer om de waarde te veranderen [Q om te stoppen]"
 
-#: src/custom.c:797 src/notify.c:522
+#: src/custom.c:810 src/notify.c:523
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr "Geef het formaat van de datum (zie 'man 3 strftime')"
 
-#: src/custom.c:799
+#: src/custom.c:812
 msgid "Enter the date format (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 msgstr "Voer datumformaat in (1-mm/dd/yyyy, 2-dd/mm/yyyy, 3-yyyy/mm/dd) "
 
-#: src/custom.c:805
+#: src/custom.c:818
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | algemene Opties"
 
-#: src/day.c:456
+#: src/custom.c:906
+msgid "Undefined option!"
+msgstr ""
+
+#: src/custom.c:934
+msgid "undefined"
+msgstr ""
+
+#: src/custom.c:970
+msgid "Key info"
+msgstr ""
+
+#: src/custom.c:971
+#, fuzzy
+msgid "Add key"
+msgstr "Nieuw Itm"
+
+#: src/custom.c:972
+#, fuzzy
+msgid "Del key"
+msgstr "Wis Item"
+
+#: src/custom.c:975
+msgid "Prev Key"
+msgstr ""
+
+#: src/custom.c:976
+msgid "Next Key"
+msgstr ""
+
+#: src/custom.c:1000
+#, fuzzy, c-format
+msgid "CalCurse %s | keys configuration"
+msgstr "CalCurse %s | algemene Opties"
+
+#: src/custom.c:1061
+msgid "Press the key you want to assign to:"
+msgstr ""
+
+#: src/custom.c:1071
+#, fuzzy, c-format
+msgid "This key is already in use for %s, please choose another one."
+msgstr "Dit item wordt al herhaald."
+
+#: src/custom.c:1099 src/io.c:1365
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#: src/day.c:457
 msgid "FATAL ERROR in day_popup_item: unknown item type\n"
 msgstr "FATALE FOUT in day_popup_item: onbekend itemtype\n"
 
-#: src/day.c:459
+#: src/day.c:460
 msgid "Event :"
 msgstr "Gebeurtenis :"
 
-#: src/day.c:462
+#: src/day.c:463
 msgid "Appointment :"
 msgstr "Afspraak :"
 
-#: src/day.c:517
+#: src/day.c:518
 msgid "Enter the new time ([hh:mm] or [h:mm]) : "
 msgstr "Voer nieuwe tijd in: ([hh:mm] of [h:mm]):"
 
-#: src/day.c:519
+#: src/day.c:520
 msgid "You entered an invalid time, should be [h:mm] or [hh:mm]"
 msgstr "Ongeldige tijd ingevoerd! Mogelijke formaten zijn: [h:mm] of [hh:mm]"
 
-#: src/day.c:543 src/day.c:601
+#: src/day.c:544 src/day.c:602
 msgid "Invalid time: start time must be before end time!"
 msgstr "Ongeldige tijd: aanvangstijd moet voor eindtijd zijn!"
 
-#: src/day.c:585
+#: src/day.c:586
 msgid "Enter the new item description:"
 msgstr "Voer een nieuwe beschrijving in:"
 
-#: src/day.c:597
+#: src/day.c:598
 msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 "Voer type herhaling in: (D)agelijks, (W)ekelijks, (M)aandelijks, (Y) "
 "jaarlijks"
 
-#: src/day.c:599 src/recur.c:667
+#: src/day.c:600 src/recur.c:668
 msgid "[D/W/M/Y] "
 msgstr "[D/W/M/Y]"
 
-#: src/day.c:600 src/recur.c:669
+#: src/day.c:601 src/recur.c:670
 msgid "The frequence you entered is not valid."
 msgstr "Het ingevoerde interval is ongeldig."
 
-#: src/day.c:602 src/recur.c:672
+#: src/day.c:603 src/recur.c:673
 msgid "The entered date is not valid."
 msgstr "De ingevoerde datum is ongeldig."
 
-#: src/day.c:628
+#: src/day.c:629
 msgid "Enter the new repetition frequence:"
 msgstr "Voer herhalingsinterval in:"
 
-#: src/day.c:737
+#: src/day.c:738
 msgid "Edit: (1)Description or (2)Repetition?"
 msgstr "Wijzig: (1)Beschrijving of (2)Herhaling"
 
-#: src/day.c:758
+#: src/day.c:759
 msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
 msgstr "Wijzig: (1)Aanvang (2)Einde (3)Beschrijving of (4)Herhaling"
 
-#: src/day.c:783
+#: src/day.c:784
 msgid "Edit: (1)Start time, (2)End time or (3)Description?"
 msgstr "Wijzig: (1)Aanvang (2)Einde of (3)Beschrijving?"
 
-#: src/day.c:816
+#: src/day.c:817
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 "Dit is een herhalende afspraak. (a)lle afspraken of alleen (o) deze wissen ?"
 
-#: src/day.c:819
+#: src/day.c:820
 msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
 msgstr ""
 "Dit item heeft een bijgesloten noot. (i)tem wissen of alleen de (n)oot?"
 
-#: src/day.c:821
+#: src/day.c:822
 msgid "[i/n] "
 msgstr "[i/n]"
 
-#: src/day.c:822
+#: src/day.c:823
 msgid "[a/o] "
 msgstr "[a/o]"
 
@@ -574,32 +643,35 @@ msgstr "FATALE FOUT in event_get: item bestaat niet\n"
 msgid "FATAL ERROR in event_delete_bynum: no such event\n"
 msgstr "FATALE FOUT in event_delete_bynum: Gebeurtenis bestaat niet\n"
 
-#: src/help.c:120
+#: src/help.c:149
 #, c-format
 msgid "Calcurse %s | help"
 msgstr "Calcurse %s | Hulp"
 
-#: src/help.c:280
+#: src/help.c:313
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Welkom in Calcurse. Dit is het centrale hulpscherm.\n"
 
-#: src/help.c:282
+#: src/help.c:315
+#, fuzzy, c-format
 msgid ""
-" Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
-"                 downward inside help screens, if necessary.\n"
-"\n"
-"     Exit help:  When finished, press 'Q' to exit help and go back\n"
-"                 to the main Calcurse screen.\n"
-"\n"
-"    Help topic:  At the bottom of this screen you can see a panel\n"
-"                 with different fields, represented by a letter and\n"
-"                 a short title. This panel contains all the available\n"
-"                 actions you can perform when using Calcurse.\n"
-"                 By pressing one of the letters appearing in this\n"
-"                 panel, you will be shown a short description of the\n"
-"                 corresponding action.\n"
-"\n"
-"       Credits:  Press '@' for credits."
+"Moving around:  Press '%s' or '%s' to scroll text upward or downward\n"
+"                inside help screens, if necessary.\n"
+"\n"
+"    Exit help:  When finished, press '%s' to exit help and go back to\n"
+"                the main Calcurse screen.\n"
+"\n"
+"   Help topic:  At the bottom of this screen you can see a panel with\n"
+"                different fields, represented by a letter and a short\n"
+"                title. This panel contains all the available actions\n"
+"                you can perform when using Calcurse.\n"
+"                By pressing one of the letters appearing in this\n"
+"                panel, you will be shown a short description of the\n"
+"                corresponding action. At the top right side of the\n"
+"                description screen are indicated the user-defined key\n"
+"                bindings that lead to the action.\n"
+"\n"
+"      Credits:  Press '%s' for credits."
 msgstr ""
 "      Navigeren:  Gebruik CTRL-P of CTRL-N om de tekst zonodig op of\n"
 "                  neer te scrollen in het hulpvenster.\n"
@@ -616,20 +688,22 @@ msgstr ""
 "\n"
 "        Auteurs:  Druk op '@' om de auteurs van Calcurse te zien."
 
-#: src/help.c:295
-msgid "Save:\n"
+#: src/help.c:334
+#, fuzzy
+msgid "Save\n"
 msgstr "Opslaan:\n"
 
-#: src/help.c:297
+#: src/help.c:336
+#, fuzzy, c-format
 msgid ""
-"Pressing 'S' saves the Calcurse data.\n"
-"\n"
-"The data is splitted into three different files which contain :\n"
+"Save calcurse data.\n"
+"Data are splitted into four different files which contain :\n"
 "\n"
-"        /  ~/.calcurse/conf -> the user configuration\n"
+"         / ~/.calcurse/conf -> user configuration\n"
 "        |                      (layout, color, general options)\n"
-"        |  ~/.calcurse/apts -> the data related to the appointments\n"
-"        \\  ~/.calcurse/todo -> the data related to the todo list\n"
+"        |  ~/.calcurse/apts -> data related to the appointments\n"
+"        |  ~/.calcurse/todo -> data related to the todo list\n"
+"         \\ ~/.calcurse/keys -> user-defined key bindings\n"
 "\n"
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
@@ -646,16 +720,17 @@ msgstr ""
 "In het venster instellingen kan een optie gekozen worden, \n"
 "die de data automatisch opslaat bij het verlaten van Calcurse."
 
-#: src/help.c:307
-msgid "Import:\n"
+#: src/help.c:347
+#, fuzzy
+msgid "Import\n"
 msgstr "Import:\n"
 
-#: src/help.c:309
+#: src/help.c:349
+#, fuzzy, c-format
 msgid ""
-"Pressing 'I' allows you to import data from an icalendar file.\n"
-"You are asked to enter the file name from which to load ical items.\n"
-"\n"
-"At the end of the import process, and if the general option\n"
+"Import data from an icalendar file.\n"
+"You will be asked to enter the file name from which to load ical\n"
+"items. At the end of the import process, and if the general option\n"
 "'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
 "many items were imported is shown.\n"
 "This report contains the total number of lines read, the number of\n"
@@ -686,16 +761,19 @@ msgstr ""
 "In dit rapport is per item met omschrijving te zien waarom het item\n"
 "niet geïmporteerd kon worden.\n"
 
-#: src/help.c:325
-msgid "Export:\n"
+#: src/help.c:365
+#, fuzzy
+msgid "Export\n"
 msgstr "Export:\n"
 
-#: src/help.c:327
+#: src/help.c:367
+#, fuzzy, c-format
 msgid ""
-"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"
+"Export calcurse data (appointments, events and todos).\n"
+"This leads to the export submenu, from which you can choose between\n"
+"two different export formats: 'ical' and 'pcal'. Choosing one of\n"
+"those formats lets you export calcurse data to icalendar or pcal\n"
+"format.\n"
 "\n"
 "You first need to specify the file to which the data will be exported.\n"
 "By default, this file is:\n"
@@ -707,8 +785,9 @@ msgid ""
 "     ~/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"
+"\n"
+"Calcurse data are exported in the following order:\n"
+"     events, appointments, todos.\n"
 msgstr ""
 "Druk op 'X' om via een export submenu tussen twee verschillende\n"
 "export formaten te kiezen: 'ical' en 'pcal'.\n"
@@ -723,63 +802,52 @@ msgstr ""
 "Alle data wordt geëxporteerd, in deze volgorde:\n"
 "gebeurtenissen, afspraken, taken.\n"
 
-#: src/help.c:340
-msgid "Displacement keys:\n"
+#: src/help.c:385
+#, fuzzy
+msgid "Displacement keys\n"
 msgstr "Navigatietoetsen:\n"
 
-#: src/help.c:342
+#: src/help.c:387
+#, c-format
 msgid ""
-"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
-"to move into the calendar.\n"
-"\n"
-"The following scheme explains how :\n"
-"\n"
-"                      move to previous week\n"
-"                              K ^  \n"
-"  move to previous day   H <       > L   move to next day\n"
-"                              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"
+"Move around inside calcurse screens.\n"
+"The following scheme summarizes how to get around:\n"
+"\n"
+"                               move up\n"
+"                        move to previous week\n"
+"\n"
+"                                 %s\n"
+"       move left                  ^  \n"
+" move to previous day             |\n"
+"                      %s\n"
+"                            <--   +  -->\n"
+"                                           %s\n"
+"                                  |            move right\n"
+"                                  v         move to next day\n"
+"                                 %s\n"
+"\n"
+"                          move to next week\n"
+"                              move down\n"
+"\n"
+"Moreover, while inside the calendar panel, the '%s' key moves\n"
+"to the first day of the week, and the '%s' 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 ""
-"Met de toetsen 'h','j','k','l' of de pijltjestoetsen \n"
-"'<','v','^',>' kan men zich door de kalender verplaatsen.\n"
-"\n"
-"Het volgende schema verduidelijkt hoe :\n"
-"\n"
-"                  naar de vorige week\n"
-"                          k ^  \n"
-"naar de vorige dag   h <       > l   naar de volgende dag\n"
-"                          j v  \n"
-"                  naar de volgende week\n"
-"\n"
-"Bovendien kan men, als men zich in het kalender panel bevindt, met de\n"
-"0-toets naar de eerste dag van de week, en met '$' naar de laatste\n"
-"dag van de week.\n"
-"\n"
-"Wanneer het afspraken of taken panel is geselecteerd, kan je met\n"
-"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:357
-msgid "View:\n"
+#: src/help.c:412
+#, fuzzy
+msgid "View\n"
 msgstr "Bekijk:\n"
 
-#: src/help.c:359
+#: src/help.c:414
+#, fuzzy, c-format
 msgid ""
-"Pressing 'V' allows you to view the item you select in either the ToDo\n"
-"or Appointment panel.\n"
+"View the item you select in either the Todo or Appointment panel.\n"
 "\n"
 "This is usefull when an event description is longer than the available\n"
-" space to display it. If that is the case, the description will be\n"
+"space to display it. If that is the case, the description will be\n"
 "shortened and its end replaced by '...'. To be able to read the entire\n"
-"description, just press 'V' and a popup window will appear, containing\n"
+"description, just press '%s' and a popup window will appear, containing\n"
 "the whole event.\n"
 "\n"
 "Press any key to close the popup window and go back to the main\n"
@@ -797,22 +865,24 @@ msgstr ""
 "Druk op een willekeurige toets om dit venster te sluiten en terug te \n"
 "keren naar het standaard Calcurse venster."
 
-#: src/help.c:370
-msgid "Tab:\n"
+#: src/help.c:425
+#, fuzzy
+msgid "Tab\n"
 msgstr "Tab:\n"
 
-#: src/help.c:372
+#: src/help.c:427
+#, fuzzy, c-format
 msgid ""
-"Pressing 'Tab' allows you to switch between panels.\n"
+"Switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
 "\n"
 "Some actions are possible only if the right panel is selected.\n"
 "For example, if you want to add a task in the TODO list, you need first\n"
-"to press the 'Tab' key to get the TODO panel selected. Then you can\n"
-"press 'A' to add your item.\n"
+"to press the '%s' key to get the TODO panel selected. Then you can\n"
+"press '%s' to add your item.\n"
 "\n"
 "Notice that at the bottom of the screen the list of possible actions\n"
-"change while pressing 'Tab', so you always know what action can be\n"
+"change while pressing '%s', so you always know what action can be\n"
 "performed on the selected panel."
 msgstr ""
 "De 'Tab'-toets verplaatst de focus tussen de panels.\n"
@@ -826,20 +896,22 @@ msgstr ""
 "acties mee verandert, zodat altijd te zien is, welke acties gedaan kunnen \n"
 "worden in het actieve panel."
 
-#: src/help.c:382
-msgid "Goto:\n"
+#: src/help.c:440
+#, fuzzy
+msgid "Goto\n"
 msgstr "Ga naar:\n"
 
-#: src/help.c:384
+#: src/help.c:442
+#, fuzzy, c-format
 msgid ""
-"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
+"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.\n"
 "\n"
-"Notice that pressing ^G (Control + G), whatever panel is\n"
+"Notice that pressing '%s', 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"
@@ -852,13 +924,15 @@ msgstr ""
 "Merk op dat met ^G (Control + G), ongeacht welk panel actief is\n"
 "de huidige datum geselecteerd zal worden in de kalender."
 
-#: src/help.c:392
-msgid "Delete:\n"
+#: src/help.c:451
+#, fuzzy
+msgid "Delete\n"
 msgstr "Wissen:\n"
 
-#: src/help.c:394
+#: src/help.c:453
+#, fuzzy, c-format
 msgid ""
-"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
+"Delete an element in the ToDo or Appointment list.\n"
 "\n"
 "Depending on which panel is selected when you press the delete key,\n"
 "the hilighted item of either the ToDo or Appointment list will be \n"
@@ -886,23 +960,25 @@ msgstr ""
 "Vergeet niet om de kalenderdata op te slaan, als je de veranderingen \n"
 "wilt behouden."
 
-#: src/help.c:406
-msgid "Add:\n"
+#: src/help.c:465
+#, fuzzy
+msgid "Add\n"
 msgstr "Toevoegen:\n"
 
-#: src/help.c:408
+#: src/help.c:467
+#, fuzzy, c-format
 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"
+"Add an item in either the ToDo or Appointment list, depending on which\n"
+"panel is selected when you press '%s'.\n"
 "\n"
 "To enter a new item in the TODO list, you will need first to enter the\n"
 "description of this new item. Then you will be asked to specify the todo\n"
 "priority. This priority is represented by a number going from 9 for the\n"
 "lowest priority, to 1 for the highest one. It is still possible to\n"
-"change the item priority afterwards, by using the '+/-' keys inside the\n"
-"todo panel.\n"
+"change the item priority afterwards, by using the '%s' and '%s' keys\n"
+"inside the todo panel.\n"
 "\n"
-"If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
+"If the APPOINTMENT panel is selected while pressing '%s', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
 "To enter a new event, press [ENTER] instead of the item start time, and\n"
 "just fill in the event description.\n"
@@ -914,7 +990,7 @@ msgid ""
 "\n"
 "The day at which occurs the event or appointment is the day currently\n"
 "selected in the calendar, so you need to move to the desired day before\n"
-"pressing 'A'.\n"
+"pressing '%s'.\n"
 "\n"
 "Notes:\n"
 "     o if an appointment lasts for such a long time that it continues\n"
@@ -957,13 +1033,15 @@ 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:438
-msgid "Edit Item:\n"
+#: src/help.c:502
+#, fuzzy
+msgid "Edit Item\n"
 msgstr "Item wijzigen:\n"
 
-#: src/help.c:440
+#: src/help.c:504
+#, fuzzy, c-format
 msgid ""
-"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Edit the item which is currently selected.\n"
 "Depending on the item type (appointment, event, or todo), and if it is\n"
 "repeated or not, you will be asked to choose one of the item properties\n"
 "to modify. An item property is one of the following: the start time, the\n"
@@ -996,18 +1074,19 @@ 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:455
-msgid "EditNote:\n"
+#: src/help.c:519
+#, fuzzy
+msgid "EditNote\n"
 msgstr "WzgNoot:\n"
 
-#: src/help.c:457
+#: src/help.c:521
+#, fuzzy, c-format
 msgid ""
-"Pressing 'N' allows you to attach a note to any type of item, or to\n"
-"edit an already existing note.\n"
+"Attach a note to any type of item, or edit an already existing note.\n"
 "This feature is useful if you do not have enough space to store all\n"
 "of your item description, or if you would like to add sub-tasks to an\n"
 "already existing todo item for example.\n"
-"Before pressing the 'N' key, you first need to highlight the item you\n"
+"Before pressing the '%s' key, you first need to highlight the item you\n"
 "want the note to be attached to. Then you will be driven to an\n"
 "external editor to edit your note. This editor is chosen the following\n"
 "way:\n"
@@ -1041,24 +1120,26 @@ 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:476
-msgid "ViewNote:\n"
+#: src/help.c:540
+#, fuzzy
+msgid "ViewNote\n"
 msgstr "BekijkNoot:\n"
 
-#: src/help.c:478
+#: src/help.c:542
+#, fuzzy, c-format
 msgid ""
-"Pressing the '>' key allows you to view a note which was previously\n"
-"attached to an item (an item which owns a note has a '>' sign in front\n"
-"of it). This command only permits to view the note, not to\n"
-"edit it (to do so, use the 'EditNote' command, using the 'N' key).\n"
-"Once you highlighted an item with a note attached to it, and the '>' key\n"
+"View a note which was previously attached to an item (an item which\n"
+"owns a note has a '>' sign in front of it).\n"
+"This command only permits to view the note, not to edit it (to do so,\n"
+"use the 'EditNote' command, by pressing the '%s' key).\n"
+"Once you highlighted an item with a note attached to it, and the '%s' key\n"
 "was pressed, you will be driven to an external pager to view that note.\n"
 "The default pager is chosen the following way:\n"
 "     o if the 'PAGER' environment variable is set, then this will be\n"
 "       the default viewer to be called.\n"
 "     o if the above environment variable is not set, then\n"
 "       '/usr/bin/less' will be used.\n"
-"As for the 'N' key, quit the pager and you will be driven back to\n"
+"As for editing a note, quit the pager and you will be driven back to\n"
 "Calcurse."
 msgstr ""
 "Druk op '>' om een bijgesloten noot te bekijken (een item heeft een noot\n"
@@ -1074,24 +1155,27 @@ msgstr ""
 "       er gebruik gemaakt worden van '/usr/bin/less'.\n"
 "Als de pager wordt afgesloten, keer je terug naar Calcurse."
 
-#: src/help.c:493
-msgid "Priority:\n"
+#: src/help.c:559
+#, fuzzy
+msgid "Priority\n"
 msgstr "Prioriteit:\n"
 
-#: src/help.c:495
+#: src/help.c:561
+#, fuzzy, c-format
 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"
-"appearing in front of the todo description. This number goes from 9 for\n"
-"the lowest priority to 1 for the highest priority. Todo having higher\n"
-"priorities are placed first (at the top) inside the todo panel.\n"
+"Change the priority of the currently selected item in the ToDo list.\n"
+"Priorities are represented by the number appearing in front of the\n"
+"todo description. This number goes from 9 for the lowest priority to\n"
+"1 for the highest priority.\n"
+"Todo having higher priorities are placed first (at the top) inside the\n"
+"todo panel.\n"
 "\n"
-"If you want to raise the priority of a todo item, you need to press '+'.\n"
+"If you want to raise the priority of a todo item, you need to press '%s'.\n"
 "In doing so, the number in front of this item will decrease, meaning its\n"
 "priority increases. The item position inside the todo panel may change,\n"
 "depending on the priority of the items above it.\n"
 "\n"
-"At the opposite, to lower a todo priority, press '-'. The todo position\n"
+"At the opposite, to lower a todo priority, press '%s'. The todo position\n"
 "may also change depending on the priority of the items below."
 msgstr ""
 "De prioriteit van het geselecteerde item in de takenlijst is te \n"
@@ -1109,16 +1193,19 @@ msgstr ""
 "'-' te drukken. Ook hier kan de plaats van de taak veranderen, afhankelijk \n"
 "van de prioriteiten van de onderstaande taken."
 
-#: src/help.c:509
-msgid "Repeat:\n"
+#: src/help.c:577
+#, fuzzy
+msgid "Repeat\n"
 msgstr "Herhalen:\n"
 
-#: src/help.c:511
+#: src/help.c:579
+#, fuzzy, c-format
 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"
-"panel. Then pressing 'R' will lead you to a set of three questions, with\n"
-"which you will be able to specify the repetition characteristics:\n"
+"Repeat an event or an appointment.\n"
+"You must first select the item to be repeated by moving inside the\n"
+"appointment panel. Then pressing '%s' will lead you to a set of three\n"
+"questions, with which you will be able to specify the repetition\n"
+"characteristics:\n"
 "\n"
 "  o        type: you can choose between a daily, weekly, monthly or\n"
 "                 yearly repetition by pressing 'D', 'W', 'M' or 'Y'\n"
@@ -1171,14 +1258,15 @@ msgstr ""
 "         schema's gemaakt worden, omdat het mogelijk is om slechts \n"
 "         een herhaling van meerdere herhaalde items te wissen."
 
-#: src/help.c:535
-msgid "Flag Item:\n"
+#: src/help.c:604
+#, fuzzy
+msgid "Flag Item\n"
 msgstr "Vlag Item:\n"
 
-#: src/help.c:537
+#: src/help.c:606
+#, fuzzy, c-format
 msgid ""
-"Pressing '!' toggles an appointment's 'important' flag.\n"
-"\n"
+"Toggle an appointment's 'important' flag.\n"
 "If an item is flagged as important, an exclamation mark appears in front\n"
 "of it, and you will be warned if time gets closed to the appointment\n"
 "start time.\n"
@@ -1195,24 +1283,25 @@ msgstr ""
 "om de gebruiker te waarschuwen over de op handen zijnde afspraak, en hoe \n"
 "lang van te voren dit gebeurt."
 
-#: src/help.c:545
-msgid "Config:\n"
+#: src/help.c:614
+#, fuzzy
+msgid "Config\n"
 msgstr "Instellingen:\n"
 
-#: src/help.c:547
+#: src/help.c:616
+#, fuzzy, c-format
 msgid ""
-"Pressing 'C' leads to the configuration submenu, from which you can\n"
-"select between color, layout, and general options.\n"
+"Open the configuration submenu.\n"
+"From this submenu, you can select between color, layout, notification\n"
+"and general options, and you can also configure your keybindings.\n"
 "\n"
 "The color submenu lets you choose the color theme.\n"
-"\n"
 "The layout submenu lets you choose the Calcurse screen layout, in other\n"
 "words where to place the three different panels on the screen.\n"
-"\n"
 "The general options submenu brings a screen with the different options\n"
 "which modifies the way Calcurse interacts with the user.\n"
-"\n"
 "The notify submenu allows you to change the notify-bar settings.\n"
+"The keys submenu lets you define your own key bindings.\n"
 "\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
@@ -1233,29 +1322,29 @@ msgstr ""
 "Vergeet niet kalenderdata op te slaan, als de nieuwe configuratie voor\n"
 "de volgende start van Calcurse behouden moeten blijven."
 
-#: src/help.c:558
-msgid "General keybindings:\n"
+#: src/help.c:629
+#, fuzzy
+msgid "Generic keybindings\n"
 msgstr "Algemene toetsen:\n"
 
-#: src/help.c:560
+#: src/help.c:631
+#, fuzzy, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
-"called general keybinding and involve the <CONTROL> key, which is\n"
-"represented by the '^' sign in the status bar panel. For example,\n"
-"'^A' means you need to press <CONTROL> and 'A' simultaneously to\n"
-"activate the command. Here is the list of all the general keybindings,\n"
-"together with their corresponding action:\n"
+"called generic keybinding.\n"
+"Here is the list of all the generic key bindings, together with their\n"
+"corresponding action:\n"
 "\n"
-" '^R' : Redraw function -> redraws calcurse panels, this is useful if\n"
+" '%s' : Redraw function -> redraws calcurse panels, this is useful if\n"
 "                           you resize your terminal screen or when\n"
 "                           garbage appears inside the display\n"
-" '^A' : Add Appointment -> add an appointment or an event\n"
-" '^T' : Add ToDo        -> add a todo\n"
-" '^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\n"
-" '^G' : Goto today      -> move to current day"
+" '%s' : Add Appointment -> add an appointment or an event\n"
+" '%s' : Add ToDo        -> add a todo\n"
+" '%s' : -1 Day          -> move to previous day\n"
+" '%s' : +1 Day          -> move to next day\n"
+" '%s' : -1 Week         -> move to previous week\n"
+" '%s' : +1 Week         -> move to next week\n"
+" '%s' : 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"
@@ -1275,17 +1364,19 @@ msgstr ""
 " '^J' : +1 week            -> Ga naar de volgende week\n"
 " '^G' : Naar vandaag       -> Ga naar de huidige datum"
 
-#: src/help.c:577
-msgid "OtherCmd:\n"
+#: src/help.c:654
+#, fuzzy
+msgid "OtherCmd\n"
 msgstr "AndereCmd:\n"
 
-#: src/help.c:579
+#: src/help.c:656
+#, fuzzy, c-format
 msgid ""
-"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Switch between status bar help pages.\n"
 "Because the terminal screen is too narrow to display all of the\n"
-"available commands, you need to press 'O' to see the next set of\n"
+"available commands, you need to press '%s' to see the next set of\n"
 "commands together with their keybindings.\n"
-"Once the last status bar page is reached, pressing 'O' another time\n"
+"Once the last status bar page is reached, pressing '%s' another time\n"
 "leads you back to the first page."
 msgstr ""
 "Met de 'O'-toets kan er tussen de verschillende hulpschermen \n"
@@ -1295,12 +1386,14 @@ msgstr ""
 "Zodra het laatste scherm is bereikt, ga je naar het eerste scherm \n"
 "terug, als er weer op 'O' wordt gedrukt."
 
-#: src/help.c:586
+#: src/help.c:665
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - tekst-gebaseerde organizer"
 
-#: src/help.c:588
+#: src/help.c:667
+#, fuzzy, c-format
 msgid ""
+"\n"
 "Copyright (c) 2004-2008 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
@@ -1333,677 +1426,747 @@ msgstr ""
 "Zendt kritiek of commentaar aan : calcurse@culot.org\n"
 "Calcurse Homepage : http://culot.org/calcurse"
 
-#: src/io.c:128
+#: src/io.c:141
 msgid "Saving..."
 msgstr "Opslaan..."
 
-#: src/io.c:129
+#: src/io.c:142
 msgid "Loading..."
 msgstr "Laden..."
 
-#: src/io.c:130
+#: src/io.c:143
 msgid "Exporting..."
 msgstr "Exporteren..."
 
-#: src/io.c:184
+#: src/io.c:144
+msgid "Internal error while displaying progress bar"
+msgstr ""
+
+#: src/io.c:207
 msgid "Choose the file used to export calcurse data:"
 msgstr "Kies het bestand om calcurse data naar te exporteren:"
 
-#: src/io.c:186 src/io.c:2321
+#: src/io.c:209 src/io.c:2537
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
 
-#: src/io.c:187 src/io.c:2322 src/recur.c:676
+#: src/io.c:210 src/io.c:2538 src/recur.c:677
 msgid "Press [ENTER] to continue."
 msgstr "[ENTER]-toets om door te gaan."
 
-#: src/io.c:250
+#: src/io.c:273
 msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
 msgstr "FATALE FOUT in foreach_date_dump: incoherent herhalingstype\n"
 
-#: src/io.c:289
+#: src/io.c:312
 msgid "Week"
 msgstr "Week"
 
-#: src/io.c:409
+#: src/io.c:432
 msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
 msgstr "FATALE FOUT in pcal_export_recur_events: incoherent herhalingstype\n"
 
-#: src/io.c:545
+#: src/io.c:568
 msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
 msgstr "FATALE FOUT in pcal_export_recur_apoints: incoherent herhalingstype\n"
 
-#: src/io.c:674
+#: src/io.c:699
 #, 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:681 src/io.c:701
+#: src/io.c:706 src/io.c:726
 #, c-format
 msgid "aborting...\n"
 msgstr "afbreken...\n"
 
-#: src/io.c:695
+#: src/io.c:720
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s met succes aangemaakt\n"
 
-#: src/io.c:696
+#: src/io.c:721
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "interactieve modus gestart...\n"
 
-#: src/io.c:733
+#: src/io.c:758
 msgid "Problems accessing data file ..."
 msgstr "Probleem bij benaderen databestand ..."
 
-#: src/io.c:744
+#: src/io.c:769
 msgid "The data files were successfully saved"
 msgstr "De databestanden zijn met succes opgeslagen"
 
-#: src/io.c:927
+#: src/io.c:963
 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:948
+#: src/io.c:984
 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:964
+#: src/io.c:1000
 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:1108
+#: src/io.c:1144
 msgid "Failed to open todo file"
 msgstr "Kan takenbestand niet openen"
 
-#: src/io.c:1170 src/io.c:1190
+#: src/io.c:1261
+#, fuzzy
+msgid "FATAL ERROR in io_load_keys: could not find any key file."
+msgstr "FATALE FOUT in launch_cmd: probleem met fork"
+
+#: src/io.c:1275
+msgid ""
+"\n"
+"Too many errors while reading configuration file!\n"
+"Please backup your keys file, remove it from directory, and launch calcurse "
+"again.\n"
+msgstr ""
+
+#: src/io.c:1292
+msgid "Could not read key label"
+msgstr ""
+
+#: src/io.c:1301
+#, fuzzy
+msgid "Key label not recognized"
+msgstr "herhalingsfrequentie niet herkend"
+
+#: src/io.c:1321
+#, c-format
+msgid "Error reading key: \"%s\""
+msgstr ""
+
+#: src/io.c:1336
+#, c-format
+msgid "\"%s\" assigned multiple times!"
+msgstr ""
+
+#: src/io.c:1357
+msgid "There were some errors when loading keys file, see log file ?"
+msgstr ""
+
+#: src/io.c:1363
+msgid "Too many errors while reading keys file, aborting..."
+msgstr ""
+
+#: src/io.c:1377 src/io.c:1397
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
 msgstr "FATALE FOUT: kan %s niet aanmaken: %s\n"
 
-#: src/io.c:1229
+#: src/io.c:1444
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welkom bij Calcurse. De missende databestanden zijn aangemaakt."
 
-#: src/io.c:1230
+#: src/io.c:1445
 msgid "Data files found. Data will be loaded now."
 msgstr "Databestanden gevonden. Data wordt geladen."
 
-#: src/io.c:1250
+#: src/io.c:1465
 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:1251
+#: src/io.c:1466
 msgid "FATAL ERROR in io_export_data: unknown export type\n"
 msgstr "FATALE FOUT in io_export_data: onbekend export type\n"
 
-#: src/io.c:1252
+#: src/io.c:1467
 msgid "The data were successfully exported"
 msgstr "De data is met succes geëxporteerd"
 
-#: src/io.c:1321
+#: src/io.c:1536
 msgid "Ical"
 msgstr "Ical"
 
-#: src/io.c:1322
+#: src/io.c:1537
 msgid "Pcal"
 msgstr "Pcal"
 
-#: src/io.c:1364
+#: src/io.c:1580
 msgid "ERROR in ical_log: unknown ical type"
 msgstr "FOUT in ical_log: onbekend ical type"
 
-#: src/io.c:1823
+#: src/io.c:2039
 msgid "recurrence frequence not found."
 msgstr "herhalingsfrequentie niet gevonden."
 
-#: src/io.c:1841
+#: src/io.c:2057
 msgid "recurrence frequence not recognized."
 msgstr "herhalingsfrequentie niet herkend"
 
-#: src/io.c:1906
+#: src/io.c:2122
 msgid "recurrence rule malformed."
 msgstr "herhalingsregel onjuist"
 
-#: src/io.c:1961
+#: src/io.c:2177
 msgid "recurrence exception dates malformed."
 msgstr "herhaling exceptie datum onjuist"
 
-#: src/io.c:1980 src/io.c:2403
+#: src/io.c:2196
 msgid ""
 "Warning: could not create new note file to store description. Aborting...\n"
 msgstr ""
 "Pas op: kan geen noot-bestand aanmaken. Omschrijving opslaan afgebroken...\n"
 
-#: src/io.c:1984
+#: src/io.c:2200
 #, c-format
 msgid "Warning: could not open %s, Aborting..."
 msgstr "Pas op: bestand %s niet te openen. Stoppen..."
 
-#: src/io.c:1991
+#: src/io.c:2207
 msgid "could not get entire item description."
 msgstr "onvolledige item omschrijving"
 
-#: src/io.c:2013
+#: src/io.c:2229
 msgid "description malformed."
 msgstr "omschrijving beschadigd"
 
-#: src/io.c:2092
+#: src/io.c:2308
 msgid "appointment has no start time."
 msgstr "afspraak heeft geen begintijd."
 
-#: src/io.c:2100
+#: src/io.c:2316
 msgid "could not compute duration (no end time)."
 msgstr "kan tijdsduur niet berekenen (geen eindtijd)."
 
-#: src/io.c:2119
+#: src/io.c:2335
 msgid "item has a negative duration."
 msgstr "item heeft een negatieve tijdsduur"
 
-#: src/io.c:2136
+#: src/io.c:2352
 msgid "item could not be identified."
 msgstr "item onbekend"
 
-#: src/io.c:2144 src/io.c:2264
+#: src/io.c:2360 src/io.c:2480
 msgid "could not retrieve item summary."
 msgstr "kan item onderwerp niet ophalen"
 
-#: src/io.c:2158
+#: src/io.c:2374
 msgid "could not retrieve event start time."
 msgstr "kan begintijd van gebeurtenis niet ophalen"
 
-#: src/io.c:2169
+#: src/io.c:2385
 msgid "could not retrieve event end time."
 msgstr "kan eindtijd van gebeurtenis niet ophalen"
 
-#: src/io.c:2178
+#: src/io.c:2394
 msgid "item duration malformed."
 msgstr "item tijdsduur onjuist"
 
-#: src/io.c:2207 src/io.c:2304
+#: src/io.c:2423 src/io.c:2520
 msgid "The ical file seems to be malformed. The end of item was not found."
 msgstr "Ical-bestand oogt onjuist. Het einde van item niet gevonden."
 
-#: src/io.c:2283
+#: src/io.c:2499
 msgid "item priority is not acceptable (must be between 1 and 9)."
 msgstr "Prioriteit van item is onjuist (kies nr tussen 1 en 9)"
 
-#: src/io.c:2319
+#: src/io.c:2535
 msgid "Enter the file name to import data from:"
 msgstr "Kies het bestand voor het importeren van data:"
 
-#: src/io.c:2362
+#: src/io.c:2576
 #, c-format
 msgid "Import process report: %04d lines read "
 msgstr "Import proces rapport: %04d gelezen regels"
 
-#: src/io.c:2364
+#: src/io.c:2578
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped "
 msgstr "%d afsp / %d geb / %d taken / %d overgeslagen "
 
-#: src/io.c:2366
+#: src/io.c:2580
 #, c-format
 msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
 msgstr ""
 "%d afsp / %d geb / %d taken / %d overgeslagen ([ENTER] om door te gaan)"
 
-#: src/io.c:2375
+#: src/io.c:2590
 msgid "FATAL ERROR in io_import_data: unknown import type"
 msgstr "FATALE FOUT in io_import_data: verkeerd import type"
 
-#: src/io.c:2381
+#: src/io.c:2596
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr "FATALE FOUT: invoerbestand niet toegankelijk, Afbreken..."
 
-#: src/io.c:2388
+#: src/io.c:2603
 msgid "FATAL ERROR in io_import_data: wrong import mode"
 msgstr "FATALE FOUT in io_import_data: verkeerde import modus"
 
-#: src/io.c:2398
+#: src/io.c:2613
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr "Pas op: ical header onjuist of verkeerde versie. Stoppen..."
 
-#: src/io.c:2408
+#: src/io.c:2668
+msgid "Some items could not be imported, see log file ?"
+msgstr "Enkele items konden niet geïmporteerd worden, log zien?"
+
+#: src/io.c:2684
+#, fuzzy
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr "Pas op: kan tijdelijk logbestand niet wissen, Stoppen..."
+
+#: src/io.c:2687 src/io.c:2693
 msgid "Warning: could not open temporary log file, Aborting..."
 msgstr "Pas op: kan tijdelijk logbestand niet openen, Stoppen..."
 
-#: src/io.c:2454
-msgid "Some items could not be imported, see log file ?"
-msgstr "Enkele items konden niet geïmporteerd worden, log zien?"
+#: src/io.c:2714
+msgid "No log file to display!"
+msgstr ""
 
-#: src/io.c:2488
-msgid "Warning: could not erase temporary log file, Aborting..."
+#: src/io.c:2749
+#, fuzzy, c-format
+msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr "Pas op: kan tijdelijk logbestand niet wissen, Stoppen..."
 
-#: src/notify.c:135
+#: src/notify.c:136
 msgid "FATAL ERROR in launch_cmd: could not fork"
 msgstr "FATALE FOUT in launch_cmd: probleem met fork"
 
-#: src/notify.c:138
+#: src/notify.c:139
 msgid "FATAL ERROR in launch_cmd: could not launch user command"
 msgstr "FATALE FOUT in launch_cmd: kan gebruikerscommando niet starten"
 
-#: src/notify.c:449
+#: src/notify.c:450
 msgid "notify-bar_show = "
 msgstr "informatiebalk_toon = "
 
-#: src/notify.c:450
+#: src/notify.c:451
 msgid "notify-bar_date = "
 msgstr "informatiebalk_datum = "
 
-#: src/notify.c:451
+#: src/notify.c:452
 msgid "notify-bar_clock = "
 msgstr "informatiebalk_tijd= "
 
-#: src/notify.c:452
+#: src/notify.c:453
 msgid "notify-bar_warning = "
 msgstr "informatiebalk_waarschuwing = "
 
-#: src/notify.c:453
+#: src/notify.c:454
 msgid "notify-bar_command = "
 msgstr "informatiebalk_commando = "
 
-#: src/notify.c:456
+#: src/notify.c:457
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(Bij JA, wordt de informatiebalk weergegeven)"
 
-#: src/notify.c:458
+#: src/notify.c:459
 msgid "(Format of the date to be displayed inside notify-bar)"
 msgstr "(Formaat van de datum in de informatiebalk.)"
 
-#: src/notify.c:461
+#: src/notify.c:462
 msgid "(Format of the time to be displayed inside notify-bar)"
 msgstr "(Formaat van de tijd in de informatiebalk.)"
 
-#: src/notify.c:464
+#: src/notify.c:465
 msgid ""
 "(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
 msgstr ""
 "Meldt gebruiker dat er een afspraak binnen 'informatiebalk_waarschuwing' "
 "seconden is"
 
-#: src/notify.c:467
+#: src/notify.c:468
 msgid "(Command used to notify user of an upcoming appointment)"
 msgstr "(Commando dat melding geeft van op handen zijnde afspraak)"
 
-#: src/notify.c:524
+#: src/notify.c:525
 msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
 msgstr "Geef het formaat van de tijd (zie 'man 3 strftime')"
 
-#: src/notify.c:526
+#: src/notify.c:527
 msgid "Enter the number of seconds (0 not to be warned before an appointment)"
 msgstr "Geef het aantal seconden (0 voor geen waarschuwing voor een afspraak)."
 
-#: src/notify.c:527
+#: src/notify.c:528
 msgid "Enter the notification command "
 msgstr "Geef het meldingscommando "
 
-#: src/notify.c:531
+#: src/notify.c:532
 #, c-format
 msgid "CalCurse %s | notify-bar options"
 msgstr "CalCurse %s | Informatiebalk-opties"
 
-#: src/recur.c:129
+#: src/recur.c:130
 msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
 msgstr "FATALE FOUT in recur_def2char: herhaal type onbekend\n"
 
-#: src/recur.c:161
+#: src/recur.c:162
 msgid "FATAL ERROR in recur_char2def: unknown char\n"
 msgstr "FATALE FOUT in recur_char2def: onbekend karakter\n"
 
-#: src/recur.c:297
+#: src/recur.c:298
 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:437
+#: src/recur.c:438
 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:570
+#: src/recur.c:571
 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:642
+#: src/recur.c:643
 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:666
+#: src/recur.c:667
 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:668
+#: src/recur.c:669
 msgid "Enter the repetition frequence:"
 msgstr "Geef de herhalingsinterval:"
 
-#: src/recur.c:671
+#: src/recur.c:672
 #, 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:674
+#: src/recur.c:675
 #, 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:675
+#: src/recur.c:676
 msgid "This item is already a repeated one."
 msgstr "Dit item wordt al herhaald."
 
-#: src/recur.c:678
+#: src/recur.c:679
 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:792
+#: src/recur.c:793
 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:821
+#: src/recur.c:822
 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:896
+#: src/recur.c:897
 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:920
+#: src/recur.c:921
 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:956
+#: src/recur.c:957
 msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
 msgstr "FATALE FOUT in recur_apoint_switch_notify: item bestaat niet\n"
 
-#: src/todo.c:138
+#: src/todo.c:139
 msgid "Enter the new ToDo item : "
 msgstr "Voer de nieuwe taak in : "
 
-#: src/todo.c:139
+#: src/todo.c:140
 msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
 msgstr "Geef taakprioriteit [1 (hoogste) - 9 (laagste)] :"
 
-#: src/todo.c:192
+#: src/todo.c:193
 msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
 msgstr "FATALE FOUT in todo_delete_note: geen noot aanwezig\n"
 
-#: src/todo.c:201
+#: src/todo.c:202
 msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
 msgstr "FATALE FOUT in todo_delete_note_bynum: taak bestaat niet\n"
 
-#: src/todo.c:230
+#: src/todo.c:231
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "FATALE FOUT in todo_delete_bynum: taak bestaat niet\n"
 
-#: src/todo.c:240
+#: src/todo.c:241
 msgid "Do you really want to delete this task ?"
 msgstr "Wilt u werkelijk deze taak wissen ?"
 
-#: src/todo.c:242
+#: src/todo.c:243
 msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
 msgstr "Dit item heeft een noot bijgesloten. Wis (t)aak of alleen de (n)oot?"
 
-#: src/todo.c:244
+#: src/todo.c:245
 msgid "[t/n] "
 msgstr "[t/n]"
 
-#: src/todo.c:328
+#: src/todo.c:329
 msgid "FATAL ERROR in todo_get_position: todo not found\n"
 msgstr "FATALE FOUT in todo_get_position: taak bestaat niet\n"
 
-#: src/todo.c:360
+#: src/todo.c:361
 msgid "FATAL ERROR in todo_chg_priority: no such action\n"
 msgstr "FATALE FOUT in todo_chg_priority: actie bestaat niet\n"
 
-#: src/todo.c:375
+#: src/todo.c:376
 msgid "Enter the new ToDo description :"
 msgstr "Voer de nieuwe taakbeschrijving in : "
 
-#: src/utils.c:61
+#: src/utils.c:68
 msgid "INTERNAL ERROR"
 msgstr "INTERNE FOUT"
 
-#: src/utils.c:62
+#: src/utils.c:69
 msgid "calcurse will now exit..."
 msgstr "calcurse eindigt nu..."
 
-#: src/utils.c:63
+#: src/utils.c:70
 msgid "Please report the following bug:"
 msgstr "Rapporteer aub de volgende fout:"
 
-#: src/utils.c:164
+#: src/utils.c:169
 msgid "Press any key to continue..."
 msgstr "Druk op een toets om door te gaan..."
 
-#: src/utils.c:402
+#: src/utils.c:412
 msgid "FATAL ERROR in updatestring: out of memory"
 msgstr "FATALE FOUT in updatestring: te weinig geheugen"
 
-#: src/utils.c:444
+#: src/utils.c:455
+msgid "Credits"
+msgstr ""
+
+#: src/utils.c:456
 msgid "Help"
 msgstr "Hulp"
 
-#: src/utils.c:445
+#: src/utils.c:457
 msgid "Quit"
 msgstr "Einde"
 
-#: src/utils.c:446
+#: src/utils.c:458
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/utils.c:447
-msgid "Export"
-msgstr "Export"
+#: src/utils.c:459
+msgid "Chg View"
+msgstr "Wzg focus"
 
-#: src/utils.c:448
+#: src/utils.c:460
 msgid "Import"
 msgstr "Import"
 
-#: src/utils.c:449
-msgid "Add Item"
-msgstr "Nieuw Itm"
-
-#: src/utils.c:450
-msgid "Del Item"
-msgstr "Wis Item"
-
-#: src/utils.c:451
-msgid "Edit Itm"
-msgstr "Wzg Itm"
-
-#: src/utils.c:452
-msgid "Flag Itm"
-msgstr "Vlag Itm"
-
-#: src/utils.c:453 src/utils.c:467
-msgid "-+1 Day"
-msgstr "-/+1 Dag"
-
-#: src/utils.c:454 src/utils.c:468
-msgid "-+1 Week"
-msgstr "-/+ Week"
-
-#: src/utils.c:455
-msgid "Up/Down"
-msgstr "Op/Neer"
-
-#: src/utils.c:456
-msgid "Repeat"
-msgstr "Herhalen"
-
-#: src/utils.c:457
-msgid "Priority"
-msgstr "Prioriteit"
-
-#: src/utils.c:458
-msgid "Chg View"
-msgstr "Wzg focus"
+#: src/utils.c:461
+msgid "Export"
+msgstr "Export"
 
-#: src/utils.c:459
+#: src/utils.c:462
 msgid "Go to"
 msgstr "Ga naar"
 
-#: src/utils.c:460
+#: src/utils.c:463
+msgid "OtherCmd"
+msgstr "AnderCmd"
+
+#: src/utils.c:464
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:461
-msgid "View"
-msgstr "Bekijken"
-
-#: src/utils.c:462
+#: src/utils.c:465
 msgid "Redraw"
 msgstr "Ververs"
 
-#: src/utils.c:463
+#: src/utils.c:466
 msgid "Add Appt"
 msgstr "Nieuw Afspr"
 
-#: src/utils.c:464
+#: src/utils.c:467
 msgid "Add Todo"
 msgstr "Nieuw Taak"
 
-#: src/utils.c:465
-msgid "EditNote"
-msgstr "WzgNoot"
-
-#: src/utils.c:466
-msgid "ViewNote"
-msgstr "BekijkNoot"
+#: src/utils.c:468
+#, fuzzy
+msgid "+1 Day"
+msgstr "-/+1 Dag"
 
 #: src/utils.c:469
-msgid "OtherCmd"
-msgstr "AnderCmd"
+#, fuzzy
+msgid "-1 Day"
+msgstr "-/+1 Dag"
 
 #: src/utils.c:470
+#, fuzzy
+msgid "+1 Week"
+msgstr "-/+ Week"
+
+#: src/utils.c:471
+#, fuzzy
+msgid "-1 Week"
+msgstr "-/+ Week"
+
+#: src/utils.c:472
 msgid "Today"
 msgstr "Vandaag"
 
-#: src/utils.c:471
+#: src/utils.c:477
 msgid "beg Week"
 msgstr "beg Week"
 
-#: src/utils.c:472
+#: src/utils.c:478
 msgid "end Week"
 msgstr "eind Week"
 
-#: src/utils.c:537
+#: src/utils.c:479
+msgid "Add Item"
+msgstr "Nieuw Itm"
+
+#: src/utils.c:480
+msgid "Del Item"
+msgstr "Wis Item"
+
+#: src/utils.c:481
+msgid "Edit Itm"
+msgstr "Wzg Itm"
+
+#: src/utils.c:482
+msgid "View"
+msgstr "Bekijken"
+
+#: src/utils.c:483
+msgid "Flag Itm"
+msgstr "Vlag Itm"
+
+#: src/utils.c:484
+msgid "Repeat"
+msgstr "Herhalen"
+
+#: src/utils.c:485
+msgid "EditNote"
+msgstr "WzgNoot"
+
+#: src/utils.c:486
+msgid "ViewNote"
+msgstr "BekijkNoot"
+
+#: src/utils.c:487
+msgid "Prio.+"
+msgstr ""
+
+#: src/utils.c:488
+msgid "Prio.-"
+msgstr ""
+
+#: src/utils.c:534
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATALE FOUT in date2sec: fout in mktime\n"
 
-#: src/utils.c:612
+#: src/utils.c:609
 msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
 msgstr "FATALE FOUT in date_sec_change: fout in mktime\n"
 
-#: src/utils.c:753
+#: src/utils.c:750
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: src/utils.c:779
+#: src/utils.c:776
 msgid "FATAL ERROR in other_status_page: unknown panel\n"
 msgstr "FATALE FOUT in other_status_page: onbekend panel\n"
 
-#: src/utils.c:849
+#: src/utils.c:846
 msgid "FATAL ERROR in mystrtol: could not convert string"
 msgstr "FATALE FOUT in mystrtol: kan string niet omzetten"
 
-#: src/utils.c:851
+#: src/utils.c:848
 msgid "FATAL ERROR in mystrtol: number is out of range"
 msgstr "FATALE FOUT in mystrtol: nummer buiten bereik"
 
-#: src/utils.c:873
+#: src/utils.c:870
 msgid "yes"
 msgstr "ja"
 
-#: src/utils.c:878
+#: src/utils.c:875
 msgid "no"
 msgstr "nee"
 
-#: src/utils.c:882
+#: src/utils.c:879
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "Optie ongedefinieerd - Probleem in print_option_incolor()"
 
-#: src/utils.c:919
+#: src/utils.c:916
 msgid "FATAL ERROR: temporary file could not be created!"
 msgstr "FATALE FOUT: tijdelijk bestand kan niet worden aangemaakt!"
 
-#: src/utils.c:933
+#: src/utils.c:930
 msgid "FATAL ERROR in erase_note: could not remove note\n"
 msgstr "FATALE FOUT in erase_note: kan noot niet verwijderen\n"
 
-#: src/vars.c:56
+#: src/vars.c:57
 msgid "January"
 msgstr "januari"
 
-#: src/vars.c:57
+#: src/vars.c:58
 msgid "February"
 msgstr "februari"
 
-#: src/vars.c:58
+#: src/vars.c:59
 msgid "March"
 msgstr "maart"
 
-#: src/vars.c:59
+#: src/vars.c:60
 msgid "April"
 msgstr "april"
 
-#: src/vars.c:60
+#: src/vars.c:61
 msgid "May"
 msgstr "mei"
 
-#: src/vars.c:61
+#: src/vars.c:62
 msgid "June"
 msgstr "juni"
 
-#: src/vars.c:62
+#: src/vars.c:63
 msgid "July"
 msgstr "juli"
 
-#: src/vars.c:63
+#: src/vars.c:64
 msgid "August"
 msgstr "augustus"
 
-#: src/vars.c:64
+#: src/vars.c:65
 msgid "September"
 msgstr "september"
 
-#: src/vars.c:65
+#: src/vars.c:66
 msgid "October"
 msgstr "oktober"
 
-#: src/vars.c:66
+#: src/vars.c:67
 msgid "November"
 msgstr "november"
 
-#: src/vars.c:67
+#: src/vars.c:68
 msgid "December"
 msgstr "december"
 
-#: src/vars.c:71 src/vars.c:78
+#: src/vars.c:72 src/vars.c:79
 msgid "Sun"
 msgstr " zo"
 
-#: src/vars.c:72
+#: src/vars.c:73
 msgid "Mon"
 msgstr " ma"
 
-#: src/vars.c:73
+#: src/vars.c:74
 msgid "Tue"
 msgstr " di"
 
-#: src/vars.c:74
+#: src/vars.c:75
 msgid "Wed"
 msgstr " wo"
 
-#: src/vars.c:75
+#: src/vars.c:76
 msgid "Thu"
 msgstr " do"
 
-#: src/vars.c:76
+#: src/vars.c:77
 msgid "Fri"
 msgstr " vr"
 
-#: src/vars.c:77
+#: src/vars.c:78
 msgid "Sat"
 msgstr " za"
 
@@ -2025,3 +2188,54 @@ msgstr "Taken"
 #: src/wins.c:420
 msgid "FATAL ERROR in wins_update: no window selected\n"
 msgstr "Fatale fout in wins_update: geen venster geselecteerd\n"
+
+#~ msgid ""
+#~ "Use 'X' or SPACE to select a color, 'H/L' 'J/K' or arrow keys to move"
+#~ msgstr ""
+#~ "'X' of SPATIE voor kleurselectie, 'h/l' 'j/k' of pijltjes verplaatsen "
+#~ "cursor"
+
+#~ msgid "('0' for no color, 'Q' to exit) :"
+#~ msgstr "('0' voor geen kleur, 'Q' voor einde) :"
+
+#~ msgid ""
+#~ "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
+#~ "to move into the calendar.\n"
+#~ "\n"
+#~ "The following scheme explains how :\n"
+#~ "\n"
+#~ "                      move to previous week\n"
+#~ "                              K ^  \n"
+#~ "  move to previous day   H <       > L   move to next day\n"
+#~ "                              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 ""
+#~ "Met de toetsen 'h','j','k','l' of de pijltjestoetsen \n"
+#~ "'<','v','^',>' kan men zich door de kalender verplaatsen.\n"
+#~ "\n"
+#~ "Het volgende schema verduidelijkt hoe :\n"
+#~ "\n"
+#~ "                  naar de vorige week\n"
+#~ "                          k ^  \n"
+#~ "naar de vorige dag   h <       > l   naar de volgende dag\n"
+#~ "                          j v  \n"
+#~ "                  naar de volgende week\n"
+#~ "\n"
+#~ "Bovendien kan men, als men zich in het kalender panel bevindt, met de\n"
+#~ "0-toets naar de eerste dag van de week, en met '$' naar de laatste\n"
+#~ "dag van de week.\n"
+#~ "\n"
+#~ "Wanneer het afspraken of taken panel is geselecteerd, kan je met\n"
+#~ "de op-en-neer toetsen (resp. k of pijl-omhoog, en j of pijl-beneden)\n"
+#~ "een item uit de lijst kiezen."
+
+#~ msgid "Priority"
+#~ msgstr "Prioriteit"