diff options
| -rw-r--r-- | src/custom.c | 32 | ||||
| -rw-r--r-- | src/notify.c | 16 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/custom.c b/src/custom.c index 960837d..dab05d0 100644 --- a/src/custom.c +++ b/src/custom.c @@ -628,8 +628,8 @@ print_general_options (WINDOW *win) PERIODIC_SAVE, CONFIRM_QUIT, CONFIRM_DELETE, - SKIP_SYSTEM_DIAGS, - SKIP_PROGRESS_BAR, + SYSTEM_DIAGS, + PROGRESS_BAR, WEEK_BEGINS_MONDAY, OUTPUT_DATE_FMT, INPUT_DATE_FMT, @@ -639,16 +639,16 @@ print_general_options (WINDOW *win) const int YOFF = 3; int y; char *opt[NB_OPTIONS] = { - _("auto_save = "), - _("auto_gc = "), - _("periodic_save = "), - _("confirm_quit = "), - _("confirm_delete = "), - _("system_dialogs = "), - _("progress_bar = "), - _("week_begins_on_monday = "), - _("output_datefmt = "), - _("input_datefmt = ") + _("general.autosave = "), + _("general.autogc = "), + _("general.periodicsave = "), + _("general.confirmquit = "), + _("general.confirmdelete = "), + _("general.systemdialogs = "), + _("general.progressbar = "), + _("general.firstdayofweek = "), + _("format.outputdate = "), + _("format.inputdate = ") }; y = 0; @@ -686,16 +686,16 @@ print_general_options (WINDOW *win) _("(if set to YES, confirmation is required " "before deleting an event)")); y += YOFF; - mvwprintw (win, y, XPOS, "[6] %s ", opt[SKIP_SYSTEM_DIAGS]); + mvwprintw (win, y, XPOS, "[6] %s ", opt[SYSTEM_DIAGS]); print_bool_option_incolor (win, conf.system_dialogs, y, - XPOS + 4 + strlen (opt[SKIP_SYSTEM_DIAGS])); + XPOS + 4 + strlen (opt[SYSTEM_DIAGS])); mvwprintw (win, y + 1, XPOS, _("(if set to YES, messages about loaded " "and saved data will be displayed)")); y += YOFF; - mvwprintw (win, y, XPOS, "[7] %s ", opt[SKIP_PROGRESS_BAR]); + mvwprintw (win, y, XPOS, "[7] %s ", opt[PROGRESS_BAR]); print_bool_option_incolor (win, conf.progress_bar, y, - XPOS + 4 + strlen (opt[SKIP_PROGRESS_BAR])); + XPOS + 4 + strlen (opt[PROGRESS_BAR])); mvwprintw (win, y + 1, XPOS, _("(if set to YES, progress bar will be displayed " "when saving data)")); diff --git a/src/notify.c b/src/notify.c index 0ef4189..de45461 100644 --- a/src/notify.c +++ b/src/notify.c @@ -639,29 +639,29 @@ print_config_options (WINDOW *optwin) int i; - opt[SHOW].name = _("notify-bar_show = "); + opt[SHOW].name = _("appearance.notifybar = "); opt[SHOW].desc = _("(if set to YES, notify-bar will be displayed)"); - opt[DATE].name = _("notify-bar_date = "); + opt[DATE].name = _("format.notifydate = "); opt[DATE].desc = _("(Format of the date to be displayed inside notify-bar)"); - opt[CLOCK].name = _("notify-bar_clock = "); + opt[CLOCK].name = _("format.notifytime = "); opt[CLOCK].desc = _("(Format of the time to be displayed inside notify-bar)"); - opt[WARN].name = _("notify-bar_warning = "); + opt[WARN].name = _("notification.warning = "); opt[WARN].desc = _("(Warn user if an appointment is within next " "'notify-bar_warning' seconds)"); - opt[CMD].name = _("notify-bar_command = "); + opt[CMD].name = _("notification.command = "); opt[CMD].desc = _("(Command used to notify user of an upcoming appointment)"); - opt[NOTIFY_ALL].name = _("notify-all = "); + opt[NOTIFY_ALL].name = _("notification.notifyall = "); opt[NOTIFY_ALL].desc = _("(Notify all appointments instead of flagged ones only)"); - opt[DMON].name = _("notify-daemon_enable = "); + opt[DMON].name = _("daemon.enable = "); opt[DMON].desc = _("(Run in background to get notifications after exiting)"); - opt[DMON_LOG].name = _("notify-daemon_log = "); + opt[DMON_LOG].name = _("daemon.log = "); opt[DMON_LOG].desc = _("(Log activity when running in background)"); pthread_mutex_lock (&nbar.mutex); |