calcurse 1.7 released

1 files changed, 517 insertions, 227 deletions

diff --git a/po/en.po b/po/en.po
index 4613a07..57c3ab5 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,4 +1,4 @@
-# 	$calcurse: en.po,v 1.2 2006/08/24 20:43:32 culot Exp $
+# 	$calcurse: en.po,v 1.3 2007/01/20 11:39:41 culot Exp $
 #
 # English/GB translation of calcurse.
 # Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.4\n"
 "Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2006-08-24 22:00+0200\n"
+"POT-Creation-Date: 2007-01-16 11:45+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,45 +19,61 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/apoint.c:138 src/recur.c:275
+#: src/apoint.c:155 src/recur.c:291
 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:164
+#: src/apoint.c:190
 msgid "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
 
-#: src/args.c:148
+#: src/args.c:190
+#, fuzzy
 msgid ""
 "\n"
-"Copyright (c) 2004-2006 Frederic Culot.\n"
+"Copyright (c) 2004-2007 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 msgstr ""
 "\n"
 "Copyright (c) 2004-2006 Frederic Culot.\n"
 "This is free software; see the source for copying conditions.\n"
 
-#: src/args.c:151 src/args.c:178
+#: src/args.c:194 src/args.c:233
 #, c-format
 msgid "Calcurse %s - text-based organizer\n"
 msgstr "Calcurse %s - text-based organizer\n"
 
-#: src/args.c:163
+#: src/args.c:206
 #, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
-"  -h\t\tprint this help and exit.\n"
-"  -v\t\tprint calcurse version and exit.\n"
+"  -h, --help\n"
+"\tprint this help and exit.\n"
 "\n"
-"Options:\n"
-"  -c <file>\tspecify the calendar <file> to use.\n"
+"  -v, --version\n"
+"\tprint calcurse version and exit.\n"
+"\n"
+"Files:\n"
+"  -c <file>, --calendar <file>\n"
+"\tspecify the calendar <file> to use.\n"
 "\n"
 "Non-interactive:\n"
-"  -a \t\tprint events and appointments for current day and exit.\n"
-"  -d <date|num>\tprint events and appointments for <date> or <num> upcoming\n"
-"\t\tdays and exit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
-"  -t\t\tprint todo list and exit.\n"
+"  -a, --appointment\n"
+" \tprint events and appointments for current day and exit.\n"
+"\n"
+"  -d <date|num>, --day <date|num>\n"
+"\tprint events and appointments for <date> or <num> upcoming days and\n"
+"\texit. Possible formats are: 'mm/dd/yyyy' or 'n'.\n"
+"\n"
+"  -n, --next\n"
+"  \tprint next appointment within upcoming 24 hours and exit. Also given\n"
+"\tis the remaining time before this next appointment.\n"
+"\n"
+"  -t[num], --todo[=num]\n"
+"\tprint todo list and exit. If the optional number [num] is given,\n"
+"\tthen only todos having a priority equal to [num] will be returned.\n"
+"\tnote: priority number must be between 1 (highest) and 9 (lowest).\n"
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
@@ -79,19 +95,24 @@ msgstr ""
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 
-#: src/args.c:193
+#: src/args.c:253
 msgid "to do:\n"
 msgstr "to do:\n"
 
-#: src/args.c:350
+#: src/args.c:282
+#, fuzzy
+msgid "next appointment:\n"
+msgstr "Appointment :"
+
+#: src/args.c:445
 msgid "Argument to the '-d' flag is not valid\n"
 msgstr "Argument to the '-d' flag is not valid\n"
 
-#: src/args.c:351
+#: src/args.c:446
 msgid "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
 msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
 
-#: src/args.c:352
+#: src/args.c:447
 msgid ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -99,19 +120,20 @@ msgstr ""
 "\n"
 "For more information, type '?' from within Calcurse, or read the manpage.\n"
 
-#: src/args.c:354
+#: src/args.c:449
 msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 msgstr "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
 
-#: src/args.c:420
-msgid "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
+#: src/args.c:515
+#, fuzzy
+msgid "Usage: calcurse [-h | -v] [-an] [-t[num]] [-d date|num] [-c file]\n"
 msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
 
-#: src/args.c:428
+#: src/args.c:523
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Try 'calcurse -h' for more information.\n"
 
