diff options
71 files changed, 1170 insertions, 1700 deletions
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index c9fe273..552bce6 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -24,10 +24,13 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies (Ubuntu) - run: sudo apt-get install asciidoc autopoint gettext xmlto autoconf-archive + 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 @@ -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 @@ -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) -------------------------- @@ -1,4 +1,4 @@ -Copyright (c) 2004-2022 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 @@ -1,17 +1,21 @@ -calcurse -======== +# calcurse [](https://github.com/lfos/calcurse/actions/workflows/make.yml) [](https://github.com/lfos/calcurse/actions/workflows/lint_python.yml)  -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: + +[](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 @@ -31,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 @@ -42,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 @@ -53,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 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2004-2022 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 e7594c5..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 #------------------------------------------------------------------------------- @@ -23,7 +21,6 @@ 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]) @@ -62,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) @@ -73,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 @@ -98,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) @@ -138,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 99e2e6a..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') 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 faa81ae..1f79f9a 100644 --- a/doc/calcurse.1.txt +++ b/doc/calcurse.1.txt @@ -1,6 +1,6 @@ //// /* - * Copyright (c) 2004-2022 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-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/credits.txt +++ b/doc/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/de/credits.txt +++ b/doc/de/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/es/credits.txt +++ b/doc/es/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/fr/credits.txt +++ b/doc/fr/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 d88269b..03a27ff 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -1,6 +1,6 @@ //// /* - * Copyright (c) 2004-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/nl/credits.txt +++ b/doc/nl/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 7a23199..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-2022 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 d43ea00..e1f5ae7 100644 --- a/doc/ru/credits.txt +++ b/doc/ru/credits.txt @@ -1,7 +1,7 @@ Calcurse - text-based organizer =============================== -Copyright (c) 2004-2022 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 356fe9f..6514949 100644 --- a/doc/submitting-patches.txt +++ b/doc/submitting-patches.txt @@ -1,6 +1,6 @@ //// /* - * Copyright (c) 2004-2022 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 74a21fb..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: 2022-04-16 18:30-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-2022 calcurse Development Team." +msgid "Copyright (c) 2004-2023 calcurse Development Team." msgstr "" msgid "This is free software; see the source for copying conditions." @@ -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 "" @@ -1767,7 +1773,7 @@ msgstr "" msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" msgstr "" @@ -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: 2022-04-16 18:30-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-2022 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 "" @@ -461,9 +457,8 @@ 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)" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Format des Datums in der Termin-Anzeige)" +msgstr "" msgid "Enter a text string (an empty string for the default text)" msgstr "" @@ -501,9 +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." -#, fuzzy msgid "Some actions are left undefined!" -msgstr "Option nicht definiert" +msgstr "" msgid "" "Sorry, colors are not supported by your terminal\n" @@ -519,9 +513,8 @@ msgstr "" msgid "unknown item type" msgstr "Unbekannte Position" -#, fuzzy msgid "Note:" -msgstr "Notiz bearb." +msgstr "" msgid "Event:" msgstr "Ereignis:" @@ -591,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" @@ -608,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 "" @@ -620,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 "" @@ -634,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 "" @@ -644,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 "" @@ -658,9 +650,8 @@ msgstr "" msgid "malformed exceptions line." msgstr "" -#, fuzzy msgid "invalid exception." -msgstr "Ungültige Wiederholungsrate." +msgstr "" #, c-format msgid "malformed %s line." @@ -676,41 +667,35 @@ msgstr "" msgid "malformed 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 "" @@ -718,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" @@ -817,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 "" @@ -830,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" @@ -846,21 +829,21 @@ msgstr "Konnte Tastenkonfigurationsdatei nicht öffnen" msgid "Could not read key label" msgstr "Tastenbezeichnung nicht lesbar" -#, fuzzy, c-format +#, c-format msgid "Key label not recognized: \"%s\"" -msgstr "Tastenbezeichnung nicht erkannt" +msgstr "" #, c-format msgid "No keys assigned to \"%s\"." msgstr "" -#, fuzzy, c-format +#, c-format msgid "Keyname not recognized: \"%s\"" -msgstr "Tastenbezeichnung nicht erkannt" +msgstr "" -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "\"%s\" ist mehrfach zugeordnet!" +msgstr "" #, c-format msgid "" @@ -870,9 +853,8 @@ msgstr "" msgid "Errors in the keys file." msgstr "" -#, fuzzy msgid "Remove offending line(s) from the keys file, aborting..." -msgstr "Zu viele Fehler beim Lesen der 'keys'-Datei, Abbruch..." +msgstr "" msgid "Some actions do not have any associated key bindings!" msgstr "Einige Aktionen haben keine Tastenzuordnung!" @@ -1196,9 +1178,8 @@ msgstr "Item an aktueller Position einfügen." msgid "Select next panel in calcurse main screen." msgstr "Wähle nächstes Fenster im calcurse-Hauptbildschirm." -#, fuzzy msgid "Select previous panel in calcurse main screen." -msgstr "Wähle nächstes Fenster im calcurse-Hauptbildschirm." +msgstr "" msgid "Import data from an external file." msgstr "Importiere Daten von einer externen Datei." @@ -1473,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" @@ -1483,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 "" @@ -1496,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 "" @@ -1637,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 "" @@ -1731,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 "" @@ -1765,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 "" @@ -1854,12 +1821,11 @@ msgstr "unbekannte Ansicht" msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]" msgstr "Verwendung: calcurse-upgrade [-h|-v|--config <file>]" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" -msgstr "This is free software; see the source for copying conditions." +msgstr "" msgid "unrecognized option:" msgstr "unbekannte Option:" @@ -1908,100 +1874,3 @@ msgstr "Aktualisiere Konfigurationsanweisungen..." msgid "Remove temporary backup..." msgstr "Entferne temporäres Backup..." - -#~ msgid "Monday" -#~ msgstr "Montag" - -#~ msgid "Sunday" -#~ msgstr "Sonntag" - -#~ msgid "undefined" -#~ msgstr "unbestimmt" - -#~ 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" - -#, c-format -#~ msgid "Error reading key: \"%s\"" -#~ msgstr "Fehler beim Lesen der Taste \"%s\"" - -#, c-format -#~ msgid "When adding default key for \"%s\", \"%s\" was already assigned!" -#~ msgstr "" -#~ "Beim Hinzufügen einer Default-Taste für \"%s\" war \"%s\" bereits " -#~ "zugewiesen!" - -#~ 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" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: calcurse\n" "Report-Msgid-Bugs-To: bugs@calcurse.org\n" -"POT-Creation-Date: 2022-04-16 18:30-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" @@ -49,7 +49,7 @@ msgstr "" msgid "calcurse %s -- text-based organizer\n" msgstr "" -msgid "Copyright (c) 2004-2022 calcurse Development Team." +msgid "Copyright (c) 2004-2023 calcurse Development Team." msgstr "" msgid "This is free software; see the source for copying conditions." @@ -582,6 +582,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 "" @@ -1768,7 +1774,7 @@ msgstr "" msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" msgstr "" @@ -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: 2022-04-16 18:30-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-2022 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 "" @@ -466,9 +463,8 @@ 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)" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Formato de la fecha mostrado en el panel de citas)" +msgstr "" msgid "Enter a text string (an empty string for the default text)" msgstr "" @@ -510,9 +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." -#, fuzzy msgid "Some actions are left undefined!" -msgstr "opción no definida" +msgstr "" msgid "" "Sorry, colors are not supported by your terminal\n" @@ -528,9 +523,8 @@ msgstr "" msgid "unknown item type" msgstr "tipo de elemento desconocido" -#, fuzzy msgid "Note:" -msgstr "EditarNota" +msgstr "" msgid "Event:" msgstr "Evento:" @@ -591,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" @@ -600,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" @@ -617,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 "" @@ -629,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 "" @@ -643,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 "" @@ -653,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 "" @@ -667,9 +661,8 @@ msgstr "" msgid "malformed exceptions line." msgstr "" -#, fuzzy msgid "invalid exception." -msgstr "Frecuencia inválida." +msgstr "" #, c-format msgid "malformed %s line." @@ -685,41 +678,35 @@ msgstr "" msgid "malformed 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 "" @@ -727,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" @@ -828,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 "" @@ -841,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" @@ -857,21 +842,21 @@ msgstr "no pudo abrirse el archivo de teclas" msgid "Could not read key label" msgstr "No se pudo leer etiqueta de tecla" -#, fuzzy, c-format +#, c-format msgid "Key label not recognized: \"%s\"" -msgstr "Etiqueta de tecla no reconocida" +msgstr "" #, c-format msgid "No keys assigned to \"%s\"." msgstr "" -#, fuzzy, c-format +#, c-format msgid "Keyname not recognized: \"%s\"" -msgstr "Etiqueta de tecla no reconocida" +msgstr "" -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "¡\"%s\" asignado múltiples veces!" +msgstr "" #, c-format msgid "" @@ -881,9 +866,8 @@ msgstr "" msgid "Errors in the keys file." msgstr "" -#, fuzzy msgid "Remove offending line(s) from the keys file, aborting..." -msgstr "Demasiados errores al leer archivo de teclas, abortando..." +msgstr "" msgid "Some actions do not have any associated key bindings!" msgstr "¡Algunas acciones no tienen ninguna tecla asociada!" @@ -925,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" @@ -1211,9 +1198,8 @@ 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." -#, fuzzy msgid "Select previous panel in calcurse main screen." -msgstr "Seleccionar el panel siguiente en la pantalla principal de calcurse." +msgstr "" msgid "Import data from an external file." msgstr "Importar datos desde un archivo externo." @@ -1501,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" @@ -1511,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 "" @@ -1524,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 "" @@ -1665,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 "" @@ -1759,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 "" @@ -1796,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 "" @@ -1886,14 +1855,11 @@ msgstr "panel desconocido" msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]" msgstr "Uso: calcurse-upgrade [-h|-v|--config <file>]" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" msgstr "" -"Esto es software libre; consulte el código fuente para ver las condiciones " -"de copia." msgid "unrecognized option:" msgstr "opción no reconocida:" @@ -1944,100 +1910,3 @@ msgstr "Actualizar directivas de configuración..." msgid "Remove temporary backup..." msgstr "Eliminar respaldo temporal..." - -#~ msgid "Monday" -#~ msgstr "Lunes" - -#~ msgid "Sunday" -#~ msgstr "Domingo" - -#~ msgid "undefined" -#~ msgstr "sin definir" - -#~ 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" - -#, c-format -#~ msgid "Error reading key: \"%s\"" -#~ msgstr "Error leyendo tecla: \"%s\"" - -#, c-format -#~ msgid "When adding default key for \"%s\", \"%s\" was already assigned!" -#~ msgstr "" -#~ "Al añadir la tecla por defecto para \"%s\", ¡\"%s\" ya estaba asignada!!" - -#~ 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" @@ -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: 2022-04-16 18:30-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-2022 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 "" @@ -492,9 +479,8 @@ 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)" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Format de la date affichée dans le panneau rendez-vous)" +msgstr "" msgid "Enter a text string (an empty string for the default text)" msgstr "" @@ -535,9 +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." -#, fuzzy msgid "Some actions are left undefined!" -msgstr "option non définie" +msgstr "" msgid "" "Sorry, colors are not supported by your terminal\n" @@ -553,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 :" @@ -616,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" @@ -625,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" @@ -642,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 "" @@ -654,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 "" @@ -668,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 "" @@ -693,9 +676,8 @@ msgstr "" msgid "malformed exceptions line." msgstr "" -#, fuzzy msgid "invalid exception." -msgstr "Fréquence invalide." +msgstr "" #, c-format msgid "malformed %s line." @@ -711,41 +693,35 @@ msgstr "" msgid "malformed 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 "" @@ -753,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" @@ -855,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 "" @@ -868,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" @@ -884,21 +858,21 @@ msgstr "impossible d'ouvrir le fichier des raccourcis clavier" msgid "Could not read key label" msgstr "Impossible de lire le libellé de la touche" -#, fuzzy, c-format +#, c-format msgid "Key label not recognized: \"%s\"" -msgstr "Libellé de la touche non reconnu" +msgstr "" #, c-format msgid "No keys assigned to \"%s\"." msgstr "" -#, fuzzy, c-format +#, c-format msgid "Keyname not recognized: \"%s\"" -msgstr "Libellé de la touche non reconnu" +msgstr "" -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "\"%s\" est assignée plusieurs fois !" +msgstr "" #, c-format msgid "" @@ -908,10 +882,8 @@ msgstr "" msgid "Errors in the keys file." msgstr "" -#, fuzzy 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 !" @@ -953,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" @@ -996,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 "" @@ -1242,9 +1214,8 @@ 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." -#, fuzzy msgid "Select previous panel in calcurse main screen." -msgstr "Sélectionner le panneau suivant dans l'écran général de calcurse." +msgstr "" msgid "Import data from an external file." msgstr "Importer les données d'un fichier externe." @@ -1535,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" @@ -1545,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 "" @@ -1558,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 "" @@ -1702,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 "" @@ -1737,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." @@ -1806,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 "" @@ -1844,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,14 +1884,11 @@ msgstr "panneau inconnu" msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]" msgstr "Utilisation : calcurse-upgrade [-h|-v|--config <fichier>]" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" msgstr "" -"Ceci est un logiciel libre : consultez le code source pour connaître les " -"conditions légales d'utilisation." msgid "unrecognized option:" msgstr "option non reconnue :" @@ -1992,116 +1937,3 @@ msgstr "Mise à jour des instructions de configuration..." msgid "Remove temporary backup..." msgstr "Suppression de la sauvegarde temporaire..." - -#~ msgid "Monday" -#~ msgstr "Lundi" - -#~ msgid "Sunday" -#~ msgstr "Dimanche" - -#~ msgid "undefined" -#~ msgstr "inconnue" - -#~ 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" - -#, c-format -#~ msgid "Error reading key: \"%s\"" -#~ msgstr "Erreur de lecture de la touche : \"%s\"" - -#~ msgid "There were some errors when loading keys file." -#~ msgstr "" -#~ "Il y a eu des erreurs au chargement du fichier de configuration des " -#~ "raccourcis." - -#, c-format -#~ msgid "When adding default key for \"%s\", \"%s\" was already assigned!" -#~ msgstr "" -#~ "Pendant l'ajout de la touche par défaut pour \"%s\", \"%s\" était déjà " -#~ "assignée !" - -#~ 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" @@ -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: 2022-04-16 18:30-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-2022 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 "" @@ -452,9 +449,8 @@ msgstr "" msgid "(Format of the date displayed in the appointments panel)" msgstr "" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Formaat van de tijd in de informatiebalk.)" +msgstr "" msgid "Enter a text string (an empty string for the default text)" msgstr "" @@ -509,9 +505,8 @@ msgstr "" msgid "unknown item type" msgstr "ongekend type item" -#, fuzzy msgid "Note:" -msgstr "WzgNoot" +msgstr "" msgid "Event:" msgstr "" @@ -581,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" @@ -598,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 "" @@ -660,16 +659,14 @@ msgstr "" msgid "malformed 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 "" @@ -677,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 "" @@ -798,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 "" @@ -811,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" @@ -839,9 +831,9 @@ msgstr "" msgid "Keyname not recognized: \"%s\"" msgstr "" -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "\"%s\" meer dan eens toegewezen!" +msgstr "" #, c-format msgid "" @@ -851,10 +843,8 @@ msgstr "" msgid "Errors in the keys file." msgstr "" -#, fuzzy msgid "Remove offending line(s) from the keys file, aborting..." msgstr "" -"Teveel fouten bij het laden van het sneltoetsenbestand, wordt afgebroken ..." msgid "Some actions do not have any associated key bindings!" msgstr "" @@ -1432,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" @@ -1454,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 "" @@ -1595,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 "" @@ -1716,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 "" @@ -1804,12 +1786,11 @@ msgstr "" msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]" msgstr "" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" -msgstr "Dit is vrije software; bekijk de broncode voor de kopieer voorwaarden" +msgstr "" msgid "unrecognized option:" msgstr "" @@ -1850,44 +1831,3 @@ msgstr "" msgid "Remove temporary backup..." msgstr "" - -#~ msgid "Monday" -#~ msgstr "maandag" - -#~ msgid "Sunday" -#~ msgstr "zondag" - -#~ msgid "undefined" -#~ msgstr "Ongekend" - -#~ 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" -#~ "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 "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 0ed0d8f..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: 2022-04-16 18:30-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-2022 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" @@ -487,29 +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)" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Formato da data exibida no painel de agendamentos)" +msgstr "" msgid "Enter a text string (an empty string for the default text)" -msgstr "" +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 " -"possíveis) " +"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 "" -"Entre com o formato do horário (veja \"man 3 strftime\" para formatos " +"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" @@ -530,9 +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." -#, fuzzy msgid "Some actions are left undefined!" -msgstr "opção não definida" +msgstr "" msgid "" "Sorry, colors are not supported by your terminal\n" @@ -548,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:" @@ -611,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" @@ -620,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" @@ -637,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 "" @@ -649,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 "" @@ -663,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 "" @@ -673,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 "" @@ -687,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." @@ -705,41 +687,35 @@ msgstr "" msgid "malformed 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 "" @@ -747,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" @@ -847,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 "" @@ -860,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" @@ -876,21 +850,21 @@ msgstr "falha na abertura do arquivo de teclas" msgid "Could not read key label" msgstr "Não foi possível ler o rótulo de tecla" -#, fuzzy, c-format +#, c-format msgid "Key label not recognized: \"%s\"" -msgstr "Rótulo de tecla não reconhecida" +msgstr "" #, c-format msgid "No keys assigned to \"%s\"." msgstr "" -#, fuzzy, c-format +#, c-format msgid "Keyname not recognized: \"%s\"" -msgstr "Rótulo de tecla não reconhecida" +msgstr "" -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "\"%s\" alocada múltiplas vezes!" +msgstr "" #, c-format msgid "" @@ -900,9 +874,8 @@ msgstr "" msgid "Errors in the keys file." msgstr "" -#, fuzzy msgid "Remove offending line(s) from the keys file, aborting..." -msgstr "Erros demais na leitura do arquivo de chaves, abortando..." +msgstr "" msgid "Some actions do not have any associated key bindings!" msgstr "Algumas ações não têm teclas de atalho associadas!" @@ -924,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" @@ -944,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" @@ -1161,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." @@ -1219,9 +1204,8 @@ 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." -#, fuzzy msgid "Select previous panel in calcurse main screen." -msgstr "Seleciona o próximo painel na tela principal do calcurse." +msgstr "" msgid "Import data from an external file." msgstr "Importa dados a partir de um arquivo externo." @@ -1473,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)" @@ -1490,10 +1474,10 @@ msgstr "(Registra atividades quando estiver executando em plano de fundo)" 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" @@ -1513,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" @@ -1535,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 "" @@ -1676,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 "" @@ -1717,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 "" @@ -1762,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." @@ -1771,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 "" @@ -1808,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 "" @@ -1898,14 +1865,11 @@ msgstr "painel desconhecido" msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]" msgstr "Uso: calcurse-upgrade [-h|-v|--config <arquivo>]" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 calcurse Development Team.\n" +"Copyright (c) 2004-2023 calcurse Development Team.\n" "This is free software; see the source for copying conditions.\n" msgstr "" -"Esse programa é livre; veja o arquivo fonte para as condições aplicadas em " -"cópias." msgid "unrecognized option:" msgstr "opção não reconhecida:" @@ -1953,101 +1917,3 @@ msgstr "Atualizar diretivas de configuração..." msgid "Remove temporary backup..." msgstr "Excluir backup temporário..." - -#~ msgid "Monday" -#~ msgstr "Segunda-feira" - -#~ msgid "Sunday" -#~ msgstr "Domingo" - -#~ msgid "undefined" -#~ msgstr "indefinida" - -#~ 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" - -#, c-format -#~ msgid "Error reading key: \"%s\"" -#~ msgstr "Erro na leitura da tecla: \"%s\"" - -#, 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 "" -#~ "(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" @@ -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: 2022-04-16 18:30-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,14 +73,14 @@ msgstr "Выполните 'calcurse -h' для получения справк msgid "calcurse %s -- text-based organizer\n" msgstr "calcurse %s - текстовый органайзер\n" -#, fuzzy -msgid "Copyright (c) 2004-2022 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 "Операции в режиме командной строки:" @@ -86,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." @@ -167,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>." @@ -194,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)" @@ -242,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?" @@ -294,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 " @@ -349,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 "Настройки расположения" @@ -379,76 +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) Подтверждение удаления событий" +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 "Формат даты отображается в неинтерактивном режиме" @@ -466,17 +489,17 @@ 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 "Формат даты, которая отображается в панели задач" -#, fuzzy msgid "(Format of the time displayed in the appointments panel)" -msgstr "(Формат даты, которая отображается в панели задач)" +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' для возможных форматов)" @@ -488,16 +511,18 @@ 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 "" +msgstr "Отсутствует инициализация!" msgid "keys configuration" msgstr "Настройка клавиш" @@ -507,33 +532,33 @@ msgstr "Нажмите клавишу, чтобы привязать её к:" #, c-format msgid "The key '%s' is already used for %s. Choose another one." -msgstr "Ключ '%s' уже используется для %s. Выберите другой ключ." +msgstr "Клавиша '%s' уже используется для %s. Выберите другую клавишу." -#, fuzzy msgid "Some actions are left undefined!" -msgstr "параметр не установлен" +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" @@ -541,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" @@ -557,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" @@ -571,195 +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 "" +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,159 +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 "ошибка открытия файла ключа" +msgstr "Не удалось открыть файл с управляющими клавишами." msgid "Could not read key label" -msgstr "Невозможно распознать клавишу" +msgstr "Некорректный формат для управляющей клавиши." -#, fuzzy, c-format +#, c-format msgid "Key label not recognized: \"%s\"" -msgstr "Клавиша не опознана" +msgstr "Нераспознанная управляющая клавиша: \"%s\"" #, c-format msgid "No keys assigned to \"%s\"." -msgstr "" +msgstr "Не назначено управляющей клавиши для \"%s\"." -#, fuzzy, c-format +#, c-format msgid "Keyname not recognized: \"%s\"" -msgstr "Клавиша не опознана" +msgstr "Управляющая клавиша не распознана: \"%s\"." -#, fuzzy, c-format +#, c-format msgid "\"%s\" assigned twice: \"%s\"." -msgstr "\"%s\" определено множество времён!" +msgstr "\"%s\" присвоена дважды: \"%s\"." #, c-format msgid "" "Action \"%s\" absent, but default key \"%s\" assigned to another action." msgstr "" +"Команда \"%s\" невыполнима, управ. клавиша \"%s\" назначена для другой " +"команды." msgid "Errors in the keys file." -msgstr "" +msgstr "Ошибки в файле с управляющими клавишами." -#, fuzzy msgid "Remove offending line(s) from the keys file, aborting..." -msgstr "Обнаружены ошибки при чтении keys-файла, отмена..." +msgstr "" +"Удалите некорректную строку(и) из файла с управляющими клавишами. " +"Завершение..." msgid "Some actions do not have any associated key bindings!" -msgstr "Некоторые действия не привязаны к клавишам!" +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" @@ -929,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 события" @@ -937,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-файл. Завершение..." @@ -960,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 "" @@ -1019,10 +1042,10 @@ msgid "Paste" msgstr "Вставить" msgid "Chg Win" -msgstr "Панель" +msgstr "След.Панель" msgid "Prev Win" -msgstr "" +msgstr "Пред.Панель" msgid "Import" msgstr "Импорт" @@ -1034,7 +1057,7 @@ msgid "Go to" msgstr "Переход" msgid "OtherCmd" -msgstr "..." +msgstr ". . ." msgid "Config" msgstr "Настройки" @@ -1043,7 +1066,7 @@ msgid "Redraw" msgstr "Обновить" msgid "Add Appt" -msgstr "Доб.Задачу" +msgstr "Доб.Меропр." msgid "Add Todo" msgstr "Доб.Дело" @@ -1112,10 +1135,10 @@ msgid "Edit Itm" msgstr "Изм.Запись" msgid "View" -msgstr "Смотреть" +msgstr "Просмотреть" msgid "Pipe" -msgstr "Программный канал (pipe)" +msgstr "Передать ->" msgid "Flag Itm" msgstr "Флаг" @@ -1147,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 "Основные" @@ -1180,38 +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." -#, fuzzy msgid "Select previous panel in calcurse main screen." -msgstr "Выбрать след. панель на главном экране calcurse" +msgstr "Выбрать пред. панель на главном экране calcurse." msgid "Import data from an external file." msgstr "Импортированть данные с внешнего файла." @@ -1220,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 "Добавить Дело. Может быть выбрана любая панель." @@ -1275,7 +1302,7 @@ msgid "Go to today, whichever panel is selected." msgstr "Текущая дата. Может быть выбрана любая панель." msgid "Enter command mode." -msgstr "Введите командный режим." +msgstr "Введите в командном режиме." msgid "Move to the right." msgstr "Вправо" @@ -1315,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 "Повысить приоритет дела внутри панели дел." @@ -1332,484 +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 "Default key(s) assigned to %d action%s." -msgstr "" +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 "(Лог активен во время фонового режима)" +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]" @@ -1818,60 +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> ]" -#, fuzzy msgid "" "\n" -"Copyright (c) 2004-2022 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 "Файл конфигурации не найден:" @@ -1883,7 +1911,7 @@ msgid "Create temporary backup of the configuration file..." msgstr "Создать временную архивную копию файла конфигурации..." msgid "Old backup file found:" -msgstr "Предыдущий файл архивной копии найден:" +msgstr "Найденная предыдущая копия архива данных:" msgid "" "\n" @@ -1891,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" @@ -1907,112 +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 "Monday" -#~ msgstr "Пн" - -#~ msgid "Sunday" -#~ msgstr "Вс" - -#~ msgid "undefined" -#~ 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" - -#, c-format -#~ msgid "Error reading key: \"%s\"" -#~ msgstr "Ошибка чтения клавиши: \"%s\"" - -#, c-format -#~ msgid "When adding default key for \"%s\", \"%s\" was already assigned!" -#~ msgstr "При назначении клав. \"%s\", \"%s\" уже была назначена!" - -#~ 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 0145788..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-2022 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 d6e9bc1..e138e5e 100644 --- a/src/apoint.c +++ b/src/apoint.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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-2022 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 84d1a9b..c89d1dd 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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/calcurse.h b/src/calcurse.h index ee96bbe..8322416 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 { diff --git a/src/config.c b/src/config.c index 9e2e40e..4e0f7db 100644 --- a/src/config.c +++ b/src/config.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 13570c6..2cd385c 100644 --- a/src/custom.c +++ b/src/custom.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -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) ? '>' : ' '; @@ -624,15 +634,19 @@ void day_popup_item(struct day_item *day) asprintf(¬epath, "%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]; @@ -651,15 +665,19 @@ void day_popup_item(struct day_item *day) asprintf(¬epath, "%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")); @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 f3a6298..7c371e4 100644 --- a/src/event.c +++ b/src/event.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 3e2b4da..8ea5df5 100644 --- a/src/getstring.c +++ b/src/getstring.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 1812e0d..f649076 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 981003f..92be6e2 100644 --- a/src/htable.h +++ b/src/htable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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(¬e_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(¬e); @@ -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'; @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 7ac7a26..d86f540 100644 --- a/src/listbox.c +++ b/src/listbox.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 9d4cd9c..d31f004 100644 --- a/src/llist.c +++ b/src/llist.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 386dcf3..0dd15bf 100644 --- a/src/llist.h +++ b/src/llist.h @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 048077a..a4b6184 100644 --- a/src/llist_ts.h +++ b/src/llist_ts.h @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 a358bd5..6eda361 100644 --- a/src/notify.c +++ b/src/notify.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 e6fce02..41cb69b 100644 --- a/src/queue.c +++ b/src/queue.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 64172ef..10523ad 100644 --- a/src/recur.c +++ b/src/recur.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 f05f78b..ed90bc7 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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; } @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 f386d58..c1719d8 100644 --- a/src/ui-calendar.c +++ b/src/ui-calendar.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 566ccd7..6a038fa 100644 --- a/src/ui-day.c +++ b/src/ui-day.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 c715250..46933b3 100644 --- a/src/ui-todo.c +++ b/src/ui-todo.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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(¬epath, "%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); @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 2640163..2d30bfc 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 8ab57b0..796ef8e 100644 --- a/src/vector.c +++ b/src/vector.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 9610924..7648df2 100644 --- a/src/vector.h +++ b/src/vector.h @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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/run-test.c b/test/run-test.c index b41226d..41d55ad 100644 --- a/test/run-test.c +++ b/test/run-test.c @@ -1,7 +1,7 @@ /* * Calcurse - text-based organizer * - * Copyright (c) 2004-2022 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 |