aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/make.yml6
-rw-r--r--.tx/config49
-rw-r--r--CHANGES.md64
-rw-r--r--COPYING2
-rw-r--r--README.md28
-rwxr-xr-xautogen.sh2
-rwxr-xr-xbuild-aux/git-version-gen2
-rw-r--r--configure.ac75
-rw-r--r--contrib/caldav/README.md13
-rwxr-xr-xcontrib/caldav/calcurse-caldav.py24
-rw-r--r--contrib/caldav/config.sample8
-rw-r--r--doc/calcurse.1.txt4
-rw-r--r--doc/credits.txt2
-rw-r--r--doc/de/credits.txt2
-rw-r--r--doc/es/credits.txt2
-rw-r--r--doc/fr/credits.txt2
-rw-r--r--doc/manual.txt4
-rw-r--r--doc/nl/credits.txt2
-rw-r--r--doc/pt_BR/credits.txt2
-rw-r--r--doc/ru/credits.txt2
-rw-r--r--doc/submitting-patches.txt2
-rw-r--r--po/calcurse.pot74
-rw-r--r--po/de.po267
-rw-r--r--po/en.po1540
-rw-r--r--po/es.po278
-rw-r--r--po/fr.po328
-rw-r--r--po/nl.po171
-rw-r--r--po/pt_BR.po340
-rw-r--r--po/ru.po1037
-rw-r--r--scripts/calcurse-upgrade.sh.in2
-rw-r--r--src/apoint.c2
-rw-r--r--src/args.c4
-rw-r--r--src/calcurse.c97
-rw-r--r--src/calcurse.h4
-rw-r--r--src/config.c2
-rw-r--r--src/custom.c10
-rw-r--r--src/day.c66
-rw-r--r--src/dmon.c4
-rw-r--r--src/event.c2
-rw-r--r--src/getstring.c2
-rw-r--r--src/help.c2
-rw-r--r--src/hooks.c2
-rw-r--r--src/htable.h2
-rw-r--r--src/ical.c24
-rw-r--r--src/io.c2
-rw-r--r--src/keys.c93
-rw-r--r--src/listbox.c2
-rw-r--r--src/llist.c2
-rw-r--r--src/llist.h2
-rw-r--r--src/llist_ts.h2
-rw-r--r--src/mem.c2
-rw-r--r--src/note.c2
-rw-r--r--src/notify.c2
-rw-r--r--src/pcal.c2
-rw-r--r--src/queue.c2
-rw-r--r--src/recur.c36
-rw-r--r--src/sha1.c3
-rw-r--r--src/sha1.h4
-rw-r--r--src/sigs.c2
-rw-r--r--src/strings.c3
-rw-r--r--src/todo.c2
-rw-r--r--src/ui-calendar.c13
-rw-r--r--src/ui-day.c2
-rw-r--r--src/ui-todo.c23
-rw-r--r--src/utf8.c2
-rw-r--r--src/utils.c2
-rw-r--r--src/vars.c4
-rw-r--r--src/vector.c2
-rw-r--r--src/vector.h2
-rw-r--r--src/wins.c2
-rwxr-xr-xtest/ical-009.sh3
-rw-r--r--test/run-test.c2
72 files changed, 1660 insertions, 3117 deletions
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index cbbe996..552bce6 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -24,15 +24,19 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install dependencies (Ubuntu)
- run: sudo apt-get install asciidoc autopoint gettext xmlto
+ run: |
+ sudo apt-get update
+ sudo apt-get install asciidoc autopoint gettext xmlto autoconf-archive
if: matrix.os == 'ubuntu-latest'
- name: Install dependencies (MacOS)
run: |
+ brew install --overwrite python
brew update
brew install automake
brew install asciidoc
brew install gettext
brew install xmlto
+ brew install autoconf-archive
brew link --force gettext
sudo mkdir /etc/xml
sudo ln -s /usr/local/etc/xml/catalog /etc/xml/catalog
diff --git a/.tx/config b/.tx/config
index b9ac976..376e152 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,123 +1,122 @@
[main]
host = https://www.transifex.com
-type = PO
-[calcurse.calcurse]
+[o:lfleischer:p:calcurse:r:calcurse]
file_filter = po/<lang>.po
source_file = po/calcurse.pot
source_lang = en
-[calcurse.doc-add]
+[o:lfleischer:p:calcurse:r:doc-add]
file_filter = po/doc/add-<lang>.po
source_file = po/doc/add.pot
source_lang = en
-[calcurse.doc-config]
+[o:lfleischer:p:calcurse:r:doc-config]
file_filter = po/doc/config-<lang>.po
source_file = po/doc/config.pot
source_lang = en
-[calcurse.doc-copy-paste]
+[o:lfleischer:p:calcurse:r:doc-copy-paste]
file_filter = po/doc/copy-paste-<lang>.po
source_file = po/doc/copy-paste.pot
source_lang = en
-[calcurse.doc-credits]
+[o:lfleischer:p:calcurse:r:doc-credits]
file_filter = po/doc/credits-<lang>.po
source_file = po/doc/credits.pot
source_lang = en
-[calcurse.doc-delete]
+[o:lfleischer:p:calcurse:r:doc-delete]
file_filter = po/doc/delete-<lang>.po
source_file = po/doc/delete.pot
source_lang = en
-[calcurse.doc-displacement]
+[o:lfleischer:p:calcurse:r:doc-displacement]
file_filter = po/doc/displacement-<lang>.po
source_file = po/doc/displacement.pot
source_lang = en
-[calcurse.doc-edit]
+[o:lfleischer:p:calcurse:r:doc-edit]
file_filter = po/doc/edit-<lang>.po
source_file = po/doc/edit.pot
source_lang = en
-[calcurse.doc-enote]
+[o:lfleischer:p:calcurse:r:doc-enote]
file_filter = po/doc/enote-<lang>.po
source_file = po/doc/enote.pot
source_lang = en
-[calcurse.doc-export]
+[o:lfleischer:p:calcurse:r:doc-export]
file_filter = po/doc/export-<lang>.po
source_file = po/doc/export.pot
source_lang = en
-[calcurse.doc-flag]
+[o:lfleischer:p:calcurse:r:doc-flag]
file_filter = po/doc/flag-<lang>.po
source_file = po/doc/flag.pot
source_lang = en
-[calcurse.doc-general]
+[o:lfleischer:p:calcurse:r:doc-general]
file_filter = po/doc/general-<lang>.po
source_file = po/doc/general.pot
source_lang = en
-[calcurse.doc-goto]
+[o:lfleischer:p:calcurse:r:doc-goto]
file_filter = po/doc/goto-<lang>.po
source_file = po/doc/goto.pot
source_lang = en
-[calcurse.doc-import]
+[o:lfleischer:p:calcurse:r:doc-import]
file_filter = po/doc/import-<lang>.po
source_file = po/doc/import.pot
source_lang = en
-[calcurse.doc-intro]
+[o:lfleischer:p:calcurse:r:doc-intro]
file_filter = po/doc/intro-<lang>.po
source_file = po/doc/intro.pot
source_lang = en
-[calcurse.doc-other]
+[o:lfleischer:p:calcurse:r:doc-other]
file_filter = po/doc/other-<lang>.po
source_file = po/doc/other.pot
source_lang = en
-[calcurse.doc-pipe]
+[o:lfleischer:p:calcurse:r:doc-pipe]
file_filter = po/doc/pipe-<lang>.po
source_file = po/doc/pipe.pot
source_lang = en
-[calcurse.doc-priority]
+[o:lfleischer:p:calcurse:r:doc-priority]
file_filter = po/doc/priority-<lang>.po
source_file = po/doc/priority.pot
source_lang = en
-[calcurse.doc-reload]
+[o:lfleischer:p:calcurse:r:doc-reload]
file_filter = po/doc/reload-<lang>.po
source_file = po/doc/reload.pot
source_lang = en
-[calcurse.doc-repeat]
+[o:lfleischer:p:calcurse:r:doc-repeat]
file_filter = po/doc/repeat-<lang>.po
source_file = po/doc/repeat.pot
source_lang = en
-[calcurse.doc-save]
+[o:lfleischer:p:calcurse:r:doc-save]
file_filter = po/doc/save-<lang>.po
source_file = po/doc/save.pot
source_lang = en
-[calcurse.doc-tab]
+[o:lfleischer:p:calcurse:r:doc-tab]
file_filter = po/doc/tab-<lang>.po
source_file = po/doc/tab.pot
source_lang = en
-[calcurse.doc-view]
+[o:lfleischer:p:calcurse:r:doc-view]
file_filter = po/doc/view-<lang>.po
source_file = po/doc/view.pot
source_lang = en
-[calcurse.doc-vnote]
+[o:lfleischer:p:calcurse:r:doc-vnote]
file_filter = po/doc/vnote-<lang>.po
source_file = po/doc/vnote.pot
source_lang = en
diff --git a/CHANGES.md b/CHANGES.md
index 6cdc6ee..acc24e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,70 @@
Release Notes
=============
+Version 4.8.1 (2023-05-22)
+--------------------------
+
+- Bug fixes:
+
+ * Fixed characters in weekly view.
+
+ * AsciiDoc checks are skipped if --disable-docs is used.
+
+ * Fixed import for iCal files with empty description (fixed by Marian
+ Buschsieweke).
+
+ * Fixed handling of note files edited outside calcurse (fixed by Nicholas
+ Johnson).
+
+ * Fixed handling of recurrent open-ended appointments at 00:00.
+
+ * Default description for items with empty descriptions (reported and
+ partially implemented by Jonathan van der Steege).
+
+- New calcurse-caldav features:
+
+ * The PasswordCommand option can now be used to manage passwords in an
+ external program and is the new recommended way of storing passwords for
+ calcurse-caldav (implemented by Ryan Lue).
+
+Version 4.8.0 (2022-04-16)
+--------------------------
+
+- New features:
+
+ * Support any weekday as first day of week; previously, only Sunday and
+ Monday were allowed (implemented by Morgan Seltzer).
+
+ * Configuration of the format in which appointment time is displayed
+ (implemented by mercurialmoon).
+
+ * Actions without key bindings.
+
+ * generic-prev-view key binding to cycle backwards through windows
+ (implemented by Aurora).
+
+ * Support for Home/End keys in text input mode.
+
+- Bug fixes:
+
+ * Support compilation on big-endian systems (reported by nmeum).
+
+ * Fixed --docdir support (fixed by Marco Sirabella).
+
+ * Allow newlines in iCal SUMMARY by replacing them with blanks (reported by
+ Matthias Braun).
+
+ * Fixed sidebar configuration sometimes not increasing width (fixed by
+ Morgan Seltzer).
+
+ * Layout change recognizes changed appointment space; before this change, a
+ layout change did not update the maximum number of appointments visible
+ until the config menu was left (fixed by Morgan Seltzer).
+
+- calcurse-caldav bug fixes:
+
+ * Fixed InsecureSSL support (reported by Pitido).
+
Version 4.7.1 (2021-04-11)
--------------------------
diff --git a/COPYING b/COPYING
index d3ebf1b..ceb0721 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 1848c92..009a5e6 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,24 @@
-calcurse
-========
+# calcurse
[![Build and test](https://github.com/lfos/calcurse/actions/workflows/make.yml/badge.svg)](https://github.com/lfos/calcurse/actions/workflows/make.yml)
[![Lint Python](https://github.com/lfos/calcurse/actions/workflows/lint_python.yml/badge.svg)](https://github.com/lfos/calcurse/actions/workflows/lint_python.yml)
![Demo](https://calcurse.org/images/demo.gif)
-Building
---------
+## Installation
-Install the following build dependencies. If your distro segments development
-files from core packages (i.e., \*-devel or \*-dev packages), you may need to
-install those as well:
+calcurse is available on a number of Linux distributions:
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/calcurse.svg)](https://repology.org/project/calcurse/versions)
+
+## Building from Source
+
+Install the following build dependencies. If your distribution segments
+development files from core packages (i.e., \*-devel or \*-dev packages), you
+may need to install those as well:
* gcc
+* autoconf-archive
* automake
* autopoint
* asciidoc
@@ -30,8 +35,7 @@ and install calcurse:
Note that `make install` needs to be run as root. When working on a Git
checkout, you need to run `./autogen.sh` before `./configure`.
-Package Overview
-----------------
+## Source Overview
* `build-aux`: auxiliary files for the build process
* `contrib`: useful tools such as hooks or the CalDAV synchronization script
@@ -41,8 +45,7 @@ Package Overview
* `src`: the actual calcurse source files
* `test`: test suite and test cases for calcurse
-Authors
--------
+## Authors
calcurse was created by Frederic Culot in 2004. Since 2011, the project is
maintained by Lukas Fleischer. Many core features added to calcurse since 2017
@@ -52,8 +55,7 @@ Of course, there are numerous other contributors. Check the Git commit log and
the `Thanks` section in the manual for a list of people who have contributed by
reporting bugs, sending fixes, or suggesting improvements.
-Contributing and Donations
---------------------------
+## Contributing and Donations
Patches, bug reports and other requests are always welcome! You can submit them
to one of our mailing lists (check the [patch submission
diff --git a/autogen.sh b/autogen.sh
index 55c7768..ee8f12f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+# Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index fe1ec84..40c04b5 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -6,7 +6,7 @@ then
exit 1
fi
-DEF_VER=4.7.0
+DEF_VER=4.8.1
VERFILE="$1"
if [ -d '.git' ]
diff --git a/configure.ac b/configure.ac
index 1f6ec61..da211d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,14 @@
#-------------------------------------------------------------------------------
# Init
#-------------------------------------------------------------------------------
-AC_PREREQ(2.59)
-AC_INIT([calcurse],
- m4_esyscmd([build-aux/git-version-gen .version]),
- [bugs@calcurse.org])
+AC_PREREQ([2.71])
+AC_INIT([calcurse],[m4_esyscmd(build-aux/git-version-gen .version)],[bugs@calcurse.org])
AM_INIT_AUTOMAKE
#m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.1])
+AM_GNU_GETTEXT_VERSION([0.19.8])
AC_CONFIG_SRCDIR([src/calcurse.c])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
#-------------------------------------------------------------------------------
# Checks for system type
#-------------------------------------------------------------------------------
@@ -19,37 +17,22 @@ AC_CANONICAL_HOST
# Checks for programs
#-------------------------------------------------------------------------------
AC_PROG_CC
+AC_C_BIGENDIAN
#-------------------------------------------------------------------------------
# Checks for header files
#-------------------------------------------------------------------------------
-AC_HEADER_STDC
AC_CHECK_HEADERS([ctype.h getopt.h locale.h math.h signal.h stdio.h stdlib.h \
string.h sys/stat.h sys/types.h sys/wait.h time.h unistd.h \
fcntl.h paths.h errno.h limits.h regex.h])
#-------------------------------------------------------------------------------
# Checks for system libs
#-------------------------------------------------------------------------------
-AC_CHECK_FUNC(initscr,,
-[
- available_ncurses="none"
- for lib in ncursesw ncurses
- do
- AC_CHECK_LIB($lib, initscr,
- [available_ncurses="$lib"; break])
- done
- if test "$available_ncurses" = none; then
- AC_MSG_ERROR(Either ncurses or ncursesw library is required to build calcurse!)
- elif test "$available_ncurses" = ncursesw; then
- AC_CHECK_HEADERS([ncursesw/ncurses.h],,
- [AC_CHECK_HEADERS([ncurses.h],,
- AC_MSG_ERROR([Missing ncursesw header file]))])
- else
- AC_CHECK_HEADERS([ncurses/ncurses.h],,
- [AC_CHECK_HEADERS([ncurses.h],,
- AC_MSG_ERROR([Missing ncurses header file]))])
- fi
- LIBS="$LIBS -l$available_ncurses"
-])
+AX_WITH_CURSES
+if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+ AC_MSG_ERROR(Either ncurses or ncursesw library is required to build calcurse!)
+fi
+
+LIBS="$LIBS $CURSES_LIBS"
AC_CHECK_HEADERS([pthread.h], [
AC_CHECK_LIB(pthread, pthread_create, [
@@ -76,7 +59,6 @@ AC_ARG_ENABLE(docs,
[enabledocs=$enableval], [enabledocs=yes])
if test x"$enabledocs" != x"yes"; then
enabledocs=no
- AC_MSG_WARN([Skipping documentation!])
fi
AC_MSG_CHECKING([whether to include documentation])
AC_MSG_RESULT($enabledocs)
@@ -87,7 +69,21 @@ AC_ARG_WITH(asciidoc,
[use AsciiDoc to regenerate documentation]),
[use_asciidoc=$withval],
[use_asciidoc="auto"])
-if test x"$use_asciidoc" = x"auto"; then
+if test x"$enabledocs" = x"no" -o x"$use_asciidoc" = x"no"; then
+ AC_MSG_WARN([Will not rebuild documentation!])
+ have_asciidoc=no
+ have_a2x=no
+elif test x"$use_asciidoc" = x"yes"; then
+ AC_PATH_PROG([ASCIIDOC], [asciidoc])
+ if test -z "$ASCIIDOC"; then
+ AC_MSG_ERROR([AsciiDoc not found and "--with-asciidoc" specified!])
+ fi
+ AC_PATH_PROG([A2X], [a2x])
+ if test -z "$A2X"; then
+ AC_MSG_ERROR([a2x not found and "--with-asciidoc" specified!])
+ fi
+ have_asciidoc=yes
+elif test x"$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc])
if test -z "$ASCIIDOC"; then
have_asciidoc=no
@@ -112,20 +108,6 @@ if test x"$use_asciidoc" = x"auto"; then
else
have_a2x=yes
fi
-elif test x"$use_asciidoc" = x"yes"; then
- AC_PATH_PROG([ASCIIDOC], [asciidoc])
- if test -z "$ASCIIDOC"; then
- AC_MSG_ERROR([AsciiDoc not found and "--with-asciidoc" specified!])
- fi
- AC_PATH_PROG([A2X], [a2x])
- if test -z "$A2X"; then
- AC_MSG_ERROR([a2x not found and "--with-asciidoc" specified!])
- fi
- have_asciidoc=yes
-elif test x"$use_asciidoc" = x"no"; then
- AC_MSG_WARN([Will not rebuild documentation!])
- have_asciidoc=no
- have_a2x=no
fi
AM_CONDITIONAL(HAVE_ASCIIDOC, test $have_asciidoc = yes)
AM_CONDITIONAL(HAVE_A2X, test $have_a2x = yes)
@@ -152,9 +134,10 @@ AM_CONDITIONAL(CALCURSE_MEMORY_DEBUG, test x$memdebug = xyes)
#-------------------------------------------------------------------------------
# Create Makefiles
#-------------------------------------------------------------------------------
-AC_OUTPUT(Makefile doc/Makefile src/Makefile test/Makefile \
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile test/Makefile \
scripts/Makefile po/Makefile.in po/Makefile \
- contrib/caldav/Makefile contrib/vdir/Makefile)
+ contrib/caldav/Makefile contrib/vdir/Makefile])
+AC_OUTPUT
#-------------------------------------------------------------------------------
# Summary
#-------------------------------------------------------------------------------
diff --git a/contrib/caldav/README.md b/contrib/caldav/README.md
index a842081..b464dc9 100644
--- a/contrib/caldav/README.md
+++ b/contrib/caldav/README.md
@@ -34,13 +34,12 @@ argument. You can choose between the following initialization modes:
For subsequent calcurse-caldav invocations, you don't need to specify any
additional parameters.
-You can specify a username and password for basic authentication in the
-config file. Alternatively, the password can be passed securely from another
-program (such as *pass*) via the `CALCURSE_CALDAV_PASSWORD` environment variable like
-so:
-```
-CALCURSE_CALDAV_PASSWORD=$(pass show calcurse) calcurse-caldav
-```
+Specify your HTTP Basic authentication credentials under the config file's
+`Auth` section. The most secure approach is to save your password in a CLI
+encrypted password store (_e.g.,_ [pass](https://www.passwordstore.org/)), and
+then set `PasswordCommand` to the shell command used to retrieve it.
+If security is not a priority, you may store your password in plain text
+instead.
Hooks
-----
diff --git a/contrib/caldav/calcurse-caldav.py b/contrib/caldav/calcurse-caldav.py
index 3f57fdf..5efd306 100755
--- a/contrib/caldav/calcurse-caldav.py
+++ b/contrib/caldav/calcurse-caldav.py
@@ -6,6 +6,7 @@ import configparser
import os
import pathlib
import re
+import shlex
import subprocess
import sys
import textwrap
@@ -30,6 +31,7 @@ class Config:
self._map = {
'Auth': {
'Password': None,
+ 'PasswordCommand': None,
'Username': None,
},
'CustomHeaders': {},
@@ -75,7 +77,7 @@ class Config:
for key, val in config.items(sec):
if key not in self._map[sec]:
die('Unexpected config key in section {}: {}'.format(sec, key))
- if type(self._map[sec][key]) == bool:
+ if isinstance(self._map[sec][key], bool):
self._map[sec][key] = config.getboolean(sec, key)
else:
self._map[sec][key] = val
@@ -657,9 +659,6 @@ verbose = args.verbose
debug = args.debug
debug_raw = args.debug_raw
-# Read environment variables
-password = os.getenv('CALCURSE_CALDAV_PASSWORD')
-
# Read configuration.
config = Config(configfn)
@@ -674,7 +673,18 @@ path = config.get('General', 'Path')
sync_filter = config.get('General', 'SyncFilter')
verbose = verbose or config.get('General', 'Verbose')
-password = password or config.get('Auth', 'Password')
+if os.getenv('CALCURSE_CALDAV_PASSWORD'):
+ # This approach is deprecated, but preserved for backwards compatibility
+ password = os.getenv('CALCURSE_CALDAV_PASSWORD')
+elif config.get('Auth', 'Password'):
+ password = config.get('Auth', 'Password')
+elif config.get('Auth', 'PasswordCommand'):
+ tokenized_cmd = shlex.split(config.get('Auth', 'PasswordCommand'))
+ password = subprocess.run(
+ tokenized_cmd, capture_output=True).stdout.decode('UTF-8').rstrip('\n')
+else:
+ password = None
+
username = config.get('Auth', 'Username')
client_id = config.get('OAuth2', 'ClientID')
@@ -733,9 +743,7 @@ try:
# Connect to the server.
if verbose:
print('Connecting to ' + hostname + '...')
- conn = httplib2.Http()
- if insecure_ssl:
- conn.disable_ssl_certificate_validation = True
+ conn = httplib2.Http(disable_ssl_certificate_validation=insecure_ssl)
if authmethod == 'oauth2':
# Authenticate with OAuth2 and authorize HTTP object
diff --git a/contrib/caldav/config.sample b/contrib/caldav/config.sample
index e2c6c2d..0ba8fa8 100644
--- a/contrib/caldav/config.sample
+++ b/contrib/caldav/config.sample
@@ -48,11 +48,13 @@ DryRun = Yes
# Enable this if you want detailed logs written to stdout.
Verbose = Yes
-# Credentials for HTTP Basic Authentication. Leave this commented out if you do
-# not want to use authentication.
+# Credentials for HTTP Basic Authentication (if required).
+# Set `Password` to your password in plaintext (unsafe),
+# or `PasswordCommand` to a shell command that retrieves it (recommended).
#[Auth]
#Username = user
-#Password = pass
+#Password = password
+#PasswordCommand = pass baikal
# Optionally specify additional HTTP headers here.
#[CustomHeaders]
diff --git a/doc/calcurse.1.txt b/doc/calcurse.1.txt
index 4605219..1f79f9a 100644
--- a/doc/calcurse.1.txt
+++ b/doc/calcurse.1.txt
@@ -1,6 +1,6 @@
////
/*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -764,5 +764,5 @@ AUTHORS
COPYRIGHT
---------
-Copyright (c) 2004-2020 calcurse Development Team.
+Copyright (c) 2004-2023 calcurse Development Team.
This software is released under the BSD License.
diff --git a/doc/credits.txt b/doc/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/credits.txt
+++ b/doc/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/de/credits.txt b/doc/de/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/de/credits.txt
+++ b/doc/de/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/es/credits.txt b/doc/es/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/es/credits.txt
+++ b/doc/es/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/fr/credits.txt b/doc/fr/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/fr/credits.txt
+++ b/doc/fr/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/manual.txt b/doc/manual.txt
index cbdfbce..03a27ff 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -1,6 +1,6 @@
////
/*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -143,7 +143,7 @@ Install process
First you need to gunzip and untar the source archive:
----
-$ tar zxvf calcurse-4.7.0.tar.gz
+$ tar zxvf calcurse-4.8.1.tar.gz
----
Once you meet the requirements and have extracted the archive, the install
diff --git a/doc/nl/credits.txt b/doc/nl/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/nl/credits.txt
+++ b/doc/nl/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/pt_BR/credits.txt b/doc/pt_BR/credits.txt
index 5cddabc..82efeb5 100644
--- a/doc/pt_BR/credits.txt
+++ b/doc/pt_BR/credits.txt
@@ -1,7 +1,7 @@
Calcurse - organizador baseado em texto
=======================================
-Copyright (c) 2004-2020 Equipe de Desenvolvimento do Calcurse
+Copyright (c) 2004-2023 Equipe de Desenvolvimento do Calcurse
Todos os direitos reservados.
A redistribuição e uso na forma de código-fonte e binário, com ou
diff --git a/doc/ru/credits.txt b/doc/ru/credits.txt
index ac7c1ab..e1f5ae7 100644
--- a/doc/ru/credits.txt
+++ b/doc/ru/credits.txt
@@ -1,7 +1,7 @@
Calcurse - text-based organizer
===============================
-Copyright (c) 2004-2020 calcurse Development Team
+Copyright (c) 2004-2023 calcurse Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/doc/submitting-patches.txt b/doc/submitting-patches.txt
index 056bfb5..6514949 100644
--- a/doc/submitting-patches.txt
+++ b/doc/submitting-patches.txt
@@ -1,6 +1,6 @@
////
/*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/po/calcurse.pot b/po/calcurse.pot
index 37c3361..2fd17ea 100644
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: calcurse 4.8.1-11-g9f7e\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
+"POT-Creation-Date: 2024-01-26 18:28+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"
@@ -50,7 +50,7 @@ msgstr ""
msgid "calcurse %s -- text-based organizer\n"
msgstr ""
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -419,12 +419,6 @@ msgstr ""
msgid "(if set to YES, confirmation is required before deleting an event)"
msgstr ""
-msgid "Monday"
-msgstr ""
-
-msgid "Sunday"
-msgstr ""
-
msgid "(specifies the first day of week in the calendar view)"
msgstr ""
@@ -449,12 +443,18 @@ msgstr ""
msgid "(Format of the date displayed in the appointments panel)"
msgstr ""
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr ""
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
msgid "Enter the date format: "
msgstr ""
@@ -467,7 +467,7 @@ msgstr ""
msgid "Undefined option!"
msgstr ""
-msgid "undefined"
+msgid "UNDEFINED"
msgstr ""
msgid "keys configuration"
@@ -480,7 +480,7 @@ msgstr ""
msgid "The key '%s' is already used for %s. Choose another one."
msgstr ""
-msgid "Some actions do not have any associated key bindings!"
+msgid "Some actions are left undefined!"
msgstr ""
msgid ""
@@ -581,6 +581,12 @@ msgstr ""
msgid "unknown ical type"
msgstr ""
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -643,9 +649,6 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
msgid "item start date not defined."
msgstr ""
@@ -803,31 +806,37 @@ msgstr ""
msgid "failed to open key file"
msgstr ""
-msgid ""
-"\n"
-"Too many errors while reading configuration file!\n"
-"Please backup your keys file, remove it from directory, and launch calcurse "
-"again.\n"
+msgid "Could not read key label"
msgstr ""
-msgid "Could not read key label"
+#, c-format
+msgid "Key label not recognized: \"%s\""
msgstr ""
-msgid "Key label not recognized"
+#, c-format
+msgid "No keys assigned to \"%s\"."
msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
+msgid "Keyname not recognized: \"%s\""
msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
+msgid "\"%s\" assigned twice: \"%s\"."
+msgstr ""
+
+#, c-format
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
+
+msgid "Errors in the keys file."
msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Remove offending line(s) from the keys file, aborting..."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
+msgid "Some actions do not have any associated key bindings!"
msgstr ""
#, c-format
@@ -954,6 +963,9 @@ msgstr ""
msgid "Chg Win"
msgstr ""
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr ""
@@ -1132,6 +1144,9 @@ msgstr ""
msgid "Select next panel in calcurse main screen."
msgstr ""
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr ""
@@ -1252,7 +1267,7 @@ msgid "FATAL ERROR: null file pointer."
msgstr ""
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
msgid "xmalloc: zero size"
@@ -1370,9 +1385,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr ""
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr ""
@@ -1761,7 +1773,7 @@ msgstr ""
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 63c51b1..568ec93 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# delix, 2012
@@ -9,15 +9,15 @@
# Stefan Schroeder <ondekoza@gmail.com>, 2017
# Tim, 2013
# Tim Summerer <summerer.tim@gmail.com>, 2019
-# Tim, 2013
+# 8eda48bac0dbbe266f569e2487f7fa50_208ec8f, 2013
msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 15:20+0000\n"
-"Last-Translator: Lukas Fleischer\n"
-"Language-Team: German (http://www.transifex.com/lfleischer/calcurse/language/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Tim Summerer <summerer.tim@gmail.com>, 2019\n"
+"Language-Team: German (http://app.transifex.com/lfleischer/calcurse/language/"
"de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -28,13 +28,11 @@ msgstr ""
msgid "null pointer"
msgstr "Null-Zeiger"
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "Datumsfehler im Termin"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "Datumsfehler im Termin"
+msgstr ""
msgid "date error in appointment"
msgstr "Datumsfehler im Termin"
@@ -59,7 +57,7 @@ msgstr "Der Aufruf `calcurse -h` zeigt weitere Hilfen."
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s -- Terminplaner im Textmodus\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -300,13 +298,11 @@ msgstr ""
msgid "Help topic does not exist: %s"
msgstr "Hilfethema existiert nicht: %s"
-#, fuzzy
msgid "Select a repeating item in the appointments panel."
-msgstr "(Position des Titels in der Terminleiste)"
+msgstr ""
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Ein Item wiederholen"
+msgstr ""
msgid "Last occurrence."
msgstr ""
@@ -437,12 +433,6 @@ msgstr ""
"(Ist JA gewählt, ist eine Bestätigung erforderlich, um ein Ereignis zu "
"löschen)"
-msgid "Monday"
-msgstr "Montag"
-
-msgid "Sunday"
-msgstr "Sonntag"
-
msgid "(specifies the first day of week in the calendar view)"
msgstr "(lege den ersten Tag der Woche in der Kalenderansicht fest)"
@@ -467,12 +457,18 @@ msgstr "(Position des Titels in der Terminleiste)"
msgid "(Format of the date displayed in the appointments panel)"
msgstr "(Format des Datums in der Termin-Anzeige)"
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr "Geben Sie das Datumsformat an (vgl. 'man 3 strftime')"
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr "Zeitformat eingeben (vgl. 'man 3 strftime')"
+
msgid "Enter the date format: "
msgstr "Datumsformat eingeben:"
@@ -487,8 +483,8 @@ msgstr "Allgemeine Einstellungen"
msgid "Undefined option!"
msgstr "Unbestimmte Einstellung!"
-msgid "undefined"
-msgstr "unbestimmt"
+msgid "UNDEFINED"
+msgstr ""
msgid "keys configuration"
msgstr "Tasteneinstellung"
@@ -500,8 +496,8 @@ msgstr "Taste drücken, die zugewiesen werden soll:"
msgid "The key '%s' is already used for %s. Choose another one."
msgstr "Die Taste '%s' wird schon von %s benutzt. Wählen Sie eine andere."
-msgid "Some actions do not have any associated key bindings!"
-msgstr "Einige Aktionen haben keine Tastenzuordnung!"
+msgid "Some actions are left undefined!"
+msgstr ""
msgid ""
"Sorry, colors are not supported by your terminal\n"
@@ -517,9 +513,8 @@ msgstr ""
msgid "unknown item type"
msgstr "Unbekannte Position"
-#, fuzzy
msgid "Note:"
-msgstr "Notiz bearb."
+msgstr ""
msgid "Event:"
msgstr "Ereignis:"
@@ -589,13 +584,11 @@ msgstr "Aufgeweckt als %s\n"
msgid "Could not stop calcurse daemon: %s\n"
msgstr "Kann den calcurse-Dienst nicht beenden: %s\n"
-#, fuzzy
msgid "illegal date in event"
-msgstr "Datumsfehler im Ereignis"
+msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "Datumsfehler im Ereignis"
+msgstr ""
msgid "Internal error: line too long"
msgstr "INTERNER FEHLER: Die Zeile ist zu lang"
@@ -606,6 +599,12 @@ msgstr "Hauptspeicher reicht nicht aus"
msgid "unknown ical type"
msgstr "Unbekannter ICal-Typ"
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -618,13 +617,11 @@ msgstr ""
msgid "frequency absent in rrule."
msgstr ""
-#, fuzzy
msgid "rrule frequency not supported."
-msgstr "Wiederholung nicht gefunden."
+msgstr ""
-#, fuzzy
msgid "invalid interval."
-msgstr "Ungültiger Filter"
+msgstr ""
msgid "either until or count."
msgstr ""
@@ -632,9 +629,8 @@ msgstr ""
msgid "missing until value."
msgstr ""
-#, fuzzy
msgid "invalid until format."
-msgstr "Ungültiges Exportformat: %s"
+msgstr ""
msgid "invalid count value."
msgstr ""
@@ -642,13 +638,11 @@ msgstr ""
msgid "invalid bymonth list."
msgstr ""
-#, fuzzy
msgid "invalid bymonthday list."
-msgstr "Ungültiges Datum: %s"
+msgstr ""
-#, fuzzy
msgid "invalid byday list."
-msgstr "Ungültiges Datum: %s"
+msgstr ""
msgid "invalid exception date value type."
msgstr ""
@@ -656,9 +650,8 @@ msgstr ""
msgid "malformed exceptions line."
msgstr ""
-#, fuzzy
msgid "invalid exception."
-msgstr "Ungültige Wiederholungsrate."
+msgstr ""
#, c-format
msgid "malformed %s line."
@@ -674,44 +667,35 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
-#, fuzzy
msgid "item start date not defined."
-msgstr "Anfangsdatum des Eintrags fehlt."
+msgstr ""
msgid "malformed start time line."
msgstr ""
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "Kann die Startzeit des Ereignis nicht lesen."
+msgstr ""
-#, fuzzy
msgid "invalid end time value type."
-msgstr "Ungültiger Zeitraum: %s"
+msgstr ""
msgid "malformed end time line."
msgstr ""
-#, fuzzy
msgid "malformed event end time."
-msgstr "Kann die Endzeit des Ereignis nicht lesen."
+msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "Syntaxfehler in Item-Zeit oder -Dauer"
+msgstr ""
msgid "malformed duration line."
msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "Ungültiges Datum: %s"
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -719,9 +703,9 @@ msgstr ""
msgid "multi-day event changed to one-day event"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Location: %s"
-msgstr "alloziiert bei: %s\n"
+msgstr ""
#, c-format
msgid "Comment: %s"
@@ -818,9 +802,8 @@ msgstr "Falsches Format für den Termin oder das Ereignis"
msgid "syntax error in item repetition"
msgstr "Syntaxfehler in Item-Wiederholung"
-#, fuzzy
msgid "syntax error in until date"
-msgstr "Eingabefehler im Datum"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -831,9 +814,8 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "Eingabefehler im Datum"
+msgstr ""
msgid "failed to open todo file"
msgstr "konnte Aufgaben-Datei nicht öffnen"
@@ -844,36 +826,38 @@ msgstr ""
msgid "failed to open key file"
msgstr "Konnte Tastenkonfigurationsdatei nicht öffnen"
-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 ""
-"\n"
-"Zu viele Fehler beim Lesen der Konfigurationsdatei!\n"
-"Bitte die Einstellungsdatei der Tastaturkürzel sichern, diese aus dem\n"
-"Verzeichnis löschen und calcurse neu starten.\n"
-
msgid "Could not read key label"
msgstr "Tastenbezeichnung nicht lesbar"
-msgid "Key label not recognized"
-msgstr "Tastenbezeichnung nicht erkannt"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "No keys assigned to \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Keyname not recognized: \"%s\""
+msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
-msgstr "Fehler beim Lesen der Taste \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
+msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "\"%s\" ist mehrfach zugeordnet!"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Errors in the keys file."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
-msgstr "Zu viele Fehler beim Lesen der 'keys'-Datei, Abbruch..."
+msgid "Remove offending line(s) from the keys file, aborting..."
+msgstr ""
+
+msgid "Some actions do not have any associated key bindings!"
+msgstr "Einige Aktionen haben keine Tastenzuordnung!"
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
@@ -1004,6 +988,9 @@ msgstr "Einfügen"
msgid "Chg Win"
msgstr "Wechseln"
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr "Importieren"
@@ -1191,6 +1178,9 @@ msgstr "Item an aktueller Position einfügen."
msgid "Select next panel in calcurse main screen."
msgstr "Wähle nächstes Fenster im calcurse-Hauptbildschirm."
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr "Importiere Daten von einer externen Datei."
@@ -1323,9 +1313,8 @@ msgid "FATAL ERROR: null file pointer."
msgstr "SCHWERER FEHLER: Null-Datei-Zeiger."
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
-"Beim Hinzufügen einer Default-Taste für \"%s\" war \"%s\" bereits zugewiesen!"
msgid "xmalloc: zero size"
msgstr "xmalloc: Länge 0"
@@ -1443,9 +1432,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr "(Aufzeichnen von Aktivitäten, wenn im Hintergrund ausgeführt)"
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr "Zeitformat eingeben (vgl. 'man 3 strftime')"
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr "Geben Sie die Zeit in Sekunden ein (0 um keine Hinweis zu erhalten)."
@@ -1468,9 +1454,8 @@ msgstr "Unbekanntes Zeichen"
msgid "recurrence error: not on start day (%s)"
msgstr ""
-#, fuzzy
msgid "illegel date in event"
-msgstr "Datumsfehler im Ereignis"
+msgstr ""
msgid "date error in event"
msgstr "Datumsfehler im Ereignis"
@@ -1478,9 +1463,8 @@ msgstr "Datumsfehler im Ereignis"
msgid "month day is zero"
msgstr ""
-#, fuzzy
msgid "no daily frequency check"
-msgstr "Ungültige Wiederholungsrate."
+msgstr ""
msgid "illegal BYDAY value"
msgstr ""
@@ -1491,17 +1475,14 @@ msgstr "Ereignis nicht gefunden"
msgid "appointment not found"
msgstr "Termin nicht gefunden"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "Eingabefehler im Datum"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "Eingabefehler im Datum"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "Eingabefehler im Datum"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
@@ -1632,23 +1613,20 @@ msgstr ""
msgid "Invalid format - try again."
msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Eine beliebige Taste um fortzufahren..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "Heute"
+msgstr ""
msgid "week"
msgstr ""
-#, fuzzy
msgid "month"
-msgstr "(m)onatlich"
+msgstr ""
msgid "year"
msgstr ""
@@ -1726,30 +1704,25 @@ msgstr ""
msgid "Invalid start time."
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent and has a note attached to it. Delete (s)elected "
"occurrence, (a)ll occurrences, or just its (n)ote?"
msgstr ""
-"An diesem Eintrag ist eine Notiz. E(i)ntrag löschen oder nur die (n)otiz?"
msgid "[san]"
msgstr ""
-#, fuzzy
msgid ""
"This item has a note attached to it. Delete (s)elected occurrence or just "
"its (n)ote?"
msgstr ""
-"An diesem Eintrag ist eine Notiz. E(i)ntrag löschen oder nur die (n)otiz?"
msgid "[sn]"
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent. Delete (s)elected occurrence or (a)ll occurrences?"
-msgstr "Dieser Eintrag ist wiederkehrend. Lösche (a)lle oder nur (e)inen?"
+msgstr ""
msgid "[sa]"
msgstr ""
@@ -1760,9 +1733,8 @@ msgstr ""
msgid "[s]"
msgstr ""
-#, fuzzy
msgid "Already repeated."
-msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
+msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
@@ -1851,7 +1823,7 @@ msgstr "Verwendung: calcurse-upgrade [-h|-v|--config <file>]"
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@@ -1902,70 +1874,3 @@ msgstr "Aktualisiere Konfigurationsanweisungen..."
msgid "Remove temporary backup..."
msgstr "Entferne temporäres Backup..."
-
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr ""
-#~ "(Ist JA gewählt, werden Nachrichten über geladene und gespeicherte Daten "
-#~ "angezeigt)"
-
-#~ msgid "date error in the event\n"
-#~ msgstr "Fehlerhafte Zeit für das Ereignis\n"
-
-#~ msgid "recurrence frequency not recognized."
-#~ msgstr "Wiederholung nicht erkannt."
-
-#~ msgid "item has a negative duration."
-#~ msgstr "Eintrag hat eine negative Dauer."
-
-#~ msgid "item duration malformed."
-#~ msgstr "Dauer des Eintrags fehlerhaft."
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr "Willkommen zu calcurse. Fehlende Dateien werden erzeugt."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Benutzerdaten gefunden. Daten werden geladen."
-
-#~ msgid "error while launching command: could not fork"
-#~ msgstr "Fehler beim Ausführen einer Befehlszeile: Kann nicht Ausführen"
-
-#~ msgid "error while launching command"
-#~ msgstr "Fehler beim Ausführen einer Befehlszeile"
-
-#~ msgid "unknown repetition type"
-#~ msgstr "Unbekannter Wiederholungstyp"
-
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Neuen Wiederholungstyp eingeben:"
-
-#~ msgid "(d)aily"
-#~ msgstr "(t)äglich"
-
-#~ msgid "(w)eekly"
-#~ msgstr "(w)öchentlich"
-
-#~ msgid "(y)early"
-#~ msgstr "(j)ährlich"
-
-#, c-format
-#~ msgid "(currently using %s)"
-#~ msgstr "(verwende momentan %s)"
-
-#~ msgid "Enter the repetition frequency:"
-#~ msgstr "Eingabe der Wiederholungsrate:"
-
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "Möchten Sie diesen Eintrag wirklich löschen?"
-
-#~ msgid "[ao]"
-#~ msgstr "[ae]"
-
-#~ msgid "[in]"
-#~ msgstr "[in]"
-
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Wiederholungstyp eingeben:"
-
-#~ msgid "wrong item type"
-#~ msgstr "Falscher Typ des Eintrags"
diff --git a/po/en.po b/po/en.po
index 56beca4..4e15252 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,15 +1,13 @@
-# English/GB translation of calcurse.
-# Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
+# English/GB translation of calcurse
+# Copyright (C) 2021 calcurse Development Team <misc@calcurse.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"
+"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
+"POT-Creation-Date: 2024-01-26 18:28+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"
@@ -17,25 +15,22 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "null pointer"
msgstr ""
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "Appointment :"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "Appointment :"
+msgstr ""
-#, fuzzy
msgid "date error in appointment"
-msgstr "Appointment :"
+msgstr ""
-#, fuzzy
msgid "no such appointment"
-msgstr "Appointment :"
+msgstr ""
msgid ""
"Usage:\n"
@@ -47,31 +42,21 @@ msgid ""
"daemon"
msgstr ""
-#, fuzzy
msgid "Try `calcurse -h` for more information."
-msgstr "Try 'calcurse -h' for more information.\n"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "calcurse %s -- text-based organizer\n"
-msgstr "Calcurse %s - text-based organizer\n"
+msgstr ""
-#, fuzzy
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
-"\n"
-"Copyright (c) 2004-2006 Frederic Culot.\n"
-"This is free software; see the source for copying conditions.\n"
-#, fuzzy
msgid "This is free software; see the source for copying conditions."
msgstr ""
-"\n"
-"Copyright (c) 2004-2006 Frederic Culot.\n"
-"This is free software; see the source for copying conditions.\n"
-#, fuzzy
msgid "Operations in command line mode:"
-msgstr "starting interactive mode...\n"
+msgstr ""
msgid " -Q, --query Print items in a given query range"
msgstr ""
@@ -155,20 +140,15 @@ msgid ""
" -x, --export[<format>] Export to stdout in ical (default) or pcal format"
msgstr ""
-#, fuzzy
msgid ""
"For more information, type '?' from within calcurse, or read the manpage."
msgstr ""
-"\n"
-"For more information, type '?' from within Calcurse, or read the manpage.\n"
-#, fuzzy
msgid "Submit feature requests and suggestions to <misc@calcurse.org>."
-msgstr "Mail bug reports and suggestions to <misc@calcurse.org>.\n"
+msgstr ""
-#, fuzzy
msgid "Submit bug reports to <bugs@calcurse.org>."
-msgstr "Mail bug reports and suggestions to <misc@calcurse.org>.\n"
+msgstr ""
#, c-format
msgid ""
@@ -192,11 +172,10 @@ msgid "completed tasks:\n"
msgstr ""
msgid "to do:\n"
-msgstr "to do:\n"
+msgstr ""
-#, fuzzy
msgid "next appointment:\n"
-msgstr "Appointment :"
+msgstr ""
#, c-format
msgid "invalid range: %s"
@@ -236,13 +215,13 @@ msgstr ""
msgid "calcurse is running (pid = %d)"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "invalid input date format: %s"
-msgstr "Enter the new ToDo item : "
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "invalid output date format: %s"
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "invalid argument combination"
msgstr ""
@@ -256,13 +235,11 @@ msgstr ""
msgid "Unable to find documentation."
msgstr ""
-#, fuzzy
msgid "Data were saved successfully"
-msgstr "The data files were successfully saved"
+msgstr ""
-#, fuzzy
msgid "Data were saved/reloaded successfully"
-msgstr "The data files were successfully saved"
+msgstr ""
msgid "Save cancelled"
msgstr ""
@@ -270,17 +247,14 @@ msgstr ""
msgid "Data were already saved"
msgstr ""
-#, fuzzy
msgid "Cannot open data file"
-msgstr "Failed to open todo file"
+msgstr ""
-#, fuzzy
msgid "Data were reloaded successfully"
-msgstr "The data files were successfully saved"
+msgstr ""
-#, fuzzy
msgid "Date were merged/reloaded successfully"
-msgstr "The data files were successfully saved"
+msgstr ""
msgid "Reload cancelled"
msgstr ""
@@ -297,9 +271,8 @@ msgstr ""
msgid "There are unsaved changes. Should they be saved?"
msgstr ""
-#, fuzzy
msgid "Do you really want to quit?"
-msgstr "Do you really want to quit ?"
+msgstr ""
msgid "Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) | p(rev) ]"
msgstr ""
@@ -330,13 +303,11 @@ msgstr ""
msgid "No such command: %s"
msgstr ""
-#, fuzzy
msgid "unknown color"
-msgstr "Colour"
+msgstr "unknown colour"
-#, fuzzy
msgid "failed to open configuration file"
-msgstr "Failed to open config file"
+msgstr ""
#, c-format
msgid "invalid configuration directive: \"%s\""
@@ -351,21 +322,20 @@ msgstr ""
msgid "unknown user option: \"%s\" (ignored)"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "invalid option format: \"%s\" (ignored)"
-msgstr "Enter the new ToDo item : "
+msgstr ""
#, c-format
msgid "unknown user option: \"%s\" (disabled)"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "invalid option format: \"%s\" (disabled)"
-msgstr "Enter the new ToDo item : "
+msgstr ""
-#, fuzzy
msgid "layout configuration"
-msgstr "CalCurse %s | general options"
+msgstr ""
msgid "Foreground"
msgstr ""
@@ -376,19 +346,17 @@ msgstr ""
msgid "(terminal's default)"
msgstr ""
-#, fuzzy
msgid "color theme"
-msgstr "CalCurse %s | help"
+msgstr "colour theme"
-#, fuzzy
msgid "(if set to YES, compact panels are used)"
-msgstr "(if set to YES, progress bar will not be displayed when saving data)"
+msgstr ""
msgid "Calendar"
-msgstr "Calendar"
+msgstr ""
msgid "Appointments"
-msgstr "Appointments"
+msgstr ""
msgid "TODO"
msgstr ""
@@ -433,7 +401,7 @@ msgid "(display more than one day in the appointments panel)"
msgstr ""
msgid "(if set to YES, automatic save is done when quitting)"
-msgstr "(if set to YES, automatic save is done when quitting)"
+msgstr ""
msgid "(run the garbage collector when quitting)"
msgstr ""
@@ -445,15 +413,9 @@ msgid "(if YES, system events are turned into appointments (or else deleted))"
msgstr ""
msgid "(if set to YES, confirmation is required before quitting)"
-msgstr "(if set to YES, confirmation is required before quitting)"
-
-msgid "(if set to YES, confirmation is required before deleting an event)"
-msgstr "(if set to YES, confirmation is required before deleting an event)"
-
-msgid "Monday"
msgstr ""
-msgid "Sunday"
+msgid "(if set to YES, confirmation is required before deleting an event)"
msgstr ""
msgid "(specifies the first day of week in the calendar view)"
@@ -480,32 +442,35 @@ msgstr ""
msgid "(Format of the date displayed in the appointments panel)"
msgstr ""
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr ""
-#, fuzzy
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+
msgid "Enter the date format: "
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "Enter the delay, in minutes, between automatic saves (0 to disable) "
msgstr ""
-#, fuzzy
msgid "general options"
-msgstr "CalCurse %s | general options"
+msgstr ""
msgid "Undefined option!"
msgstr ""
-msgid "undefined"
+msgid "UNDEFINED"
msgstr ""
-#, fuzzy
msgid "keys configuration"
-msgstr "CalCurse %s | general options"
+msgstr ""
msgid "Press the key you want to assign to:"
msgstr ""
@@ -514,7 +479,7 @@ msgstr ""
msgid "The key '%s' is already used for %s. Choose another one."
msgstr ""
-msgid "Some actions do not have any associated key bindings!"
+msgid "Some actions are left undefined!"
msgstr ""
msgid ""
@@ -524,67 +489,62 @@ msgstr ""
"Sorry, colours are not supported by your terminal\n"
"(Press [ENTER] to continue)"
-#, fuzzy, c-format
+#, c-format
msgid "Could not save %s."
-msgstr "Enter description :"
+msgstr ""
msgid "unknown item type"
msgstr ""
-#, fuzzy
msgid "Note:"
-msgstr "Add Item"
+msgstr ""
-#, fuzzy
msgid "Event:"
-msgstr "Event :"
+msgstr ""
-#, fuzzy
msgid "Appointment:"
-msgstr "Appointment :"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not stop daemon properly: %s\n"
-msgstr "Enter description :"
+msgstr ""
#, c-format
msgid "terminated at %s with signal %d\n"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not remove daemon lock file: %s\n"
-msgstr "Enter description :"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not fork: %s\n"
-msgstr "Enter description :"
+msgstr ""
#, c-format
msgid "Could not detach from the controlling terminal: %s\n"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not change working directory: %s\n"
-msgstr "Enter description :"
+msgstr ""
msgid "Cannot daemonize, aborting\n"
msgstr ""
-#, fuzzy
msgid "Could not set lock file\n"
-msgstr "Enter description :"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not access \"%s\": %s\n"
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
#, c-format
msgid "started at %s\n"
msgstr ""
-#, fuzzy
msgid "error loading next appointment\n"
-msgstr "Appointment :"
+msgstr ""
#, c-format
msgid "launching notification at %s for: \"%s\"\n"
@@ -603,16 +563,15 @@ msgstr[1] ""
msgid "awakened at %s\n"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not stop calcurse daemon: %s\n"
-msgstr "Enter description :"
+msgstr ""
msgid "illegal date in event"
msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "FATAL ERROR in event_scan: date error in the event\n"
+msgstr ""
msgid "Internal error: line too long"
msgstr ""
@@ -620,9 +579,14 @@ msgstr ""
msgid "out of memory"
msgstr ""
-#, fuzzy
msgid "unknown ical type"
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
+
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
msgid "need DTSTART to determine event type."
msgstr ""
@@ -639,9 +603,8 @@ msgstr ""
msgid "rrule frequency not supported."
msgstr ""
-#, fuzzy
msgid "invalid interval."
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "either until or count."
msgstr ""
@@ -649,9 +612,8 @@ msgstr ""
msgid "missing until value."
msgstr ""
-#, fuzzy
msgid "invalid until format."
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "invalid count value."
msgstr ""
@@ -671,31 +633,25 @@ msgstr ""
msgid "malformed exceptions line."
msgstr ""
-#, fuzzy
msgid "invalid exception."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "malformed %s line."
-msgstr "Enter description :"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "malformed %s."
-msgstr "Enter description :"
+msgstr ""
-#, fuzzy
msgid "malformed summary line."
-msgstr "Enter description :"
-
-msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
+msgid "malformed summary."
msgstr ""
-#, fuzzy
msgid "item start date not defined."
-msgstr "The day you entered is not valid"
+msgstr ""
msgid "malformed start time line."
msgstr ""
@@ -715,17 +671,14 @@ msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "malformed duration line."
-msgstr "Enter description :"
+msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -748,9 +701,8 @@ msgstr ""
msgid "item could not be identified."
msgstr ""
-#, fuzzy
msgid "only one description allowed."
-msgstr "Enter description :"
+msgstr ""
msgid "only one location allowed."
msgstr ""
@@ -758,9 +710,8 @@ msgstr ""
msgid "The ical file seems to be malformed. The end of item was not found."
msgstr ""
-#, fuzzy
msgid "could not retrieve item summary."
-msgstr "Enter description :"
+msgstr ""
msgid "item priority is invalid (must be between 0 and 9)."
msgstr ""
@@ -774,13 +725,12 @@ msgstr ""
msgid "The file cannot be accessed, please enter another file name."
msgstr ""
-#, fuzzy
msgid "Press [ENTER] to continue."
-msgstr "Press [ENTER] to continue"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Failed to open \"%s\", - %s\n"
-msgstr "Failed to open todo file"
+msgstr ""
msgid "Failed to build message\n"
msgstr ""
@@ -797,9 +747,8 @@ msgstr ""
msgid "%s does not exist"
msgstr ""
-#, fuzzy
msgid "Data files have changed and will be overwritten:"
-msgstr "Data files found. Data will be loaded now."
+msgstr ""
msgid "(c)ontinue"
msgstr ""
@@ -813,37 +762,29 @@ msgstr ""
msgid "[cma]"
msgstr ""
-#, fuzzy
msgid "failed to open appointment file"
-msgstr "Failed to open config file"
+msgstr ""
-#, fuzzy
msgid "syntax error in the item date"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "no event nor appointment found"
-msgstr "FATAL ERROR in load_app: no event nor appointment found\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in item time or duration"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in item identifier"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "wrong format in the appointment or event"
-msgstr "FATAL ERROR in load_app: wrong format in the appointment or event\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in item repetition"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in until date"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -854,58 +795,60 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "failed to open todo file"
-msgstr "Failed to open todo file"
+msgstr ""
msgid "Screen data have changed and will be lost:"
msgstr ""
-#, fuzzy
msgid "failed to open key file"
-msgstr "Failed to open todo file"
-
-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 ""
msgid "Could not read key label"
msgstr ""
-msgid "Key label not recognized"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "No keys assigned to \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Keyname not recognized: \"%s\""
msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Errors in the keys file."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
+msgid "Remove offending line(s) from the keys file, aborting..."
msgstr ""
-#, fuzzy, c-format
+msgid "Some actions do not have any associated key bindings!"
+msgstr ""
+
+#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
-#, fuzzy
msgid "The data were successfully exported"
-msgstr "The data files were successfully saved"
+msgstr ""
msgid "Press [ENTER] to continue"
-msgstr "Press [ENTER] to continue"
+msgstr ""
msgid "unknown export type"
msgstr ""
@@ -926,9 +869,8 @@ msgstr ""
msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
msgstr ""
-#, fuzzy
msgid "FATAL ERROR: wrong import mode"
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
#, c-format
msgid "%d app"
@@ -1002,13 +944,13 @@ msgid "Credits"
msgstr ""
msgid "Help"
-msgstr "Help"
+msgstr ""
msgid "Quit"
-msgstr "Quit"
+msgstr ""
msgid "Save"
-msgstr "Save"
+msgstr ""
msgid "Reload"
msgstr ""
@@ -1019,9 +961,11 @@ msgstr ""
msgid "Paste"
msgstr ""
-#, fuzzy
msgid "Chg Win"
-msgstr "Chg View"
+msgstr ""
+
+msgid "Prev Win"
+msgstr ""
msgid "Import"
msgstr ""
@@ -1029,41 +973,35 @@ msgstr ""
msgid "Export"
msgstr ""
-#, fuzzy
msgid "Go to"
-msgstr "Goto:\n"
+msgstr ""
msgid "OtherCmd"
msgstr ""
msgid "Config"
-msgstr "Config"
+msgstr ""
msgid "Redraw"
-msgstr "Redraw"
+msgstr ""
-#, fuzzy
msgid "Add Appt"
-msgstr "Add Item"
+msgstr ""
msgid "Add Todo"
msgstr ""
-#, fuzzy
msgid "-1 Day"
-msgstr "-/+1 Day"
+msgstr ""
-#, fuzzy
msgid "+1 Day"
-msgstr "-/+1 Day"
+msgstr ""
-#, fuzzy
msgid "-1 Week"
-msgstr "-/+1 Week"
+msgstr ""
-#, fuzzy
msgid "+1 Week"
-msgstr "-/+1 Week"
+msgstr ""
msgid "-1 Month"
msgstr ""
@@ -1077,13 +1015,11 @@ msgstr ""
msgid "+1 Year"
msgstr ""
-#, fuzzy
msgid "Nxt View"
-msgstr "View"
+msgstr ""
-#, fuzzy
msgid "Prv View"
-msgstr "View"
+msgstr ""
msgid "Today"
msgstr ""
@@ -1097,51 +1033,44 @@ msgstr ""
msgid "Left"
msgstr ""
-#, fuzzy
msgid "Down"
-msgstr "Up/Down"
+msgstr ""
msgid "Up"
msgstr ""
-#, fuzzy
msgid "beg Week"
-msgstr "-/+1 Week"
+msgstr ""
-#, fuzzy
msgid "end Week"
-msgstr "-/+1 Week"
+msgstr ""
msgid "Add Item"
-msgstr "Add Item"
+msgstr ""
msgid "Del Item"
-msgstr "Del Item"
+msgstr ""
-#, fuzzy
msgid "Edit Itm"
-msgstr "Add Item"
+msgstr ""
msgid "View"
-msgstr "View"
+msgstr ""
msgid "Pipe"
msgstr ""
-#, fuzzy
msgid "Flag Itm"
-msgstr "Del Item"
+msgstr ""
msgid "Repeat"
msgstr ""
-#, fuzzy
msgid "EditNote"
-msgstr "Add Item"
+msgstr ""
-#, fuzzy
msgid "ViewNote"
-msgstr "View"
+msgstr ""
msgid "Prio.+"
msgstr ""
@@ -1159,25 +1088,23 @@ msgid ""
"# interface. It should not be edited directly.\n"
msgstr ""
-#, fuzzy
msgid "FATAL ERROR: could not create default keys file."
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
-#, fuzzy
msgid "FATAL ERROR: key value out of bounds"
-msgstr "FATAL ERROR in update_windows: no window selected\n"
+msgstr ""
msgid "General"
-msgstr "General"
+msgstr ""
msgid "Layout"
-msgstr "Layout"
+msgstr ""
msgid "Sidebar"
msgstr ""
msgid "Color"
-msgstr "Colour"
+msgstr ""
msgid "Notify"
msgstr ""
@@ -1185,9 +1112,8 @@ msgstr ""
msgid "Keys"
msgstr ""
-#, fuzzy
msgid "Unknown"
-msgstr "Colour"
+msgstr ""
msgid "Cancel the ongoing action."
msgstr ""
@@ -1219,6 +1145,9 @@ msgstr ""
msgid "Select next panel in calcurse main screen."
msgstr ""
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr ""
@@ -1231,9 +1160,8 @@ msgstr ""
msgid "Show next possible actions inside status bar."
msgstr ""
-#, fuzzy
msgid "Enter the configuration menu."
-msgstr "CalCurse %s | general options"
+msgstr ""
msgid "Redraw calcurse's screen."
msgstr ""
@@ -1336,12 +1264,11 @@ msgstr ""
msgid "Lower a task priority inside the todo panel."
msgstr ""
-#, fuzzy
msgid "FATAL ERROR: null file pointer."
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+msgstr ""
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
msgid "xmalloc: zero size"
@@ -1371,9 +1298,8 @@ msgstr ""
msgid "could not allocate memory to store block info"
msgstr ""
-#, fuzzy
msgid "Block not found"
-msgstr "Appointment :"
+msgstr ""
#, c-format
msgid "overflow at %s"
@@ -1435,9 +1361,8 @@ msgstr ""
msgid "Warning: could not open %s, Aborting..."
msgstr ""
-#, 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)"
+msgstr ""
msgid "(Format of the date to be displayed inside notify-bar)"
msgstr ""
@@ -1461,9 +1386,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr ""
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr ""
@@ -1504,32 +1426,26 @@ msgstr ""
msgid "event not found"
msgstr ""
-#, fuzzy
msgid "appointment not found"
-msgstr "Appointment :"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
-#, fuzzy
msgid "syntax error in item date"
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "date error in item exception"
-msgstr "FATAL ERROR in event_scan: date error in the event\n"
+msgstr ""
#, c-format
msgid "Error setting signal #%d : %s\n"
@@ -1545,22 +1461,22 @@ msgid "ERROR setting first day of week"
msgstr ""
msgid "The day you entered is not valid"
-msgstr "The day you entered is not valid"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Enter the day to go to [ENTER for today] : %s"
-msgstr "Enter the day to go to [ENTER for today] : dd/mm/yyyy"
+msgstr ""
#, c-format
msgid "The move failed (%d/%d/%d)."
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Enter start date [%s] and/or time ([hh:mm] or [hhmm]):"
-msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
+msgstr ""
msgid "Press [Enter] to continue"
-msgstr "Press [Enter] to continue"
+msgstr ""
msgid "Invalid date or time."
msgstr ""
@@ -1582,23 +1498,20 @@ msgstr ""
msgid "Time: hh:mm (hh: or :mm) or hhmm. Duration: +mm, +hh:mm, +??d??h??m."
msgstr ""
-#, fuzzy
msgid "Invalid time or duration."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
msgid "Invalid date: end time must come after start time."
msgstr ""
-#, fuzzy
msgid "Enter the new item description:"
-msgstr "Enter description :"
+msgstr ""
msgid "Exception days:"
msgstr ""
-#, fuzzy
msgid "Invalid date format - try again:."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
msgid "Limit repetition to listed days."
msgstr ""
@@ -1651,20 +1564,17 @@ msgstr ""
msgid "Monthdays 1|..|31 or -1|..|-31, space-separated list, '?' for help:"
msgstr ""
-#, fuzzy
msgid "Invalid format - try again."
-msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
+msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Press any key to continue..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "May"
+msgstr ""
msgid "week"
msgstr ""
@@ -1684,9 +1594,8 @@ msgstr ""
msgid "Invalid frequency."
msgstr ""
-#, fuzzy
msgid "Until date, increment or repeat count ('?' for input formats):"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+msgstr ""
#, c-format
msgid "Date: %s (year, month may be omitted, endless: 0)."
@@ -1709,16 +1618,14 @@ msgstr ""
msgid "Repetition must begin on start day (%s); any change discarded."
msgstr ""
-#, fuzzy
msgid "Description"
-msgstr "Enter description :"
+msgstr ""
msgid "Repetition"
msgstr ""
-#, fuzzy
msgid "Edit: "
-msgstr "Add Item"
+msgstr ""
msgid "Start time"
msgstr ""
@@ -1732,18 +1639,15 @@ msgstr ""
msgid "Pipe item to external command:"
msgstr ""
-#, fuzzy
msgid "Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event:"
msgstr ""
-"Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
msgid ""
"Enter end time as date (and/or time) or duration ('?' for input formats):"
msgstr ""
-#, fuzzy
msgid "Enter description:"
-msgstr "Enter description :"
+msgstr ""
#, c-format
msgid "Date: %s (and/or time), year or month may be omitted."
@@ -1787,16 +1691,14 @@ msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
-#, fuzzy
msgid "Enter the new TODO item:"
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "Enter the TODO priority [0 (none), 1 (highest) - 9 (lowest)]:"
msgstr ""
-#, fuzzy
msgid "Do you really want to delete this task?"
-msgstr "Do you really want to delete this task ?"
+msgstr ""
msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote?"
msgstr ""
@@ -1804,16 +1706,15 @@ msgstr ""
msgid "[tn]"
msgstr ""
-#, fuzzy
msgid "Enter the new TODO description:"
-msgstr "Enter the new ToDo item : "
+msgstr ""
msgid "TODO:"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Could not remove calcurse lock file: %s\n"
-msgstr "Enter description :"
+msgstr ""
msgid "/!\\ INTERNAL ERROR /!\\"
msgstr ""
@@ -1825,7 +1726,7 @@ msgid "[yn]"
msgstr ""
msgid "Press any key to continue..."
-msgstr "Press any key to continue..."
+msgstr ""
msgid "failure in mktime"
msgstr ""
@@ -1834,10 +1735,10 @@ msgid "error in mktime"
msgstr ""
msgid "yes"
-msgstr "yes"
+msgstr ""
msgid "no"
-msgstr "no"
+msgstr ""
msgid "option not defined"
msgstr ""
@@ -1871,30 +1772,23 @@ msgstr ""
msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]"
msgstr ""
-#, fuzzy
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\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"
msgid "unrecognized option:"
msgstr ""
-#, fuzzy
msgid "Configuration file not found:"
-msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
+msgstr ""
-#, fuzzy
msgid "Pre-3.0.0 configuration file format detected..."
-msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
+msgstr ""
-#, fuzzy
msgid "Create temporary backup of the configuration file..."
-msgstr "Failed to open config file"
+msgstr ""
msgid "Old backup file found:"
msgstr ""
@@ -1923,1027 +1817,3 @@ msgstr ""
msgid "Remove temporary backup..."
msgstr ""
-
-#, fuzzy
-#~ msgid "error while launching command: could not fork"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr ""
-#~ "(if set to YES, messages about loaded and saved data will not be "
-#~ "displayed)"
-
-#, fuzzy
-#~ msgid "empty description."
-#~ msgstr "Enter description :"
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr "Welcome to Calcurse. Missing data files were created."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Data files found. Data will be loaded now."
-
-#, fuzzy
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Enter description :"
-
-#, fuzzy
-#~ msgid "Enter the repetition frequency:"
-#~ msgstr "Enter description :"
-
-#, fuzzy
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "Do you really want to delete this item ?"
-
-#, fuzzy
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Enter description :"
-
-#, fuzzy
-#~ msgid "could not get entire item description."
-#~ msgstr "Enter description :"
-
-#, fuzzy
-#~ msgid "configuration variable unknown: \"%s\""
-#~ msgstr ""
-#~ "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
-
-#, fuzzy
-#~ msgid "wrong configuration variable format for \"%s\""
-#~ msgstr ""
-#~ "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
-
-#, fuzzy
-#~ msgid "(if set to YES, progress bar will be displayed when saving data)"
-#~ msgstr ""
-#~ "(if set to YES, progress bar will not be displayed when saving data)"
-
-#~ msgid "Saving..."
-#~ msgstr "Saving..."
-
-#~ msgid "Loading..."
-#~ msgstr "Loading..."
-
-#, fuzzy
-#~ msgid "Exporting..."
-#~ msgstr "aborting...\n"
-
-#~ msgid "Problems accessing data file ..."
-#~ msgstr "Problems accessing data file ..."
-
-#~ msgid "The data files were successfully saved"
-#~ msgstr "The data files were successfully saved"
-
-#, fuzzy
-#~ msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
-#~ msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm]):"
-#~ msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-#, fuzzy
-#~ msgid "The entered date is not valid."
-#~ msgstr "The day you entered is not valid"
-
-#, fuzzy
-#~ msgid "Possible formats are [%s] or '0' for an endless repetition."
-#~ msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#, fuzzy
-#~ msgid "Enter the new repetition frequency:"
-#~ msgstr "Enter description :"
-
-#, fuzzy
-#~ msgid "Enter end date ([%s]), duration ([+xxwxxd]) or '0':"
-#~ msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-#, fuzzy
-#~ msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
-#~ msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
-
-#, fuzzy
-#~ msgid ""
-#~ "Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
-#~ "[+xxxdxxhxxm] or [+mm]"
-#~ msgstr ""
-#~ "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
-
-#, fuzzy
-#~ msgid "Possible formats are [%s], [+xxwxxd] or '0'."
-#~ msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#, fuzzy
-#~ msgid "Enter an option number to change its value"
-#~ msgstr "Enter an option number to change its value [Q to quit] "
-
-#, fuzzy
-#~ msgid "The frequence you entered is not valid."
-#~ msgstr "The day you entered is not valid"
-
-#~ msgid "January"
-#~ msgstr "January"
-
-#~ msgid "February"
-#~ msgstr "February"
-
-#~ msgid "March"
-#~ msgstr "March"
-
-#~ msgid "April"
-#~ msgstr "April"
-
-#~ msgid "June"
-#~ msgstr "June"
-
-#~ msgid "July"
-#~ msgstr "July"
-
-#~ msgid "August"
-#~ msgstr "August"
-
-#~ msgid "September"
-#~ msgstr "September"
-
-#~ msgid "October"
-#~ msgstr "October"
-
-#~ msgid "November"
-#~ msgstr "November"
-
-#~ msgid "December"
-#~ msgstr "December"
-
-#~ msgid "Sun"
-#~ msgstr "Sun"
-
-#~ msgid "Mon"
-#~ msgstr "Mon"
-
-#~ msgid "Tue"
-#~ msgstr "Tue"
-
-#~ msgid "Wed"
-#~ msgstr "Wed"
-
-#~ msgid "Thu"
-#~ msgstr "Thu"
-
-#~ msgid "Fri"
-#~ msgstr "Fri"
-
-#~ msgid "Sat"
-#~ msgstr "Sat"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
-#~ " [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-#~ " [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
-#~ " [--read-only]\n"
-#~ msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Miscellaneous:\n"
-#~ " -h, --help\n"
-#~ "\tprint this help and exit.\n"
-#~ "\n"
-#~ " -v, --version\n"
-#~ "\tprint calcurse version and exit.\n"
-#~ "\n"
-#~ " --status\n"
-#~ "\tdisplay the status of running instances of calcurse.\n"
-#~ "\n"
-#~ " --read-only\n"
-#~ "\tDon't save configuration nor appointments/todos. Use with care.\n"
-#~ "\n"
-#~ "Files:\n"
-#~ " -c <file>, --calendar <file>\n"
-#~ "\tspecify the calendar <file> to use (has precedence over '-D').\n"
-#~ "\n"
-#~ " -D <dir>, --directory <dir>\n"
-#~ "\tspecify the data directory to use.\n"
-#~ "\tIf not specified, the default directory is ~/.calcurse\n"
-#~ "\n"
-#~ "Non-interactive:\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. To specify both a starting date and a range, use the\n"
-#~ "\t'--startday' and the '--range' option.\n"
-#~ "\n"
-#~ " -g, --gc\n"
-#~ "\trun the garbage collector for note files and exit. \n"
-#~ "\n"
-#~ " -i <file>, --import <file>\n"
-#~ "\timport the icalendar data contained in <file>. \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"
-#~ " -l <num>, --limit <num>\n"
-#~ "\tonly print information regarding the next <num> items. \n"
-#~ "\n"
-#~ " -r[num], --range[=num]\n"
-#~ "\tprint events and appointments for the [num] number of days\n"
-#~ "\tand exit. If no [num] is given, a range of 1 day is considered.\n"
-#~ "\n"
-#~ " -s[date], --startday[=date]\n"
-#~ "\tprint events and appointments from [date] and exit.\n"
-#~ "\tIf no [date] is given, the current day is considered.\n"
-#~ "\n"
-#~ " -S<regex>, --search=<regex>\n"
-#~ "\tsearch for the given regular expression within events, appointments,\n"
-#~ "\tand todos description.\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"
-#~ "\tThe priority number must be between 1 (highest) and 9 (lowest).\n"
-#~ "\tIt is also possible to specify '0' for the priority, in which case\n"
-#~ "\tonly completed tasks will be shown.\n"
-#~ "\n"
-#~ " -x[format], --export[=format]\n"
-#~ "\texport user data to the specified format. Events, appointments and\n"
-#~ "\ttodos are converted and echoed to stdout.\n"
-#~ "\tTwo possible formats are available: 'ical' and 'pcal'.\n"
-#~ "\tIf the optional argument format is not given, ical format is\n"
-#~ "\tselected by default.\n"
-#~ "\tnote: redirect standard output to export data to a file,\n"
-#~ "\tby issuing a command such as: calcurse --export > calcurse.dat\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Miscellaneous:\n"
-#~ " -h\t\tprint this help and exit.\n"
-#~ " -v\t\tprint calcurse version and exit.\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " -c <file>\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.\n"
-#~ " -t\t\tprint todo list and exit.\n"
-#~ "\n"
-#~ "For more information, type '?' from within Calcurse, or read the "
-#~ "manpage.\n"
-#~ "Mail bug reports and suggestions to <misc@calcurse.org>.\n"
-
-#, fuzzy
-#~ msgid "Enter the new ending date: [%s] or '0'"
-#~ msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#, fuzzy
-#~ msgid "Possible formats are [%s] or '0' for an endless repetition"
-#~ msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#~ msgid "Argument to the '-d' flag is not valid\n"
-#~ msgstr "Argument to the '-d' flag is not valid\n"
-
-#, fuzzy
-#~ msgid "Argument is not valid\n"
-#~ msgstr "Argument to the '-d' flag is not valid\n"
-
-#, fuzzy
-#~ msgid "%s does not exist, create it now [y/n]? "
-#~ msgstr "%s does not exist, create it now [y or n] ? "
-
-#~ msgid "aborting...\n"
-#~ msgstr "aborting...\n"
-
-#~ msgid "%s successfully created\n"
-#~ msgstr "%s successfully created\n"
-
-#~ msgid "Exit"
-#~ msgstr "Exit"
-
-#, fuzzy
-#~ msgid "No color"
-#~ msgstr "Colour"
-
-#, fuzzy
-#~ msgid "Add key"
-#~ msgstr "Add Item"
-
-#, fuzzy
-#~ msgid "Del key"
-#~ msgstr "Del Item"
-
-#, fuzzy
-#~ msgid "unknwon type"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid "To do :"
-#~ msgstr "To do :"
-
-#, fuzzy
-#~ msgid "Calcurse help"
-#~ msgstr "CalCurse %s | help"
-
-#~ msgid " Welcome to Calcurse. This is the main help screen.\n"
-#~ msgstr " Welcome to Calcurse. This is the main help screen.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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 ""
-#~ " 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."
-
-#, fuzzy
-#~ msgid "Save\n"
-#~ msgstr "Save:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Save calcurse data.\n"
-#~ "Data are splitted into four different files which contain :\n"
-#~ "\n"
-#~ " / ~/.calcurse/conf -> user configuration\n"
-#~ " | (layout, color, general options)\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 ""
-#~ "Pressing 'S' saves the Calcurse data.\n"
-#~ "\n"
-#~ "The data is splitted into three different files which contains :\n"
-#~ "\n"
-#~ " / ~/.calcurse/conf -> the user configuration\n"
-#~ " | (layout, colour, general options)\n"
-#~ " | ~/.calcurse/apts -> the data related to the appointments\n"
-#~ " \\ ~/.calcurse/todo -> the data related to the todo list\n"
-#~ "\n"
-#~ "In the config menu, you can choose to save the Calcurse data\n"
-#~ "automatically before quitting."
-
-#, fuzzy
-#~ msgid "Export\n"
-#~ msgstr "aborting...\n"
-
-#, fuzzy
-#~ msgid "Displacement keys\n"
-#~ msgstr "Displacement keys:\n"
-
-#, fuzzy
-#~ msgid "View\n"
-#~ msgstr "View:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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"
-#~ "shortened and its end replaced by '...'. To be able to read the entire\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 ""
-#~ "Pressing 'V' allows you to view the item you select in either the ToDo\n"
-#~ "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"
-#~ "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"
-#~ "the whole event.\n"
-#~ "\n"
-#~ "Press any key to close the popup window and go back to the main\n"
-#~ "Calcurse screen."
-
-#, fuzzy
-#~ msgid "Tab\n"
-#~ msgstr "Tab:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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 '%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 '%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"
-#~ "The panel currently in use has its border in colour.\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"
-#~ "\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"
-#~ "performed on the selected panel."
-
-#, fuzzy
-#~ msgid "Goto\n"
-#~ msgstr "Goto:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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 '%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"
-#~ "\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."
-
-#, fuzzy
-#~ msgid "Delete\n"
-#~ msgstr "Delete:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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"
-#~ "removed from this list.\n"
-#~ "\n"
-#~ "If the item to be deleted is recurrent, you will be asked if you\n"
-#~ "wish to suppress all of the item occurences or just the one you\n"
-#~ "selected.\n"
-#~ "\n"
-#~ "If the general option 'confirm_delete' is set to 'YES', then you will\n"
-#~ "be asked for confirmation before deleting the selected event.\n"
-#~ "Do not forget to save the calendar data to retrieve the modifications\n"
-#~ "next time you launch Calcurse."
-#~ msgstr ""
-#~ "Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
-#~ "\n"
-#~ "Depending on which panel is selected when you press the delete key,\n"
-#~ "the highlighted item of either the ToDo or Appointment list will be \n"
-#~ "removed from this list.\n"
-#~ "\n"
-#~ "If the general option 'confirm_delete' is set to 'YES', then you will\n"
-#~ "be asked for confirmation before deleting the selected event.\n"
-#~ "Do not forget to save the calendar data to retrieve the modifications\n"
-#~ "next time you launch Calcurse."
-
-#, fuzzy
-#~ msgid "Add\n"
-#~ msgstr "Add:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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 '%s' and '%s' keys\n"
-#~ "inside the todo panel.\n"
-#~ "\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"
-#~ "To enter a new appointment to be added in the APPOINTMENT list, you\n"
-#~ "will need to enter successively the time at which the appointment\n"
-#~ "begins, the appointment length (either by specifying the end time in\n"
-#~ "[hh:mm] or the duration in [+hh:mm], [+xxdxxhxxm] or [+mm] format), \n"
-#~ "and the description of the event.\n"
-#~ "\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 '%s'.\n"
-#~ "\n"
-#~ "Notes:\n"
-#~ " o if an appointment lasts for such a long time that it continues\n"
-#~ " on the next days, this event will be indicated on all the\n"
-#~ " corresponding days, and the beginning or ending hour will be\n"
-#~ " replaced by '..' if the event does not begin or end on the day.\n"
-#~ " o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-#~ " description prompt, without any description, no item will be\n"
-#~ " added.\n"
-#~ " o do not forget to save the calendar data to retrieve the new\n"
-#~ " event next time you launch Calcurse."
-#~ msgstr ""
-#~ "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"
-#~ "\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"
-#~ "To enter a new event, press [ENTER] instead of the item start time, and\n"
-#~ "just fill in the event description.\n"
-#~ "To enter a new appointment to be added in the APPOINTMENT list, you\n"
-#~ "will need to enter successively the time at which the appointment\n"
-#~ "begins, the appointment length (either by specifying the duration in\n"
-#~ "minutes, or the end time in [hh:mm] or [h:mm] format), and the\n"
-#~ "description of the event.\n"
-#~ "\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"
-#~ "\n"
-#~ "Notes:\n"
-#~ " o if an appointment lasts for such a long time that it continues\n"
-#~ " into the next days, this event will be indicated on all the\n"
-#~ " corresponding days, and the beginning or ending hour will be\n"
-#~ " replaced by '..' if the event does not begin or end on the day.\n"
-#~ " o if you only press [ENTER] at the APPOINTMENT or TODO event\n"
-#~ " description prompt, without any description, no item will be\n"
-#~ " added.\n"
-#~ " o do not forget to save the calendar data to retrieve the new\n"
-#~ " event next time you launch Calcurse."
-
-#, fuzzy
-#~ msgid "Edit Item\n"
-#~ msgstr "Add Item"
-
-#, fuzzy
-#~ msgid "EditNote\n"
-#~ msgstr "Add Item"
-
-#, fuzzy
-#~ msgid "ViewNote\n"
-#~ msgstr "View:\n"
-
-#, fuzzy
-#~ msgid "Repeat\n"
-#~ msgstr "Redraw:\n"
-
-#, fuzzy
-#~ msgid "Flag Item\n"
-#~ msgstr "Add Item"
-
-#, fuzzy
-#~ msgid "Config\n"
-#~ msgstr "Config:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "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"
-#~ "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"
-#~ "The general options submenu brings a screen with the different options\n"
-#~ "which modifies the way Calcurse interacts with the user.\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 ""
-#~ "Pressing 'C' leads to the configuration submenu, from which you can\n"
-#~ "select between colour, layout, and general options.\n"
-#~ "\n"
-#~ "The colour submenu lets you choose the colour 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"
-#~ "Do not forget to save the calendar data to retrieve your configuration\n"
-#~ "next time you launch Calcurse."
-
-#~ msgid "Calcurse - text-based organizer"
-#~ msgstr "Calcurse - text-based organizer"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] "
-#~ "or [+mm]) : "
-#~ msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-#, fuzzy
-#~ msgid "could not convert string"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid "ToDo"
-#~ msgstr "ToDo"
-
-#~ msgid "Appointment"
-#~ msgstr "Appointment"
-
-#, fuzzy
-#~ msgid "missing colors in config file"
-#~ msgstr "Failed to open config file"
-
-#~ msgid "auto_save = "
-#~ msgstr "auto_save = "
-
-#, fuzzy
-#~ msgid "periodic_save = "
-#~ msgstr "auto_save = "
-
-#~ msgid "confirm_quit = "
-#~ msgstr "confirm_quit = "
-
-#~ msgid "confirm_delete = "
-#~ msgstr "confirm_delete = "
-
-#~ msgid "skip_system_dialogs = "
-#~ msgstr "skip_system_dialogues = "
-
-#~ msgid "skip_progress_bar = "
-#~ msgstr "skip_progress_bar = "
-
-#~ msgid "week_begins_on_monday = "
-#~ msgstr "week_begins_on_monday = "
-
-#~ 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)"
-
-#, fuzzy
-#~ msgid "Week"
-#~ msgstr "-/+1 Week"
-
-#, fuzzy
-#~ msgid "could not find any key file."
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "could not remove note"
-#~ msgstr "Enter description :"
-
-#~ msgid "Enter an option number to change its value [Q to quit] "
-#~ msgstr "Enter an option number to change its value [Q to quit] "
-
-#, fuzzy
-#~ msgid "CalCurse %s | notify-bar options"
-#~ msgstr "CalCurse %s | general options"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Copyright (c) 2004-2008 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"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "\n"
-#~ "Send your feedback or comments to : misc@calcurse.org\n"
-#~ "Calcurse home page : http://calcurse.org"
-#~ msgstr ""
-#~ "Copyright (c) 2004-2006 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"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "\n"
-#~ "Send your feedback or comments to : misc@calcurse.org\n"
-#~ "Calcurse home page : http://calcurse.org"
-
-#~ msgid "Pick the desired layout on next screen [press ENTER]"
-#~ msgstr "Pick the desired layout on next screen [press ENTER]"
-
-#, fuzzy
-#~ msgid "('A'= Appointment panel, 'C'= calendar panel, 'T'= todo panel)"
-#~ msgstr "('A'= Appointment panel, 'c'= calendar panel, 't'= todo panel)"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in apoint_delete: no such type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid "FATAL ERROR in apoint_scan: date error in the appointment\n"
-#~ msgstr "FATAL ERROR in apoint_scan: date error in the appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in apoint_get: no such item\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in apoint_delete_bynum: no such appointment"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in apoint_switch_notify: no such appointment"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in custom_load_color: wrong color number.\n"
-#~ msgstr ""
-#~ "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
-
-#, 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"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in custom_color_theme_name: unknown color\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in day_popup_item: unknown item type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in event_get: no such item\n"
-#~ 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"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
-#~ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in io_export_data: wrong export mode\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in io_export_data: unknown export type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in io_import_data: unknown import type"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in launch_cmd: could not launch user command"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_def2char: unknown recur type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_char2def: unknown char\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_item_inday: unknown item type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_event_erase: no such event\n"
-#~ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_apoint_erase: no such appointment\n"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_repeat_item: wrong item type\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_get_apoint: no such item\n"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_get_event: no such item\n"
-#~ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in recur_apoint_switch_notify: no such item\n"
-#~ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in todo_delete_note_bynum: no note attached\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in todo_delete_note_bynum: no such todo\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in todo_get_position: todo not found\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in todo_chg_priority: no such action\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid "FATAL ERROR in date2sec: failure in mktime\n"
-#~ msgstr "FATAL ERROR in date2sec: failure in mktime\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
-#~ msgstr "FATAL ERROR in date2sec: failure in mktime\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in other_status_page: unknown panel\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in mystrtol: number is out of range"
-#~ msgstr "FATAL ERROR in update_windows: no window selected\n"
-
-#~ msgid "option not defined - Problem in print_option_incolor()"
-#~ msgstr "option not defined - Problem in print_option_incolor()"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in erase_note: could not remove note\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#, fuzzy
-#~ 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"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in wins_prop: property unknown\n"
-#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
-#~ msgid ""
-#~ "Please resize your terminal screen\n"
-#~ "(to at least 80x24),\n"
-#~ "and restart calcurse.\n"
-#~ msgstr ""
-#~ "Please resize your terminal screen\n"
-#~ "(to at least 80x24),\n"
-#~ "and restart calcurse.\n"
-
-#, fuzzy
-#~ msgid "FATAL ERROR in update_time_in_date: failure in mktime\n"
-#~ msgstr "FATAL ERROR in date2sec: failure in mktime\n"
-
-#~ msgid "Pick the number corresponding to the color scheme (Q to exit) :"
-#~ msgstr "Pick the number corresponding to the colour scheme (Q to exit) :"
-
-#~ msgid "([>0<] for black & white)"
-#~ msgstr "([>0<] for black & white)"
-
-#~ 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"
diff --git a/po/es.po b/po/es.po
index 448f9a2..c15fa5b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# Emmanuel M <emmanuelbendavid@gmail.com>, 2017
@@ -12,27 +12,26 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 15:20+0000\n"
-"Last-Translator: Lukas Fleischer\n"
-"Language-Team: Spanish (http://www.transifex.com/lfleischer/calcurse/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Victorhck <victorhck@opensuse.org>, 2018\n"
+"Language-Team: Spanish (http://app.transifex.com/lfleischer/calcurse/"
"language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? "
+"1 : 2;\n"
msgid "null pointer"
msgstr "puntero nulo"
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "error en la fecha de la cita"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "error en la fecha de la cita"
+msgstr ""
msgid "date error in appointment"
msgstr "error en la fecha de la cita"
@@ -57,7 +56,7 @@ msgstr "Consulte `calcurse -h` para más información."
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s -- organizador basado en texto\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -304,13 +303,11 @@ msgstr ""
msgid "Help topic does not exist: %s"
msgstr "El tema de ayuda no existe: %s"
-#, fuzzy
msgid "Select a repeating item in the appointments panel."
-msgstr "(posición de la cabecera en el panel de citas)"
+msgstr ""
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Repetir un elemento"
+msgstr ""
msgid "Last occurrence."
msgstr ""
@@ -442,12 +439,6 @@ msgid "(if set to YES, confirmation is required before deleting an event)"
msgstr ""
"(si se le asigna YES, se requiere confirmación antes de borrar un evento)"
-msgid "Monday"
-msgstr "Lunes"
-
-msgid "Sunday"
-msgstr "Domingo"
-
msgid "(specifies the first day of week in the calendar view)"
msgstr "(especifica el primer día de la semana en la vista de calendario)"
@@ -472,6 +463,9 @@ msgstr "(posición de la cabecera en el panel de citas)"
msgid "(Format of the date displayed in the appointments panel)"
msgstr "(Formato de la fecha mostrado en el panel de citas)"
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
@@ -480,6 +474,11 @@ msgstr ""
"Ingrese el formato de la fecha (ver 'man 3 strftime' para los formatos "
"posibles) "
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+"Introduzca el formato de la hora (ver 'man 3 strftime' para los formatos "
+"posibles) "
+
msgid "Enter the date format: "
msgstr "Ingrese el formato de fecha:"
@@ -494,8 +493,8 @@ msgstr "opciones generales"
msgid "Undefined option!"
msgstr "¡Opción no definida!"
-msgid "undefined"
-msgstr "sin definir"
+msgid "UNDEFINED"
+msgstr ""
msgid "keys configuration"
msgstr "configuración de teclas"
@@ -507,8 +506,8 @@ msgstr "Presione la tecla que quiere asignarle a:"
msgid "The key '%s' is already used for %s. Choose another one."
msgstr "La tecla '%s' ya está en uso por %s. Elija otra."
-msgid "Some actions do not have any associated key bindings!"
-msgstr "¡Algunas acciones no tienen ninguna tecla asociada!"
+msgid "Some actions are left undefined!"
+msgstr ""
msgid ""
"Sorry, colors are not supported by your terminal\n"
@@ -524,9 +523,8 @@ msgstr ""
msgid "unknown item type"
msgstr "tipo de elemento desconocido"
-#, fuzzy
msgid "Note:"
-msgstr "EditarNota"
+msgstr ""
msgid "Event:"
msgstr "Evento:"
@@ -587,6 +585,7 @@ msgid "sleeping at %s for %d second\n"
msgid_plural "sleeping at %s for %d seconds\n"
msgstr[0] "durmiendo en %s por %d segundo\n"
msgstr[1] "durmiendo en %s por %d segundos\n"
+msgstr[2] "durmiendo en %s por %d segundos\n"
#, c-format
msgid "awakened at %s\n"
@@ -596,13 +595,11 @@ msgstr "despertado %s\n"
msgid "Could not stop calcurse daemon: %s\n"
msgstr "No pudo detenerse el demonio de calcurse: %s\n"
-#, fuzzy
msgid "illegal date in event"
-msgstr "error de fecha en evento"
+msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "error de fecha en evento"
+msgstr ""
msgid "Internal error: line too long"
msgstr "Error interno: línea demasiado larga"
@@ -613,6 +610,12 @@ msgstr "memoria agotada"
msgid "unknown ical type"
msgstr "tipo ical desconocido"
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -625,13 +628,11 @@ msgstr ""
msgid "frequency absent in rrule."
msgstr ""
-#, fuzzy
msgid "rrule frequency not supported."
-msgstr "frecuencia recurrente no encontrada."
+msgstr ""
-#, fuzzy
msgid "invalid interval."
-msgstr "máscara de filtrado inválida"
+msgstr ""
msgid "either until or count."
msgstr ""
@@ -639,9 +640,8 @@ msgstr ""
msgid "missing until value."
msgstr ""
-#, fuzzy
msgid "invalid until format."
-msgstr "formato de exportación inválido: %s"
+msgstr ""
msgid "invalid count value."
msgstr ""
@@ -649,13 +649,11 @@ msgstr ""
msgid "invalid bymonth list."
msgstr ""
-#, fuzzy
msgid "invalid bymonthday list."
-msgstr "fecha inválida: %s"
+msgstr ""
-#, fuzzy
msgid "invalid byday list."
-msgstr "fecha inválida: %s"
+msgstr ""
msgid "invalid exception date value type."
msgstr ""
@@ -663,9 +661,8 @@ msgstr ""
msgid "malformed exceptions line."
msgstr ""
-#, fuzzy
msgid "invalid exception."
-msgstr "Frecuencia inválida."
+msgstr ""
#, c-format
msgid "malformed %s line."
@@ -681,44 +678,35 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
-#, fuzzy
msgid "item start date not defined."
-msgstr "la fecha de comienzo del elemento no está definida."
+msgstr ""
msgid "malformed start time line."
msgstr ""
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "no se pudo recuperar la fecha de comienzo del evento."
+msgstr ""
-#, fuzzy
msgid "invalid end time value type."
-msgstr "rango de fecha inválido: %s"
+msgstr ""
msgid "malformed end time line."
msgstr ""
-#, fuzzy
msgid "malformed event end time."
-msgstr "no se pudo recuperar la fecha de finalización del evento."
+msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "error de sintaxis en la hora o duración del evento"
+msgstr ""
msgid "malformed duration line."
msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "fecha inválida: %s"
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -726,9 +714,9 @@ msgstr ""
msgid "multi-day event changed to one-day event"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Location: %s"
-msgstr " asignado en: %s\n"
+msgstr ""
#, c-format
msgid "Comment: %s"
@@ -827,9 +815,8 @@ msgstr "formato inválido en la cita o evento"
msgid "syntax error in item repetition"
msgstr "error de sintaxis en el valor de repetición del elemento"
-#, fuzzy
msgid "syntax error in until date"
-msgstr "error de sintaxis en la fecha del elemento"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -840,9 +827,8 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "error de sintaxis en la fecha del elemento"
+msgstr ""
msgid "failed to open todo file"
msgstr "No pudo abrirse archivo de tareas"
@@ -853,36 +839,38 @@ msgstr ""
msgid "failed to open key file"
msgstr "no pudo abrirse el archivo de teclas"
-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 ""
-"\n"
-"¡Demasiados errores al leer el archivo de configuración!\n"
-"Por favor respalde el archivo de teclas, elimínelo del directorio y vuelva a "
-"iniciar calcurse.\n"
-
msgid "Could not read key label"
msgstr "No se pudo leer etiqueta de tecla"
-msgid "Key label not recognized"
-msgstr "Etiqueta de tecla no reconocida"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "No keys assigned to \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Keyname not recognized: \"%s\""
+msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
-msgstr "Error leyendo tecla: \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
+msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "¡\"%s\" asignado múltiples veces!"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Errors in the keys file."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
-msgstr "Demasiados errores al leer archivo de teclas, abortando..."
+msgid "Remove offending line(s) from the keys file, aborting..."
+msgstr ""
+
+msgid "Some actions do not have any associated key bindings!"
+msgstr "¡Algunas acciones no tienen ninguna tecla asociada!"
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
@@ -921,18 +909,21 @@ msgid "%d app"
msgid_plural "%d apps"
msgstr[0] "%d app"
msgstr[1] "%d apps"
+msgstr[2] "%d apps"
#, c-format
msgid "%d event"
msgid_plural "%d events"
msgstr[0] "%d evento"
msgstr[1] "%d eventos"
+msgstr[2] "%d eventos"
#, c-format
msgid "%d todo"
msgid_plural "%d todos"
msgstr[0] "%d tarea"
msgstr[1] "%d tareas"
+msgstr[2] "%d tareas"
#, c-format
msgid "%d skipped"
@@ -1017,6 +1008,9 @@ msgstr "Pegar"
msgid "Chg Win"
msgstr "CmbVent"
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr "Importar"
@@ -1204,6 +1198,9 @@ msgstr "Pegar un elemento en la posición actual."
msgid "Select next panel in calcurse main screen."
msgstr "Seleccionar el panel siguiente en la pantalla principal de calcurse."
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr "Importar datos desde un archivo externo."
@@ -1347,9 +1344,8 @@ msgid "FATAL ERROR: null file pointer."
msgstr "ERROR FATAL: puntero nulo a archivo."
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
-"Al añadir la tecla por defecto para \"%s\", ¡\"%s\" ya estaba asignada!!"
msgid "xmalloc: zero size"
msgstr "xmalloc: tamaño cero"
@@ -1468,11 +1464,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr "(Registrar actividad al ejecutar en segundo plano)"
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-"Introduzca el formato de la hora (ver 'man 3 strftime' para los formatos "
-"posibles) "
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr ""
"Introduzca el número de segundos (con 0 no se avisará antes de una cita)"
@@ -1496,9 +1487,8 @@ msgstr "carácter inválido"
msgid "recurrence error: not on start day (%s)"
msgstr ""
-#, fuzzy
msgid "illegel date in event"
-msgstr "error de fecha en evento"
+msgstr ""
msgid "date error in event"
msgstr "error de fecha en evento"
@@ -1506,9 +1496,8 @@ msgstr "error de fecha en evento"
msgid "month day is zero"
msgstr ""
-#, fuzzy
msgid "no daily frequency check"
-msgstr "Frecuencia inválida."
+msgstr ""
msgid "illegal BYDAY value"
msgstr ""
@@ -1519,17 +1508,14 @@ msgstr "evento no encontrado"
msgid "appointment not found"
msgstr "cita no encontrada"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "error de sintaxis en la fecha del elemento"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "error de sintaxis en la fecha del elemento"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "error de sintaxis en la fecha del elemento"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
@@ -1660,23 +1646,20 @@ msgstr ""
msgid "Invalid format - try again."
msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Presione cualquier tecla para continuar..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "Hoy"
+msgstr ""
msgid "week"
msgstr ""
-#, fuzzy
msgid "month"
-msgstr "(m)ensual"
+msgstr ""
msgid "year"
msgstr ""
@@ -1754,33 +1737,25 @@ msgstr ""
msgid "Invalid start time."
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent and has a note attached to it. Delete (s)elected "
"occurrence, (a)ll occurrences, or just its (n)ote?"
msgstr ""
-"Este elemento tiene una nota adjunta. ¿Eliminar el elemento m(i)smo o sólo "
-"su (n)ota?"
msgid "[san]"
msgstr ""
-#, fuzzy
msgid ""
"This item has a note attached to it. Delete (s)elected occurrence or just "
"its (n)ote?"
msgstr ""
-"Este elemento tiene una nota adjunta. ¿Eliminar el elemento m(i)smo o sólo "
-"su (n)ota?"
msgid "[sn]"
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent. Delete (s)elected occurrence or (a)ll occurrences?"
msgstr ""
-"Este elemento es recurrente. ¿Eliminar tod(a)s las ocurrencias o sól(o) ésta?"
msgid "[sa]"
msgstr ""
@@ -1791,9 +1766,8 @@ msgstr ""
msgid "[s]"
msgstr ""
-#, fuzzy
msgid "Already repeated."
-msgstr "Este elemento es ya un elemento repetido."
+msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
@@ -1883,7 +1857,7 @@ msgstr "Uso: calcurse-upgrade [-h|-v|--config <file>]"
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@@ -1936,71 +1910,3 @@ msgstr "Actualizar directivas de configuración..."
msgid "Remove temporary backup..."
msgstr "Eliminar respaldo temporal..."
-
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr ""
-#~ "(si se le asigna YES, se mostraran mensajes sobre datos leídos y "
-#~ "guardados)"
-
-#~ msgid "date error in the event\n"
-#~ msgstr "error de fecha en el evento\n"
-
-#~ msgid "recurrence frequency not recognized."
-#~ msgstr "frecuencia recurrente no reconocida."
-
-#~ msgid "item has a negative duration."
-#~ msgstr "el elemento tiene una duración negativa."
-
-#~ msgid "item duration malformed."
-#~ msgstr "duración del elemento mal formada."
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr ""
-#~ "Bienvenido/a a calcurse. Se crearon los archivos de datos que faltaban."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Archivos de datos encontrados. Ahora se cargaran los datos."
-
-#~ msgid "error while launching command: could not fork"
-#~ msgstr "error al lanzar comando: no pudo realizarse fork"
-
-#~ msgid "error while launching command"
-#~ msgstr "error al lanzar comando"
-
-#~ msgid "unknown repetition type"
-#~ msgstr "tipo de repetición desconocido"
-
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Ingrese el tipo de repetición:"
-
-#~ msgid "(d)aily"
-#~ msgstr "(d)iario"
-
-#~ msgid "(w)eekly"
-#~ msgstr "semanal (w)"
-
-#~ msgid "(y)early"
-#~ msgstr "anual (y)"
-
-#, c-format
-#~ msgid "(currently using %s)"
-#~ msgstr "(actualmente utilizando %s)"
-
-#~ msgid "Enter the repetition frequency:"
-#~ msgstr "Introduzca la frecuencia de repetición:"
-
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "¿Quiere eliminar este elemento?"
-
-#~ msgid "[ao]"
-#~ msgstr "[ao]"
-
-#~ msgid "[in]"
-#~ msgstr "[in]"
-
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Ingrese el tipo de repetición:"
-
-#~ msgid "wrong item type"
-#~ msgstr "tipo de elemento inválido"
diff --git a/po/fr.po b/po/fr.po
index ef032ff..4af80ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# esaule <godrik@mandragor.org>, 2011
@@ -14,27 +14,26 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 15:20+0000\n"
-"Last-Translator: Lukas Fleischer\n"
-"Language-Team: French (http://www.transifex.com/lfleischer/calcurse/language/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Gwendal Rogel <pythot@yahoo.fr>, 2018-2019\n"
+"Language-Team: French (http://app.transifex.com/lfleischer/calcurse/language/"
"fr/)\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
msgid "null pointer"
msgstr "Pointeur nul"
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "erreur de date sur ce rendez-vous"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "erreur de date sur ce rendez-vous"
+msgstr ""
msgid "date error in appointment"
msgstr "erreur de date sur ce rendez-vous"
@@ -42,7 +41,6 @@ msgstr "erreur de date sur ce rendez-vous"
msgid "no such appointment"
msgstr "rendez-vous inconnu"
-#, fuzzy
msgid ""
"Usage:\n"
"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
@@ -52,13 +50,6 @@ msgid ""
"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<format>] | --"
"daemon"
msgstr ""
-"Usage :\n"
-"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
-"calcurse -Q [--from <date>] [--to <date>] [--days <number>]\n"
-"calcurse -a | -d <date> | -d <number> | -n | -r[<number>] | -s[<date>] | -"
-"t[<number>]\n"
-"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<file>] | --"
-"daemon"
msgid "Try `calcurse -h` for more information."
msgstr "Tapez `calcurse -h` pour plus d'informations"
@@ -67,7 +58,7 @@ msgstr "Tapez `calcurse -h` pour plus d'informations"
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s -- organiseur en mode texte\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -152,9 +143,8 @@ msgstr " -h, --help Affiche cette aide"
msgid " -i, --import <file> Import iCal data from file"
msgstr " -i, --import <file> Importe des données iCal depuis le fichier"
-#, fuzzy
msgid " -q, --quiet Suppress import/export result message"
-msgstr " -q, --quiet Supprime les messages système"
+msgstr ""
msgid " --read-only Do not save configuration or data files"
msgstr ""
@@ -314,9 +304,8 @@ msgstr ""
msgid "Do you really want to quit?"
msgstr "Voulez-vous vraiment quitter?"
-#, fuzzy
msgid "Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) | p(rev) ]"
-msgstr "Commande : [ h (aide) | w(!) (écrire) | q(!) (quitter) | wq(!) ]"
+msgstr ""
msgid "Read-only mode - use w!"
msgstr "Mode écriture seule - utiliser w!"
@@ -328,13 +317,11 @@ msgstr "Il y a des modifications non sauvegardées - utiliser w ou q!"
msgid "Help topic does not exist: %s"
msgstr "Le sujet n'existe pas dans l'aide : %s"
-#, fuzzy
msgid "Select a repeating item in the appointments panel."
-msgstr "(position de l'entête dans le panneau rendez-vous)"
+msgstr ""
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Répéter un élément"
+msgstr ""
msgid "Last occurrence."
msgstr ""
@@ -468,12 +455,6 @@ msgid "(if set to YES, confirmation is required before deleting an event)"
msgstr ""
"(si fixé à OUI, il est nécessaire de confirmer avant d'effacer un élément)"
-msgid "Monday"
-msgstr "Lundi"
-
-msgid "Sunday"
-msgstr "Dimanche"
-
msgid "(specifies the first day of week in the calendar view)"
msgstr "(indique le premier jour de la semaine dans la vue de calendrier)"
@@ -498,6 +479,9 @@ msgstr "(position de l'entête dans le panneau rendez-vous)"
msgid "(Format of the date displayed in the appointments panel)"
msgstr "(Format de la date affichée dans le panneau rendez-vous)"
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
@@ -505,6 +489,11 @@ msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr ""
"Saisir le format de date (voir 'man 3 strftime' pour les formats possibles)"
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+"Saisir le format de l'heure (voir 'man 3 strftime' pour les formats "
+"possibles)"
+
msgid "Enter the date format: "
msgstr "Saisir le format de date : "
@@ -519,8 +508,8 @@ msgstr "options générales"
msgid "Undefined option!"
msgstr "Option inconnue !"
-msgid "undefined"
-msgstr "inconnue"
+msgid "UNDEFINED"
+msgstr ""
msgid "keys configuration"
msgstr "Configuration des raccourcis"
@@ -532,8 +521,8 @@ msgstr "Pressez la touche que vous voulez assigner :"
msgid "The key '%s' is already used for %s. Choose another one."
msgstr "Le raccourci '%s' est déjà utilisé for %s. Choisissez en un autre."
-msgid "Some actions do not have any associated key bindings!"
-msgstr "Certaines actions n'ont pas de raccourcis clavier associés !"
+msgid "Some actions are left undefined!"
+msgstr ""
msgid ""
"Sorry, colors are not supported by your terminal\n"
@@ -549,9 +538,8 @@ msgstr "N'a pu sauvegarder %s."
msgid "unknown item type"
msgstr "type d'élément inconnu"
-#, fuzzy
msgid "Note:"
-msgstr "EditNote"
+msgstr ""
msgid "Event:"
msgstr "Événement :"
@@ -612,6 +600,7 @@ msgid "sleeping at %s for %d second\n"
msgid_plural "sleeping at %s for %d seconds\n"
msgstr[0] "endormi à %s pour %d seconde\n"
msgstr[1] "endormi à %s pour %d secondes\n"
+msgstr[2] "endormi à %s pour %d secondes\n"
#, c-format
msgid "awakened at %s\n"
@@ -621,13 +610,11 @@ msgstr "réveillé à %s\n"
msgid "Could not stop calcurse daemon: %s\n"
msgstr "Impossible d'arrêter le démon calcurse : %s\n"
-#, fuzzy
msgid "illegal date in event"
-msgstr "date erronée dans l'événement"
+msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "date erronée dans l'événement"
+msgstr ""
msgid "Internal error: line too long"
msgstr "Erreur interne : ligne trop longue"
@@ -638,6 +625,12 @@ msgstr "dépassement de mémoire"
msgid "unknown ical type"
msgstr "type ical inconnu"
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -650,13 +643,11 @@ msgstr ""
msgid "frequency absent in rrule."
msgstr ""
-#, fuzzy
msgid "rrule frequency not supported."
-msgstr "fréquence de répétition introuvable."
+msgstr ""
-#, fuzzy
msgid "invalid interval."
-msgstr "Filtre invalide"
+msgstr ""
msgid "either until or count."
msgstr ""
@@ -664,24 +655,20 @@ msgstr ""
msgid "missing until value."
msgstr ""
-#, fuzzy
msgid "invalid until format."
-msgstr "format d'exportation invalide : %s"
+msgstr ""
-#, fuzzy
msgid "invalid count value."
-msgstr "Date non valide."
+msgstr ""
msgid "invalid bymonth list."
msgstr ""
-#, fuzzy
msgid "invalid bymonthday list."
-msgstr "date invalide : %s"
+msgstr ""
-#, fuzzy
msgid "invalid byday list."
-msgstr "Date non valide."
+msgstr ""
msgid "invalid exception date value type."
msgstr ""
@@ -689,9 +676,8 @@ msgstr ""
msgid "malformed exceptions line."
msgstr ""
-#, fuzzy
msgid "invalid exception."
-msgstr "Fréquence invalide."
+msgstr ""
#, c-format
msgid "malformed %s line."
@@ -707,44 +693,35 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
-#, fuzzy
msgid "item start date not defined."
-msgstr "la date de début de l'élément n'est pas définie."
+msgstr ""
msgid "malformed start time line."
msgstr ""
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "impossible de récupérer l'heure de début de l'événement."
+msgstr ""
-#, fuzzy
msgid "invalid end time value type."
-msgstr "Date ou heure non valide."
+msgstr ""
msgid "malformed end time line."
msgstr ""
-#, fuzzy
msgid "malformed event end time."
-msgstr "impossible de récupérer l'heure de fin de l'événement."
+msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "Heure ou durée non valide."
+msgstr ""
msgid "malformed duration line."
msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "Heure ou durée non valide."
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -752,9 +729,9 @@ msgstr ""
msgid "multi-day event changed to one-day event"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Location: %s"
-msgstr " alloué en : %s\n"
+msgstr ""
#, c-format
msgid "Comment: %s"
@@ -854,9 +831,8 @@ msgstr "format incorrect du rendez-vous ou de l'événement"
msgid "syntax error in item repetition"
msgstr "erreur de syntaxe dans la répétition de l'élément"
-#, fuzzy
msgid "syntax error in until date"
-msgstr "erreur de syntaxe dans la date de l'élément"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -867,9 +843,8 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "erreur de syntaxe dans la date de l'élément"
+msgstr ""
msgid "failed to open todo file"
msgstr "impossible d'ouvrir le fichier des tâches"
@@ -880,39 +855,38 @@ msgstr "Les données à l'écran ont été modifiées et seront perdues :"
msgid "failed to open key file"
msgstr "impossible d'ouvrir le fichier des raccourcis clavier"
-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 ""
-"\n"
-"Trop d'erreurs à la lecture du fichier de configuration !\n"
-"Veuillez faire une sauvegarde de votre fichier de raccourcis, supprimer le "
-"du répertoire, puis relancer calcurse.\n"
-
msgid "Could not read key label"
msgstr "Impossible de lire le libellé de la touche"
-msgid "Key label not recognized"
-msgstr "Libellé de la touche non reconnu"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "No keys assigned to \"%s\"."
+msgstr ""
+
+#, c-format
+msgid "Keyname not recognized: \"%s\""
+msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
-msgstr "Erreur de lecture de la touche : \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
+msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "\"%s\" est assignée plusieurs fois !"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Errors in the keys file."
msgstr ""
-"Il y a eu des erreurs au chargement du fichier de configuration des "
-"raccourcis."
-msgid "Too many errors while reading keys file, aborting..."
+msgid "Remove offending line(s) from the keys file, aborting..."
msgstr ""
-"Trop d'erreurs durant la lecture du fichier de raccourcis, annulation..."
+
+msgid "Some actions do not have any associated key bindings!"
+msgstr "Certaines actions n'ont pas de raccourcis clavier associés !"
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
@@ -951,18 +925,21 @@ msgid "%d app"
msgid_plural "%d apps"
msgstr[0] "%d app"
msgstr[1] "%d apps"
+msgstr[2] "%d apps"
#, c-format
msgid "%d event"
msgid_plural "%d events"
msgstr[0] "%d événement"
msgstr[1] "%d événements"
+msgstr[2] "%d événements"
#, c-format
msgid "%d todo"
msgid_plural "%d todos"
msgstr[0] "%d tâche"
msgstr[1] "%d tâches"
+msgstr[2] "%d tâches"
#, c-format
msgid "%d skipped"
@@ -994,13 +971,10 @@ msgstr "Attention : impossible d'effacer le journal temporaire %s, Abandon..."
msgid "Invalid delay"
msgstr "Délai invalide"
-#, fuzzy
msgid ""
"Periodic save cancelled. Data files have changed. Save and merge "
"interactively"
msgstr ""
-"Sauvegarde périodique : les fichiers de données ont été modifiés. "
-"L'enregistrement est annulé."
#, c-format
msgid ""
@@ -1048,6 +1022,9 @@ msgstr "Coller"
msgid "Chg Win"
msgstr "Chg.Fen."
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr "Importer"
@@ -1237,6 +1214,9 @@ msgstr "Coller un élément à la position actuelle."
msgid "Select next panel in calcurse main screen."
msgstr "Sélectionner le panneau suivant dans l'écran général de calcurse."
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr "Importer les données d'un fichier externe."
@@ -1376,10 +1356,8 @@ msgid "FATAL ERROR: null file pointer."
msgstr "ERREUR FATALE : pointeur de fichier nul."
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
-"Pendant l'ajout de la touche par défaut pour \"%s\", \"%s\" était déjà "
-"assignée !"
msgid "xmalloc: zero size"
msgstr "xmalloc : taille nulle"
@@ -1504,11 +1482,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr "(Enregistrer l'activité lors de l'exécution en arrière-plan)"
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-"Saisir le format de l'heure (voir 'man 3 strftime' pour les formats "
-"possibles)"
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr ""
"Saisir le nombre de secondes (0 pour désactiver l'alerte qui précéde un "
@@ -1533,9 +1506,8 @@ msgstr "caractère inconnu"
msgid "recurrence error: not on start day (%s)"
msgstr ""
-#, fuzzy
msgid "illegel date in event"
-msgstr "date erronée dans l'événement"
+msgstr ""
msgid "date error in event"
msgstr "date erronée dans l'événement"
@@ -1543,9 +1515,8 @@ msgstr "date erronée dans l'événement"
msgid "month day is zero"
msgstr ""
-#, fuzzy
msgid "no daily frequency check"
-msgstr "Fréquence invalide."
+msgstr ""
msgid "illegal BYDAY value"
msgstr ""
@@ -1556,17 +1527,14 @@ msgstr "événement introuvable"
msgid "appointment not found"
msgstr "rendez-vous introuvable"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "erreur de syntaxe dans la date de l'élément"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "erreur de syntaxe dans la date de l'élément"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "erreur de syntaxe dans la date de l'élément"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
@@ -1700,28 +1668,23 @@ msgstr ""
msgid "Monthdays 1|..|31 or -1|..|-31, space-separated list, '?' for help:"
msgstr ""
-#, fuzzy
msgid "Invalid format - try again."
-msgstr "Date ou heure non valide."
+msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Presser une touche pour continuer..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "Aujourd."
+msgstr ""
-#, fuzzy
msgid "week"
-msgstr "hebdomadaire"
+msgstr ""
-#, fuzzy
msgid "month"
-msgstr "mensuel"
+msgstr ""
msgid "year"
msgstr ""
@@ -1735,22 +1698,19 @@ msgstr ""
msgid "Invalid frequency."
msgstr "Fréquence invalide."
-#, fuzzy
msgid "Until date, increment or repeat count ('?' for input formats):"
-msgstr "Entrer la date de fin ou la durée ('?' pour les formats d'entrée) :"
+msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Date: %s (year, month may be omitted, endless: 0)."
-msgstr "Date : %s (année ou mois peuvent être omis). Durée infinie : 0."
+msgstr ""
msgid "Increment: +?? (days) or: +??w??d (weeks). Repeat count: #?? (number)."
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Invalid date: until date must come after start date (%s)."
msgstr ""
-"Date non valide : la date de fin doit être postérieure à la date de début "
-"(%s)."
msgid "Invalid date."
msgstr "Date non valide."
@@ -1804,34 +1764,25 @@ msgstr "Date : %s (et/ou heure), année ou mois peuvent être omis."
msgid "Invalid start time."
msgstr "Heure de départ non valide."
-#, fuzzy
msgid ""
"This item is recurrent and has a note attached to it. Delete (s)elected "
"occurrence, (a)ll occurrences, or just its (n)ote?"
msgstr ""
-"Une note est associée à cet élément. Effacer l'élém(e)nt ou seulement la "
-"(n)ote ?"
msgid "[san]"
msgstr ""
-#, fuzzy
msgid ""
"This item has a note attached to it. Delete (s)elected occurrence or just "
"its (n)ote?"
msgstr ""
-"Une note est associée à cet élément. Effacer l'élém(e)nt ou seulement la "
-"(n)ote ?"
msgid "[sn]"
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent. Delete (s)elected occurrence or (a)ll occurrences?"
msgstr ""
-"Cet élément est répétitif. Effacer (t)outes les occurrences ou seulement "
-"(c)elle-ci ?"
msgid "[sa]"
msgstr ""
@@ -1842,9 +1793,8 @@ msgstr ""
msgid "[s]"
msgstr ""
-#, fuzzy
msgid "Already repeated."
-msgstr "Cet élément est déjà répétitif."
+msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
@@ -1936,7 +1886,7 @@ msgstr "Utilisation : calcurse-upgrade [-h|-v|--config <fichier>]"
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@@ -1987,81 +1937,3 @@ msgstr "Mise à jour des instructions de configuration..."
msgid "Remove temporary backup..."
msgstr "Suppression de la sauvegarde temporaire..."
-
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr ""
-#~ "(si fixé à OUI, les messages concernant le chargement et l'enregistrement "
-#~ "des données seront affichés)"
-
-#~ msgid "date error in the event\n"
-#~ msgstr "erreur dans la date de l'événement\n"
-
-#~ msgid "recurrence frequency not recognized."
-#~ msgstr "fréquence de répétition non reconnue."
-
-#~ msgid "item has a negative duration."
-#~ msgstr "l'élément a une durée négative."
-
-#~ msgid "item duration malformed."
-#~ msgstr "durée de l'élément mal formée."
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr "Bienvenue dans Calcurse. Les fichiers manquants ont été créés."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr ""
-#~ "Fichiers de données trouvés. Les données seront chargées immédiatement."
-
-#~ msgid "error while launching command: could not fork"
-#~ msgstr "erreur pendant le lancement de la commande : fork impossible"
-
-#~ msgid "error while launching command"
-#~ msgstr "erreur durant le lancement de la commande"
-
-#~ msgid "unknown repetition type"
-#~ msgstr "type de répétition inconnu"
-
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Saisir le nouveau type de répétition :"
-
-#~ msgid "(d)aily"
-#~ msgstr "(q)uotidien"
-
-#~ msgid "(w)eekly"
-#~ msgstr "(h)ebdomadaire"
-
-#~ msgid "(m)onthly"
-#~ msgstr "(m)ensuel"
-
-#~ msgid "(y)early"
-#~ msgstr "(a)nnuel"
-
-#, c-format
-#~ msgid "(currently using %s)"
-#~ msgstr "(actuellement : %s)"
-
-#~ msgid "Enter the repetition frequency:"
-#~ msgstr "Saisir la fréquence de répétition :"
-
-#~ msgid "Duration in days: +dd. Duration in weeks and days: +??w??d."
-#~ msgstr "Durée en jours : +dd. Durée en semaines et jours : +??w??d."
-
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "Voulez-vous vraiment effacer cet élément ?"
-
-#~ msgid "[ao]"
-#~ msgstr "[tc]"
-
-#~ msgid "[in]"
-#~ msgstr "[en]"
-
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Saisir le type de répétition :"
-
-#, c-format
-#~ msgid "Date: %s (year or month may be omitted). Endless duration: '0'."
-#~ msgstr "Date : %s (année or mois peuvent être omis). Durée infinie : '0'."
-
-#~ msgid "wrong item type"
-#~ msgstr "type d'élément incorrect"
diff --git a/po/nl.po b/po/nl.po
index cb12654..8392ccc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# Frob Nicator <mart@martlubbers.net>, 2016
@@ -11,10 +11,10 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 15:20+0000\n"
-"Last-Translator: Lukas Fleischer\n"
-"Language-Team: Dutch (http://www.transifex.com/lfleischer/calcurse/language/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Marco van Hulten <marco@hulten.org>, 2018\n"
+"Language-Team: Dutch (http://app.transifex.com/lfleischer/calcurse/language/"
"nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
@@ -25,13 +25,11 @@ msgstr ""
msgid "null pointer"
msgstr "null pointer"
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "datumfout in de afspraak"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "datumfout in de afspraak"
+msgstr ""
msgid "date error in appointment"
msgstr "datumfout in de afspraak"
@@ -56,7 +54,7 @@ msgstr "Probeer `calcurse -h` voor meer informatie."
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s -- tekst gebaseerde agenda\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -297,9 +295,8 @@ msgstr ""
msgid "Select a repeating item in the appointments panel."
msgstr ""
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Herhaal item"
+msgstr ""
msgid "Last occurrence."
msgstr ""
@@ -428,12 +425,6 @@ msgstr "(Bij JA, wordt er een bevestiging gevraagd bij eindigen programma"
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)"
-msgid "Monday"
-msgstr "maandag"
-
-msgid "Sunday"
-msgstr "zondag"
-
msgid "(specifies the first day of week in the calendar view)"
msgstr ""
@@ -458,12 +449,18 @@ msgstr ""
msgid "(Format of the date displayed in the appointments panel)"
msgstr ""
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr ""
+
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr "Geef het formaat van de datum (zie 'man 3 strftime')"
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr "Geef het formaat van de tijd (zie 'man 3 strftime')"
+
msgid "Enter the date format: "
msgstr ""
@@ -478,8 +475,8 @@ msgstr "Algemene opties"
msgid "Undefined option!"
msgstr "Niet gekende optie!"
-msgid "undefined"
-msgstr "Ongekend"
+msgid "UNDEFINED"
+msgstr ""
msgid "keys configuration"
msgstr "Toetsinstellingen"
@@ -491,7 +488,7 @@ msgstr "Druk de toets die u wilt toewijzen:"
msgid "The key '%s' is already used for %s. Choose another one."
msgstr ""
-msgid "Some actions do not have any associated key bindings!"
+msgid "Some actions are left undefined!"
msgstr ""
msgid ""
@@ -508,9 +505,8 @@ msgstr ""
msgid "unknown item type"
msgstr "ongekend type item"
-#, fuzzy
msgid "Note:"
-msgstr "WzgNoot"
+msgstr ""
msgid "Event:"
msgstr ""
@@ -580,13 +576,11 @@ msgstr ""
msgid "Could not stop calcurse daemon: %s\n"
msgstr ""
-#, fuzzy
msgid "illegal date in event"
-msgstr "datumfout in gebeurtenis"
+msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "datumfout in gebeurtenis"
+msgstr ""
msgid "Internal error: line too long"
msgstr "Interne fout: lijn te lang"
@@ -597,6 +591,12 @@ msgstr ""
msgid "unknown ical type"
msgstr "onbekend ical type"
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -659,19 +659,14 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
-#, fuzzy
msgid "item start date not defined."
-msgstr "item onbekend"
+msgstr ""
msgid "malformed start time line."
msgstr ""
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "kan begintijd van gebeurtenis niet ophalen"
+msgstr ""
msgid "invalid end time value type."
msgstr ""
@@ -679,23 +674,20 @@ msgstr ""
msgid "malformed end time line."
msgstr ""
-#, fuzzy
msgid "malformed event end time."
-msgstr "kan eindtijd van gebeurtenis niet ophalen"
+msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "syntaxfout in itemtijd of duurtijd van het item"
+msgstr ""
msgid "malformed duration line."
msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "item heeft een negatieve tijdsduur"
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -800,9 +792,8 @@ msgstr "fout formaat in de afspraak of gebeurtenis"
msgid "syntax error in item repetition"
msgstr "syntaxfout in de herhaling van het item"
-#, fuzzy
msgid "syntax error in until date"
-msgstr "syntaxfout in datum van item"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -813,9 +804,8 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "syntaxfout in datum van item"
+msgstr ""
msgid "failed to open todo file"
msgstr "kon het todo-bestand niet openen"
@@ -826,37 +816,38 @@ msgstr ""
msgid "failed to open key file"
msgstr ""
-msgid ""
-"\n"
-"Too many errors while reading configuration file!\n"
-"Please backup your keys file, remove it from directory, and launch calcurse "
-"again.\n"
+msgid "Could not read key label"
msgstr ""
-"\n"
-"Teveel fouten tijdens het lezen van het configuratiebestand!\n"
-"Maak een backup van het sneltoetsenbestand, verwijder het van de map en "
-"start calcurse opnieuw op.\n"
-msgid "Could not read key label"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "No keys assigned to \"%s\"."
msgstr ""
-msgid "Key label not recognized"
+#, c-format
+msgid "Keyname not recognized: \"%s\""
msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "\"%s\" meer dan eens toegewezen!"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
+
+msgid "Errors in the keys file."
+msgstr ""
-msgid "There were some errors when loading keys file."
+msgid "Remove offending line(s) from the keys file, aborting..."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
+msgid "Some actions do not have any associated key bindings!"
msgstr ""
-"Teveel fouten bij het laden van het sneltoetsenbestand, wordt afgebroken ..."
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
@@ -983,6 +974,9 @@ msgstr "Plak"
msgid "Chg Win"
msgstr ""
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr "Import"
@@ -1161,6 +1155,9 @@ msgstr ""
msgid "Select next panel in calcurse main screen."
msgstr ""
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr "Importeer gegevens uit een extern bestand."
@@ -1283,7 +1280,7 @@ msgid "FATAL ERROR: null file pointer."
msgstr ""
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
+msgid "Default key(s) assigned to %d action%s."
msgstr ""
msgid "xmalloc: zero size"
@@ -1403,9 +1400,6 @@ msgstr ""
msgid "(Log activity when running in background)"
msgstr ""
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr "Geef het formaat van de tijd (zie 'man 3 strftime')"
-
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)."
@@ -1428,9 +1422,8 @@ msgstr "onbekend karakter"
msgid "recurrence error: not on start day (%s)"
msgstr ""
-#, fuzzy
msgid "illegel date in event"
-msgstr "datumfout in gebeurtenis"
+msgstr ""
msgid "date error in event"
msgstr "datumfout in gebeurtenis"
@@ -1450,17 +1443,14 @@ msgstr "Gebeurtenis niet gevonden"
msgid "appointment not found"
msgstr "afspraak niet gevonden"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "syntaxfout in datum van item"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "syntaxfout in datum van item"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "syntaxfout in datum van item"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
@@ -1591,23 +1581,20 @@ msgstr ""
msgid "Invalid format - try again."
msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Druk op een toets om door te gaan..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "Vandaag"
+msgstr ""
msgid "week"
msgstr ""
-#, fuzzy
msgid "month"
-msgstr "(m)aandelijks"
+msgstr ""
msgid "year"
msgstr ""
@@ -1712,9 +1699,8 @@ msgstr ""
msgid "[s]"
msgstr ""
-#, fuzzy
msgid "Already repeated."
-msgstr "Dit item wordt al herhaald."
+msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
@@ -1802,7 +1788,7 @@ msgstr ""
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@@ -1845,24 +1831,3 @@ msgstr ""
msgid "Remove temporary backup..."
msgstr ""
-
-#~ msgid "item duration malformed."
-#~ msgstr "item tijdsduur onjuist"
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr "Welkom bij Calcurse. De missende databestanden zijn aangemaakt."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Databestanden gevonden. Data wordt geladen."
-
-#~ msgid "error while launching command"
-#~ msgstr "fout bij uitvoeren commando"
-
-#~ msgid "(d)aily"
-#~ msgstr "(d)agelijks"
-
-#~ msgid "(w)eekly"
-#~ msgstr "(w)ekelijks"
-
-#~ msgid "(y)early"
-#~ msgstr "(y)aarlijks"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aa7fe42..bcee694 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,35 +1,35 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# Fabio Bianchi <fabiobianchi10@gmail.com>, 2019
# Rafael Fontenelle <rffontenelle@gmail.com>, 2012-2014
+# Vitor Henrique, 2023
msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 15:20+0000\n"
-"Last-Translator: Lukas Fleischer\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/lfleischer/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Vitor Henrique, 2023\n"
+"Language-Team: Portuguese (Brazil) (http://app.transifex.com/lfleischer/"
"calcurse/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
msgid "null pointer"
msgstr "ponteiro nulo"
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "erro de data no agendamento"
+msgstr ""
-#, fuzzy
msgid "error in appointment description"
-msgstr "erro de data no agendamento"
+msgstr ""
msgid "date error in appointment"
msgstr "erro de data no agendamento"
@@ -37,7 +37,6 @@ msgstr "erro de data no agendamento"
msgid "no such appointment"
msgstr "agendamento inexistente"
-#, fuzzy
msgid ""
"Usage:\n"
"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
@@ -47,13 +46,6 @@ msgid ""
"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<format>] | --"
"daemon"
msgstr ""
-"Uso:\n"
-"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
-"calcurse -Q [--from <date>] [--to <date>] [--days <number>]\n"
-"calcurse -a | -d <date> | -d <number> | -n | -r[<number>] | -s[<date>] | -"
-"t[<number>]\n"
-"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<file>] | --"
-"daemon"
msgid "Try `calcurse -h` for more information."
msgstr "Tente `calcurse -h` para mais informações."
@@ -62,7 +54,7 @@ msgstr "Tente `calcurse -h` para mais informações."
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s -- agenda baseada em texto\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
msgstr ""
msgid "This is free software; see the source for copying conditions."
@@ -131,13 +123,13 @@ msgstr ""
" -c, --calendar <file> O arquivo correspondente da agenda a ser usada"
msgid " -C, --confdir <dir> The configuration directory to use"
-msgstr ""
+msgstr " -C, --confdir <dir> O diretório de configuração a ser usado"
msgid " --daemon Run notification daemon in the background"
msgstr " --daemon Executa a notificação em segundo plano"
msgid " -D, --datadir <dir> The data directory to use"
-msgstr ""
+msgstr " -D, --datadir <dir> O diretório de dados a ser usado"
msgid " -g, --gc Run the garbage collector"
msgstr " -g, --gc Execute o coletor de lixo"
@@ -148,9 +140,8 @@ msgstr " -h, --help Mostra o texto de ajuda"
msgid " -i, --import <file> Import iCal data from file"
msgstr " -i, --import <file> Importa o arquivo iCal"
-#, fuzzy
msgid " -q, --quiet Suppress import/export result message"
-msgstr " -q, --quiet Esconde os diálogos do sistema"
+msgstr ""
msgid " --read-only Do not save configuration or data files"
msgstr ""
@@ -306,9 +297,8 @@ msgstr "Existem alterações não salvas. Salvar?"
msgid "Do you really want to quit?"
msgstr "Você certeza que deseja sair?"
-#, fuzzy
msgid "Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) | p(rev) ]"
-msgstr "Comando: [ h(ajuda) | w(escrever)(!) | q(sair)(!) | wq(!) ]"
+msgstr ""
msgid "Read-only mode - use w!"
msgstr "Modo somente-leitura - usar w!"
@@ -320,13 +310,11 @@ msgstr "Existem alterações não salvas - use w ou q!"
msgid "Help topic does not exist: %s"
msgstr "Tópico de ajuda não existe: %s"
-#, fuzzy
msgid "Select a repeating item in the appointments panel."
-msgstr "(posição do cabeçalho no painel de agendamentos)"
+msgstr ""
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Repete um item"
+msgstr ""
msgid "Last occurrence."
msgstr ""
@@ -357,19 +345,19 @@ msgstr ""
#, c-format
msgid "unknown user option: \"%s\" (ignored)"
-msgstr ""
+msgstr "opção de usuário desconhecida: \"%s\" (ignorada)"
#, c-format
msgid "invalid option format: \"%s\" (ignored)"
-msgstr ""
+msgstr "formato de opção inválido: \"%s\" (ignorado)"
#, c-format
msgid "unknown user option: \"%s\" (disabled)"
-msgstr ""
+msgstr "opção de usuário desconhecida: \"%s\" (desabilitada)"
#, c-format
msgid "invalid option format: \"%s\" (disabled)"
-msgstr ""
+msgstr "formato de opção inválido: \"%s\" (desabilitada)"
msgid "layout configuration"
msgstr "Configuração de layout"
@@ -463,12 +451,6 @@ msgstr ""
"(se definida como SIM, uma confirmação será necessária antes da exclusão de "
"um evento)"
-msgid "Monday"
-msgstr "Segunda-feira"
-
-msgid "Sunday"
-msgstr "Domingo"
-
msgid "(specifies the first day of week in the calendar view)"
msgstr "(especifica o primeiro dia da semana na visão de calendário)"
@@ -493,20 +475,26 @@ msgstr "(posição do cabeçalho no painel de agendamentos)"
msgid "(Format of the date displayed in the appointments panel)"
msgstr "(Formato da data exibida no painel de agendamentos)"
-msgid "Enter a text string (an empty string for the default text)"
+msgid "(Format of the time displayed in the appointments panel)"
msgstr ""
+msgid "Enter a text string (an empty string for the default text)"
+msgstr "Insira um texto (deixe vazio para o texto padrão)"
+
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr ""
-"Entre com o formato da data (veja \"man 3 strftime\" para formatos "
+"Insira o formato da data (veja \"man 3 strftime\" para formatos possíveis) "
+
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr ""
+"Insira o formato do horário (veja \"man 3 strftime\" para formatos "
"possíveis) "
msgid "Enter the date format: "
-msgstr "Entre com formato da data: "
+msgstr "Insira o formato da data: "
msgid "Enter the delay, in minutes, between automatic saves (0 to disable) "
-msgstr ""
-"Entre com a distância, em minutos, entre salvamentos (0 = desabilitar) "
+msgstr "Insira a distância, em minutos, entre salvamentos (0 = desabilitar) "
msgid "general options"
msgstr "Opções Gerais"
@@ -514,8 +502,8 @@ msgstr "Opções Gerais"
msgid "Undefined option!"
msgstr "Opção indefinida!"
-msgid "undefined"
-msgstr "indefinida"
+msgid "UNDEFINED"
+msgstr ""
msgid "keys configuration"
msgstr "Configuração das Teclas"
@@ -527,8 +515,8 @@ msgstr "Pressione a tecla que você quer designar para:"
msgid "The key '%s' is already used for %s. Choose another one."
msgstr "A tecla '%s' já está em uso para %s. Selecione outra."
-msgid "Some actions do not have any associated key bindings!"
-msgstr "Algumas ações não têm teclas de atalho associadas!"
+msgid "Some actions are left undefined!"
+msgstr ""
msgid ""
"Sorry, colors are not supported by your terminal\n"
@@ -544,9 +532,8 @@ msgstr "Não foi possível salvarCould not save %s."
msgid "unknown item type"
msgstr "tipo de item desconhecido"
-#, fuzzy
msgid "Note:"
-msgstr "EditNota"
+msgstr ""
msgid "Event:"
msgstr "Evento:"
@@ -607,6 +594,7 @@ msgid "sleeping at %s for %d second\n"
msgid_plural "sleeping at %s for %d seconds\n"
msgstr[0] "Dormir em %s por %d segundo\n"
msgstr[1] "Dormir em %s por %d segundos\n"
+msgstr[2] "Dormir em %s por %d segundos\n"
#, c-format
msgid "awakened at %s\n"
@@ -616,13 +604,11 @@ msgstr "Acordou em %s\n"
msgid "Could not stop calcurse daemon: %s\n"
msgstr "Não foi possível parar o daemon do calcurse: %s\n"
-#, fuzzy
msgid "illegal date in event"
-msgstr "erro na data em evento"
+msgstr ""
-#, fuzzy
msgid "date error in event\n"
-msgstr "erro na data em evento"
+msgstr ""
msgid "Internal error: line too long"
msgstr "Erro interno: linha muito comprida"
@@ -633,6 +619,12 @@ msgstr "memória insuficiente"
msgid "unknown ical type"
msgstr "tipo de ical desconhecido"
+msgid "(empty)"
+msgstr ""
+
+msgid "ical_store_event: out of memory"
+msgstr ""
+
msgid "need DTSTART to determine event type."
msgstr ""
@@ -645,13 +637,11 @@ msgstr ""
msgid "frequency absent in rrule."
msgstr ""
-#, fuzzy
msgid "rrule frequency not supported."
-msgstr "periodicidade de recorrência não encontrada."
+msgstr ""
-#, fuzzy
msgid "invalid interval."
-msgstr "máscara de filtro inválida"
+msgstr ""
msgid "either until or count."
msgstr ""
@@ -659,9 +649,8 @@ msgstr ""
msgid "missing until value."
msgstr ""
-#, fuzzy
msgid "invalid until format."
-msgstr "formato de exportação inválido: %s"
+msgstr ""
msgid "invalid count value."
msgstr ""
@@ -669,13 +658,11 @@ msgstr ""
msgid "invalid bymonth list."
msgstr ""
-#, fuzzy
msgid "invalid bymonthday list."
-msgstr "data inválida: %s"
+msgstr ""
-#, fuzzy
msgid "invalid byday list."
-msgstr "data inválida: %s"
+msgstr ""
msgid "invalid exception date value type."
msgstr ""
@@ -683,9 +670,8 @@ msgstr ""
msgid "malformed exceptions line."
msgstr ""
-#, fuzzy
msgid "invalid exception."
-msgstr "combinação inválida de argumentos"
+msgstr ""
#, c-format
msgid "malformed %s line."
@@ -701,44 +687,35 @@ msgstr ""
msgid "malformed summary."
msgstr ""
-msgid "line break in summary."
-msgstr ""
-
-#, fuzzy
msgid "item start date not defined."
-msgstr "data de início do ítem não foi definida."
+msgstr ""
msgid "malformed start time line."
msgstr ""
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "não foi possível adquirir hora de início do evento."
+msgstr ""
-#, fuzzy
msgid "invalid end time value type."
-msgstr "intervalo de datas inválido: %s"
+msgstr ""
msgid "malformed end time line."
msgstr ""
-#, fuzzy
msgid "malformed event end time."
-msgstr "não foi possível adquirir hora de término do evento."
+msgstr ""
msgid "end must be later than start."
msgstr ""
-#, fuzzy
msgid "either end or duration."
-msgstr "erro de sintaxe no horário ou duração do item"
+msgstr ""
msgid "malformed duration line."
msgstr ""
-#, fuzzy
msgid "invalid duration."
-msgstr "data inválida: %s"
+msgstr ""
msgid "exception date, but no recurrence rule."
msgstr ""
@@ -746,9 +723,9 @@ msgstr ""
msgid "multi-day event changed to one-day event"
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Location: %s"
-msgstr " alocado em: %s\n"
+msgstr ""
#, c-format
msgid "Comment: %s"
@@ -846,9 +823,8 @@ msgstr "formato errado no agendamento ou evento"
msgid "syntax error in item repetition"
msgstr "erro de sintaxe na repetição do item"
-#, fuzzy
msgid "syntax error in until date"
-msgstr "erro de sintaxe no item data"
+msgstr ""
msgid "until date error"
msgstr ""
@@ -859,9 +835,8 @@ msgstr ""
msgid "missing end of recurrence"
msgstr ""
-#, fuzzy
msgid "syntax error in item state"
-msgstr "erro de sintaxe no item data"
+msgstr ""
msgid "failed to open todo file"
msgstr "falha na abertura do arquivo de tarefas"
@@ -872,36 +847,38 @@ msgstr ""
msgid "failed to open key file"
msgstr "falha na abertura do arquivo de teclas"
-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 ""
-"\n"
-"Muitos erros de leitura do arquivo de configuração!\n"
-"Favor faça backup de seus arquivos de teclas, exclua-o de seu diretório e "
-"carregue calcurse novamente.\n"
-
msgid "Could not read key label"
msgstr "Não foi possível ler o rótulo de tecla"
-msgid "Key label not recognized"
-msgstr "Rótulo de tecla não reconhecida"
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr ""
#, c-format
-msgid "Error reading key: \"%s\""
-msgstr "Erro na leitura da tecla: \"%s\""
+msgid "No keys assigned to \"%s\"."
+msgstr ""
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "\"%s\" alocada múltiplas vezes!"
+msgid "Keyname not recognized: \"%s\""
+msgstr ""
-msgid "There were some errors when loading keys file."
+#, c-format
+msgid "\"%s\" assigned twice: \"%s\"."
msgstr ""
-msgid "Too many errors while reading keys file, aborting..."
-msgstr "Erros demais na leitura do arquivo de chaves, abortando..."
+#, c-format
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
+
+msgid "Errors in the keys file."
+msgstr ""
+
+msgid "Remove offending line(s) from the keys file, aborting..."
+msgstr ""
+
+msgid "Some actions do not have any associated key bindings!"
+msgstr "Algumas ações não têm teclas de atalho associadas!"
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
@@ -920,7 +897,7 @@ msgid "wrong export mode"
msgstr "modo de exportação errado"
msgid "Enter the file name to import data from:"
-msgstr "Entre com o nome do arquivo de onde serão importados os dados:"
+msgstr "Insira o nome do arquivo de onde serão importados os dados:"
#, c-format
msgid "Import process report: %04d lines read"
@@ -940,18 +917,21 @@ msgid "%d app"
msgid_plural "%d apps"
msgstr[0] "%d agend."
msgstr[1] "%d agends."
+msgstr[2] "%d agends."
#, c-format
msgid "%d event"
msgid_plural "%d events"
msgstr[0] "%d evento"
msgstr[1] "%d eventos"
+msgstr[2] "%d eventos"
#, c-format
msgid "%d todo"
msgid_plural "%d todos"
msgstr[0] "%d tarefa"
msgstr[1] "%d tarefas"
+msgstr[2] "%d tarefas"
#, c-format
msgid "%d skipped"
@@ -1034,6 +1014,9 @@ msgstr "Colar"
msgid "Chg Win"
msgstr "MudarJan"
+msgid "Prev Win"
+msgstr ""
+
msgid "Import"
msgstr "Importar"
@@ -1154,6 +1137,15 @@ msgid ""
"# via the key configuration menu of the interactive user\n"
"# interface. It should not be edited directly.\n"
msgstr ""
+"#\n"
+"# Arquivo de configuração das teclas do Calcurse\n"
+"#\n"
+"# Nesse arquivo, são definidos os atalhos de teclado\n"
+"# usados pelo Calcurse. Ele é gerado automaticamente\n"
+"# pelo Calcurse e é mantido por meio do menu de\n"
+"# configuração de teclas da interface interativa do usuário\n"
+"# interface interativa do usuário. Ele não deve ser editado\n"
+"# diretamente.\n"
msgid "FATAL ERROR: could not create default keys file."
msgstr "ERRO FATAL: não foi possível criar arquivo de teclas padrões."
@@ -1212,6 +1204,9 @@ msgstr "Cola um item na posição atual."
msgid "Select next panel in calcurse main screen."
msgstr "Seleciona o próximo painel na tela principal do calcurse."
+msgid "Select previous panel in calcurse main screen."
+msgstr ""
+
msgid "Import data from an external file."
msgstr "Importa dados a partir de um arquivo externo."
@@ -1357,8 +1352,8 @@ msgid "FATAL ERROR: null file pointer."
msgstr "ERRO FATAL: ponteiro nulo de arquivo."
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
-msgstr "Quando adicionava tecla padrão para \"%s\", \"%s\" já foi designada!"
+msgid "Default key(s) assigned to %d action%s."
+msgstr ""
msgid "xmalloc: zero size"
msgstr "xmalloc: tamanho zero"
@@ -1462,8 +1457,8 @@ msgstr "(Formato de horário a ser exibido dentro da barra de notificação)"
msgid ""
"(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
msgstr ""
-"(Avisa o usuário se um agendamento ocorrerá nos próximos \"notify-bar_warning"
-"\" segundos)"
+"(Avisa o usuário se um agendamento ocorrerá nos próximos \"notify-"
+"bar_warning\" segundos)"
msgid "(Command used to notify user of an upcoming appointment)"
msgstr "(Comando usado para notificar usuário de um agendamento próximo)"
@@ -1477,17 +1472,12 @@ msgstr "(Executa em plano de fundo para pegar notificações depois de sair)"
msgid "(Log activity when running in background)"
msgstr "(Registra atividades quando estiver executando em plano de fundo)"
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr ""
-"Entre com o formato do horário (veja \"man 3 strftime\" para formatos "
-"possíveis) "
-
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
msgstr ""
-"Entre com o número de segundos (0 para não ser avisado antes do agendamento)"
+"Insira o número de segundos (0 para não ser avisado antes do agendamento)"
msgid "Enter the notification command "
-msgstr "Entre com o comando de notificação "
+msgstr "Insira o comando de notificação "
msgid "notification options"
msgstr "opções de notificação"
@@ -1507,9 +1497,8 @@ msgstr "caractere desconhecido"
msgid "recurrence error: not on start day (%s)"
msgstr ""
-#, fuzzy
msgid "illegel date in event"
-msgstr "erro na data em evento"
+msgstr ""
msgid "date error in event"
msgstr "erro na data em evento"
@@ -1529,17 +1518,14 @@ msgstr "evento não encontrado"
msgid "appointment not found"
msgstr "agendamento não encontrado"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "erro de sintaxe no item data"
+msgstr ""
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "erro de sintaxe no item data"
+msgstr ""
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "erro de sintaxe no item data"
+msgstr ""
msgid "illegal bymonth value"
msgstr ""
@@ -1670,24 +1656,20 @@ msgstr ""
msgid "Invalid format - try again."
msgstr ""
-#, fuzzy
msgid "Press any key to continue."
-msgstr "Pressione qualquer tecla para continuar..."
+msgstr ""
msgid "Base period:"
msgstr ""
-#, fuzzy
msgid "day"
-msgstr "Hoje"
+msgstr ""
-#, fuzzy
msgid "week"
-msgstr "semanalmente"
+msgstr ""
-#, fuzzy
msgid "month"
-msgstr "mensalmente"
+msgstr ""
msgid "year"
msgstr ""
@@ -1711,9 +1693,9 @@ msgstr ""
msgid "Increment: +?? (days) or: +??w??d (weeks). Repeat count: #?? (number)."
msgstr ""
-#, fuzzy, c-format
+#, c-format
msgid "Invalid date: until date must come after start date (%s)."
-msgstr "a data final não pode vir antes da data inicial"
+msgstr ""
msgid "Invalid date."
msgstr ""
@@ -1756,7 +1738,7 @@ msgid ""
msgstr ""
msgid "Enter description:"
-msgstr "Insera uma descrição:"
+msgstr "Insira uma descrição:"
#, c-format
msgid "Date: %s (and/or time), year or month may be omitted."
@@ -1765,33 +1747,25 @@ msgstr ""
msgid "Invalid start time."
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent and has a note attached to it. Delete (s)elected "
"occurrence, (a)ll occurrences, or just its (n)ote?"
msgstr ""
-"Este item tem uma anotação anexada a ele. Excluir o (i)tem ou somente sua "
-"(n)ota?"
msgid "[san]"
msgstr ""
-#, fuzzy
msgid ""
"This item has a note attached to it. Delete (s)elected occurrence or just "
"its (n)ote?"
msgstr ""
-"Este item tem uma anotação anexada a ele. Excluir o (i)tem ou somente sua "
-"(n)ota?"
msgid "[sn]"
msgstr ""
-#, fuzzy
msgid ""
"This item is recurrent. Delete (s)elected occurrence or (a)ll occurrences?"
msgstr ""
-"Este item é recorrente. Excluir (t)odas as ocorrências ou (s)omente esta?"
msgid "[sa]"
msgstr ""
@@ -1802,9 +1776,8 @@ msgstr ""
msgid "[s]"
msgstr ""
-#, fuzzy
msgid "Already repeated."
-msgstr "Este é um item repetido."
+msgstr ""
msgid "A (s)imple or (a)dvanced repetition?"
msgstr ""
@@ -1894,7 +1867,7 @@ msgstr "Uso: calcurse-upgrade [-h|-v|--config <arquivo>]"
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@@ -1944,72 +1917,3 @@ msgstr "Atualizar diretivas de configuração..."
msgid "Remove temporary backup..."
msgstr "Excluir backup temporário..."
-
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr ""
-#~ "(se definida como SIM, mensagens sobre dados carregados e salvados serão "
-#~ "exibidos)"
-
-#~ msgid "date error in the event\n"
-#~ msgstr "erro de data no evento\n"
-
-#~ msgid "recurrence frequency not recognized."
-#~ msgstr "periodicidade de recorrência não reconhecida."
-
-#~ msgid "item has a negative duration."
-#~ msgstr "item tem uma duração negativa."
-
-#~ msgid "item duration malformed."
-#~ msgstr "duração de item mal-formulada."
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr ""
-#~ "Bem-vindo ao Calcurse. Arquivos de dados não encontrados foram criados."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Arquivos de dados encontrados. Os dados serão carregados agora."
-
-#~ msgid "error while launching command: could not fork"
-#~ msgstr ""
-#~ "erro durante o lançamento do comando: não foi possível realizar fork"
-
-#~ msgid "error while launching command"
-#~ msgstr "erro durante o lançamento do comando"
-
-#~ msgid "unknown repetition type"
-#~ msgstr "tipo de repetição desconhecida"
-
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Insira o novo tipo de repetição:"
-
-#~ msgid "(d)aily"
-#~ msgstr "(d)iária"
-
-#~ msgid "(w)eekly"
-#~ msgstr "(s)emanal"
-
-#~ msgid "(m)onthly"
-#~ msgstr "(m)ensal"
-
-#~ msgid "(y)early"
-#~ msgstr "(a)nual"
-
-#, c-format
-#~ msgid "(currently using %s)"
-#~ msgstr "(atualmente usando %s)"
-
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "Tem certeza que deseja excluir este item?"
-
-#~ msgid "[ao]"
-#~ msgstr "[ts]"
-
-#~ msgid "[in]"
-#~ msgstr "[in]"
-
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Insira o tipo da repetição:"
-
-#~ msgid "wrong item type"
-#~ msgstr "tipo de item errado"
diff --git a/po/ru.po b/po/ru.po
index 2a14e54..7243440 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,47 +1,54 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the calcurse package.
#
# Translators:
# ÐлекÑей Мехоношин <ruskidecko@gmail.com>, 2011-2012
# ÐлекÑей Мехоношин <ruskidecko@gmail.com>, 2012-2014,2016
+# Vladimir Kalashnikov, 2023
# Lukas Fleischer <transifex@cryptocrack.de>, 2011
+# Vladimir Kalashnikov, 2023
+# Vladimir Kalashnikov, 2023
+# Vlad Savikin, 2021
+# Vlad Savikin, 2021
# ÐлекÑей Мехоношин <ruskidecko@gmail.com>, 2016-2017,2019-2020
msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2021-04-10 09:12-0400\n"
-"PO-Revision-Date: 2020-10-12 17:52+0000\n"
-"Last-Translator: ÐлекÑей Мехоношин <ruskidecko@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/lfleischer/calcurse/"
+"POT-Creation-Date: 2024-01-26 18:28+0100\n"
+"PO-Revision-Date: 2013-07-23 08:43+0000\n"
+"Last-Translator: Vlad Savikin, 2021\n"
+"Language-Team: Russian (http://app.transifex.com/lfleischer/calcurse/"
"language/ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
+"(n%100>=11 && n%100<=14)? 2 : 3);\n"
msgid "null pointer"
-msgstr "пуÑтой указатель"
+msgstr ""
+"Ошибка в работе программы: null pointer (указатель не указывает на "
+"корректные данные)."
-#, fuzzy
msgid "illegal date in appointment"
-msgstr "ошибка даты в задаче"
+msgstr "ÐеÑущеÑÑ‚Ð²ÑƒÑŽÑ‰Ð°Ñ Ð´Ð°Ñ‚Ð° Ð´Ð»Ñ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑтиÑ."
-#, fuzzy
msgid "error in appointment description"
-msgstr "ошибка даты в задаче"
+msgstr "Ошибка в опиÑании мероприÑтиÑ."
msgid "date error in appointment"
-msgstr "ошибка даты в задаче"
+msgstr ""
+"Ошибка в работе программы: date error in appointment (некорректно указана "
+"дата мероприÑтиÑ)."
msgid "no such appointment"
-msgstr "задача отÑутÑтвует"
+msgstr ""
+"Ошибка в работе программы: no such appointment (мероприÑтие не найдено)."
-#, fuzzy
msgid ""
"Usage:\n"
"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
@@ -51,11 +58,13 @@ msgid ""
"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<format>] | --"
"daemon"
msgstr ""
-"ИÑпользование:\n"
-"calcurse [-D ] [-C ] [-c ]\n"
-"calcurse -Q [--from ] [--to ] [--days ]\n"
-"calcurse -a | -d | -d | -n | -r[] | -s[] | -t[]\n"
-"calcurse -h | -v | --status | -G | -P | -g | -i | -x[] | --daemon"
+"ИÑпользуйте:\n"
+"calcurse [-D <directory>] [-C <directory>] [-c <calendar file>]\n"
+"calcurse -Q [--from <date>] [--to <date>] [--days <number>]\n"
+"calcurse -a | -d <date> | -d <number> | -n | -r[<number>] | -s[<date>] | -"
+"t[<number>]\n"
+"calcurse -h | -v | --status | -G | -P | -g | -i <file> | -x[<format>] | --"
+"daemon"
msgid "Try `calcurse -h` for more information."
msgstr "Выполните 'calcurse -h' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñправки."
@@ -64,13 +73,14 @@ msgstr "Выполните 'calcurse -h' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ ÑправкÐ
msgid "calcurse %s -- text-based organizer\n"
msgstr "calcurse %s - текÑтовый органайзер\n"
-msgid "Copyright (c) 2004-2020 calcurse Development Team."
-msgstr "Копирайт (c) 2004-2020 calcurse Development Team."
+msgid "Copyright (c) 2004-2023 calcurse Development Team."
+msgstr "Copyright (c) 2004-2023 calcurse Development Team."
msgid "This is free software; see the source for copying conditions."
msgstr ""
-"Это Ñвободное ПО. Ð”Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÑƒÑловиÑми ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐŸÐž, ознакомьтеÑÑŒ "
-"Ñ Ð¸Ñходным кодом."
+"Это Ñвободное программное обеÑпечение.\n"
+"Ð”Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÑƒÑловиÑми ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтого программного обеÑпечениÑ,\n"
+"ознакомьтеÑÑŒ Ñ Ð¸Ñходным кодом."
msgid "Operations in command line mode:"
msgstr "Операции в режиме командной Ñтроки:"
@@ -85,79 +95,92 @@ msgstr ""
msgid " -P, --purge Read items and write them back"
msgstr ""
+" -P, --purge ИÑпользование рег. выражений Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñей в календаре"
msgid ""
"Query short forms:\n"
"-a, -d <date>|<number>, -n, -r[<number>], -s[<date>], -t<number>"
msgstr ""
+" Краткие запроÑÑ‹:\n"
+" -a, -d <date>|<number>, -n, -r[<number>], -s[<date>], -t<number>"
msgid "Note that filter, format and day-range options affect input or output:"
msgstr ""
+" Заметьте, еÑÑ‚ÑŒ опции Ð´Ð»Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°, формата и временного диапазона "
+"влиÑющие на ввод или вывод: "
msgid " --filter-* Filter items loaded by -Q, -G, -P and -x"
msgstr ""
+" --filter-* Фильтрует загруженные Ñлементы Ð´Ð»Ñ -Q, -G, -"
+"P и -x"
msgid ""
" --format-* Rewrite output from -Q, -G and --dump-imported"
msgstr ""
+" --format-* Переоформить вывод -Q, -G и --dump-imported"
msgid " --from <date> Limit day range of -Q."
-msgstr ""
+msgstr " --from <date> Ðачало временного диапазона Ð´Ð»Ñ -Q"
msgid " --to <date> Limit day range of -Q."
-msgstr ""
+msgstr " --to <date> Конец временного диапазона Ð´Ð»Ñ -Q"
msgid " --days <number> Limit day range of -Q."
-msgstr ""
+msgstr " --days <number> От \"СегоднÑ\" отÑчёт дней Ð´Ð»Ñ -Q"
msgid " --limit, -l <number> Limit number of query results"
-msgstr ""
+msgstr " --limit, -l <number> Ограничение вывода (количеÑтвенно)"
msgid " --search, -S <regexp> Match regular expression in queries"
msgstr ""
+" --search, -S <regexp> ИÑпользование рег. выражений в запроÑах"
msgid "Consult the man page for details."
-msgstr "ПодробноÑти Ñмотрите в man-Ñтранице"
+msgstr " ПодробноÑти Ñмотрите в man-Ñтранице"
msgid "Miscellaneous:"
msgstr "Разное:"
msgid " -c, --calendar <file> The calendar data file to use"
-msgstr ""
+msgstr " -c, --calendar <file> Выбор файла Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ нужного календарÑ"
msgid " -C, --confdir <dir> The configuration directory to use"
-msgstr ""
+msgstr " -C, --confdir <dir> Выбор рабочей директории Ð´Ð»Ñ Ð½Ð°Ñтроек"
msgid " --daemon Run notification daemon in the background"
-msgstr "--daemon ЗапуÑтить демон уведомлений в фоне"
+msgstr " --daemon ЗапуÑтить демон уведомлений в фоне"
msgid " -D, --datadir <dir> The data directory to use"
-msgstr ""
+msgstr " -D, --datadir <dir> Выбор рабочей директории Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
msgid " -g, --gc Run the garbage collector"
-msgstr "-g, --gc ЗапуÑтить Ñборщик муÑора"
+msgstr " -g, --gc ЗапуÑтить Ñборщик муÑора"
msgid " -h, --help Show this help text"
-msgstr "-h, --help Показать Ñту Ñправку"
+msgstr " -h, --help Показать Ñту Ñправку"
msgid " -i, --import <file> Import iCal data from file"
-msgstr ""
+msgstr " -i, --import <file> Импорт данных в формате iCalendar (*.ics)"
msgid " -q, --quiet Suppress import/export result message"
-msgstr ""
+msgstr " -q, --quiet Подавить вывод при импорте/ÑкÑпорте"
msgid " --read-only Do not save configuration or data files"
-msgstr "--read-only Ðе ÑохранÑÑ‚ÑŒ наÑтройки или файлы Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸"
+msgstr " --read-only Ðе ÑохранÑÑ‚ÑŒ наÑтройки или файлы Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸"
msgid " --status Display status of running instances"
msgstr ""
+" --status Показать информацию о запущенных ÑкземплÑрах "
+"программы"
msgid " -v, --version Show version information"
-msgstr " -v, --version Показать информацию о верÑии"
+msgstr " -v, --version Показать информацию о верÑии программы"
msgid ""
" -x, --export[<format>] Export to stdout in ical (default) or pcal format"
msgstr ""
+" -x, --export[<format>] ЭкÑпорт в iCalendar (по умолчанию) (*.ics) или "
+"Pcal (*.ps)"
msgid ""
"For more information, type '?' from within calcurse, or read the manpage."
@@ -166,7 +189,7 @@ msgstr ""
"обратитеÑÑŒ к man."
msgid "Submit feature requests and suggestions to <misc@calcurse.org>."
-msgstr "ÐŸÐ¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ ваши идеи приÑылайте на <misc@calcurse.org>."
+msgstr "ÐŸÐ¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð¸/или Ваши идеи приÑылайте на <misc@calcurse.org>."
msgid "Submit bug reports to <bugs@calcurse.org>."
msgstr "Обнаруженные ошибки приÑылайте на <bugs@calcurse.org>."
@@ -193,47 +216,47 @@ msgid "calcurse is not running"
msgstr "calcurse не запущен"
msgid "completed tasks:\n"
-msgstr "Выполненные задачи:\n"
+msgstr "Прошедшие мероприÑтиÑ:\n"
msgid "to do:\n"
msgstr "СпиÑок дел:\n"
msgid "next appointment:\n"
-msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð·Ð°Ð´Ð°Ñ‡Ð°:\n"
+msgstr "Следующее мероприÑтие:\n"
#, c-format
msgid "invalid range: %s"
-msgstr "неверный диапазон: %s"
+msgstr "Ðеверный диапазон: %s."
#, c-format
msgid "invalid date: %s"
-msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°: %s"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°: %s."
#, c-format
msgid "invalid priority: %s"
-msgstr "неверный приоритет: %s"
+msgstr "Ðеверный приоритет: %s."
#, c-format
msgid "invalid export format: %s"
-msgstr "неверный формат ÑкÑпорта: %s"
+msgstr "Ðеверный формат ÑкÑпорта: %s."
msgid "invalid filter mask"
-msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¼Ð°Ñка фильтра"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¼Ð°Ñка фильтра."
msgid "cannot handle more than one regular expression"
-msgstr "невозможно иÑпользовать более одного рег. выражениÑ"
+msgstr "Ðевозможно иÑпользовать более одного рег. выражениÑ."
#, c-format
msgid "could not compile regular expression: %s"
-msgstr "невозможно Ñкомпилировать рег. выражение: %s"
+msgstr "Ðевозможно Ñкомпилировать рег. выражение: %s."
#, c-format
msgid "filter criterion already in use: %s"
-msgstr ""
+msgstr "Критерий уже иÑпользован: %s."
#, c-format
msgid "invalid date range: %s"
-msgstr "неверный диапазон дат: %s"
+msgstr "Ðеверный диапазон дат: %s."
#, c-format
msgid "calcurse is running (pid = %d)"
@@ -241,50 +264,50 @@ msgstr "calcurse запущен (pid = %d)"
#, c-format
msgid "invalid input date format: %s"
-msgstr ""
+msgstr "Ðеверный формат ввода даты %s."
#, c-format
msgid "invalid output date format: %s"
-msgstr ""
+msgstr "Ðеверный формат вывода даты %s."
msgid "invalid argument combination"
-msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²"
+msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð²."
msgid "cannot specify a range and an end date"
-msgstr "невозможно задать диапазон и конечную дату"
+msgstr "Ðевозможно задать диапазон и конечную дату."
msgid "end date cannot come before start date"
-msgstr "ÐºÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ð´Ð°Ñ‚Ð° не может быть до даты начала"
+msgstr "ÐšÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ð´Ð°Ñ‚Ð° не может быть до даты начала."
msgid "Unable to find documentation."
-msgstr "Ðевозможно найти документацию"
+msgstr "Ðевозможно найти документацию."
msgid "Data were saved successfully"
-msgstr ""
+msgstr "Данные уÑпешно Ñохранены."
msgid "Data were saved/reloaded successfully"
-msgstr ""
+msgstr "Данные уÑпешно Ñохранены/обновлены."
msgid "Save cancelled"
-msgstr "Сохранение отменено"
+msgstr "Сохранение отменено."
msgid "Data were already saved"
-msgstr ""
+msgstr "Данные уже были Ñохранены."
msgid "Cannot open data file"
-msgstr ""
+msgstr "Ðевозможно открыть файл данных."
msgid "Data were reloaded successfully"
-msgstr ""
+msgstr "Данные уÑпешно обновлены."
msgid "Date were merged/reloaded successfully"
-msgstr ""
+msgstr "Данные уÑпешно Ñинхронизированы."
msgid "Reload cancelled"
-msgstr ""
+msgstr "Обновление отменено."
msgid "Data were already loaded"
-msgstr ""
+msgstr "Данные уже были загружены."
msgid "Export to (i)cal or (p)cal format?"
msgstr "Формат ÑкÑпорта (i)cal или (p)cal?"
@@ -293,51 +316,51 @@ msgid "[ip]"
msgstr "[ip]"
msgid "There are unsaved changes. Should they be saved?"
-msgstr ""
+msgstr "ИмеютÑÑ Ð½ÐµÑохранённые изменениÑ. Сохранить?"
msgid "Do you really want to quit?"
msgstr "Вы уверены, что хотите выйти?"
msgid "Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) | p(rev) ]"
-msgstr ""
+msgstr "Команды: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) | p(rev) ]"
msgid "Read-only mode - use w!"
-msgstr ""
+msgstr "Режим Ñ‡Ñ‚ÐµÐ½Ð¸Ñ - иÑпользуйте w!"
msgid "There are unsaved changes - use w or q!"
msgstr ""
+"ИмеютÑÑ Ð½ÐµÑохранённые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ - иÑпользуйте w (запиÑÑŒ) или q! (выход без "
+"ÑохранениÑ)."
#, c-format
msgid "Help topic does not exist: %s"
-msgstr "Раздел Ñправки не ÑущеÑтвует: %s"
+msgstr "Раздел Ñправки не ÑущеÑтвует: %s."
-#, fuzzy
msgid "Select a repeating item in the appointments panel."
-msgstr "(Формат даты, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð² панели задач)"
+msgstr "Выберете повторÑющуюÑÑ Ð·Ð°Ð¿Ð¸ÑÑŒ на панели МероприÑтий."
-#, fuzzy
msgid "Not a repeating item."
-msgstr "Повторить запиÑÑŒ"
+msgstr "Ðе повторÑющаÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑŒ."
msgid "Last occurrence."
-msgstr ""
+msgstr "ПоÑледний пункт из поÑледовательноÑти."
msgid "First occurrence."
-msgstr ""
+msgstr "Первый пункт из поÑледовательноÑти."
#, c-format
msgid "No such command: %s"
-msgstr "Команда не обнаружено: %s"
+msgstr "Команда не обнаружена: %s."
msgid "unknown color"
-msgstr "неизвеÑтный цвет"
+msgstr "ÐеизвеÑтный цвет."
msgid "failed to open configuration file"
-msgstr "ошибка Ð¾Ñ‚Ñ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации"
+msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации."
#, c-format
msgid "invalid configuration directive: \"%s\""
-msgstr "invalid configuration directive: \"%s\""
+msgstr "Ðеверные параметры конфигурации: \"%s\""
msgid ""
"Pre-3.0.0 configuration file format detected, please upgrade running "
@@ -348,19 +371,19 @@ msgstr ""
#, c-format
msgid "unknown user option: \"%s\" (ignored)"
-msgstr ""
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: \"%s\" (игнорируетÑÑ)"
#, c-format
msgid "invalid option format: \"%s\" (ignored)"
-msgstr ""
+msgstr "Ðеверный формат опции: \"%s\" (игнорируетÑÑ)"
#, c-format
msgid "unknown user option: \"%s\" (disabled)"
-msgstr ""
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ: \"%s\" (отключена)"
#, c-format
msgid "invalid option format: \"%s\" (disabled)"
-msgstr ""
+msgstr "Ðеверный формат опции: \"%s\" (отключена)"
msgid "layout configuration"
msgstr "ÐаÑтройки раÑположениÑ"
@@ -378,82 +401,77 @@ msgid "color theme"
msgstr "Ð¦Ð²ÐµÑ‚Ð¾Ð²Ð°Ñ Ñхема"
msgid "(if set to YES, compact panels are used)"
-msgstr "(ЕÑли выбрано ДÐ/YES, будет иÑпользован компактный вид панелей)"
+msgstr "(да/нет) Компактное отображение"
msgid "Calendar"
msgstr "Календарь"
msgid "Appointments"
-msgstr "Задачи"
+msgstr "МероприÑтиÑ"
msgid "TODO"
-msgstr "Дела"
+msgstr "СпиÑок дел"
msgid "(specifies the panel that is selected by default)"
-msgstr "(Задаёт панель, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ активна по умолчанию)"
+msgstr "Определение панели выделенной по умолчанию"
msgid "monthly"
-msgstr "ежемеÑÑчно"
+msgstr "ЕжемеÑÑчно"
msgid "weekly"
-msgstr "еженедельно"
+msgstr "Еженедельно"
msgid "(preferred calendar display)"
-msgstr ""
+msgstr "Предпочитаемый вид календарÑ"
msgid "show completed"
-msgstr ""
+msgstr "Показывать выполненные"
msgid "hide completed"
-msgstr ""
+msgstr "СпрÑтать выполненные"
msgid "(preferred todo display)"
-msgstr ""
+msgstr "Предпочитаемый вид ÑпиÑка дел"
msgid "(horizontal line above the day heading)"
msgstr ""
+"(да/нет) Отобразить разделительную линию между днÑми в панели календарÑ"
msgid "(empty line between events and appointments)"
-msgstr ""
+msgstr "(да/нет) Добавить раÑÑтоÑние между мероприÑтиÑми и вÑтречами"
msgid "(each day ends with an empty line)"
-msgstr ""
+msgstr "(да/нет) Окончить предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð½Ñ Ð¿ÑƒÑтой Ñтрокой"
msgid "(insert an empty line after each appointment)"
-msgstr ""
+msgstr "(да/нет) Добавить пуÑтую Ñтроку между мероприÑтиÑми"
msgid "(text for a day without events and appointments)"
-msgstr ""
+msgstr "Отображаемый текÑÑ‚ на поле Ñвободного днÑ"
msgid "(display more than one day in the appointments panel)"
-msgstr ""
+msgstr "(да/нет) Показывать неÑколько дней на панели мероприÑтий"
msgid "(if set to YES, automatic save is done when quitting)"
-msgstr "(yes/no) ÐвтоÑохранение при выходе из программы"
+msgstr "(да/нет) ÐвтоматичеÑкое Ñохранение при выходе из программы"
msgid "(run the garbage collector when quitting)"
-msgstr "(yes/no) запуÑтить Ñборщик муÑора при выходе"
+msgstr "(да/нет) ЗапуÑтить Ñборщик муÑора при выходе"
msgid "(if not null, automatically save data every 'periodic_save' minutes)"
-msgstr "(N/0) ÐвтоÑохранение каждые N минут. (Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ '0')"
+msgstr "ÐвтоматичеÑкое Ñохранение каждые n минут. (Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ '0')"
msgid "(if YES, system events are turned into appointments (or else deleted))"
-msgstr ""
+msgstr "(да/нет) Ð’Ñе ÑиÑтемные мероприÑÑ‚Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑŽÑ‚ÑÑ Ð² общие (или нет)"
msgid "(if set to YES, confirmation is required before quitting)"
-msgstr "(yes/no) Подтверждение выхода из программы"
+msgstr "(да/нет) Подтверждение выхода из программы"
msgid "(if set to YES, confirmation is required before deleting an event)"
-msgstr "(yes/no) Подтверждение ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñобытий"
-
-msgid "Monday"
-msgstr "Пн"
-
-msgid "Sunday"
-msgstr "Ð’Ñ"
+msgstr "(да/нет) Подтверждение ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñобытий"
msgid "(specifies the first day of week in the calendar view)"
-msgstr "(указание первого Ð´Ð½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸ в календаре)"
+msgstr "Указание первого Ð´Ð½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸ в календаре"
msgid "(Format of the date to be displayed in non-interactive mode)"
msgstr "Формат даты отображаетÑÑ Ð² неинтерактивном режиме"
@@ -471,31 +489,40 @@ msgid "to the right"
msgstr "вправо"
msgid "(position of the heading in the appointments panel)"
-msgstr ""
+msgstr "РаÑположение шапки на панели мероприÑтий"
msgid "(Format of the date displayed in the appointments panel)"
-msgstr "(Формат даты, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð² панели задач)"
+msgstr "Формат даты, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð² панели задач"
+
+msgid "(Format of the time displayed in the appointments panel)"
+msgstr "Формат времени, которое отображаетÑÑ Ð² панели задач"
msgid "Enter a text string (an empty string for the default text)"
msgstr ""
+"Добавить текÑтовую Ñтроку (иначе будет отображатьÑÑ Ñ‚ÐµÐºÑÑ‚ по умолчанию)"
msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
msgstr "Задайте формат даты (Ñм. 'man 3 strftime' Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ñ… форматов)"
+msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
+msgstr "Задайте формат времени (Ñм. 'man 3 strftime' Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ñ… форматов) "
+
msgid "Enter the date format: "
msgstr "Задайте формат даты: "
msgid "Enter the delay, in minutes, between automatic saves (0 to disable) "
-msgstr "Введите задержку между автоÑохранениÑми (в минутах) или 0 Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ "
+msgstr ""
+"Введите задержку между автоматичеÑкими ÑохранениÑми (в минутах) или 0 Ð´Ð»Ñ "
+"отмены "
msgid "general options"
msgstr "ОÑновные наÑтройки"
msgid "Undefined option!"
-msgstr "ÐÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка!"
+msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð½Ð°Ñтройка!"
-msgid "undefined"
-msgstr "неопределено"
+msgid "UNDEFINED"
+msgstr "ОтÑутÑтвует инициализациÑ!"
msgid "keys configuration"
msgstr "ÐаÑтройка клавиш"
@@ -505,32 +532,33 @@ msgstr "Ðажмите клавишу, чтобы привÑзать её к:"
#, c-format
msgid "The key '%s' is already used for %s. Choose another one."
-msgstr "Ключ '%s' уже иÑпользуетÑÑ Ð´Ð»Ñ %s. Выберите другой ключ."
+msgstr "Клавиша '%s' уже иÑпользуетÑÑ Ð´Ð»Ñ %s. Выберите другую клавишу."
-msgid "Some actions do not have any associated key bindings!"
-msgstr "Ðекоторые дейÑÑ‚Ð²Ð¸Ñ Ð½Ðµ привÑзаны к клавишам!"
+msgid "Some actions are left undefined!"
+msgstr "Ðекоторые дейÑÑ‚Ð²Ð¸Ñ Ð½Ðµ определены!"
msgid ""
"Sorry, colors are not supported by your terminal\n"
"(Press [ENTER] to continue)"
-msgstr "Цвета не поддерживаютÑÑ Ð²Ð°ÑˆÐ¸Ð¼ терминалом (Ðажмите [ENTER])"
+msgstr ""
+"Цвета не поддерживаютÑÑ Ð²Ð°ÑˆÐ¸Ð¼ терминалом\n"
+"(Ðажмите [ENTER], чтобы продолжить)"
#, c-format
msgid "Could not save %s."
-msgstr ""
+msgstr "Ðевоможно Ñохранить %s"
msgid "unknown item type"
-msgstr "неизвеÑтный тип запиÑи"
+msgstr "ÐеизвеÑтный тип запиÑи"
-#, fuzzy
msgid "Note:"
-msgstr "Изм.Заметку"
+msgstr "Заметка:"
msgid "Event:"
msgstr "Событие:"
msgid "Appointment:"
-msgstr "Задача:"
+msgstr "МероприÑтие:"
#, c-format
msgid "Could not stop daemon properly: %s\n"
@@ -538,7 +566,7 @@ msgstr "Ðевозможно оÑтановить демон должным об
#, c-format
msgid "terminated at %s with signal %d\n"
-msgstr "завершено %s Ñ Ñигналом %d\n"
+msgstr "Завершено %s Ñ Ñигналом %d\n"
#, c-format
msgid "Could not remove daemon lock file: %s\n"
@@ -554,13 +582,13 @@ msgstr "Ðевозможно прервать Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющего тер
#, c-format
msgid "Could not change working directory: %s\n"
-msgstr "Ðевозможно выбрать рабочую директориюг: %s\n"
+msgstr "Ðевозможно выбрать рабочую директорию: %s\n"
msgid "Cannot daemonize, aborting\n"
-msgstr "Ðевозможно демонизировать процеÑÑ. Завершение\n"
+msgstr "Ðевозможно демонизировать процеÑÑ. Завершение...\n"
msgid "Could not set lock file\n"
-msgstr "Ðевозможно выбрать заблокированный файл\n"
+msgstr "Ðе удалоÑÑŒ Ñоздать файл блокировки\n"
#, c-format
msgid "Could not access \"%s\": %s\n"
@@ -568,198 +596,188 @@ msgstr "Ðет доÑтупа \"%s\": %s\n"
#, c-format
msgid "started at %s\n"
-msgstr "запуÑк в %s\n"
+msgstr "ЗапуÑк в %s\n"
msgid "error loading next appointment\n"
-msgstr "ошибка при загрузке Ñледующей задачи\n"
+msgstr "Ошибка при загрузке Ñледующего мероприÑтиÑ\n"
#, c-format
msgid "launching notification at %s for: \"%s\"\n"
-msgstr "запуÑк ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ %s длÑ: \"%s\"\n"
+msgstr "ЗапуÑк ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ %s длÑ: \"%s\"\n"
msgid "error while sending notification\n"
-msgstr "ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ уведомлениÑ\n"
+msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ уведомлениÑ\n"
#, c-format
msgid "sleeping at %s for %d second\n"
msgid_plural "sleeping at %s for %d seconds\n"
-msgstr[0] "ÑпÑщий режим %s на %d Ñек.\n"
+msgstr[0] "СпÑщий режим %s на %d Ñек.\n"
msgstr[1] "ÑпÑщий режим %s на %d Ñек.\n"
msgstr[2] "ÑпÑщий режим %s на %d Ñек.\n"
-msgstr[3] "ÑпÑщий режим %s на %d Ñек.\n"
+msgstr[3] "СпÑщий режим %s на %d Ñек.\n"
#, c-format
msgid "awakened at %s\n"
-msgstr "пробуждение %s\n"
+msgstr "Пробуждение %s\n"
#, c-format
msgid "Could not stop calcurse daemon: %s\n"
msgstr "Ðевозможно оÑтановить демон calcurse: %s\n"
-#, fuzzy
msgid "illegal date in event"
-msgstr "ошибка даты в Ñобытии"
+msgstr "Ошибка в дате мероприÑтиÑ."
-#, fuzzy
msgid "date error in event\n"
-msgstr "ошибка даты в Ñобытии"
+msgstr "Ошибка в дате мероприÑтиÑ.\n"
msgid "Internal error: line too long"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ñтрока"
msgid "out of memory"
-msgstr "нехватка памÑти"
+msgstr "Ðе хватает памÑти"
msgid "unknown ical type"
-msgstr "неизвеÑтный тип ical"
+msgstr "ÐеизвеÑтный тип файла iCalendar"
+
+msgid "(empty)"
+msgstr "(пуÑто)"
+
+msgid "ical_store_event: out of memory"
+msgstr "ical_store_event: не хватает памÑти"
msgid "need DTSTART to determine event type."
-msgstr ""
+msgstr "Ðеобходим DTSTART Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‚Ð¸Ð¿Ð° мероприÑтиÑ."
msgid "malformed recurrence line."
-msgstr ""
+msgstr "Ðекорректно ÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð² Ñтрочке поÑледовательноÑÑ‚ÑŒ."
msgid "frequency not set in rrule."
-msgstr ""
+msgstr "Ðе задана продолжительноÑÑ‚ÑŒ повторений Ð´Ð»Ñ Ð¿Ð¾ÑледовательноÑти."
msgid "frequency absent in rrule."
msgstr ""
+"Ðе ÑоответÑтвует Ñтандарту продолжительноÑÑ‚ÑŒ повторений Ð´Ð»Ñ "
+"поÑледовательноÑти."
-#, fuzzy
msgid "rrule frequency not supported."
-msgstr "Ñ€ÐµÐºÑƒÑ€Ñ€ÐµÐ½Ñ‚Ð½Ð°Ñ Ñ‡Ð°Ñтота не найдена"
+msgstr "Ð”Ð»Ñ Ð¿Ð¾ÑледовательноÑти Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ Ñ‡Ð°Ñтота повторений не поддерживаетÑÑ."
-#, fuzzy
msgid "invalid interval."
-msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¼Ð°Ñка фильтра"
+msgstr "Ðекорректный интервал."
msgid "either until or count."
-msgstr ""
+msgstr "Выберете дату или продолжительноÑÑ‚ÑŒ."
msgid "missing until value."
-msgstr ""
+msgstr "ОтÑутÑтвует Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾ÑледовательноÑти."
-#, fuzzy
msgid "invalid until format."
-msgstr "неверный формат ÑкÑпорта: %s"
+msgstr "Ðекорректный формат Ð´Ð»Ñ Ð¿Ð¾ÑледовательноÑти."
-#, fuzzy
msgid "invalid count value."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°."
+msgstr "Ðекорректное значение Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñти."
msgid "invalid bymonth list."
-msgstr ""
+msgstr "Ðекорректно задан ÑпиÑок по меÑÑцам."
-#, fuzzy
msgid "invalid bymonthday list."
-msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°: %s"
+msgstr "Ðекорректно задан ÑпиÑок по днÑм в меÑÑце."
-#, fuzzy
msgid "invalid byday list."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°."
+msgstr "Ðекорректно задан ÑпиÑок по днÑм."
msgid "invalid exception date value type."
-msgstr ""
+msgstr "Ðекорректный тип Ð´Ð»Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð°Ñ‚Ñ‹ иÑключениÑ."
msgid "malformed exceptions line."
-msgstr ""
+msgstr "Ðекорректно Ñформированное в Ñтроке иÑключение."
-#, fuzzy
msgid "invalid exception."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‡Ð°Ñтота."
+msgstr "Ðекорректное иÑключение."
#, c-format
msgid "malformed %s line."
-msgstr ""
+msgstr "Ðекорректно ÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ %s Ñтрока."
#, c-format
msgid "malformed %s."
-msgstr ""
+msgstr "Ðекорректно Ñформированный %s."
msgid "malformed summary line."
-msgstr ""
+msgstr "Ðекорректно ÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð² Ñтроке ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ "
msgid "malformed summary."
-msgstr ""
-
-msgid "line break in summary."
-msgstr ""
+msgstr "Ðекорректно ÑÑ„Ð¾Ñ€Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ."
-#, fuzzy
msgid "item start date not defined."
-msgstr "Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð½Ðµ определено."
+msgstr "Дата начала мероприÑÑ‚Ð¸Ñ Ð½Ðµ определена."
msgid "malformed start time line."
-msgstr ""
+msgstr "Ðекорректно Ñформировано Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°."
-#, fuzzy
msgid "invalid or malformed event start time."
-msgstr "невозможно воÑÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° ÑобытиÑ."
+msgstr "ÐедопуÑтимое или некорректно Ñформированное Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° мероприÑтиÑ."
-#, fuzzy
msgid "invalid end time value type."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð° или времÑ."
+msgstr "Ðекорректный тип Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ окончаниÑ."
msgid "malformed end time line."
-msgstr ""
+msgstr "Ðекорректно Ñформировано Ð²Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ."
-#, fuzzy
msgid "malformed event end time."
-msgstr "невозможно воÑÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ ÑобытиÑ."
+msgstr "Ðекорректно Ñформировано Ð²Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑтиÑ. "
msgid "end must be later than start."
-msgstr ""
+msgstr "Окончание должно быть поÑле начала."
-#, fuzzy
msgid "either end or duration."
-msgstr "Ðеверное Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð»Ð¸ продолжительноÑÑ‚ÑŒ."
+msgstr "Либо окончание, либо продолжительноÑÑ‚ÑŒ."
msgid "malformed duration line."
-msgstr ""
+msgstr "Ðе правильный формат Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñти."
-#, fuzzy
msgid "invalid duration."
-msgstr "Ðеверное Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð»Ð¸ продолжительноÑÑ‚ÑŒ."
+msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ."
msgid "exception date, but no recurrence rule."
-msgstr ""
+msgstr "Дата-иÑключение, но не задано правило повтора."
msgid "multi-day event changed to one-day event"
-msgstr ""
+msgstr "Многодневное мероприÑтие изменено на однодневное."
-#, fuzzy, c-format
+#, c-format
msgid "Location: %s"
-msgstr " allocated in: %s\n"
+msgstr "РаÑположение: %s"
#, c-format
msgid "Comment: %s"
-msgstr ""
+msgstr "Комментарий: %s"
#, c-format
msgid "rrule does not match start day (%s)."
-msgstr ""
+msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð·Ð°Ð´Ð°Ñ‡Ð° поÑледовательноÑти отноÑительно даты начала (%s)."
msgid "item could not be identified."
-msgstr "значение не может быть раÑпознано."
+msgstr "ЗапиÑÑŒ не может быть идентифицирована."
msgid "only one description allowed."
-msgstr ""
+msgstr "ДопуÑтимо лишь одно опиÑание. "
msgid "only one location allowed."
-msgstr ""
+msgstr "ДопуÑтимо лишь одно раÑположение."
msgid "The ical file seems to be malformed. The end of item was not found."
-msgstr "Файл ical Ñкорее вÑего повреждён. Ðе найдено окончание запиÑи."
+msgstr "Файл iСalendar Ñкорее-вÑего повреждён. Ðе найдено окончание запиÑи."
msgid "could not retrieve item summary."
-msgstr "невозможно воÑÑтановить Ñуммарные запиÑи."
+msgstr "Ðевозможно получить краткое опиÑание запиÑи."
msgid "item priority is invalid (must be between 0 and 9)."
-msgstr "приоритет запиÑи в неверном формате (должно быть чиÑло между 0 и 9)"
+msgstr "Приоритет запиÑи в неверном формате (должно быть чиÑло от 0 и до 9)."
msgid "Warning: ical header malformed or wrong version number. Aborting..."
msgstr ""
-"Внимание: заголовок ical повреждён или неправильный номер верÑии. "
+"Внимание: заголовок iCalendar повреждён или его верÑÐ¸Ñ Ð½Ðµ поддерживаетÑÑ. "
"Завершение..."
msgid "Choose the file used to export calcurse data:"
@@ -769,156 +787,162 @@ msgid "The file cannot be accessed, please enter another file name."
msgstr "Файл не может быть добавлен, попробуйте другое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
msgid "Press [ENTER] to continue."
-msgstr "Ðажмите [ENTER]."
+msgstr "Ðажмите [Enter], чтобы продолжить..."
#, c-format
msgid "Failed to open \"%s\", - %s\n"
-msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ \"%s\", - %s\n"
+msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ \"%s\", - %s.\n"
msgid "Failed to build message\n"
-msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑообщениÑ\n"
+msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑообщениÑ.\n"
#, c-format
msgid "Failed to print message \"%s\"\n"
-msgstr "Ошибка вывода ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ \"%s\"\n"
+msgstr "Ошибка вывода ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ \"%s\".\n"
#, c-format
msgid "Failed to close \"%s\" - %s\n"
-msgstr "Ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ \"%s\" - %s\n"
+msgstr "Ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ \"%s\" - %s.\n"
#, c-format
msgid "%s does not exist"
-msgstr "%s не ÑущеÑтвует"
+msgstr "%s не ÑущеÑтвует."
msgid "Data files have changed and will be overwritten:"
-msgstr ""
+msgstr "Файлы данных были изменены и будут перезапиÑаны:"
msgid "(c)ontinue"
-msgstr ""
+msgstr "(c)продолжить"
msgid "(m)erge"
msgstr "(m)ÑлиÑние"
msgid "c(a)ncel"
-msgstr ""
+msgstr "(a)отмена"
msgid "[cma]"
-msgstr ""
+msgstr "[cma]"
msgid "failed to open appointment file"
-msgstr "ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° задач"
+msgstr "Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° Ñ Ð¼ÐµÑ€Ð¾Ð¿Ñ€Ð¸ÑтиÑми."
msgid "syntax error in the item date"
-msgstr "опечатка в запиÑе даты"
+msgstr "Опечатка даты в запиÑи"
msgid "no event nor appointment found"
-msgstr "ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¸ задачи не найдены"
+msgstr "МероприÑÑ‚Ð¸Ñ Ð¾Ñ‚ÑутÑтвуют."
msgid "syntax error in item time or duration"
-msgstr "опечатка в запиÑи даты или продолжительноÑти"
+msgstr "Опечатка во времени или в продолжительноÑти запиÑи."
msgid "syntax error in item identifier"
-msgstr "опечатка в запиÑи опознавателÑ"
+msgstr "Опечатка в идентификаторе запиÑи."
msgid "wrong format in the appointment or event"
-msgstr "неверный формат ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¸Ð»Ð¸ задачи"
+msgstr "Ðеверный формат мероприÑтиÑ."
msgid "syntax error in item repetition"
-msgstr "опечатка в запиÑи повторениÑ"
+msgstr "Опечатка в запиÑи повторениÑ."
-#, fuzzy
msgid "syntax error in until date"
-msgstr "опечатка в запиÑи даты"
+msgstr "Опечатка в дате Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑледовательноÑти."
msgid "until date error"
-msgstr ""
+msgstr "Ошибка в дате Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑледовательноÑти."
msgid "BYMONTHDAY illegal with WEEKLY"
-msgstr ""
+msgstr "ÐеÑовмеÑтимые параметры."
msgid "missing end of recurrence"
-msgstr ""
+msgstr "ОтÑутÑтвует дата Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑледовательноÑти."
-#, fuzzy
msgid "syntax error in item state"
-msgstr "опечатка в запиÑи даты"
+msgstr "СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в данных запиÑи."
msgid "failed to open todo file"
-msgstr "ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ todo-файла"
+msgstr "Ðе удалоÑÑŒ открыть файл Ñо ÑпиÑком дел."
msgid "Screen data have changed and will be lost:"
-msgstr ""
+msgstr "Обнаружены неÑохранённые изменениÑ, которые могут быть утрачены:"
msgid "failed to open key file"
-msgstr "ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° ключа"
-
-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 ""
-"\n"
-"Обнаружены ошибки при чтении файла наÑтроек!\n"
-"Сделайте копию keys-файла, удалите его из каталога и запуÑтите calcurse "
-"Ñнова.\n"
+msgstr "Ðе удалоÑÑŒ открыть файл Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющими клавишами."
msgid "Could not read key label"
-msgstr "Ðевозможно раÑпознать клавишу"
+msgstr "Ðекорректный формат Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющей клавиши."
+
+#, c-format
+msgid "Key label not recognized: \"%s\""
+msgstr "ÐераÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‰Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ°: \"%s\""
-msgid "Key label not recognized"
-msgstr "Клавиша не опознана"
+#, c-format
+msgid "No keys assigned to \"%s\"."
+msgstr "Ðе назначено управлÑющей клавиши Ð´Ð»Ñ \"%s\"."
+
+#, c-format
+msgid "Keyname not recognized: \"%s\""
+msgstr "УправлÑÑŽÑ‰Ð°Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° не раÑпознана: \"%s\"."
#, c-format
-msgid "Error reading key: \"%s\""
-msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸: \"%s\""
+msgid "\"%s\" assigned twice: \"%s\"."
+msgstr "\"%s\" приÑвоена дважды: \"%s\"."
#, c-format
-msgid "\"%s\" assigned multiple times!"
-msgstr "\"%s\" определено множеÑтво времён!"
+msgid ""
+"Action \"%s\" absent, but default key \"%s\" assigned to another action."
+msgstr ""
+"Команда \"%s\" невыполнима, управ. клавиша \"%s\" назначена Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ "
+"команды."
+
+msgid "Errors in the keys file."
+msgstr "Ошибки в файле Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющими клавишами."
-msgid "There were some errors when loading keys file."
+msgid "Remove offending line(s) from the keys file, aborting..."
msgstr ""
+"Удалите некорректную Ñтроку(и) из файла Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющими клавишами. "
+"Завершение..."
-msgid "Too many errors while reading keys file, aborting..."
-msgstr "Обнаружены ошибки при чтении keys-файла, отмена..."
+msgid "Some actions do not have any associated key bindings!"
+msgstr "Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… дейÑтвий не назначены клавиши!"
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
-msgstr "ФÐТÐЛЬÐÐЯ ОШИБКÐ: невозможно Ñоздать %s: %s\n"
+msgstr "Ðварийное завершение программы: не удалоÑÑŒ Ñоздать %s: %s\n"
msgid "The data were successfully exported"
-msgstr "Данные уÑпешно ÑкÑпортированы"
+msgstr "Данные уÑпешно ÑкÑпортированы."
msgid "Press [ENTER] to continue"
-msgstr "Ðажмите [ENTER]"
+msgstr "Ðажмите [Enter], чтобы продолжить"
msgid "unknown export type"
-msgstr "неизвеÑтный тип ÑкÑпорта"
+msgstr "ÐеизвеÑтный тип ÑкÑпорта."
msgid "wrong export mode"
-msgstr "ошибочный режим ÑкÑпорта"
+msgstr "Ошибочный режим ÑкÑпорта."
msgid "Enter the file name to import data from:"
-msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°: "
+msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°:"
#, c-format
msgid "Import process report: %04d lines read"
-msgstr "Отчёт процеÑÑа импорта:%04d lines read"
+msgstr "Отчёт процеÑÑа импорта: %04d Ñтрок прочитано"
msgid "unknown import type"
-msgstr "неизвеÑтный тип импорта"
+msgstr "ÐеизвеÑтный тип импорта"
msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
-msgstr "ФÐТÐЛЬÐÐЯ ОШИБКÐ: входÑщий файл не может быть добавлен. Завершение..."
+msgstr ""
+"Ðварийное завершение программы: входÑщий файл не может быть добавлен. "
+"Завершение..."
msgid "FATAL ERROR: wrong import mode"
-msgstr "ФÐТÐЛЬÐÐЯ ОШИБКÐ: неправильный режим импорта"
+msgstr "Ðварийное завершение программы: неправильный режим импорта."
#, c-format
msgid "%d app"
msgid_plural "%d apps"
-msgstr[0] "%d app"
+msgstr[0] "%d мероприÑтий"
msgstr[1] "%d apps"
msgstr[2] "%d apps"
msgstr[3] "%d apps"
@@ -926,7 +950,7 @@ msgstr[3] "%d apps"
#, c-format
msgid "%d event"
msgid_plural "%d events"
-msgstr[0] "%d Ñобытие"
+msgstr[0] "%d Ñобытий"
msgstr[1] "%d ÑобытиÑ"
msgstr[2] "%d ÑобытиÑ"
msgstr[3] "%d ÑобытиÑ"
@@ -934,17 +958,17 @@ msgstr[3] "%d ÑобытиÑ"
#, c-format
msgid "%d todo"
msgid_plural "%d todos"
-msgstr[0] "%d дело"
+msgstr[0] "%d дел"
msgstr[1] "%d дела"
msgstr[2] "%d дела"
msgstr[3] "%d дела"
#, c-format
msgid "%d skipped"
-msgstr "%d пропущен"
+msgstr "%d пропущено"
msgid "Some items could not be imported."
-msgstr ""
+msgstr "Ðекоторые запиÑи не прошли импорт. "
msgid "Warning: could not open temporary log file, Aborting..."
msgstr "Внимание: невозможно открыть временный log-файл. Завершение..."
@@ -957,22 +981,24 @@ msgstr "Ðет log-файла Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ!"
#, c-format
msgid "See %s for details."
-msgstr ""
+msgstr "Детали в %s."
msgid "Display log file?"
-msgstr ""
+msgstr "Отобразить лог файл?"
#, c-format
msgid "Warning: could not erase temporary log file %s, Aborting..."
msgstr "Внимание: невозможно очиÑтить временный log-файл %s. Завершение..."
msgid "Invalid delay"
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ°"
+msgstr "Ðекорректный интервал Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ."
msgid ""
"Periodic save cancelled. Data files have changed. Save and merge "
"interactively"
msgstr ""
+"ÐвтоÑохранение не выполнено. Данные изменены. Сохр./объедините данные "
+"вручную."
#, c-format
msgid ""
@@ -1016,7 +1042,10 @@ msgid "Paste"
msgstr "Ð’Ñтавить"
msgid "Chg Win"
-msgstr "Панель"
+msgstr "След.Панель"
+
+msgid "Prev Win"
+msgstr "Пред.Панель"
msgid "Import"
msgstr "Импорт"
@@ -1028,7 +1057,7 @@ msgid "Go to"
msgstr "Переход"
msgid "OtherCmd"
-msgstr "..."
+msgstr ". . ."
msgid "Config"
msgstr "ÐаÑтройки"
@@ -1037,7 +1066,7 @@ msgid "Redraw"
msgstr "Обновить"
msgid "Add Appt"
-msgstr "Доб.Задачу"
+msgstr "Доб.Меропр."
msgid "Add Todo"
msgstr "Доб.Дело"
@@ -1106,10 +1135,10 @@ msgid "Edit Itm"
msgstr "Изм.ЗапиÑÑŒ"
msgid "View"
-msgstr "Смотреть"
+msgstr "ПроÑмотреть"
msgid "Pipe"
-msgstr "Программный канал (pipe)"
+msgstr "Передать ->"
msgid "Flag Itm"
msgstr "Флаг"
@@ -1141,16 +1170,21 @@ msgstr ""
"#\n"
"# Файл наÑтройки быÑтрых клавиш Calcurse\n"
"#\n"
-"# Ð’ Ñтом файле определены быÑтрые клавиши, которые иÑпользуютÑÑ Ð² Calcurse.\n"
+"# Ð’ Ñтом файле определены управлÑющие клавиши, которые иÑпользуютÑÑ Ð² "
+"Calcurse.\n"
"# Calcurse Ñоздал их автоматичеÑки и редактируютÑÑ Ð¾Ð½Ð¸ в меню наÑтроек в "
"программе.\n"
"# ÐапрÑмую редактировать быÑтрые клавиши нельзÑ.\n"
msgid "FATAL ERROR: could not create default keys file."
-msgstr "FATAL ERROR: could not create default keys file."
+msgstr ""
+"Ðварийное завершение программы: не удалоÑÑŒ Ñоздать файл Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющими "
+"клавишами."
msgid "FATAL ERROR: key value out of bounds"
-msgstr "FATAL ERROR: key value out of bounds"
+msgstr ""
+"Ðварийное завершение программы: значение Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñющей клавиши не "
+"корректно. "
msgid "General"
msgstr "ОÑновные"
@@ -1174,34 +1208,37 @@ msgid "Unknown"
msgstr "ÐезвеÑтный(аÑ)"
msgid "Cancel the ongoing action."
-msgstr "Отмена поÑтоÑнного дейÑтвиÑ."
+msgstr "Прервать выполнÑемое дейÑтвие."
msgid "Select the highlighted item."
msgstr "Выбрать подÑвеченную запиÑÑŒ."
msgid "Print general information about calcurse's authors, license, etc."
-msgstr "ПроÑмотреть оÑновную информацию об авторах, лицензии и Ñ‚.п."
+msgstr "ПроÑмотреть оÑновную информацию об авторах, лицензии и прочем."
msgid "Display hints whenever some help screens are available."
msgstr "Показать Ñправку, еÑли Ñ‚Ð°ÐºÐ¾Ð²Ð°Ñ Ð¸Ð¼ÐµÐµÑ‚ÑÑ."
msgid "Exit from the current menu, or quit calcurse."
-msgstr "Выйти из текущего меню или из calcurse"
+msgstr "Выйти из текущего меню, или из calcurse."
msgid "Save calcurse data."
-msgstr "Сохр. данные calcurse"
+msgstr "Сохр. данные calcurse."
msgid "Reload appointments and todo items."
-msgstr "Обновить задачу и ÑпиÑок дел."
+msgstr "Обновить запиÑи мероприÑтий и ÑпиÑка дел."
msgid "Copy the item that is currently selected."
-msgstr "Копировать выделенную запиÑÑŒ (пункт?)"
+msgstr "Копировать выделенную запиÑÑŒ."
msgid "Paste an item at the current position."
-msgstr "Ð’Ñтавить запиÑÑŒ в текущую позицию"
+msgstr "Ð’Ñтавить запиÑÑŒ в текущую позицию."
msgid "Select next panel in calcurse main screen."
-msgstr "Выбрать Ñлед. панель на главном Ñкране calcurse"
+msgstr "Выбрать Ñлед. панель на главном Ñкране calcurse."
+
+msgid "Select previous panel in calcurse main screen."
+msgstr "Выбрать пред. панель на главном Ñкране calcurse."
msgid "Import data from an external file."
msgstr "Импортированть данные Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ файла."
@@ -1210,19 +1247,19 @@ msgid "Export data to a new file format."
msgstr "ЭкÑпортировать данные в файл."
msgid "Select the day to go to."
-msgstr "Выбрать день Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° на него."
+msgstr "Выбрать день Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð° к нему."
msgid "Show next possible actions inside status bar."
-msgstr "Отобразить в полоÑе ÑтатуÑа ещё одни возможные дейÑтвиÑ. "
+msgstr "Отобразить в полоÑе ÑтатуÑа ещё одни возможные дейÑтвиÑ."
msgid "Enter the configuration menu."
msgstr "Войти в меню наÑтроек."
msgid "Redraw calcurse's screen."
-msgstr "Обновить Ñкран calcurse"
+msgstr "Обновить Ñкран calcurse."
msgid "Add an appointment, whichever panel is currently selected."
-msgstr "Добавить Задачу. Может быть выбрана Ð»ÑŽÐ±Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ."
+msgstr "Добавить МероприÑтие. Может быть выбрана Ð»ÑŽÐ±Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ."
msgid "Add a todo item, whichever panel is currently selected."
msgstr "Добавить Дело. Может быть выбрана Ð»ÑŽÐ±Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ."
@@ -1265,7 +1302,7 @@ msgid "Go to today, whichever panel is selected."
msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð´Ð°Ñ‚Ð°. Может быть выбрана Ð»ÑŽÐ±Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ."
msgid "Enter command mode."
-msgstr "Введите командный режим."
+msgstr "Введите в командном режиме."
msgid "Move to the right."
msgstr "Вправо"
@@ -1305,15 +1342,14 @@ msgid "Repeat an item"
msgstr "Повторить запиÑÑŒ"
msgid "Pipe the currently selected item to an external program."
-msgstr ""
-"Открыть программный канал (pipe) выбранной запиÑи Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ программой."
+msgstr "Передать выбранный Ñлемент на обработку внешней программе."
msgid "Attach (or edit if one exists) a note to the currently selected item"
msgstr ""
-"ПривÑзать (или задать, еÑли не ÑущеÑтвует) заметку Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ запиÑи"
+"Добавить (или редактировать, еÑли ÑущеÑтвует) заметку Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ запиÑи"
msgid "View the note attached to the currently selected item."
-msgstr "ПроÑмотр вложенной запиÑки."
+msgstr "ПроÑмотреть заметку, прикреплённую к выбранному Ñлементу."
msgid "Raise a task priority inside the todo panel."
msgstr "ПовыÑить приоритет дела внутри панели дел."
@@ -1322,487 +1358,484 @@ msgid "Lower a task priority inside the todo panel."
msgstr "Понизить приоритет дела внутри ÑпиÑка дел."
msgid "FATAL ERROR: null file pointer."
-msgstr "FATAL ERROR: null file pointer."
+msgstr ""
+"Ðварийное завершение программы: указатель указывает на некорректные данные."
#, c-format
-msgid "When adding default key for \"%s\", \"%s\" was already assigned!"
-msgstr "При назначении клав. \"%s\", \"%s\" уже была назначена!"
+msgid "Default key(s) assigned to %d action%s."
+msgstr "По умолчанию иÑпользуетÑÑ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ°(и) %d Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %s."
msgid "xmalloc: zero size"
-msgstr "xmalloc: zero size"
+msgstr "xmalloc: попытка выделить памÑÑ‚ÑŒ нулевого размера"
msgid "xmalloc: out of memory"
-msgstr "xmalloc: out of memory"
+msgstr "xmalloc: не хватает памÑти"
msgid "xcalloc: zero size"
-msgstr "xcalloc: zero size"
+msgstr "xcalloc: попытка выделить памÑÑ‚ÑŒ нулевого размера"
msgid "xcalloc: overflow"
-msgstr "xcalloc: overflow"
+msgstr "xcalloc: переполнение"
msgid "xcalloc: out of memory"
-msgstr "xcalloc: out of memory"
+msgstr "xcalloc: не хватает памÑти"
msgid "xrealloc: zero size"
-msgstr "xrealloc: zero size"
+msgstr "xrealloc: попытка выделить памÑÑ‚ÑŒ нулевого размера"
msgid "xrealloc: overflow"
-msgstr "xrealloc: overflow"
+msgstr "xrealloc: переполнение"
msgid "xrealloc: out of memory"
-msgstr "xrealloc: out of memory"
+msgstr "xrealloc: не хватает памÑти"
msgid "could not allocate memory to store block info"
-msgstr "could not allocate memory to store block info"
+msgstr "Ðе удалоÑÑŒ выделить памÑÑ‚ÑŒ Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ о блоке"
msgid "Block not found"
-msgstr "Block not found"
+msgstr "Блок не обнаружен"
#, c-format
msgid "overflow at %s"
-msgstr "overflow at %s"
+msgstr "Переполнение в %s"
#, c-format
msgid "dbg_free: null pointer at %s"
-msgstr "dbg_free: null pointer at %s"
+msgstr "dbg_free: нулевой указатель в %s"
#, c-format
msgid "block seems already freed at %s"
-msgstr "block seems already freed at %s"
+msgstr "Блок памÑти уже был выÑвобожден в %s"
#, c-format
msgid "corrupt block header at %s"
-msgstr "corrupt block header at %s"
+msgstr "Повреждённый заголовок блока в %s"
#, c-format
msgid "corrupt block end at %s, (end = %u, should be %d)"
-msgstr "corrupt block end at %s, (end = %u, should be %d)"
+msgstr "Повреждённый конец блока в %s, (окончание = %u, ожидалоÑÑŒ %d)"
msgid "---==== MEMORY BLOCK ====----------------\n"
-msgstr "---==== MEMORY BLOCK ====----------------\n"
+msgstr "---==== БЛОК ПÐМЯТИ ====-----------------\n"
#, c-format
msgid " id: %u\n"
-msgstr " id: %u\n"
+msgstr " Идентификатор: %u\n"
#, c-format
msgid " size: %u\n"
-msgstr " size: %u\n"
+msgstr " Размер: %u\n"
#, c-format
msgid " allocated in: %s\n"
-msgstr " allocated in: %s\n"
+msgstr " Выделено в: %s\n"
msgid "-----------------------------------------\n"
msgstr "-----------------------------------------\n"
msgid "+------------------------------+\n"
-msgstr "+------------------------------+\n"
+msgstr "+----------------------------------------+\n"
msgid "| calcurse memory usage report |\n"
-msgstr "| calcurse memory usage report |\n"
+msgstr "| отчёт об иÑпользовании памÑти calcurse |\n"
#, c-format
msgid " number of calls: %u\n"
-msgstr " number of calls: %u\n"
+msgstr " КоличеÑтво вызовов: %u\n"
#, c-format
msgid " allocated blocks: %u\n"
-msgstr " allocated blocks: %u\n"
+msgstr " Выделенные блоки Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…: %u\n"
#, c-format
msgid " unfreed blocks: %u\n"
-msgstr " unfreed blocks: %u\n"
+msgstr " Ðе выÑбождённые блоки: %u\n"
#, c-format
msgid "Warning: could not open %s, Aborting..."
msgstr "Внимание: невозможно открыть %s, Завершение..."
msgid "(if set to YES, notify-bar will be displayed)"
-msgstr "(ЕÑли выбрано yes, будет выводитÑÑ Ð¾ÐºÐ½Ð¾ уведомлениÑ)"
+msgstr "(да/нет) Выводить окно уведомлениÑ"
msgid "(Format of the date to be displayed inside notify-bar)"
-msgstr "(Формат даты выводитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ окна уведомлениÑ)"
+msgstr "Формат даты внутри окна уведомлениÑ"
msgid "(Format of the time to be displayed inside notify-bar)"
-msgstr "(Формат времени выводитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ окна уведомлениÑ)"
+msgstr "Формат времени внутри окна уведомлениÑ"
msgid ""
"(Warn user if an appointment is within next 'notify-bar_warning' seconds)"
-msgstr "(Предупреждать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾ Ñобытии за 'notify-bar_warning' Ñекунд)"
+msgstr "Предупреждать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾ мероприÑтии за n Ñекунд"
msgid "(Command used to notify user of an upcoming appointment)"
-msgstr "(Команда уведомлÑет Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾ грÑдущем Ñобытии)"
+msgstr "Команда уведомлÑет Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾ грÑдущем Ñобытии"
msgid "(Notify all appointments instead of flagged ones only)"
-msgstr ""
-"(Извещать обо вÑех задачах, вмеÑто тех, которые помечены Ð´Ð»Ñ Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ)"
+msgstr "Извещать обо вÑех задачах, вмеÑто тех, которые помечены Ð´Ð»Ñ Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ"
msgid "(Run in background to get notifications after exiting)"
-msgstr "(ЗапуÑтить в фоновом режиме, Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти получать уведомлениÑ)"
+msgstr "(да/нет) ЗапуÑтить ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² фоновом режиме"
msgid "(Log activity when running in background)"
-msgstr "(Лог активен во Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð¾Ð½Ð¾Ð²Ð¾Ð³Ð¾ режима)"
-
-msgid "Enter the time format (see 'man 3 strftime' for possible formats) "
-msgstr "Задайте формат времени (Ñм. 'man 3 strftime' Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ñ… форматов) "
+msgstr "(да/нет) ВеÑти журналирование во Ð²Ñ€ÐµÐ¼Ñ Ñ„Ð¾Ð½Ð¾Ð²Ð¾Ð³Ð¾ режима"
msgid "Enter the number of seconds (0 not to be warned before an appointment)"
-msgstr "Введите количеÑтво Ñекунд (0 - отмена Ð¾Ð¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ ÑобытиÑ)"
+msgstr "Введите количеÑтво Ñекунд (0 - отмена Ð¾Ð¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ мероприÑтиÑ)"
msgid "Enter the notification command "
msgstr "Введите команду ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ "
msgid "notification options"
-msgstr "наÑтройки уведомлениÑ"
+msgstr "ÐаÑтройки уведомлениÑ"
msgid "incoherent repetition type"
-msgstr "беÑÑвÑзный тип повторениÑ"
+msgstr "БеÑÑвÑзный тип повторениÑ."
msgid "System event"
-msgstr ""
+msgstr "СиÑтемное Ñобытие."
msgid "unknown character"
-msgstr "неизвеÑтный Ñимвол"
+msgstr "ÐеизвеÑтный Ñимвол."
#, c-format
msgid "recurrence error: not on start day (%s)"
-msgstr ""
+msgstr "Ошибка при повторении: не Ñовпадение Ñ Ð´Ð½Ñ‘Ð¼ начала (%s). "
-#, fuzzy
msgid "illegel date in event"
-msgstr "ошибка даты в Ñобытии"
+msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð´Ð°Ñ‚Ð° Ð´Ð»Ñ ÑобытиÑ"
msgid "date error in event"
-msgstr "ошибка даты в Ñобытии"
+msgstr "Ошибка при запиÑи даты ÑобытиÑ"
msgid "month day is zero"
-msgstr ""
+msgstr "Ошибка при чиÑленном обозначении Ð´Ð½Ñ Ð¼ÐµÑÑца."
-#, fuzzy
msgid "no daily frequency check"
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‡Ð°Ñтота."
+msgstr "ОтÑутÑтвует контроль за повторениÑми."
msgid "illegal BYDAY value"
-msgstr ""
+msgstr "ÐедопуÑтимое значение Ð´Ð»Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð½Ñ"
msgid "event not found"
-msgstr "Ñобытие не найдено"
+msgstr "Событий не найдено"
msgid "appointment not found"
-msgstr "задача не найдена"
+msgstr "МероприÑтий не найдено"
-#, fuzzy
msgid "syntax error in bymonthday"
-msgstr "опечатка в запиÑи даты"
+msgstr "Ошибка при запиÑи Ð´Ð½Ñ Ð¼ÐµÑÑца."
-#, fuzzy
msgid "syntax error in bywday"
-msgstr "опечатка в запиÑи даты"
+msgstr "Ошибка при запиÑи Ð´Ð½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸."
-#, fuzzy
msgid "syntax error in bymonth"
-msgstr "опечатка в запиÑи даты"
+msgstr "Ошибка при запиÑи меÑÑца."
msgid "illegal bymonth value"
-msgstr ""
+msgstr "ÐедопуÑтимое значение Ð´Ð»Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑÑца."
msgid "syntax error in item date"
-msgstr "опечатка в запиÑи даты"
+msgstr "Ошибка при запиÑи даты."
msgid "date error in item exception"
-msgstr "ошибка даты в значении"
+msgstr "Ошибка в дате при обозначении иÑключений."
#, c-format
msgid "Error setting signal #%d : %s\n"
-msgstr "Сигнал ошибки наÑтройки #%d : %s\n"
+msgstr "Ошибка уÑтановки Ñигнала #%d : %s\n"
msgid "no note attached"
-msgstr "запиÑка отÑутÑтвует"
+msgstr "Заметка отÑутÑтвует"
msgid "no such todo"
-msgstr "дело не найдено"
+msgstr "Дел не найдено"
msgid "ERROR setting first day of week"
msgstr "ОШИБКРнаÑтройки первого Ð´Ð½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸"
msgid "The day you entered is not valid"
-msgstr "День введён вами Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹"
+msgstr "Введённые данные о желаемом дне не ÑвлÑÑŽÑ‚ÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼Ð¸."
#, c-format
msgid "Enter the day to go to [ENTER for today] : %s"
-msgstr "Переход на N-ый день [ENTER Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ днÑ] : %s"
+msgstr "Переход [Enter Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ днÑ] на n-ый день: %s"
#, c-format
msgid "The move failed (%d/%d/%d)."
-msgstr ""
+msgstr "Ошибка Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° (%d/%d/%d)."
#, c-format
msgid "Enter start date [%s] and/or time ([hh:mm] or [hhmm]):"
-msgstr "Введите дату начала [%s] и/или Ð²Ñ€ÐµÐ¼Ñ ([hh:mm] or [hhmm]):"
+msgstr "Введите дату [%s] и/или Ð²Ñ€ÐµÐ¼Ñ ([ЧЧ:ММ] или [ЧЧММ]) начала:"
msgid "Press [Enter] to continue"
-msgstr "Ðажмите [Enter]"
+msgstr "Ðажмите [Enter] Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ..."
msgid "Invalid date or time."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð° или времÑ."
+msgstr "Ðекорректно задано дата или времÑ."
msgid "Invalid time: start time must come before end time!"
-msgstr "Ðеверное времÑ: Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° должно идти до времени конца"
+msgstr ""
+"Ðекорректно задано времÑ: начальное Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ идти до времени окончаниÑ!"
#, c-format
msgid "Repetition must begin on start day (%s)."
-msgstr ""
+msgstr "Повторение должно начинатьÑÑ Ñ Ð¸Ð·Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ð¾ указанного Ð´Ð½Ñ (%s)."
msgid "Enter end date (and/or time) or duration ('?' for input formats):"
msgstr ""
-"Введите конечную дату (и/или времÑ) или продолжительноÑÑ‚ÑŒ ('?' Ñм. форматы):"
+"Введите дату Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ (и/или времÑ) или продолжительноÑÑ‚ÑŒ ('?' Ñм. Ñправку):"
#, c-format
msgid "Date: %s, year or month may be omitted."
-msgstr ""
+msgstr "Дата: %s, год или меÑÑц можно пропуÑтить."
msgid "Time: hh:mm (hh: or :mm) or hhmm. Duration: +mm, +hh:mm, +??d??h??m."
msgstr ""
-"ВремÑ: hh:mm (hh: или :mm) или hhmm. ПродолжительноÑÑ‚ÑŒ: +mm, +hh:mm, +??d??"
-"h??m."
+"ВремÑ: ЧЧ:ММ (ЧЧ: или :ММ) или ЧЧММ. ПродолжительноÑÑ‚ÑŒ: +ММ, +ЧЧ:ММ, +??д??"
+"ч??м"
msgid "Invalid time or duration."
-msgstr "Ðеверное Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð»Ð¸ продолжительноÑÑ‚ÑŒ."
+msgstr "Ðекорректно задано Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð»Ð¸ продолжительноÑÑ‚ÑŒ."
msgid "Invalid date: end time must come after start time."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°: конечное Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ идти поÑле начального времени."
+msgstr "Ðекорректно задана дата: окончание должно идти поÑле начала."
msgid "Enter the new item description:"
-msgstr "ОпиÑание: "
+msgstr "ОпиÑание:"
msgid "Exception days:"
-msgstr ""
+msgstr "ИÑключаемые дни:"
msgid "Invalid date format - try again:."
-msgstr "Ðеверный формат даты - попробуйте Ñнова:."
+msgstr "Ðекорректный формат даты - попробуйте Ñнова."
msgid "Limit repetition to listed days."
-msgstr ""
+msgstr "Ð’ краткой запиÑи обозначить по каким именно днÑм ограничить."
msgid "Expand repetition to listed days."
-msgstr ""
+msgstr "Ð’ краткой запиÑи обозначить по каким именно днÑм повторÑÑ‚ÑŒ."
msgid "Expand repetition to listed days, either all or 1st, 2nd, ... of month."
msgstr ""
+"ЧиÑленно обозначить по каким именно днÑм в меÑÑце повторÑÑ‚ÑŒ: 1 2 .. 22 .."
msgid "Note: limit to monthdays, if any."
-msgstr ""
+msgstr "Примечание: Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ конкретным днÑм меÑÑца (опционально)."
msgid "Expand repetition to listed days, either all or 1st, 2nd, ... of year."
msgstr ""
+"ЧиÑленно обозначить по каким именно днÑм в году повторÑÑ‚ÑŒ: 1 2 .. 322 .."
msgid "Note: expand to listed months, if any; limit to monthdays, if any."
msgstr ""
+"Примечание: раÑширить по меÑÑцам и/или ограничить по днÑм (опционально)."
msgid "Limit repetition to listed months."
-msgstr ""
+msgstr "ЧиÑленно обозначить по каким именно меÑÑцам ограничить."
msgid "Expand repetition to listed months."
-msgstr ""
+msgstr "ЧиÑленно обозначить по каким именно меÑÑцам повторÑÑ‚ÑŒ."
msgid "Limit repetition to listed days of month."
-msgstr ""
+msgstr "ЧиÑленно обозначить по каким именно днÑм в меÑÑце ограничить."
msgid "Expand repetition to listed days of month."
-msgstr ""
+msgstr "ЧиÑленно обозначить по каким именно днÑм в меÑÑце повторÑÑ‚ÑŒ."
#, c-format
msgid "Weekdays %s|..|%s, space-separated list, '?' for help:"
-msgstr ""
+msgstr "Задайте днÑми %s .. %s, разделÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼ ('?' Ñм. Ñправку):"
#, c-format
msgid ""
"Weekdays [n]%s|..|[n]%s, space-separated list, n=1,-1,..,5,-5, '?' for help:"
msgstr ""
+"Задайте днÑми [n]%s .. [n]%s (-5<=n<=5), разделÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼ ('?' Ñм. Ñправку):"
#, c-format
msgid ""
"Weekdays [n]%s|..|[n]%s, space-separated list, n=1,-1,..,53,-53, '?' for "
"help:"
msgstr ""
+"Задайте днÑми [n]%s .. [n]%s (-53<=n<=53), разделÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼ ('?' Ñм. "
+"Ñправку):"
msgid "Months 1|..|12, space-separated list, '?' for help:"
msgstr ""
+"Задайте меÑÑцы 1 2 .. n (1<=n<=12), разделÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼ ('?' Ñм. Ñправку):"
msgid "Monthdays 1|..|31 or -1|..|-31, space-separated list, '?' for help:"
msgstr ""
+"Задайте дни меÑÑца 1 2 .. 31 или -1 .. -31, разделÑÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð¾Ð¼ ('?' Ñм."
+"Ñправку):"
-#, fuzzy
msgid "Invalid format - try again."
-msgstr "Ðеверный формат даты - попробуйте Ñнова:."
+msgstr "Указан некорректный формат. ПожалуйÑта, попробуйте ещё раз."
-#, fuzzy
msgid "Press any key to continue."
msgstr "Ðажмите любую клавишу..."
msgid "Base period:"
-msgstr ""
+msgstr "Базовый период:"
-#, fuzzy
msgid "day"
-msgstr "СегоднÑ"
+msgstr "(d)день"
-#, fuzzy
msgid "week"
-msgstr "еженедельно"
+msgstr "(w)неделÑ"
-#, fuzzy
msgid "month"
-msgstr "ежемеÑÑчно"
+msgstr "(m)меÑÑц"
msgid "year"
-msgstr ""
+msgstr "(y)год"
msgid "[dwmy]"
-msgstr "[днмг]"
+msgstr "[dwmy]"
msgid "Frequency:"
-msgstr ""
+msgstr "ЧаÑтота повторов:"
msgid "Invalid frequency."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ‡Ð°Ñтота."
+msgstr "Указано некорректное значение Ð´Ð»Ñ Ñ‡Ð°Ñтоты повторов."
-#, fuzzy
msgid "Until date, increment or repeat count ('?' for input formats):"
-msgstr "Введите конечную дату или продолжительноÑÑ‚ÑŒ ('?' Ñм. форматы):"
+msgstr ""
+"Задайте дату Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€ÐµÐ½Ð¸Ð¹, период. или кол-во повтор. ('?' Ñм. "
+"Ñправку)"
#, c-format
msgid "Date: %s (year, month may be omitted, endless: 0)."
msgstr ""
+"Дата: %s (год, меÑÑц могут быть опущены или впиÑать \"0\" - беÑконечно)."
msgid "Increment: +?? (days) or: +??w??d (weeks). Repeat count: #?? (number)."
msgstr ""
+"ПовторÑÑ‚ÑŒ: +?? (дней) или: +??н??д (недель). Кол-во повторений: #?? (чиÑлом)"
-#, fuzzy, c-format
+#, c-format
msgid "Invalid date: until date must come after start date (%s)."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°: ÐºÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ð´Ð°Ñ‚Ð° должны идти поÑле начальной даты (%s)."
+msgstr "Дата Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° Ñледовать за датой начала (%s)."
msgid "Invalid date."
-msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°."
+msgstr "Указано некорректное значение даты."
msgid "Repeat count is too big."
-msgstr ""
+msgstr "Элементов в поÑледовательноÑти мероприÑтий Ñлишком много."
#, c-format
msgid "Repetition must begin on start day (%s); any change discarded."
-msgstr ""
+msgstr "ПоÑледовательноÑÑ‚ÑŒ должна идти от начала (%s); ÑÐ±Ñ€Ð¾Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹."
msgid "Description"
-msgstr "ОпиÑание"
+msgstr "опиÑание"
msgid "Repetition"
-msgstr "Повторение"
+msgstr "поÑлед."
msgid "Edit: "
-msgstr "Редактировать:"
+msgstr "Изм.:"
msgid "Start time"
-msgstr "Ðачальное времÑ"
+msgstr "начало"
msgid "End time"
-msgstr "Конечное времÑ"
+msgstr "окончание"
msgid "Move"
-msgstr "Вперёд"
+msgstr "Ñдвиг"
msgid "Pipe item to external command:"
-msgstr "Программный канал (pipe) во внешнюю команду:"
+msgstr "Передать Ñлемент во внешнюю команду:"
msgid "Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event:"
msgstr ""
-"Ðачало ([чч:мм] или [ччмм]). ОÑтавьте пуÑтым еÑли Ñобытие займёт веÑÑŒ день: "
+"Ðачало ([ЧЧ:ММ] или [ЧЧММ]). ОÑтавьте пуÑтым еÑли Ñобытие займёт веÑÑŒ день:"
msgid ""
"Enter end time as date (and/or time) or duration ('?' for input formats):"
msgstr ""
+"Введите дату Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ (и/или времÑ) или продолжительноÑÑ‚ÑŒ ('?' Ñм. Ñправку):"
msgid "Enter description:"
-msgstr "ОпиÑание: "
+msgstr "Введите опиÑание:"
#, c-format
msgid "Date: %s (and/or time), year or month may be omitted."
-msgstr ""
+msgstr "Дата: %s (и/или времÑ), год и меÑÑц можно опуÑтить."
msgid "Invalid start time."
-msgstr "Ðеверное начальное времÑ."
+msgstr "Указан некорректный формат Ð´Ð»Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ начала мероприÑтиÑ."
-#, fuzzy
msgid ""
"This item is recurrent and has a note attached to it. Delete (s)elected "
"occurrence, (a)ll occurrences, or just its (n)ote?"
-msgstr "Эта запиÑÑŒ Ñодержит заметку. Удалить (i)запиÑÑŒ или только (n)заметку ?"
+msgstr ""
+"ПоÑледов. мероприÑтий Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¾Ð¹. УдалÑем (s)одно, (a)вÑÑ‘ или (n)заметку?"
msgid "[san]"
-msgstr ""
+msgstr "[san]"
-#, fuzzy
msgid ""
"This item has a note attached to it. Delete (s)elected occurrence or just "
"its (n)ote?"
-msgstr "Эта запиÑÑŒ Ñодержит заметку. Удалить (i)запиÑÑŒ или только (n)заметку ?"
+msgstr "МероприÑтие Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¾Ð¹. УдалÑем вÑÑ‘ (s)выбранное или (n)заметку?"
msgid "[sn]"
-msgstr ""
+msgstr "[sn]"
-#, fuzzy
msgid ""
"This item is recurrent. Delete (s)elected occurrence or (a)ll occurrences?"
-msgstr ""
-"Эта запиÑÑŒ имеет повторениÑ. Удалить (a)вÑе подобные запиÑи или только "
-"(o)Ñту ?"
+msgstr "ПоÑледовательноÑÑ‚ÑŒ мероприÑтий. УдалÑем (s)одно или (a)вÑÑ‘?"
msgid "[sa]"
-msgstr ""
+msgstr "[sa]"
msgid "Confirm deletion. Delete (s)elected occurrence? Press (s) to confirm."
-msgstr ""
+msgstr "Подтвердите удаление. Удалить (s)выбранное?"
msgid "[s]"
-msgstr ""
+msgstr "[s]"
-#, fuzzy
msgid "Already repeated."
-msgstr "Эта запиÑÑŒ уже повторÑетÑÑ."
+msgstr "Уже повторÑетÑÑ."
msgid "A (s)imple or (a)dvanced repetition?"
-msgstr ""
+msgstr "ТребуетÑÑ (s)проÑтое или (a)замыÑловатое повторение?"
msgid "Enter the new TODO item:"
msgstr "Дело: "
msgid "Enter the TODO priority [0 (none), 1 (highest) - 9 (lowest)]:"
-msgstr "Введите приоритет Дела [0 (без приоритета), 1 (выÑокий) - 9 (низкий)]:"
+msgstr ""
+"Введите приоритет Ð´Ð»Ñ Ð”ÐµÐ»Ð° [0 (без приоритета), 1 (выÑокий), … , 9 (низкий)]:"
msgid "Do you really want to delete this task?"
msgstr "Удалить Ñту запиÑÑŒ?"
msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote?"
-msgstr "К делу прикреплена запиÑка. Удалить (t)дело или только (n)запиÑку ?"
+msgstr "К делу прикреплена заметка. Удалить вÑÑ‘ (t)дело или (n)заметку?"
msgid "[tn]"
msgstr "[tn]"
msgid "Enter the new TODO description:"
-msgstr "ОпиÑание дела: "
+msgstr "ОпиÑание Дела:"
msgid "TODO:"
-msgstr "Дело:"
+msgstr "Дела:"
#, c-format
msgid "Could not remove calcurse lock file: %s\n"
-msgstr "Ðевозможно удалить занÑтый файл: %s\n"
+msgstr "Ðевозможно удалить файл блокировки Ð´Ð»Ñ calcurse: %s\n"
msgid "/!\\ INTERNAL ERROR /!\\"
-msgstr "/!\\ INTERNAL ERROR /!\\"
+msgstr "/!\\ ÐЕПОÐЯТÐÐЯ ОШИБКР/!\\"
msgid "Please report the following bug:"
-msgstr "Сообщите об ошибке:"
+msgstr "ПожалуйÑта, Ñообщите об ошибке:"
msgid "[yn]"
msgstr "[yn]"
@@ -1811,57 +1844,62 @@ msgid "Press any key to continue..."
msgstr "Ðажмите любую клавишу..."
msgid "failure in mktime"
-msgstr "ошибка в mktime"
+msgstr "Сбой в mktime"
msgid "error in mktime"
-msgstr "ошибка в mktime"
+msgstr "Ошибка в mktime"
msgid "yes"
-msgstr "yes"
+msgstr "Да"
msgid "no"
-msgstr "no"
+msgstr "Ðет"
msgid "option not defined"
-msgstr "параметр не уÑтановлен"
+msgstr "ÐžÐ¿Ñ†Ð¸Ñ Ð½Ðµ определена"
#, c-format
msgid "temporary file \"%s\" could not be created"
-msgstr "временный файл \"%s\" не может быть Ñоздан"
+msgstr "Временный файл \"%s\" не может быть Ñоздан"
#, c-format
msgid "Error when closing file at %s"
-msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s"
+msgstr "Ошибка в процеÑÑе Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s"
msgid "No note file found\n"
msgstr "Файл Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¾Ð¹ не найден\n"
msgid "mm/dd/yyyy"
-msgstr "мм/дд/гггг"
+msgstr "ММ/ДД/ГГГГ"
msgid "dd/mm/yyyy"
-msgstr "дд/мм/гггг"
+msgstr "ДД/ММ/ГГГГ"
msgid "yyyy/mm/dd"
-msgstr "гггг/мм/дд"
+msgstr "ГГГГ/ММ/ДД"
msgid "yyyy-mm-dd"
-msgstr "гггг-мм-дд"
+msgstr "ГГГГ-ММ-ДД"
msgid "unknown panel"
-msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
+msgstr "ÐераÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]"
-msgstr "ИÑпользовать: calcurse-upgrade [-h|-v|--config <file>]"
+msgstr "ИÑпользуйте: calcurse-upgrade [ -h | -v | --config <file> ]"
msgid ""
"\n"
-"Copyright (c) 2004-2020 calcurse Development Team.\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
+"\n"
+"Copyright (c) 2004-2023 calcurse Development Team.\n"
+"Это Ñвободное программное обеÑпечение.\n"
+"Ð”Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÑƒÑловиÑми ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтого программного обеÑпечениÑ,\n"
+"ознакомьтеÑÑŒ Ñ Ð¸Ñходным кодом.\n"
msgid "unrecognized option:"
-msgstr "неизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ:"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ:"
msgid "Configuration file not found:"
msgstr "Файл конфигурации не найден:"
@@ -1873,7 +1911,7 @@ msgid "Create temporary backup of the configuration file..."
msgstr "Создать временную архивную копию файла конфигурации..."
msgid "Old backup file found:"
-msgstr "Предыдущий файл архивной копии найден:"
+msgstr "ÐÐ°Ð¹Ð´ÐµÐ½Ð½Ð°Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð° данных:"
msgid ""
"\n"
@@ -1881,14 +1919,14 @@ msgid ""
"configuration from this backup and then remove the backup file."
msgstr ""
"\n"
-"ЕÑли Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ðµ завершилаÑÑŒ, воÑÑтановите вашу конфигурацию "
-"из Ñтого архивного файла, затем его удалив."
+"ЕÑли Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ðµ завершилаÑÑŒ,\n"
+"воÑÑтановите вашу конфигурацию из Ñтого архивного файла, затем его удалив."
msgid "done"
-msgstr "завершено"
+msgstr "Готово"
msgid "Old temporary file found:"
-msgstr "Обнаружен предыдущий временный файл данных:"
+msgstr "Ðайденный предыдущий временный файл:"
msgid ""
"\n"
@@ -1897,84 +1935,11 @@ msgid ""
"start over with a backup of your old configuration file."
msgstr ""
"\n"
-"ЕÑли Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ðµ завершилаÑÑŒ, удалите файл и попробуйте Ñнова, "
-"иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ñ‹Ð¹ файл Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ конфигурацией."
+"ЕÑли Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð½Ðµ завершилаÑÑŒ, удалите файл и\n"
+"попробуйте Ñнова, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ñ‹Ð¹ файл Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ конфигурацией."
msgid "Upgrade configuration directives..."
msgstr "Обновление конфигурации..."
msgid "Remove temporary backup..."
-msgstr "Удалить временный архивный файл..."
-
-#~ msgid ""
-#~ "(if set to YES, messages about loaded and saved data will be displayed)"
-#~ msgstr "(yes/no) Отображение ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ загрузке и Ñохранении данных"
-
-#~ msgid "date error in the event\n"
-#~ msgstr "ошибка даты в Ñобытии\n"
-
-#~ msgid "recurrence frequency not recognized."
-#~ msgstr "Ñ€ÐµÐºÑƒÑ€Ñ€ÐµÐ½Ñ‚Ð½Ð°Ñ Ñ‡Ð°Ñтота не раÑпознана"
-
-#~ msgid "item has a negative duration."
-#~ msgstr "значение имеет отрицательную продолжительноÑÑ‚ÑŒ."
-
-#~ msgid "item duration malformed."
-#~ msgstr "значение продолжительноÑти повреждено."
-
-#~ msgid "Welcome to Calcurse. Missing data files were created."
-#~ msgstr ""
-#~ "Добро пожаловать в Calcurse. ОтÑутÑтвующие файлы данных будут Ñозданы."
-
-#~ msgid "Data files found. Data will be loaded now."
-#~ msgstr "Данные найдены и будут загружены"
-
-#~ msgid "error while launching command: could not fork"
-#~ msgstr "ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿ÑƒÑка команды: невозможно разделитьÑÑ (fork)"
-
-#~ msgid "error while launching command"
-#~ msgstr "ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿ÑƒÑка команды"
-
-#~ msgid "unknown repetition type"
-#~ msgstr "неизвеÑтный тип повторениÑ"
-
-#~ msgid "Enter the new repetition type:"
-#~ msgstr "Введите тип повторениÑ:"
-
-#~ msgid "(d)aily"
-#~ msgstr "(d)ежедневно"
-
-#~ msgid "(w)eekly"
-#~ msgstr "(w)еженедельно"
-
-#~ msgid "(m)onthly"
-#~ msgstr "(m)ежемеÑÑчно"
-
-#~ msgid "(y)early"
-#~ msgstr "(y)ежегодно"
-
-#, c-format
-#~ msgid "(currently using %s)"
-#~ msgstr "(иÑпользуетÑÑ %s)"
-
-#~ msgid "Enter the repetition frequency:"
-#~ msgstr "Введите чаÑтоту повторениÑ:"
-
-#~ msgid "Duration in days: +dd. Duration in weeks and days: +??w??d."
-#~ msgstr ""
-#~ "ПродолжительноÑÑ‚ÑŒ в днÑÑ…: +dd. ПродолжительноÑÑ‚ÑŒ в неделÑÑ… и днÑÑ…: +??w??d"
-
-#~ msgid "Do you really want to delete this item?"
-#~ msgstr "Удалить?"
-
-#~ msgid "[ao]"
-#~ msgstr "[ао]"
-
-#~ msgid "[in]"
-#~ msgstr "[в]"
-
-#~ msgid "Enter the repetition type:"
-#~ msgstr "Ðазначить тип повторениÑ:"
-
-#~ msgid "wrong item type"
-#~ msgstr "неправильный тип запиÑи"
+msgstr "Удаление временной копии архива данных..."
diff --git a/scripts/calcurse-upgrade.sh.in b/scripts/calcurse-upgrade.sh.in
index c9c9c78..b6a7438 100644
--- a/scripts/calcurse-upgrade.sh.in
+++ b/scripts/calcurse-upgrade.sh.in
@@ -15,7 +15,7 @@ if [ "$#" -gt 0 ]; then
elif [ "$1" = "-v" -o "$1" = "--version" ]; then
echo "calcurse-upgrade @PACKAGE_VERSION@"
echo "$(gettext "
-Copyright (c) 2004-2020 calcurse Development Team.
+Copyright (c) 2004-2023 calcurse Development Team.
This is free software; see the source for copying conditions.
")"
else
diff --git a/src/apoint.c b/src/apoint.c
index b4e8f2e..e138e5e 100644
--- a/src/apoint.c
+++ b/src/apoint.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/args.c b/src/args.c
index c66c724..57cbe63 100644
--- a/src/args.c
+++ b/src/args.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@ static void version_arg(void)
{
printf(_("calcurse %s -- text-based organizer\n"), VERSION);
putchar('\n');
- printf("%s\n", _("Copyright (c) 2004-2020 calcurse Development Team."));
+ printf("%s\n", _("Copyright (c) 2004-2023 calcurse Development Team."));
printf("%s\n", _("This is free software; see the source for copying conditions."));
}
diff --git a/src/calcurse.c b/src/calcurse.c
index 308a332..c89d1dd 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,37 +41,6 @@
#define HANDLE_KEY(key, fn) case key: fn(); break;
int count, reg;
-/*
- * Store events and appointments for a range of days in the day vector -
- * beginning with the selected day - and load them into the APP listbox. If no
- * day-change occurs, reset the selected APP item and with it the selected day,
- * thereby storing and loading the same range of days.
- */
-static void do_storage(int day_changed)
-{
- int pre_sel;
- /*
- * Save the selected item before rebuilding the day vector -
- * unless a preselection is already set.
- */
- if (!(pre_sel = day_check_sel_data()))
- day_set_sel_data(ui_day_get_sel());
-
- if (!day_changed)
- ui_day_sel_reset();
-
- /* The day_items vector. */
- day_store_items(get_slctd_day(), 1, day_get_days());
- /* The APP listbox. */
- ui_day_load_items();
-
- if (day_changed && !pre_sel)
- ui_day_sel_reset();
- else
- ui_day_find_sel();
-
- day_set_sel_data(&empty_day);
-}
static inline void key_generic_change_view(void)
{
@@ -98,7 +67,7 @@ static inline void key_generic_goto(void)
wins_erase_status_bar();
ui_calendar_set_current_date();
ui_calendar_change_day(conf.input_datefmt);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
}
@@ -107,7 +76,7 @@ static inline void key_generic_goto_today(void)
wins_erase_status_bar();
ui_calendar_set_current_date();
ui_calendar_goto_today();
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
}
@@ -125,14 +94,14 @@ static inline void key_generic_config_menu(void)
wins_erase_status_bar();
wins_reset_status_page();
custom_config_main();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_ALL);
}
static inline void key_generic_add_appt(void)
{
ui_day_item_add();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
}
@@ -148,7 +117,7 @@ static inline void key_add_item(void)
case APP:
case CAL:
ui_day_item_add();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
break;
case TOD:
@@ -164,7 +133,7 @@ static inline void key_edit_item(void)
{
if (wins_slctd() == APP && !event_dummy(ui_day_get_sel())) {
ui_day_item_edit();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
} else if (wins_slctd() == TOD) {
ui_todo_edit();
@@ -176,7 +145,7 @@ static inline void key_del_item(void)
{
if (wins_slctd() == APP && !event_dummy(ui_day_get_sel())) {
ui_day_item_delete(reg);
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
} else if (wins_slctd() == TOD) {
ui_todo_delete();
@@ -194,7 +163,7 @@ static inline void key_generic_paste(void)
{
if (wins_slctd() == APP) {
ui_day_item_paste(reg);
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP);
}
}
@@ -203,7 +172,7 @@ static inline void key_repeat_item(void)
{
if (wins_slctd() == APP && !event_dummy(ui_day_get_sel())) {
ui_day_item_repeat();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
}
}
@@ -212,7 +181,7 @@ static inline void key_flag_item(void)
{
if (wins_slctd() == APP && !event_dummy(ui_day_get_sel())) {
ui_day_flag();
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_APP);
} else if (wins_slctd() == TOD) {
ui_todo_flag();
@@ -251,7 +220,7 @@ static inline void key_edit_note(void)
{
if (wins_slctd() == APP && !event_dummy(ui_day_get_sel())) {
ui_day_edit_note();
- do_storage(0);
+ day_do_storage(0);
} else if (wins_slctd() == TOD) {
ui_todo_edit_note();
}
@@ -291,7 +260,7 @@ static inline void key_generic_save(void)
if (ret == IO_SAVE_RELOAD) {
ui_todo_load_items();
ui_todo_sel_reset();
- do_storage(0);
+ day_do_storage(0);
notify_check_next_app(1);
ui_calendar_monthly_view_cache_set_invalid();
}
@@ -326,7 +295,7 @@ static inline void key_generic_reload(void)
ret == IO_RELOAD_MERGE) {
ui_todo_load_items();
ui_todo_sel_reset();
- do_storage(0);
+ day_do_storage(0);
notify_check_next_app(1);
ui_calendar_monthly_view_cache_set_invalid();
}
@@ -356,7 +325,7 @@ static inline void key_generic_import(void)
wins_erase_status_bar();
io_import_data(IO_IMPORT_ICAL, NULL, NULL, NULL, NULL, NULL, NULL);
ui_calendar_monthly_view_cache_set_invalid();
- do_storage(0);
+ day_do_storage(0);
ui_todo_load_items();
wins_update(FLAG_ALL);
}
@@ -381,14 +350,14 @@ static inline void key_generic_export()
break;
}
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_ALL);
}
static inline void key_generic_prev_day(void)
{
ui_calendar_move(DAY_PREV, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -401,7 +370,7 @@ static inline void key_move_left(void)
static inline void key_generic_next_day(void)
{
ui_calendar_move(DAY_NEXT, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -414,7 +383,7 @@ static inline void key_move_right(void)
static inline void key_generic_prev_week(void)
{
ui_calendar_move(WEEK_PREV, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -425,7 +394,7 @@ static inline void key_move_up(void)
} else if (wins_slctd() == APP) {
if (!ui_day_sel_move(-1)) {
ui_calendar_move(DAY_PREV, 1);
- do_storage(1);
+ day_do_storage(1);
ui_day_sel_dayend();
}
wins_update(FLAG_APP | FLAG_CAL);
@@ -438,7 +407,7 @@ static inline void key_move_up(void)
static inline void key_generic_next_week(void)
{
ui_calendar_move(WEEK_NEXT, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -449,7 +418,7 @@ static inline void key_move_down(void)
} else if (wins_slctd() == APP) {
if (!ui_day_sel_move(1)) {
ui_calendar_move(DAY_PREV, day_get_days() - 2);
- do_storage(1);
+ day_do_storage(1);
ui_day_sel_daybegin(day_get_days() - 1);
}
wins_update(FLAG_APP | FLAG_CAL);
@@ -462,28 +431,28 @@ static inline void key_move_down(void)
static inline void key_generic_prev_month(void)
{
ui_calendar_move(MONTH_PREV, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
static inline void key_generic_next_month(void)
{
ui_calendar_move(MONTH_NEXT, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
static inline void key_generic_prev_year(void)
{
ui_calendar_move(YEAR_PREV, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
static inline void key_generic_next_year(void)
{
ui_calendar_move(YEAR_NEXT, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -491,7 +460,7 @@ static inline void key_start_of_week(void)
{
if (wins_slctd() == CAL) {
ui_calendar_move(WEEK_START, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
}
@@ -500,7 +469,7 @@ static inline void key_end_of_week(void)
{
if (wins_slctd() == CAL) {
ui_calendar_move(WEEK_END, count);
- do_storage(1);
+ day_do_storage(1);
wins_update(FLAG_CAL | FLAG_APP);
}
}
@@ -657,7 +626,7 @@ static inline void key_generic_cmd(void)
item->order = next;
ui_calendar_set_slctd_day(sec2date(next));
day_set_sel_data(item);
- do_storage(1);
+ day_do_storage(1);
valid = 1;
}
@@ -702,7 +671,7 @@ static inline void key_generic_cmd(void)
item->order = prev;
ui_calendar_set_slctd_day(sec2date(prev));
day_set_sel_data(item);
- do_storage(1);
+ day_do_storage(1);
valid = 1;
}
@@ -812,7 +781,7 @@ int main(int argc, char **argv)
*/
wins_wrefresh(win[KEY].p);
ui_calendar_monthly_view_cache_set_invalid();
- do_storage(1);
+ day_do_storage(1);
ui_todo_load_items();
ui_todo_sel_reset();
wins_update(FLAG_ALL);
@@ -832,7 +801,7 @@ int main(int argc, char **argv)
que_show();
if (conf.systemevents) {
que_save();
- do_storage(0);
+ day_do_storage(0);
}
wins_update(FLAG_ALL);
que_rem();
@@ -842,7 +811,7 @@ int main(int argc, char **argv)
resize = 0;
wins_reset();
if (conf.multiple_days) {
- do_storage(0);
+ day_do_storage(0);
wins_update(FLAG_APP);
}
}
diff --git a/src/calcurse.h b/src/calcurse.h
index db8dd51..8322416 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -307,6 +307,7 @@ struct conf {
};
#define EMPTY_DAY_DEFAULT "--"
+#define EMPTY_EVENT_DESC_DEFAULT _("(empty description)")
/* Daemon-related configuration. */
struct dmon_conf {
@@ -857,6 +858,7 @@ void day_display_item_date(struct day_item *, WINDOW *, int, time_t, int, int);
void day_display_item(struct day_item *, WINDOW *, int, int, int, int);
void day_write_stdout(time_t, const char *, const char *, const char *,
const char *, int *);
+void day_do_storage(int day_changed);
void day_popup_item(struct day_item *);
int day_check_if_item(struct date);
unsigned day_chk_busy_slices(struct date, int, int *);
diff --git a/src/config.c b/src/config.c
index 3627cb8..4e0f7db 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/custom.c b/src/custom.c
index 744f9f9..2cd385c 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1242,7 +1242,7 @@ void custom_config_main(void)
old_layout = wins_layout();
custom_layout_config();
if (wins_layout() != old_layout)
- wins_reset();
+ wins_resize();
break;
case 'G':
case 'g':
@@ -1268,7 +1268,11 @@ void custom_config_main(void)
resize = 0;
wins_reset();
}
-
+
+ /* needed to update app list */
+ day_do_storage(0);
+
+ /* wins_update(FLAG_ALL), but with custom bindings */
wins_set_bindings(bindings, ARRAY_SIZE(bindings));
wins_update_border(FLAG_ALL);
wins_update_panels(FLAG_ALL);
diff --git a/src/day.c b/src/day.c
index 6a18dc1..78f4acf 100644
--- a/src/day.c
+++ b/src/day.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ static struct day_item sel_data = { 0, 0, 0, {NULL}};
/*
* Save the item to become the selected APP item.
- * Public function used to override the setting in do_storage().
+ * Public function used to override the setting in day_do_storage().
*/
int day_set_sel_data(struct day_item *d)
{
@@ -198,7 +198,8 @@ static void day_add_item(int type, time_t start, time_t order, union aptev_ptr i
/* Get the message of an item. */
char *day_item_get_mesg(struct day_item *day)
{
- switch (day->type) {
+ switch (day->type)
+ {
case APPT:
return day->item.apt->mesg;
case EVNT:
@@ -212,6 +213,15 @@ char *day_item_get_mesg(struct day_item *day)
}
}
+/* Get the display message of an item. */
+char *day_item_get_display_mesg(struct day_item *day)
+{
+ char *msg = day_item_get_mesg(day);
+ if (msg[0] == '\0')
+ return EMPTY_EVENT_DESC_DEFAULT;
+ return msg;
+}
+
/* Get the note attached to an item. */
char *day_item_get_note(struct day_item *day)
{
@@ -529,7 +539,7 @@ day_display_item(struct day_item *day, WINDOW *win, int incolor, int width,
if (width <= 0)
return;
- char *mesg = day_item_get_mesg(day);
+ char *mesg = day_item_get_display_mesg(day);
ch_recur = (day->type == RECUR_EVNT) ? '*' : ' ';
ch_note = day_item_get_note(day) ? '>' : ' ';
@@ -578,6 +588,38 @@ void day_write_stdout(time_t date, const char *fmt_apt, const char *fmt_rapt,
}
}
+/*
+ * Store events and appointments for a range of days in the day vector -
+ * beginning with the selected day - and load them into the APP listbox. If no
+ * day-change occurs, reset the selected APP item and with it the selected day,
+ * thereby storing and loading the same range of days.
+ */
+void day_do_storage(int day_changed)
+{
+ int pre_sel;
+ /*
+ * Save the selected item before rebuilding the day vector -
+ * unless a preselection is already set.
+ */
+ if(!(pre_sel = day_check_sel_data()))
+ day_set_sel_data(ui_day_get_sel());
+
+ if (!day_changed)
+ ui_day_sel_reset();
+
+ /* The day_items vector. */
+ day_store_items(get_slctd_day(), 1, day_get_days());
+ /* The APP listbox. */
+ ui_day_load_items();
+
+ if (day_changed && !pre_sel)
+ ui_day_sel_reset();
+ else
+ ui_day_find_sel();
+
+ day_set_sel_data(&empty_day);
+}
+
/* Display an item inside a popup window. */
void day_popup_item(struct day_item *day)
{
@@ -592,15 +634,19 @@ void day_popup_item(struct day_item *day)
asprintf(&notepath, "%s%s", path_notes, day_item_get_note(day));
fp = fopen(notepath, "r");
+ if (fp == NULL) {
+ item_in_popup(NULL, NULL, day_item_get_mesg(day), _("Event:"));
+ return;
+ }
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);
- asprintf(&msg, "%s\n\n%s\n%s", day_item_get_mesg(day), note_heading, note);
+ asprintf(&msg, "%s\n\n%s\n%s", day_item_get_display_mesg(day), note_heading, note);
item_in_popup(NULL, NULL, msg, _("Event:"));
mem_free(msg);
} else {
- item_in_popup(NULL, NULL, day_item_get_mesg(day), _("Event:"));
+ item_in_popup(NULL, NULL, day_item_get_display_mesg(day), _("Event:"));
}
} else if (day->type == APPT || day->type == RECUR_APPT) {
char a_st[100], a_end[100];
@@ -619,15 +665,19 @@ void day_popup_item(struct day_item *day)
asprintf(&notepath, "%s%s", path_notes, day_item_get_note(day));
fp = fopen(notepath, "r");
+ if (fp == NULL) {
+ item_in_popup(a_st, a_end, day_item_get_mesg(day), _("Appointment:"));
+ return;
+ }
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);
- asprintf(&msg, "%s\n\n%s\n%s", day_item_get_mesg(day), note_heading, note);
+ asprintf(&msg, "%s\n\n%s\n%s", day_item_get_display_mesg(day), note_heading, note);
item_in_popup(a_st, a_end, msg, _("Appointment:"));
mem_free(msg);
} else {
- item_in_popup(a_st, a_end, day_item_get_mesg(day), _("Appointment:"));
+ item_in_popup(a_st, a_end, day_item_get_display_mesg(day), _("Appointment:"));
}
} else {
EXIT(_("unknown item type"));
diff --git a/src/dmon.c b/src/dmon.c
index e61caf5..cb51de7 100644
--- a/src/dmon.c
+++ b/src/dmon.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
#define DMON_ABRT(...) do { \
DMON_LOG (__VA_ARGS__); \
- if (kill (getpid (), SIGINT) < 0) \
+ if (kill (getpid (), SIGINT) == -1) \
{ \
DMON_LOG (_("Could not stop daemon properly: %s\n"), \
strerror (errno)); \
diff --git a/src/event.c b/src/event.c
index e0da4c1..7c371e4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/getstring.c b/src/getstring.c
index 74c251e..8ea5df5 100644
--- a/src/getstring.c
+++ b/src/getstring.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/help.c b/src/help.c
index ffad2ea..3f2c94f 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/hooks.c b/src/hooks.c
index 7bfd548..f649076 100644
--- a/src/hooks.c
+++ b/src/hooks.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/htable.h b/src/htable.h
index 5266213..92be6e2 100644
--- a/src/htable.h
+++ b/src/htable.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/ical.c b/src/ical.c
index 7c3768e..a8ce0a4 100644
--- a/src/ical.c
+++ b/src/ical.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -214,7 +214,8 @@ static void ical_export_note(FILE *stream, char *name)
asprintf(&note_file, "%s/%s", path_notes, name);
if (!(fp = fopen(note_file, "r")) || ungetc(getc(fp), fp) == EOF) {
- fclose(fp);
+ if (fp)
+ fclose(fp);
return;
}
string_init(&note);
@@ -520,6 +521,10 @@ ical_store_event(char *mesg, char *note, time_t day, time_t end,
struct event *ev;
struct recur_event *rev;
+ if (!mesg)
+ mesg = mem_strdup(_("(empty)"));
+ EXIT_IF(!mesg, _("ical_store_event: out of memory"));
+
/*
* Repeating event. The end day is ignored, and the event becomes
* one-day even if multi-day.
@@ -572,6 +577,10 @@ ical_store_apoint(char *mesg, char *note, time_t start, long dur,
struct recur_apoint *rapt;
time_t day;
+ if (!mesg)
+ mesg = mem_strdup(_("(empty)"));
+ EXIT_IF(!mesg, _("ical_store_event: out of memory"));
+
if (has_alarm)
state |= APOINT_NOTIFY;
if (rpt) {
@@ -682,7 +691,7 @@ static int ical_readline(FILE * fdi, char *buf, char *lstore, unsigned *ln)
while (fgets(lstore, BUFSIZ, fdi) != NULL) {
(*ln)++;
if ((eol = strchr(lstore, '\n')) != NULL) {
- if (*(eol - 1) == '\r')
+ if (strlen(lstore) > 1 && *(eol - 1) == '\r')
*(eol - 1) = '\0';
else
*eol = '\0';
@@ -1331,12 +1340,9 @@ static char *ical_read_summary(char *line, unsigned *noskipped,
}
/* An event summary is one line only. */
- if (strchr(summary, '\n')) {
- ical_log(log, item_type, itemline, _("line break in summary."));
- (*noskipped)++;
- mem_free(summary);
- summary = NULL;
- }
+ for (p = summary; *p; p++)
+ if (*p == '\n')
+ *p = ' ';
leave:
return summary;
}
diff --git a/src/io.c b/src/io.c
index 43a8390..d596aab 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/keys.c b/src/keys.c
index 7c57c38..a5e9470 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -162,6 +162,47 @@ static struct keydef_s keydef[NBVKEYS] = {
*/
static char *keynames[KEY_MAX];
+/* Maps a key code to a custom key name */
+struct custom_keyname_s {
+ int keycode;
+ char* keyname;
+};
+
+#define CUSTOM_KEYS 26
+
+/*
+ * Customized key names with calcurse short forms
+ */
+static struct custom_keyname_s custom_keynames[CUSTOM_KEYS] = {
+ { TAB, "TAB" },
+ { RETURN, "RET" },
+ { ESCAPE, "ESC" },
+ { SPACE, "SPC" },
+ { KEY_UP, "UP" },
+ { KEY_DOWN, "DWN" },
+ { KEY_LEFT, "LFT" },
+ { KEY_RIGHT, "RGT" },
+ { KEY_HOME, "HOM" },
+ { KEY_END, "END" },
+ { KEY_NPAGE, "PgD" },
+ { KEY_PPAGE, "PgU" },
+ { KEY_IC, "INS" },
+ { KEY_DC, "DEL" },
+ { KEY_F(1), "F1" },
+ { KEY_F(2), "F2" },
+ { KEY_F(3), "F3" },
+ { KEY_F(4), "F4" },
+ { KEY_F(5), "F5" },
+ { KEY_F(6), "F6" },
+ { KEY_F(7), "F7" },
+ { KEY_F(8), "F8" },
+ { KEY_F(9), "F9" },
+ { KEY_F(10), "F10" },
+ { KEY_F(11), "F11" },
+ { KEY_F(12), "F12" },
+};
+
+
static void dump_intro(FILE * fd)
{
const char *intro =
@@ -175,6 +216,16 @@ static void dump_intro(FILE * fd)
fprintf(fd, "%s\n", intro);
}
+static bool is_customized(int c) {
+ int i;
+
+ for (i = 0; i < CUSTOM_KEYS; i++)
+ if (c == custom_keynames[i].keycode)
+ return true;
+
+ return false;
+}
+
void keys_init(void)
{
int i;
@@ -193,40 +244,20 @@ void keys_init(void)
/* Insertion of ncurses names in the ASCII range ... */
for (i = 1; i < 128; i++)
- if ((cp = keyname(i)))
- keynames[i] = mem_strdup(cp);
+ if (!is_customized(i))
+ if ((cp = keyname(i)))
+ keynames[i] = mem_strdup(cp);
+
/* ... and for the ncurses pseudo-characters. */
for (i = KEY_MIN; i < KEY_MAX; i++)
- if ((cp = keyname(i)))
- keynames[i] = mem_strdup(cp);
+ if (!is_customized(i))
+ if ((cp = keyname(i)))
+ keynames[i] = mem_strdup(cp);
/* Replace some with calcurse short forms. */
- keynames[TAB] = "TAB";
- keynames[RETURN] = "RET";
- keynames[ESCAPE] = "ESC";
- keynames[SPACE] = "SPC";
- keynames[KEY_UP] = "UP";
- keynames[KEY_DOWN] = "DWN";
- keynames[KEY_LEFT] = "LFT";
- keynames[KEY_RIGHT] = "RGT";
- keynames[KEY_HOME] = "HOM";
- keynames[KEY_END] = "END";
- keynames[KEY_NPAGE] = "PgD";
- keynames[KEY_PPAGE] = "PgU";
- keynames[KEY_IC] = "INS";
- keynames[KEY_DC] = "DEL";
- keynames[KEY_F(1)] = "F1";
- keynames[KEY_F(2)] = "F2";
- keynames[KEY_F(3)] = "F3";
- keynames[KEY_F(4)] = "F4";
- keynames[KEY_F(5)] = "F5";
- keynames[KEY_F(6)] = "F6";
- keynames[KEY_F(7)] = "F7";
- keynames[KEY_F(8)] = "F8";
- keynames[KEY_F(9)] = "F9";
- keynames[KEY_F(10)] = "F10";
- keynames[KEY_F(11)] = "F11";
- keynames[KEY_F(12)] = "F12";
+ for (i = 0; i < CUSTOM_KEYS; i++) {
+ keynames[custom_keynames[i].keycode] = custom_keynames[i].keyname;
+ }
}
static void key_free(char *s)
diff --git a/src/listbox.c b/src/listbox.c
index 2b39aa8..d86f540 100644
--- a/src/listbox.c
+++ b/src/listbox.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/llist.c b/src/llist.c
index 04f16a1..d31f004 100644
--- a/src/llist.c
+++ b/src/llist.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/llist.h b/src/llist.h
index 1f7f419..0dd15bf 100644
--- a/src/llist.h
+++ b/src/llist.h
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/llist_ts.h b/src/llist_ts.h
index 1604d3e..a4b6184 100644
--- a/src/llist_ts.h
+++ b/src/llist_ts.h
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/mem.c b/src/mem.c
index 8b8a5d5..ce3cf80 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/note.c b/src/note.c
index 4f20d9d..655ad89 100644
--- a/src/note.c
+++ b/src/note.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/notify.c b/src/notify.c
index 3491e8e..6eda361 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/pcal.c b/src/pcal.c
index 16c3b9f..435656a 100644
--- a/src/pcal.c
+++ b/src/pcal.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/queue.c b/src/queue.c
index a00ebad..41cb69b 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/recur.c b/src/recur.c
index 72cb40f..10523ad 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -253,8 +253,13 @@ void recur_apoint_free(struct recur_apoint *rapt)
mem_free(rapt->mesg);
if (rapt->note)
mem_free(rapt->note);
- if (rapt->rpt)
+ if (rapt->rpt) {
+ recur_free_exc_list(&rapt->rpt->exc);
+ recur_free_int_list(&rapt->rpt->bywday);
+ recur_free_int_list(&rapt->rpt->bymonth);
+ recur_free_int_list(&rapt->rpt->bymonthday);
mem_free(rapt->rpt);
+ }
recur_free_exc_list(&rapt->exc);
mem_free(rapt);
}
@@ -264,8 +269,13 @@ void recur_event_free(struct recur_event *rev)
mem_free(rev->mesg);
if (rev->note)
mem_free(rev->note);
- if (rev->rpt)
+ if (rev->rpt) {
+ recur_free_exc_list(&rev->rpt->exc);
+ recur_free_int_list(&rev->rpt->bywday);
+ recur_free_int_list(&rev->rpt->bymonth);
+ recur_free_int_list(&rev->rpt->bymonthday);
mem_free(rev->rpt);
+ }
recur_free_exc_list(&rev->exc);
mem_free(rev);
}
@@ -1003,14 +1013,20 @@ static int find_occurrence(time_t start, long dur, struct rpt *rpt, llist_t *exc
if (rpt->until && t >= NEXTDAY(rpt->until))
return 0;
- /* Does it span the given day? */
- if (t + DUR(t) < day)
+ /* Does it span the given day?
+ *
+ * NOTE: An appointment ending at 00:00 is not considered to span the
+ * given day, unless the appointment is an appointment without
+ * specified end time, which is internally treated as appointment with
+ * duration 0.
+ */
+ if (t + DUR(t) >= day || (t == day && dur == 0)) {
+ if (occurrence)
+ *occurrence = t;
+ return 1;
+ } else {
return 0;
-
- if (occurrence)
- *occurrence = t;
-
- return 1;
+ }
}
#undef DUR
diff --git a/src/sha1.c b/src/sha1.c
index 3826c76..6ab63f8 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
#include <stdlib.h>
#include <string.h>
+#include "config.h"
#include "sha1.h"
#define rol(val, n) (((val) << (n)) | ((val) >> (32 - (n))))
diff --git a/src/sha1.h b/src/sha1.h
index bdba4e8..25d60b9 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,6 @@ typedef struct {
void sha1_init(sha1_ctx_t *);
void sha1_update(sha1_ctx_t *, const uint8_t *, unsigned int);
-void sha1_final(sha1_ctx_t *, uint8_t *);
+void sha1_final(sha1_ctx_t *, uint8_t[SHA1_DIGESTLEN]);
void sha1_digest(const char *, char *);
void sha1_stream(FILE *, char *);
diff --git a/src/sigs.c b/src/sigs.c
index fab4498..9320652 100644
--- a/src/sigs.c
+++ b/src/sigs.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/strings.c b/src/strings.c
index b3dc1c4..ed90bc7 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,7 @@ int string_vcatf(struct string *sb, const char *format, va_list ap)
ap2);
}
sb->len += n;
+ va_end(ap2);
return n;
}
diff --git a/src/todo.c b/src/todo.c
index 932e02a..9bd8f8a 100644
--- a/src/todo.c
+++ b/src/todo.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/ui-calendar.c b/src/ui-calendar.c
index f69ea4c..c1719d8 100644
--- a/src/ui-calendar.c
+++ b/src/ui-calendar.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -560,9 +560,8 @@ draw_weekly_view(struct scrollwin *sw, struct date *current_day)
if (j != WEEKINDAYS - 1
&& i != DAYSLICESNO - 1) {
WINS_CALENDAR_LOCK;
- mvwhline(sw->inner, OFFY + 2 + i,
- OFFX + 3 + 4 * j, ACS_S9,
- 2);
+ mvwaddstr(sw->inner, OFFY + 2 + i,
+ OFFX + 3 + 4 * j, "__");
WINS_CALENDAR_UNLOCK;
}
if (slices[i]) {
@@ -593,9 +592,9 @@ draw_weekly_view(struct scrollwin *sw, struct date *current_day)
/* Draw marks to indicate midday on the sides of the calendar. */
WINS_CALENDAR_LOCK;
custom_apply_attr(sw->inner, ATTR_HIGHEST);
- mvwhline(sw->inner, OFFY + 1 + DAYSLICESNO / 2, OFFX, ACS_S9, 1);
- mvwhline(sw->inner, OFFY + 1 + DAYSLICESNO / 2,
- OFFX + WCALWIDTH - 1, ACS_S9, 1);
+ mvwaddch(sw->inner, OFFY + 1 + DAYSLICESNO / 2, OFFX, '<');
+ mvwaddch(sw->inner, OFFY + 1 + DAYSLICESNO / 2,
+ OFFX + WCALWIDTH - 1, '>');
custom_remove_attr(sw->inner, ATTR_HIGHEST);
WINS_CALENDAR_UNLOCK;
diff --git a/src/ui-day.c b/src/ui-day.c
index 0bd82bb..6a038fa 100644
--- a/src/ui-day.c
+++ b/src/ui-day.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/ui-todo.c b/src/ui-todo.c
index cad89fd..46933b3 100644
--- a/src/ui-todo.c
+++ b/src/ui-todo.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -207,14 +207,16 @@ void ui_todo_draw(int n, WINDOW *win, int y, int hilt, void *cb_data)
if (hilt)
custom_apply_attr(win, ATTR_HIGHEST);
- if (utf8_strwidth(todo->mesg) < width) {
- mesg = todo->mesg;
- } else {
+ mesg = todo->mesg;
+ if (mesg[0] == '\0')
+ mesg = EMPTY_EVENT_DESC_DEFAULT;
+
+ if (utf8_strwidth(mesg) >= width) {
width -= 3;
- for (j = 0; todo->mesg[j] && width > 0; j++) {
- if (!UTF8_ISCONT(todo->mesg[j]))
- width -= utf8_width(&todo->mesg[j]);
- buf[j] = todo->mesg[j];
+ for (j = 0; mesg[j] && width > 0; j++) {
+ if (!UTF8_ISCONT(mesg[j]))
+ width -= utf8_width(&mesg[j]);
+ buf[j] = mesg[j];
}
if (j) {
buf[j - 1] = '.';
@@ -325,6 +327,11 @@ void ui_todo_popup_item(void)
asprintf(&notepath, "%s%s", path_notes, item->note);
fp = fopen(notepath, "r");
+ if (fp == NULL) {
+ item_in_popup(NULL, NULL, item->mesg, _("TODO:"));
+ return;
+ }
+
note_read_contents(note, note_size, fp);
fclose(fp);
mem_free(notepath);
diff --git a/src/utf8.c b/src/utf8.c
index 1fd4c3b..997a4fa 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/utils.c b/src/utils.c
index f631c8c..2d30bfc 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/vars.c b/src/vars.c
index ac0fb4f..c8508e2 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -175,8 +175,6 @@ void vars_init(void)
ui_calendar_set_first_day_of_week(MONDAY);
- wins_set_sbar_width(col * SBARMINWIDTH / 100);
-
/* Pad structure to scroll text inside the appointment panel */
apad.length = 1;
apad.first_onscreen = 0;
diff --git a/src/vector.c b/src/vector.c
index fd468ab..796ef8e 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/vector.h b/src/vector.h
index 86cb3b8..7648df2 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/wins.c b/src/wins.c
index fa4874b..46ac98e 100644
--- a/src/wins.c
+++ b/src/wins.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/test/ical-009.sh b/test/ical-009.sh
index dbd0a30..6c1a0d4 100755
--- a/test/ical-009.sh
+++ b/test/ical-009.sh
@@ -18,7 +18,7 @@ if [ "$1" = 'actual' ]; then
elif [ "$1" = 'expected' ]; then
cat <<EOD
Import process report: 0131 lines read
-2 apps / 0 events / 1 todo / 21 skipped
+3 apps / 0 events / 1 todo / 20 skipped
VEVENT [12]: invalid or malformed event start time.
VEVENT [17]: item start date not defined.
VEVENT [21]: rrule frequency not supported.
@@ -26,7 +26,6 @@ VEVENT [27]: malformed summary line.
VTODO [32]: item priority is invalid (must be between 0 and 9).
VEVENT [36]: malformed exceptions line.
VEVENT [43]: exception date, but no recurrence rule.
-VEVENT [49]: line break in summary.
VEVENT [54]: malformed description line.
VEVENT [60]: malformed description.
VTODO [72]: malformed summary.
diff --git a/test/run-test.c b/test/run-test.c
index d1db112..41d55ad 100644
--- a/test/run-test.c
+++ b/test/run-test.c
@@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2020 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2023 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without