-#: src/calcurse.c:127
+#: src/calcurse.c:130
 msgid ""
 "Sorry, colors are not supported by your terminal\n"
 "(Press [ENTER] to continue)"
@@ -119,11 +141,11 @@ msgstr ""
 "Sorry, colours are not supported by your terminal\n"
 "(Press [ENTER] to continue)"
 
-#: src/calcurse.c:129
+#: src/calcurse.c:132
 msgid "Do you really want to quit ?"
 msgstr "Do you really want to quit ?"
 
-#: src/calcurse.c:200
+#: src/calcurse.c:211
 msgid ""
 "Please resize your terminal screen\n"
 "(to at least 80x24),\n"
@@ -133,223 +155,338 @@ msgstr ""
 "(to at least 80x24),\n"
 "and restart calcurse.\n"
 
-#: src/calcurse.c:260
+#: src/calcurse.c:277
 msgid "To do :"
 msgstr "To do :"
 
-#: src/calcurse.c:538
+#: src/calcurse.c:621
 msgid "FATAL ERROR in update_windows: no window selected\n"
 msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/calcurse.c:618
+#: src/calcurse.c:728
 #, c-format
 msgid "Calendar"
 msgstr "Calendar"
 
-#: src/calcurse.c:621
+#: src/calcurse.c:731
 #, c-format
 msgid "Appointments"
 msgstr "Appointments"
 
-#: src/calcurse.c:624
+#: src/calcurse.c:734
 #, c-format
 msgid "ToDo"
 msgstr "ToDo"
 
-#: src/calcurse.c:656
+#: src/calcurse.c:767 src/calcurse.c:813
 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/calcurse.c:662
+#: src/calcurse.c:774
 #, c-format
 msgid "CalCurse %s | general options"
 msgstr "CalCurse %s | general options"
 
-#: src/calcurse.c:699
+#: src/calcurse.c:815
+msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
+#: src/calcurse.c:817
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
+#: src/calcurse.c:819
+msgid "Enter the number of seconds (0 not to be warned before an appointment)"
+msgstr ""
+
+#: src/calcurse.c:823
+#, fuzzy, c-format
+msgid "CalCurse %s | notify-bar options"
+msgstr "CalCurse %s | general options"
+
+#: src/calcurse.c:891
 msgid "auto_save = "
 msgstr "auto_save = "
 
-#: src/calcurse.c:700
+#: src/calcurse.c:892
 msgid "confirm_quit = "
 msgstr "confirm_quit = "
 
-#: src/calcurse.c:701
+#: src/calcurse.c:893
 msgid "confirm_delete = "
 msgstr "confirm_delete = "
 
-#: src/calcurse.c:702
+#: src/calcurse.c:894
 msgid "skip_system_dialogs = "
 msgstr "skip_system_dialogues = "
 
-#: src/calcurse.c:703
+#: src/calcurse.c:895
 msgid "skip_progress_bar = "
 msgstr "skip_progress_bar = "
 
-#: src/calcurse.c:704
+#: src/calcurse.c:896
 msgid "week_begins_on_monday = "
 msgstr "week_begins_on_monday = "
 
-#: src/calcurse.c:713
+#: src/calcurse.c:905
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(if set to YES, automatic save is done when quitting)"
 
-#: src/calcurse.c:719
+#: src/calcurse.c:911
 msgid "(if set to YES, confirmation is required before quitting)"
 msgstr "(if set to YES, confirmation is required before quitting)"
 
-#: src/calcurse.c:725
+#: src/calcurse.c:917
 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/calcurse.c:731
+#: src/calcurse.c:923
 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/calcurse.c:737
+#: src/calcurse.c:929
 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/calcurse.c:743
+#: src/calcurse.c:935
 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/calcurse.c:758
+#: src/calcurse.c:946
+msgid "notify-bar_show = "
+msgstr ""
+
+#: src/calcurse.c:947
+msgid "notify-bar_date = "
+msgstr ""
+
+#: src/calcurse.c:948
+msgid "notify-bar_clock = "
+msgstr ""
+
+#: src/calcurse.c:949
+msgid "notify-bar_warning = "
+msgstr ""
+
+#: src/calcurse.c:959
+#, 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/calcurse.c:966
+msgid "(Format of the date to be displayed inside notify-bar)"
+msgstr ""
+
+#: src/calcurse.c:973
+msgid "(Format of the time to be displayed inside notify-bar)"
+msgstr ""
+
+#: src/calcurse.c:980
+msgid ""
+"(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
+msgstr ""
+
+#: src/calcurse.c:996
 msgid "yes"
 msgstr "yes"
 
