new keybindings added
This commit is contained in:
Frederic Culot
parent
748662568f
commit
03ce2c6ea9
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2008-08-03 Frederic Culot <frederic@culot.org>
|
||||
|
||||
* src/calendar.c (calendar_goto_today): new function
|
||||
|
||||
* src/calcurse.c: CTRL-G, '0' and '$' keybindings added
|
||||
* src/help.c (help_screen, wanted_page): help text updated
|
||||
* src/utils.c (status_bar): new bindings added
|
||||
* src/utils.c (other_status_page): fixed a bug in status page
|
||||
number calculation
|
||||
|
||||
2008-05-17 Frederic Culot <frederic@culot.org>
|
||||
|
||||
* === Released 2.1 ===
|
||||
|
||||
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: frederic@culot.org\n"
|
||||
"POT-Creation-Date: 2008-05-03 21:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -49,7 +49,7 @@ msgstr ""
|
||||
msgid "FATAL ERROR in apoint_delete: no such type\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/apoint.c:386 src/recur.c:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
|
||||
msgstr ""
|
||||
|
||||
@ -398,15 +398,15 @@ msgstr ""
|
||||
msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr ""
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr ""
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
msgid "The frequence you entered is not valid."
|
||||
msgstr ""
|
||||
|
||||
#: src/day.c:602 src/recur.c:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
msgid "The entered date is not valid."
|
||||
msgstr ""
|
||||
|
||||
@ -903,7 +903,7 @@ msgstr ""
|
||||
msgid "The file cannot be accessed, please enter another file name."
|
||||
msgstr ""
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr ""
|
||||
|
||||
@ -1038,73 +1038,73 @@ msgstr ""
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:163
|
||||
#: src/recur.c:161
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
msgid "FATAL ERROR in recur_event_scan: date error in the event\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:421
|
||||
#: src/recur.c:419
|
||||
msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:554
|
||||
#: src/recur.c:552
|
||||
msgid "FATAL ERROR in recur_event_erase: no such event\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:626
|
||||
#: src/recur.c:624
|
||||
msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:650
|
||||
#: src/recur.c:648
|
||||
msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, c-format
|
||||
msgid "Enter the ending date: [%s] or '0' for an endless repetition"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:658
|
||||
#: src/recur.c:656
|
||||
#, c-format
|
||||
msgid "Possible formats are [%s] or '0' for an endless repetition"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
msgid "Sorry, the date you entered is older than the item start time."
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:776
|
||||
#: src/recur.c:774
|
||||
msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:805
|
||||
#: src/recur.c:803
|
||||
msgid "FATAL ERROR in recur_exc_scan: syntax error in the item date\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:880
|
||||
#: src/recur.c:878
|
||||
msgid "FATAL ERROR in recur_get_apoint: no such item\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:904
|
||||
#: src/recur.c:902
|
||||
msgid "FATAL ERROR in recur_get_event: no such item\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:940
|
||||
#: src/recur.c:938
|
||||
msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
48
po/de.po
48
po/de.po
@ -1,4 +1,4 @@
|
||||
# $calcurse: de.po,v 1.14 2008/05/03 19:39:13 culot Exp $
|
||||
# $calcurse: de.po,v 1.15 2008/08/03 18:41:55 culot Exp $
|
||||
#
|
||||
# German translations for calcurse package.
|
||||
# Copyright (C) 2006-2007 Michael Schulz <bloodshower@web.de>
|
||||
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: calcurse 1.9\n"
|
||||
"Report-Msgid-Bugs-To: frederic@culot.org\n"
|
||||
"POT-Creation-Date: 2008-05-03 21:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: 2007-09-02 18:06+0200\n"
|
||||
"Last-Translator: Michael\n"
|
||||
"Language-Team: Michael Schulz <bloodshower@freenet.de>\n"
|
||||
@ -56,7 +56,7 @@ msgstr "M
|
||||
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:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
|
||||
msgstr "SCHWERER FEHLER in apoint_scan: Termin hat fehlerhafte Zeit\n"
|
||||
|
||||
@ -482,15 +482,15 @@ msgstr ""
|
||||
"Art der neuen Wiederholung: (D) täglich, (W)öchentlich, (M)onatlich, (Y) "
|
||||
"jährlich"
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr "[T/W/M/J]"
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
msgid "The frequence you entered is not valid."
|
||||
msgstr "Das eingegebene Intervall ist ungültig."
|
||||
|
||||
#: src/day.c:602 src/recur.c:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
msgid "The entered date is not valid."
|
||||
msgstr "Das eingegebene Datum ist ungültig."
|
||||
|
||||
@ -1247,7 +1247,7 @@ msgstr ""
|
||||
"Auf die Datei kann nicht zugegriffen werden, bitte einen anderen Dateinamen "
|
||||
"eingeben."
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr "[EINGABE] um fortzufahren."
|
||||
|
||||
@ -1389,76 +1389,76 @@ msgstr "Geben Sie den Befehl f
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr "CalCurse %s | Optionen der Benachrichtigungszeile"
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
|
||||
msgstr "SCHWERER FEHLER in recur_def2char: unbekannter Typ\n"
|
||||
|
||||
#: src/recur.c:163
|
||||
#: src/recur.c:161
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr "SCHWERER FEHLER in recur_char2def: unbekanntes Zeichen\n"
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
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:421
|
||||
#: src/recur.c:419
|
||||
msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
|
||||
msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
|
||||
|
||||
#: src/recur.c:554
|
||||
#: src/recur.c:552
|
||||
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:626
|
||||
#: src/recur.c:624
|
||||
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:650
|
||||
#: src/recur.c:648
|
||||
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:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr "Geben Sie das Wiederholungsintervall an:"
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, 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:658
|
||||
#: src/recur.c:656
|
||||
#, 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:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
msgid "Sorry, the date you entered is older than the item start time."
|
||||
msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
|
||||
|
||||
#: src/recur.c:776
|
||||
#: src/recur.c:774
|
||||
msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
|
||||
msgstr "SCHWERER FEHLER in recur_repeat_item: falscher Eintragstyp\n"
|
||||
|
||||
#: src/recur.c:805
|
||||
#: src/recur.c:803
|
||||
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:880
|
||||
#: src/recur.c:878
|
||||
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:904
|
||||
#: src/recur.c:902
|
||||
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:940
|
||||
#: src/recur.c:938
|
||||
msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
|
||||
msgstr ""
|
||||
"SCHWERER FEHLER in recur_apoint_switch_notify: Eintrag nicht vorhanden\n"
|
||||
|
||||
48
po/en.po
48
po/en.po
@ -1,4 +1,4 @@
|
||||
# $calcurse: en.po,v 1.9 2008/05/03 19:39:13 culot Exp $
|
||||
# $calcurse: en.po,v 1.10 2008/08/03 18:41:55 culot Exp $
|
||||
#
|
||||
# English/GB translation of calcurse.
|
||||
# Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
|
||||
@ -11,7 +11,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: calcurse 1.4\n"
|
||||
"Report-Msgid-Bugs-To: frederic@culot.org\n"
|
||||
"POT-Creation-Date: 2008-05-03 21:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: 2006-07-03 00:05+0100\n"
|
||||
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
|
||||
"Language-Team: English/GB <en_GB@li.org>\n"
|
||||
@ -54,7 +54,7 @@ msgstr "Do you really want to delete this item ?"
|
||||
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:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
|
||||
msgstr "FATAL ERROR in apoint_scan: date error in the appointment\n"
|
||||
|
||||
@ -445,16 +445,16 @@ msgstr "Enter description :"
|
||||
msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr ""
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr ""
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
#, fuzzy
|
||||
msgid "The frequence you entered is not valid."
|
||||
msgstr "The day you entered is not valid"
|
||||
|
||||
#: src/day.c:602 src/recur.c:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
#, fuzzy
|
||||
msgid "The entered date is not valid."
|
||||
msgstr "The day you entered is not valid"
|
||||
@ -1101,7 +1101,7 @@ msgstr ""
|
||||
msgid "The file cannot be accessed, please enter another file name."
|
||||
msgstr ""
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
#, fuzzy
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr "Press [ENTER] to continue"
|
||||
@ -1245,83 +1245,83 @@ msgstr ""
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr "CalCurse %s | general options"
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
#, 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:163
|
||||
#: src/recur.c:161
|
||||
#, fuzzy
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
#, 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:421
|
||||
#: src/recur.c:419
|
||||
#, 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:554
|
||||
#: src/recur.c:552
|
||||
#, 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:626
|
||||
#: src/recur.c:624
|
||||
#, 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:650
|
||||
#: src/recur.c:648
|
||||
msgid "Enter the repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, 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:658
|
||||
#: src/recur.c:656
|
||||
#, 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:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
msgid "Sorry, the date you entered is older than the item start time."
|
||||
msgstr ""
|
||||
|
||||
#: src/recur.c:776
|
||||
#: src/recur.c:774
|
||||
#, 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:805
|
||||
#: src/recur.c:803
|
||||
#, 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:880
|
||||
#: src/recur.c:878
|
||||
#, 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:904
|
||||
#: src/recur.c:902
|
||||
#, 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:940
|
||||
#: src/recur.c:938
|
||||
#, fuzzy
|
||||
msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
|
||||
msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
|
||||
|
||||
48
po/es.po
48
po/es.po
@ -1,4 +1,4 @@
|
||||
# $calcurse: es.po,v 1.10 2008/05/03 19:39:13 culot Exp $
|
||||
# $calcurse: es.po,v 1.11 2008/08/03 18:41:55 culot Exp $
|
||||
#
|
||||
# Spanish translations for calcurse package.
|
||||
# Copyright (c) Jose Lopez <testinground@gmail.com> 2006 Free Software Foundation, Inc.
|
||||
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Calcurse 1.8\n"
|
||||
"Report-Msgid-Bugs-To: frederic@culot.org\n"
|
||||
"POT-Creation-Date: 2008-05-03 21:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: 2006-09-10 08:06+0200\n"
|
||||
"Last-Translator: Jose Lopez <testinground@gmail.com>\n"
|
||||
"Language-Team: Jose Lopez <testinground@gmail.com>\n"
|
||||
@ -55,7 +55,7 @@ msgstr "
|
||||
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:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
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"
|
||||
|
||||
@ -476,15 +476,15 @@ msgstr "Introduce la descripcion del nuevo elemento:"
|
||||
msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr "Tipo de repeticion: (D) diario, (W) semanal, (M) mensual, (Y) anual?"
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr "[D/W/M/Y] "
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
msgid "The frequence you entered is not valid."
|
||||
msgstr "La frecuencia que has introducido no es valida."
|
||||
|
||||
#: src/day.c:602 src/recur.c:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
msgid "The entered date is not valid."
|
||||
msgstr "La fecha introducida no es valida."
|
||||
|
||||
@ -1249,7 +1249,7 @@ msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
|
||||
msgid "The file cannot be accessed, please enter another file name."
|
||||
msgstr "El archivo no es accesible, por favor elige otro nombre de archivo."
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr "Pulsa [INTRO] para continuar."
|
||||
|
||||
@ -1393,78 +1393,78 @@ msgstr "Introduce el comando de notificacion"
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr "Calcurse %s | opciones de la barra de notificaciones"
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
#, 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:163
|
||||
#: src/recur.c:161
|
||||
#, fuzzy
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr "ERROR FATAL en custom_color_theme_name: color desconocido\n"
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
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:421
|
||||
#: src/recur.c:419
|
||||
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:554
|
||||
#: src/recur.c:552
|
||||
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:626
|
||||
#: src/recur.c:624
|
||||
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:650
|
||||
#: src/recur.c:648
|
||||
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:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr "Introduce la frecuencia de repeticion:"
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, 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:658
|
||||
#: src/recur.c:656
|
||||
#, 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:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr "Este elemento es ya un elemento repetido."
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
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:776
|
||||
#: src/recur.c:774
|
||||
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:805
|
||||
#: src/recur.c:803
|
||||
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:880
|
||||
#: src/recur.c:878
|
||||
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:904
|
||||
#: src/recur.c:902
|
||||
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:940
|
||||
#: src/recur.c:938
|
||||
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"
|
||||
|
||||
|
||||
48
po/fr.po
48
po/fr.po
@ -1,4 +1,4 @@
|
||||
# $calcurse: fr.po,v 1.20 2008/05/03 19:39:13 culot Exp $
|
||||
# $calcurse: fr.po,v 1.21 2008/08/03 18:41:55 culot Exp $
|
||||
#
|
||||
# French translations for calcurse package.
|
||||
# Copyright (C) 2004-2008 Frederic Culot <frederic@culot.org>
|
||||
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: calcurse 2.1\n"
|
||||
"Report-Msgid-Bugs-To: frederic@culot.org\n"
|
||||
"POT-Creation-Date: 2008-05-03 21:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: 2008-05-03 21:33+0200\n"
|
||||
"Last-Translator: Frederic Culot <frederic@culot.org>\n"
|
||||
"Language-Team: French <calcurse-i18n@culot.org>\n"
|
||||
@ -54,7 +54,7 @@ msgstr "Voulez-vous vraiment effacer cet
|
||||
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:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
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"
|
||||
@ -477,15 +477,15 @@ msgid "Enter the new repetition type: (D)aily, (W)eekly, (M)onthly, (Y)early"
|
||||
msgstr ""
|
||||
"Entrez le nouveau type: (D) journ., (W) hebdo., (M) mensuel, (Y) annuel"
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr "[D/W/M/Y] "
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
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:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
msgid "The entered date is not valid."
|
||||
msgstr "Le jour que vous avez entré n'est pas valide."
|
||||
|
||||
@ -1283,7 +1283,7 @@ msgstr "Choisissez le fichier dans lequel exporter les donn
|
||||
msgid "The file cannot be accessed, please enter another file name."
|
||||
msgstr "Le fichier ne peut être ouvert, veuillez entrer un nouveau nom."
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr "Appuyez sur [ENTREE] pour continuer."
|
||||
|
||||
@ -1424,73 +1424,73 @@ msgstr "Entrez la commande de notification"
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr "CalCurse %s | options de la barre de notification"
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
|
||||
msgstr "ERREUR FATALE dans recur_def2char: type inconnu\n"
|
||||
|
||||
#: src/recur.c:163
|
||||
#: src/recur.c:161
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr "ERREUR FATALE dans recur_char2def: caractère inconnu\n"
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
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:421
|
||||
#: src/recur.c:419
|
||||
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:554
|
||||
#: src/recur.c:552
|
||||
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:626
|
||||
#: src/recur.c:624
|
||||
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:650
|
||||
#: src/recur.c:648
|
||||
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:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr "Entrez la fréquence de répétition:"
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, 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:658
|
||||
#: src/recur.c:656
|
||||
#, 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:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr "Cet élément est déjà recurrent."
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
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:776
|
||||
#: src/recur.c:774
|
||||
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:805
|
||||
#: src/recur.c:803
|
||||
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:880
|
||||
#: src/recur.c:878
|
||||
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:904
|
||||
#: src/recur.c:902
|
||||
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:940
|
||||
#: src/recur.c:938
|
||||
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"
|
||||
|
||||
52
po/nl.po
52
po/nl.po
@ -1,4 +1,4 @@
|
||||
# $calcurse: nl.po,v 1.7 2008/05/03 19:39:13 culot Exp $
|
||||
# $calcurse: nl.po,v 1.8 2008/08/03 18:41:55 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-04-26 17:33+0200\n"
|
||||
"POT-Creation-Date: 2008-05-17 12:15+0200\n"
|
||||
"PO-Revision-Date: 2008-05-03 21:35+0200\n"
|
||||
"Last-Translator: Jeremy Roon\n"
|
||||
"Language-Team: Jeremy Roon <p.roon@chello.nl>\n"
|
||||
@ -52,7 +52,7 @@ msgstr "Wilt u werkelijk dit item wissen ?"
|
||||
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:252
|
||||
#: src/apoint.c:386 src/recur.c:250
|
||||
msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
|
||||
msgstr "FATALE FOUT in apoint_scan: datafout in de afspraak\n"
|
||||
|
||||
@ -72,7 +72,8 @@ msgstr "FATALE FOUT in apoint_switch_notify: Afspraak bestaat niet"
|
||||
msgid ""
|
||||
"Usage: calcurse [-h|-v] [-x] [-N] [-an] [-t[num]] [-d date|num] [-c file]\n"
|
||||
msgstr ""
|
||||
"Gebruik:calcurse [-h|-v] [-x] [-N] [-an] [-t[nr]] [-d datum|nr] [-c bestand]\n"
|
||||
"Gebruik:calcurse [-h|-v] [-x] [-N] [-an] [-t[nr]] [-d datum|nr] [-c "
|
||||
"bestand]\n"
|
||||
|
||||
#: src/args.c:59
|
||||
msgid "Try 'calcurse -h' for more information.\n"
|
||||
@ -459,15 +460,15 @@ msgstr ""
|
||||
"Voer type herhaling in: (D)agelijks, (W)ekelijks, (M)aandelijks, (Y) "
|
||||
"jaarlijks"
|
||||
|
||||
#: src/day.c:599 src/recur.c:651
|
||||
#: src/day.c:599 src/recur.c:649
|
||||
msgid "[D/W/M/Y] "
|
||||
msgstr "[D/W/M/Y]"
|
||||
|
||||
#: src/day.c:600 src/recur.c:653
|
||||
#: src/day.c:600 src/recur.c:651
|
||||
msgid "The frequence you entered is not valid."
|
||||
msgstr "Het ingevoerde interval is ongeldig."
|
||||
|
||||
#: src/day.c:602 src/recur.c:656
|
||||
#: src/day.c:602 src/recur.c:654
|
||||
msgid "The entered date is not valid."
|
||||
msgstr "De ingevoerde datum is ongeldig."
|
||||
|
||||
@ -518,6 +519,7 @@ 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:119
|
||||
#, c-format
|
||||
msgid "Calcurse %s | help"
|
||||
msgstr "Calcurse %s | Hulp"
|
||||
|
||||
@ -1228,7 +1230,7 @@ msgstr "Kies het bestand om calcurse data naar te exporteren:"
|
||||
msgid "The file cannot be accessed, please enter another file name."
|
||||
msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
|
||||
|
||||
#: src/io.c:129 src/recur.c:660
|
||||
#: src/io.c:129 src/recur.c:658
|
||||
msgid "Press [ENTER] to continue."
|
||||
msgstr "[ENTER]-toets om door te gaan."
|
||||
|
||||
@ -1365,73 +1367,73 @@ msgstr "Geef het meldingscommando "
|
||||
msgid "CalCurse %s | notify-bar options"
|
||||
msgstr "CalCurse %s | Informatiebalk-opties"
|
||||
|
||||
#: src/recur.c:131
|
||||
#: src/recur.c:129
|
||||
msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
|
||||
msgstr "FATALE FOUT in recur_def2char: herhaal type onbekend\n"
|
||||
|
||||
#: src/recur.c:163
|
||||
#: src/recur.c:161
|
||||
msgid "FATAL ERROR in recur_char2def: unknown char\n"
|
||||
msgstr "FATALE FOUT in recur_char2def: onbekend karakter\n"
|
||||
|
||||
#: src/recur.c:299
|
||||
#: src/recur.c:297
|
||||
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:421
|
||||
#: src/recur.c:419
|
||||
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:554
|
||||
#: src/recur.c:552
|
||||
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:626
|
||||
#: src/recur.c:624
|
||||
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:650
|
||||
#: src/recur.c:648
|
||||
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:652
|
||||
#: src/recur.c:650
|
||||
msgid "Enter the repetition frequence:"
|
||||
msgstr "Geef de herhalingsinterval:"
|
||||
|
||||
#: src/recur.c:655
|
||||
#: src/recur.c:653
|
||||
#, 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:658
|
||||
#: src/recur.c:656
|
||||
#, 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:659
|
||||
#: src/recur.c:657
|
||||
msgid "This item is already a repeated one."
|
||||
msgstr "Dit item wordt al herhaald."
|
||||
|
||||
#: src/recur.c:662
|
||||
#: src/recur.c:660
|
||||
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:776
|
||||
#: src/recur.c:774
|
||||
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:805
|
||||
#: src/recur.c:803
|
||||
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:880
|
||||
#: src/recur.c:878
|
||||
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:904
|
||||
#: src/recur.c:902
|
||||
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:940
|
||||
#: src/recur.c:938
|
||||
msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
|
||||
msgstr "FATALE FOUT in recur_apoint_switch_notify: item bestaat niet\n"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $calcurse: calcurse.c,v 1.63 2008/04/26 15:35:26 culot Exp $ */
|
||||
/* $calcurse: calcurse.c,v 1.64 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -219,10 +219,14 @@ main (int argc, char **argv)
|
||||
other_status_page (wins_slctd ());
|
||||
break;
|
||||
|
||||
case CTRL ('G'):
|
||||
case 'G':
|
||||
case 'g': /* Goto function */
|
||||
erase_status_bar ();
|
||||
calendar_set_current_date ();
|
||||
if (ch == CTRL ('G'))
|
||||
calendar_goto_today ();
|
||||
else
|
||||
calendar_change_day (conf.input_datefmt);
|
||||
do_storage = true;
|
||||
day_changed = true;
|
||||
@ -383,7 +387,7 @@ main (int argc, char **argv)
|
||||
io_export_data (IO_EXPORT_INTERACTIVE, &conf);
|
||||
break;
|
||||
|
||||
case (261): /* right arrow */
|
||||
case KEY_RIGHT:
|
||||
case ('L'):
|
||||
case ('l'):
|
||||
case CTRL ('L'):
|
||||
@ -395,7 +399,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
break;
|
||||
|
||||
case (260): /* left arrow */
|
||||
case KEY_LEFT:
|
||||
case ('H'):
|
||||
case ('h'):
|
||||
case CTRL ('H'):
|
||||
@ -407,7 +411,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
break;
|
||||
|
||||
case (259): /* up arrow */
|
||||
case KEY_UP:
|
||||
case ('K'):
|
||||
case ('k'):
|
||||
case CTRL ('K'):
|
||||
@ -433,7 +437,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
break;
|
||||
|
||||
case (258): /* down arrow */
|
||||
case KEY_DOWN:
|
||||
case ('J'):
|
||||
case ('j'):
|
||||
case CTRL ('J'):
|
||||
@ -460,6 +464,24 @@ main (int argc, char **argv)
|
||||
}
|
||||
break;
|
||||
|
||||
case '0':
|
||||
if (wins_slctd () == CAL)
|
||||
{
|
||||
do_storage = true;
|
||||
day_changed = true;
|
||||
calendar_move (WEEK_START);
|
||||
}
|
||||
break;
|
||||
|
||||
case '$':
|
||||
if (wins_slctd () == CAL)
|
||||
{
|
||||
do_storage = true;
|
||||
day_changed = true;
|
||||
calendar_move (WEEK_END);
|
||||
}
|
||||
break;
|
||||
|
||||
case ('Q'): /* Quit calcurse :( */
|
||||
case ('q'):
|
||||
if (conf.auto_save)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $calcurse: calendar.c,v 1.15 2008/04/12 21:14:03 culot Exp $ */
|
||||
/* $calcurse: calendar.c,v 1.16 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -327,12 +327,23 @@ calendar_update_panel (WINDOW *cwin)
|
||||
wnoutrefresh (cwin);
|
||||
}
|
||||
|
||||
/* Set the selected day in calendar to current day. */
|
||||
void
|
||||
calendar_goto_today (void)
|
||||
{
|
||||
date_t today;
|
||||
|
||||
calendar_store_current_date (&today);
|
||||
slctd_day.dd = today.dd;
|
||||
slctd_day.mm = today.mm;
|
||||
slctd_day.yyyy = today.yyyy;
|
||||
}
|
||||
|
||||
/*
|
||||
* Ask for a date to jump to, then check the correctness of that date
|
||||
* and jump to it.
|
||||
* If the entered date is empty, automatically jump to the current date.
|
||||
* today is the current day given to that routine, and slctd_day is updated
|
||||
* with the newly selected date.
|
||||
* slctd_day is updated with the newly selected date.
|
||||
*/
|
||||
void
|
||||
calendar_change_day (int datefmt)
|
||||
@ -340,7 +351,6 @@ calendar_change_day (int datefmt)
|
||||
#define LDAY 11
|
||||
char selected_day[LDAY] = "";
|
||||
char outstr[BUFSIZ];
|
||||
date_t today;
|
||||
int dday, dmonth, dyear;
|
||||
int wrong_day = 1;
|
||||
char *mesg_line1 =
|
||||
@ -359,12 +369,8 @@ calendar_change_day (int datefmt)
|
||||
{
|
||||
if (strlen (selected_day) == 0)
|
||||
{
|
||||
calendar_store_current_date (&today);
|
||||
/* go to today */
|
||||
wrong_day = 0;
|
||||
slctd_day.dd = today.dd;
|
||||
slctd_day.mm = today.mm;
|
||||
slctd_day.yyyy = today.yyyy;
|
||||
calendar_goto_today ();
|
||||
}
|
||||
else if (strlen (selected_day) != LDAY - 1)
|
||||
{
|
||||
@ -414,7 +420,7 @@ date_change (struct tm *date, int delta_month, int delta_day)
|
||||
void
|
||||
calendar_move (move_t move)
|
||||
{
|
||||
int ret;
|
||||
int ret, days_to_remove, days_to_add;
|
||||
struct tm t;
|
||||
|
||||
memset (&t, 0, sizeof (struct tm));
|
||||
@ -422,6 +428,7 @@ calendar_move (move_t move)
|
||||
t.tm_mon = slctd_day.mm - 1;
|
||||
t.tm_year = slctd_day.yyyy - 1900;
|
||||
|
||||
ret = 1;
|
||||
switch (move)
|
||||
{
|
||||
case UP:
|
||||
@ -448,6 +455,24 @@ calendar_move (move_t move)
|
||||
return;
|
||||
ret = date_change (&t, 0, 1);
|
||||
break;
|
||||
case WEEK_START:
|
||||
/* Normalize struct tm to get week day number. */
|
||||
mktime (&t);
|
||||
if (calendar_week_begins_on_monday ())
|
||||
days_to_remove = ((t.tm_wday == 0) ? WEEKINDAYS - 1 : t.tm_wday - 1);
|
||||
else
|
||||
days_to_remove = ((t.tm_wday == 0) ? 0 : t.tm_wday);
|
||||
ret = date_change (&t, 0, 0 - days_to_remove);
|
||||
break;
|
||||
case WEEK_END:
|
||||
mktime (&t);
|
||||
if (calendar_week_begins_on_monday ())
|
||||
days_to_add = ((t.tm_wday == 0) ? 0 : WEEKINDAYS - t.tm_wday);
|
||||
else
|
||||
days_to_add = ((t.tm_wday == 0) ?
|
||||
WEEKINDAYS - 1 : WEEKINDAYS - 1 - t.tm_wday);
|
||||
ret = date_change (&t, 0, days_to_add);
|
||||
break;
|
||||
default:
|
||||
ret = 1;
|
||||
/* NOTREACHED */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $calcurse: calendar.h,v 1.10 2008/04/12 21:14:03 culot Exp $ */
|
||||
/* $calcurse: calendar.h,v 1.11 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -72,6 +72,8 @@ typedef enum
|
||||
DOWN,
|
||||
LEFT,
|
||||
RIGHT,
|
||||
WEEK_START,
|
||||
WEEK_END,
|
||||
MOVES
|
||||
}
|
||||
move_t;
|
||||
@ -87,6 +89,7 @@ void calendar_init_slctd_day (void);
|
||||
date_t *calendar_get_slctd_day (void);
|
||||
long calendar_get_slctd_day_sec (void);
|
||||
void calendar_update_panel (WINDOW *);
|
||||
void calendar_goto_today (void);
|
||||
void calendar_change_day (int);
|
||||
void calendar_move (move_t);
|
||||
char *calendar_get_pom (time_t);
|
||||
|
||||
23
src/help.c
23
src/help.c
@ -1,4 +1,4 @@
|
||||
/* $calcurse: help.c,v 1.26 2008/04/20 09:33:09 culot Exp $ */
|
||||
/* $calcurse: help.c,v 1.27 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -175,6 +175,7 @@ wanted_page (int ch)
|
||||
case CTRL ('j'):
|
||||
case CTRL ('k'):
|
||||
case CTRL ('l'):
|
||||
case CTRL ('g'):
|
||||
page = HELP_GENERAL;
|
||||
break;
|
||||
|
||||
@ -186,14 +187,16 @@ wanted_page (int ch)
|
||||
page = HELP_EXPORT;
|
||||
break;
|
||||
|
||||
case '0':
|
||||
case '$':
|
||||
case 'h':
|
||||
case 'l':
|
||||
case 'j':
|
||||
case 'k':
|
||||
case 259:
|
||||
case 258:
|
||||
case 260:
|
||||
case 261:
|
||||
case KEY_UP:
|
||||
case KEY_DOWN:
|
||||
case KEY_RIGHT:
|
||||
case KEY_LEFT:
|
||||
page = HELP_DISPLACEMENT;
|
||||
break;
|
||||
|
||||
@ -315,6 +318,9 @@ help_screen (void)
|
||||
" move to previous day H < > L move to next day\n"
|
||||
" J v \n"
|
||||
" move to next week\n"
|
||||
"\nMoreover, 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"
|
||||
"\nWhen 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.");
|
||||
@ -350,7 +356,9 @@ help_screen (void)
|
||||
"\nUsing this command, you do not need to travel to that day using\n"
|
||||
"the displacement keys inside the calendar panel.\n"
|
||||
"If you hit [ENTER] without specifying any date, Calcurse checks the\n"
|
||||
"system current date and you will be taken to that date.");
|
||||
"system current date and you will be taken to that date.\n"
|
||||
"\nNotice that pressing ^G (Control + G), whatever panel is\n"
|
||||
"selected, will select current day in the calendar.");
|
||||
|
||||
hscr[HELP_DELETE].title = _("Delete:\n");
|
||||
hscr[HELP_DELETE].text =
|
||||
@ -534,7 +542,8 @@ help_screen (void)
|
||||
" '^H' : -1 Day -> move to previous day\n"
|
||||
" '^L' : +1 Day -> move to next day\n"
|
||||
" '^K' : -1 Week -> move to previous week\n"
|
||||
" '^J' : +1 Week -> move to next week");
|
||||
" '^J' : +1 Week -> move to next week\n"
|
||||
" '^G' : Goto today -> move to current day");
|
||||
|
||||
hscr[HELP_OTHER].title = _("OtherCmd:\n");
|
||||
hscr[HELP_OTHER].text =
|
||||
|
||||
19
src/utils.c
19
src/utils.c
@ -1,4 +1,4 @@
|
||||
/* $calcurse: utils.c,v 1.45 2008/04/12 21:14:03 culot Exp $ */
|
||||
/* $calcurse: utils.c,v 1.46 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -442,19 +442,22 @@ status_bar (void)
|
||||
binding_t eday = { "^HL", _("-+1 Day") };
|
||||
binding_t ewek = { "^KJ", _("-+1 Week") };
|
||||
binding_t othr = { " O", _("OtherCmd") };
|
||||
binding_t today = {" ^G", _("Today") };
|
||||
binding_t weekb = {" 0", _("beg Week") };
|
||||
binding_t weeke = {" $", _("end Week") };
|
||||
|
||||
binding_t *binding[TOTAL_CMDS] = {
|
||||
/* calendar keys */
|
||||
&help, &quit, &save, &export, &day, &week, &tab, &togo, &appt,
|
||||
&todo, &conf, &othr, &eday, &ewek, &draw, &othr,
|
||||
&help, &quit, &save, &export, &day, &week, &weekb, &weeke, &tab,
|
||||
&togo, &conf, &othr, &appt, &todo, &eday, &ewek, &draw, &today, &othr,
|
||||
/* appointment keys */
|
||||
&help, &quit, &save, &export, &add, &del, &edit, &view, &rept,
|
||||
&updn, &flag, &othr, &enote, &vnote, &appt, &todo, &eday, &ewek,
|
||||
&conf, &togo, &tab, &draw, &othr,
|
||||
&conf, &togo, &tab, &draw, &today, &othr,
|
||||
/* todo keys */
|
||||
&help, &quit, &save, &export, &add, &del, &edit, &view, &prio,
|
||||
&updn, &tab, &othr, &enote, &vnote, &appt, &todo, &eday, &ewek,
|
||||
&conf, &togo, &draw, &othr
|
||||
&conf, &togo, &draw, &today, &othr
|
||||
};
|
||||
|
||||
/* Total length of a command. */
|
||||
@ -764,15 +767,11 @@ other_status_page (int panel)
|
||||
default:
|
||||
ierror (error, IERROR_FATAL);
|
||||
}
|
||||
max_page = ceil (nb_item / (2 * CMDS_PER_LINE)) + 1;
|
||||
max_page = ceil (nb_item / (2 * CMDS_PER_LINE + 1)) + 1;
|
||||
if (status_page < max_page)
|
||||
{
|
||||
status_page++;
|
||||
}
|
||||
else
|
||||
{
|
||||
status_page = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Returns the beginning of current day in seconds from 1900. */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $calcurse: utils.h,v 1.29 2008/04/12 21:14:03 culot Exp $ */
|
||||
/* $calcurse: utils.h,v 1.30 2008/08/03 18:41:55 culot Exp $ */
|
||||
|
||||
/*
|
||||
* Calcurse - text-based organizer
|
||||
@ -38,9 +38,9 @@
|
||||
|
||||
#define SPC 32 /* ASCII code for white space */
|
||||
|
||||
#define NB_CAL_CMDS 16 /* number of commands while in cal view */
|
||||
#define NB_APP_CMDS 23 /* same thing while in appointment view */
|
||||
#define NB_TOD_CMDS 22 /* same thing while in todo view */
|
||||
#define NB_CAL_CMDS 19 /* number of commands while in cal view */
|
||||
#define NB_APP_CMDS 24 /* same thing while in appointment view */
|
||||
#define NB_TOD_CMDS 23 /* same thing while in todo view */
|
||||
#define TOTAL_CMDS NB_CAL_CMDS + NB_APP_CMDS + NB_TOD_CMDS
|
||||
#define NB_PANELS 3 /* 3 panels: CALENDAR, APPOINTMENT, TODO */
|
||||
#define CMDS_PER_LINE 6 /* max number of commands per line */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user