-#: src/calcurse.c:761
+#: src/calcurse.c:999
 msgid "no"
 msgstr "no"
 
-#: src/calcurse.c:765
+#: src/calcurse.c:1003
 msgid "option not defined - Problem in print_option_incolor()"
 msgstr "option not defined - Problem in print_option_incolor()"
 
-#: src/calcurse.c:782
+#: src/calcurse.c:1020
 msgid "Do you really want to delete this item ?"
 msgstr "Do you really want to delete this item ?"
 
-#: src/calcurse.c:783
+#: src/calcurse.c:1021
 msgid "Do you really want to delete this task ?"
 msgstr "Do you really want to delete this task ?"
 
-#: src/calcurse.c:823
+#: src/calcurse.c:1062
 #, fuzzy
 msgid "FATAL ERROR in del_item: no such type\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/calcurse.c:861
-msgid "Enter the new ToDo item : "
-msgstr "Enter the new ToDo item : "
-
-#: src/calcurse.c:882
+#: src/calcurse.c:1106
 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/calcurse.c:883
+#: src/calcurse.c:1107
 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/calcurse.c:884
+#: src/calcurse.c:1108
 msgid "Enter description :"
 msgstr "Enter description :"
 
-#: src/calcurse.c:885
+#: src/calcurse.c:1109
 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/calcurse.c:886
+#: src/calcurse.c:1110
 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/calcurse.c:887
+#: src/calcurse.c:1111 src/day.c:428 src/day.c:614
 msgid "Press [Enter] to continue"
 msgstr "Press [Enter] to continue"
 
-#: src/calcurse.c:1087
+#: src/calcurse.c:1316
 msgid "Failed to open config file"
 msgstr "Failed to open config file"
 
-#: src/calcurse.c:1088 src/calendar.c:192 src/io.c:134 src/io.c:378
-#: src/io.c:449
+#: src/calcurse.c:1317 src/calendar.c:193 src/io.c:135 src/io.c:409
+#: src/io.c:493
 msgid "Press [ENTER] to continue"
 msgstr "Press [ENTER] to continue"
 
-#: src/calcurse.c:1164
+#: src/calcurse.c:1416
 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/calendar.c:191
+#: src/calendar.c:192
 msgid "The day you entered is not valid"
 msgstr "The day you entered is not valid"
 
-#: src/calendar.c:193
-msgid "Enter the day to go to [ENTER for today] : dd/mm/yyyy"
+#: src/calendar.c:194
+#, fuzzy
+msgid "Enter the day to go to [ENTER for today] : mm/dd/yyyy"
 msgstr "Enter the day to go to [ENTER for today] : dd/mm/yyyy"
 
-#: src/custom.c:96
+#: src/custom.c:97
 msgid "Exit"
 msgstr "Exit"
 
-#: src/custom.c:97
+#: src/custom.c:98
 msgid "General"
 msgstr "General"
 
-#: src/custom.c:98
+#: src/custom.c:99
 msgid "Layout"
 msgstr "Layout"
 
-#: src/custom.c:99
+#: src/custom.c:100
 msgid "Color"
 msgstr "Colour"
 
-#: src/custom.c:110
+#: src/custom.c:101
+msgid "Notify"
+msgstr ""
+
+#: src/custom.c:112
 msgid "Pick the desired layout on next screen [press ENTER]"
 msgstr "Pick the desired layout on next screen [press ENTER]"
 
-#: src/custom.c:111
-msgid "('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)"
+#: src/custom.c:113
+#, fuzzy
+msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
 msgstr "('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)"
 
-#: src/custom.c:112
-msgid "   |Ac|      |At|      |cA|      |tA|"
-msgstr "   |Ac|      |At|      |cA|      |tA|"
+#: src/custom.c:115
+msgid "    AC       AT       CA       TA       TC       TA       CT       AT"
+msgstr ""
 
-#: src/custom.c:113
-msgid "[1]|At|   [2]|Ac|   [3]|tA|   [4]|cA|"
-msgstr "[1]|At|   [2]|Ac|   [3]|tA|   [4]|cA|"
+#: src/custom.c:117
+msgid " [1]AT    [2]AC    [3]TA    [4]CA    [5]TA    [6]TC    [7]AT    [8]CT"
+msgstr ""
 
-#: src/custom.c:148
+#: src/custom.c:142
 msgid "Pick the number corresponding to the color scheme (Q to exit) :"
 msgstr "Pick the number corresponding to the colour scheme (Q to exit) :"
 
-#: src/custom.c:158
+#: src/custom.c:152
 msgid "([>0<] for black & white)"
 msgstr "([>0<] for black & white)"
 
-#: src/day.c:312
+#: src/day.c:339
 #, 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:315
+#: src/day.c:342
 msgid "Event :"
 msgstr "Event :"
 
-#: src/day.c:319
+#: src/day.c:346
 msgid "Appointment :"
 msgstr "Appointment :"
 
-#: src/day.c:371
+#: src/day.c:415
+msgid "Edit: (1)Start time, (2)End time or (3)Description?"
+msgstr ""
+
+#: src/day.c:418
+msgid "Edit: (1)Start time, (2)End time, (3)Description or (4)Repetition?"
+msgstr ""
+
+#: src/day.c:420
+msgid "Edit: (1)Description or (2)Repetition?"
+msgstr ""
+
+#: src/day.c:423 src/recur.c:530
+#, fuzzy
+msgid "The entered date is not valid."
+msgstr "The day you entered is not valid"
+
+#: src/day.c:425 src/recur.c:532
+#, fuzzy
+msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+#: src/day.c:427
+msgid "Invalid time: start time must be before end time!"
+msgstr ""
+
+#: src/day.c:429
+#, fuzzy
+msgid "Enter the new item description:"
+msgstr "Enter description :"
+
+#: src/day.c:431
+msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
+msgstr ""
+
+#: src/day.c:432 src/recur.c:523
+msgid "[D/W/M/Y] "
+msgstr ""
+
+#: src/day.c:433
+msgid "Enter the new repetition frequence:"
+msgstr ""
+
+#: src/day.c:434 src/recur.c:527
+#, fuzzy
+msgid "The frequence you entered is not valid."
+msgstr "The day you entered is not valid"
+
+#: src/day.c:436
+msgid "Enter the new ending date: [mm/dd/yyyy] or '0'"
+msgstr ""
+
+#: src/day.c:613
+#, 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:616
+#, 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:643
 msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
 msgstr ""
 
-#: src/day.c:374
+#: src/day.c:646
 msgid "[a/o] "
 msgstr ""
 
@@ -361,11 +498,11 @@ msgstr "FATAL ERROR in event_scan: date error in the 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:98
+#: src/help.c:103
 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:100
+#: src/help.c:105
 msgid ""
 " Moving around:  Press CTRL-P or CTRL-N to scroll text upward or\n"
 "                 downward inside help screens, if necessary.\n"
@@ -399,36 +536,11 @@ msgstr ""
 "\n"
 "       Credits:  Press '@' for credits."
 
-#: src/help.c:113
-msgid "Redraw:\n"
-msgstr "Redraw:\n"
-
-#: src/help.c:115
-#, fuzzy
-msgid ""
-"Pressing CTRL-L redraws the Calcurse panels.\n"
-"\n"
-"You might want to use this function when you resize your terminal\n"
-"screen for example, and you want Calcurse to take into account the new\n"
-"size of the terminal.\n"
-"\n"
-"This function can also be useful when garbage appears in the display,\n"
-"and you want to clean it."
-msgstr ""
-"Pressing 'R' redraws the Calcurse panels.\n"
-"\n"
-"You might want to use this function when you resize your terminal\n"
-"screen for example, and you want Calcurse to take into account the new\n"
-"size of the terminal.\n"
-"\n"
-"This function can also be useful when garbage appears in the display,\n"
-"and you want to clear it."
-
-#: src/help.c:122
+#: src/help.c:118
 msgid "Save:\n"
 msgstr "Save:\n"
 
-#: src/help.c:124
+#: src/help.c:120
 msgid ""
 "Pressing 'S' saves the Calcurse data.\n"
 "\n"
@@ -454,11 +566,11 @@ msgstr ""
 "In the config menu, you can choose to save the Calcurse data\n"
 "automatically before quitting."
 
-#: src/help.c:134
+#: src/help.c:130
 msgid "Displacement keys:\n"
 msgstr "Displacement keys:\n"
 
-#: src/help.c:136
+#: src/help.c:132
 msgid ""
 "You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
 "to move into the calendar.\n"
@@ -490,11 +602,11 @@ msgstr ""
 "(respectively K or up arrow, and J or down arrow) allows you to select\n"
 "an item from those lists."
 
-#: src/help.c:148
+#: src/help.c:144
 msgid "View:\n"
 msgstr "View:\n"
 
-#: src/help.c:150
+#: src/help.c:146
 msgid ""
 "Pressing 'V' allows you to view the item you select in either the ToDo\n"
 "or Appointment panel.\n"
@@ -520,11 +632,11 @@ msgstr ""
 "Press any key to close the popup window and go back to the main\n"
 "Calcurse screen."
 
-#: src/help.c:160
+#: src/help.c:156
 msgid "Tab:\n"
 msgstr "Tab:\n"
 
-#: src/help.c:162
+#: src/help.c:158
 msgid ""
 "Pressing 'Tab' allows you to switch between panels.\n"
 "The panel currently in use has its border colorized.\n"
@@ -550,11 +662,11 @@ msgstr ""
 "change while pressing 'Tab', so you always know what action can be\n"
 "performed on the selected panel."
 
-#: src/help.c:172
+#: src/help.c:168
 msgid "Goto:\n"
 msgstr "Goto:\n"
 
-#: src/help.c:174
+#: src/help.c:170
 msgid ""
 "Pressing 'G' allows you to jump to a specific day in the calendar.\n"
 "\n"
@@ -570,11 +682,11 @@ msgstr ""
 "If you hit [ENTER] without specifying any date, Calcurse checks the\n"
 "system current date and you will be taken to that date."
 
-#: src/help.c:180
+#: src/help.c:176
 msgid "Delete:\n"
 msgstr "Delete:\n"
 
-#: src/help.c:182
+#: src/help.c:178
 #, fuzzy
 msgid ""
 "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
@@ -603,17 +715,22 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve the modifications\n"
 "next time you launch Calcurse."
 
-#: src/help.c:194
+#: src/help.c:190
 msgid "Add:\n"
 msgstr "Add:\n"
 
-#: src/help.c:196
+#: src/help.c:192
+#, fuzzy
 msgid ""
 "Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
 "list, depending on which panel is selected when you press 'A'.\n"
 "\n"
-"To enter a new item in the TODO list, you only need to enter the\n"
-"description of this new item.\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"
 "\n"
 "If the APPOINTMENT panel is selected while pressing 'A', you will be\n"
 "able to enter either a new appointment or a new all-day long event.\n"
@@ -673,10 +790,55 @@ msgstr ""
 
 #: src/help.c:223
 #, fuzzy
+msgid "Edit Item:\n"
+msgstr "Add Item"
+
+#: src/help.c:225
+msgid ""
+"Pressing 'E' allows you to edit the item which is currently selected.\n"
+"Depending on the item type (appointment, event, or todo), and if it is\n"
+"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"
+"end time, the description, or the item repetition.\n"
+"Once you have chosen the property you want to modify, you will be shown\n"
+"its actual value, and you will be able to change it as you like.\n"
+"\n"
+"Notes:\n"
+"       o if you choose to edit the item repetition properties, you will\n"
+"         be asked to re-enter all of the repetition characteristics\n"
+"         (repetition type, frequence, and ending date). Moreover, the\n"
+"         previous data concerning the deleted occurences will be lost.\n"
+"       o do not forget to save the calendar data to retrieve the\n"
+"         modified properties next time you launch Calcurse."
+msgstr ""
+
+#: src/help.c:240
+msgid "Priority:\n"
+msgstr ""
+
+#: src/help.c:242
+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"
+"\n"
+"If you want to raise the priority of a todo item, you need to press '+'.\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"
+"may also change depending on the priority of the items below."
+msgstr ""
+
+#: src/help.c:254
+#, fuzzy
 msgid "Repeat:\n"
 msgstr "Redraw:\n"
 
-#: src/help.c:225
+#: src/help.c:256
 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"
@@ -699,16 +861,20 @@ msgid ""
 "                 repetition, enter '0' and the item will be repeated\n"
 "                 forever.\n"
 "\n"
-"Note: the 'Repeat' and 'Delete' command can be mixed to create\n"
-"        complicated configurations, as it is possible to delete only\n"
-"        one occurence of a repeated item."
+"Notes:\n"
+"       o repeated items are marked with an '*' inside the appointment\n"
+"         panel, to be easily recognizable from non-repeated ones.\n"
+"       o the 'Repeat' and 'Delete' command can be mixed to create\n"
+"         complicated configurations, as it is possible to delete only\n"
+"         one occurence of a repeated item."
 msgstr ""
 
-#: src/help.c:246
+#: src/help.c:280
 msgid "Config:\n"
 msgstr "Config:\n"
 
-#: src/help.c:248
+#: src/help.c:282
+#, fuzzy
 msgid ""
 "Pressing 'C' leads to the configuration submenu, from which you can\n"
 "select between color, layout, and general options.\n"
@@ -721,6 +887,8 @@ msgid ""
 "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"
+"\n"
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 msgstr ""
@@ -738,13 +906,52 @@ msgstr ""
 "Do not forget to save the calendar data to retrieve your configuration\n"
 "next time you launch Calcurse."
 
-#: src/help.c:258
+#: src/help.c:293
+msgid "General keybindings:\n"
+msgstr ""
+
+#: src/help.c:295
+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"
+"\n"
+" '^R' : 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"
+msgstr ""
+
+#: src/help.c:311
+msgid "OtherCmd:\n"
+msgstr ""
+
+#: src/help.c:313
+msgid ""
+"Pressing 'O' allows you to switch between status bar help pages.\n"
+"Because the terminal screen is too narrow to display all of the\n"
+"available commands, you need to press 'O' 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"
+"leads you back to the first page."
+msgstr ""
+
+#: src/help.c:320
 msgid "Calcurse - text-based organizer"
 msgstr "Calcurse - text-based organizer"
 
-#: src/help.c:260
+#: src/help.c:322
+#, fuzzy
 msgid ""
-"Copyright (c) 2004-2006 Frederic Culot\n"
+"Copyright (c) 2004-2007 Frederic Culot\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -776,218 +983,263 @@ msgstr ""
 "Send your feedback or comments to : calcurse@culot.org\n"
 "Calcurse home page : http://culot.org/calcurse"
 
-#: src/help.c:281
+#: src/help.c:345
 #, c-format
 msgid "CalCurse %s | help"
 msgstr "CalCurse %s | help"
 
-#: src/io.c:77
+#: src/io.c:78
 #, 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:82 src/io.c:99
+#: src/io.c:83 src/io.c:100
 #, c-format
 msgid "aborting...\n"
 msgstr "aborting...\n"
 
-#: src/io.c:93
+#: src/io.c:94
 #, c-format
 msgid "%s successfully created\n"
 msgstr "%s successfully created\n"
 
-#: src/io.c:94
+#: src/io.c:95
 #, c-format
 msgid "starting interactive mode...\n"
 msgstr "starting interactive mode...\n"
 
-#: src/io.c:130
+#: src/io.c:131
 msgid "Problems accessing data file ..."
 msgstr "Problems accessing data file ..."
 
-#: src/io.c:133
+#: src/io.c:134
 msgid "The data files were successfully saved"
 msgstr "The data files were successfully saved"
 
-#: src/io.c:249
+#: src/io.c:278
 msgid "FATAL ERROR in 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:268
+#: src/io.c:297
 msgid "FATAL ERROR in 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:283
+#: src/io.c:312
 msgid "FATAL ERROR in load_app: no event nor appointment found\n"
 msgstr "FATAL ERROR in load_app: no event nor appointment found\n"
 
-#: src/io.c:377
+#: src/io.c:408
 msgid "Failed to open todo file"
 msgstr "Failed to open todo file"
 
-#: src/io.c:447
+#: src/io.c:491
 msgid "Welcome to Calcurse. Missing data files were created."
 msgstr "Welcome to Calcurse. Missing data files were created."
 
-#: src/io.c:448
+#: src/io.c:492
 msgid "Data files found. Data will be loaded now."
 msgstr "Data files found. Data will be loaded now."
 
-#: src/io.c:464
+#: src/io.c:508
 msgid "Saving..."
 msgstr "Saving..."
 
-#: src/io.c:465
+#: src/io.c:509
 msgid "Loading..."
 msgstr "Loading..."
 
-#: src/recur.c:316
+#: src/recur.c:332
 #, 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:348
+#: src/recur.c:366
 #, 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:437
+#: src/recur.c:441
 #, 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:486
+#: src/recur.c:501
 #, 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:505
+#: src/recur.c:522
 msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
 msgstr ""
 
-#: src/recur.c:506
-msgid "[D/W/M/Y] "
-msgstr ""
-
-#: src/recur.c:508
+#: src/recur.c:525
 msgid "Enter the repetition frequence:"
 msgstr ""
 
-#: src/recur.c:510
-#, fuzzy
-msgid "The frequence you entered is not valid."
-msgstr "The day you entered is not valid"
-
-#: src/recur.c:512
+#: src/recur.c:529
 msgid "Enter the ending date: [mm/dd/yyyy] or '0' for an endless repetition"
 msgstr ""
 
-#: src/recur.c:513
-#, fuzzy
-msgid "The entered date is not valid."
-msgstr "The day you entered is not valid"
-
-#: src/recur.c:515
-#, fuzzy
-msgid "Possible formats are [mm/dd/yyyy] or '0' for an endless repetetition"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#: src/recur.c:516
+#: src/recur.c:533
 msgid "This item is already a repeated one."
 msgstr ""
 
-#: src/recur.c:517
+#: src/recur.c:534
 #, fuzzy
 msgid "Press [ENTER] to continue."
 msgstr "Press [ENTER] to continue"
 
-#: src/recur.c:593
+#: src/recur.c:536
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr ""
+
+#: src/recur.c:620
 #, 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:618
+#: src/recur.c:645
 #, 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/todo.c:78
+#: src/recur.c:710
+#, 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:730
+#, fuzzy
+msgid "FATAL ERROR in recur_get_event: no such item\n"
+msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
+
+#: src/todo.c:42
+msgid "Enter the new ToDo item : "
+msgstr "Enter the new ToDo item : "
+
+#: src/todo.c:44
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr ""
+
+#: src/todo.c:100
 msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-#: src/utils.c:76
+#: src/todo.c:136
+#, 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:158
+#, 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:175
+#, fuzzy
+msgid "Enter the new ToDo description :"
+msgstr "Enter the new ToDo item : "
+
+#: src/utils.c:78
 msgid "Press any key to continue..."
 msgstr "Press any key to continue..."
 
-#: src/utils.c:234
-msgid "-- Press 'N' for next page --"
-msgstr "-- Press 'N' for next page --"
-
-#: src/utils.c:235
-msgid "-- Press 'P' for previous page --"
-msgstr "-- Press 'P' for previous page --"
+#: src/utils.c:281
+#, fuzzy
+msgid "FATAL ERROR in updatestring: out of memory\n"
+msgstr "FATAL ERROR in update_windows: no window selected\n"
 
-#: src/utils.c:372 src/utils.c:406 src/utils.c:445
+#: src/utils.c:367
 msgid "Help"
 msgstr "Help"
 
-#: src/utils.c:373 src/utils.c:407 src/utils.c:446
+#: src/utils.c:368
 msgid "Quit"
 msgstr "Quit"
 
-#: src/utils.c:375 src/utils.c:409 src/utils.c:448
-msgid "Redraw"
-msgstr "Redraw"
-
-#: src/utils.c:376 src/utils.c:410 src/utils.c:449
+#: src/utils.c:369
 msgid "Save"
 msgstr "Save"
 
-#: src/utils.c:378
-msgid "-/+1 Day"
+#: src/utils.c:370
+msgid "Add Item"
+msgstr "Add Item"
+
+#: src/utils.c:371
+msgid "Del Item"
+msgstr "Del Item"
+
+#: src/utils.c:372
+#, fuzzy
+msgid "Edit Itm"
+msgstr "Add Item"
+
+#: src/utils.c:373 src/utils.c:385
+#, fuzzy
+msgid "-+1 Day"
 msgstr "-/+1 Day"
 
-#: src/utils.c:380
-msgid "-/+1 Week"
+#: src/utils.c:374 src/utils.c:386
+#, fuzzy
+msgid "-+1 Week"
 msgstr "-/+1 Week"
 
-#: src/utils.c:382 src/utils.c:422 src/utils.c:459
-msgid "GoTo"
-msgstr "GoTo"
+#: src/utils.c:375
+msgid "Up/Down"
+msgstr "Up/Down"
+
+#: src/utils.c:376
+msgid "Repeat"
+msgstr ""
 
-#: src/utils.c:384 src/utils.c:414 src/utils.c:453
+#: src/utils.c:377
+msgid "Priority"
+msgstr ""
+
+#: src/utils.c:378
 msgid "Chg View"
 msgstr "Chg View"
 
-#: src/utils.c:386 src/utils.c:426 src/utils.c:463
+#: src/utils.c:379
+#, fuzzy
+msgid "Go to"
+msgstr "Goto:\n"
+
+#: src/utils.c:380
 msgid "Config"
 msgstr "Config"
 
-#: src/utils.c:412 src/utils.c:451
-msgid "Up/Down"
-msgstr "Up/Down"
+#: src/utils.c:381
+msgid "View"
+msgstr "View"
 
-#: src/utils.c:416 src/utils.c:455
-msgid "Add Item"
-msgstr "Add Item"
+#: src/utils.c:382
+msgid "Redraw"
+msgstr "Redraw"
 
-#: src/utils.c:418 src/utils.c:457
-msgid "Del Item"
-msgstr "Del Item"
+#: src/utils.c:383
+#, fuzzy
+msgid "Add Appt"
+msgstr "Add Item"
 
-#: src/utils.c:420
-msgid "Repeat"
+#: src/utils.c:384
+msgid "Add Todo"
 msgstr ""
 
-#: src/utils.c:424 src/utils.c:461
-msgid "View"
-msgstr "View"
+#: src/utils.c:387
+msgid "OtherCmd"
+msgstr ""
 
-#: src/utils.c:491
+#: src/utils.c:447
 msgid "FATAL ERROR in date2sec: failure in mktime\n"
 msgstr "FATAL ERROR in date2sec: failure in mktime\n"
 
-#: src/utils.c:614
+#: src/utils.c:501
+#, fuzzy
+msgid "FATAL ERROR in update_time_in_date: failure in mktime\n"
+msgstr "FATAL ERROR in date2sec: failure in mktime\n"
+
+#: src/utils.c:628
 msgid "Appointment"
 msgstr "Appointment"
 
@@ -1066,3 +1318,41 @@ msgstr "Fri"
 #: src/vars.c:63
 msgid "Sat"
 msgstr "Sat"
+
+#~ msgid "-- Press 'N' for next page --"
+#~ msgstr "-- Press 'N' for next page --"
+
+#~ msgid "-- Press 'P' for previous page --"
+#~ msgstr "-- Press 'P' for previous page --"
+
+#~ msgid "   |Ac|      |At|      |cA|      |tA|"
+#~ msgstr "   |Ac|      |At|      |cA|      |tA|"
+
+#~ msgid "[1]|At|   [2]|Ac|   [3]|tA|   [4]|cA|"
+#~ msgstr "[1]|At|   [2]|Ac|   [3]|tA|   [4]|cA|"
+
+#~ msgid "Redraw:\n"
+#~ msgstr "Redraw:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Pressing CTRL-L redraws the Calcurse panels.\n"
+#~ "\n"
+#~ "You might want to use this function when you resize your terminal\n"
+#~ "screen for example, and you want Calcurse to take into account the new\n"
+#~ "size of the terminal.\n"
+#~ "\n"
+#~ "This function can also be useful when garbage appears in the display,\n"
+#~ "and you want to clean it."
+#~ msgstr ""
+#~ "Pressing 'R' redraws the Calcurse panels.\n"
+#~ "\n"
+#~ "You might want to use this function when you resize your terminal\n"
+#~ "screen for example, and you want Calcurse to take into account the new\n"
+#~ "size of the terminal.\n"
+#~ "\n"
+#~ "This function can also be useful when garbage appears in the display,\n"
+#~ "and you want to clear it."
+
+#~ msgid "GoTo"
+#~ msgstr "GoTo"