Merge branch 'maint'

This commit is contained in:
Lukas Fleischer 2013-02-04 20:11:58 +01:00
commit b30ccc6319
49 changed files with 81 additions and 63 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without

11
NEWS
View File

@ -1,3 +1,14 @@
[02 Feb 2013]
Version 3.1.3:
- Bug fixes:
* Complete the test-suite even if libfaketime is not present.
* Add a workaround for broken libfaketime-based tests on 32-bit systems
(fixes Debian bug #697013).
* Do not update start time/duration with bogus values if the prompt is
canceled in edit mode.
[16 Dec 2012]
Version 3.1.2:
- Bug fixes:

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
# Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without

View File

@ -1,6 +1,6 @@
////
/*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -390,5 +390,5 @@ Authors
Copyright
---------
Copyright (c) 2004-2012 calcurse Development Team.
Copyright (c) 2004-2013 calcurse Development Team.
This software is released under the BSD License.

View File

@ -1,6 +1,6 @@
////
/*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -149,7 +149,7 @@ Install process
First you need to gunzip and untar the source archive:
----
$ tar zxvf calcurse-3.1.2.tar.gz
$ tar zxvf calcurse-3.1.3.tar.gz
----
Once you meet the requirements and have extracted the archive, the install

View File

@ -1,6 +1,6 @@
////
/*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -39,7 +39,7 @@ msgstr ""
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@ -984,7 +984,7 @@ msgstr ""
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -45,11 +45,11 @@ msgstr "Geben Sie 'calcurse -h' ein, für weitere Informationen.\n"
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"Dies ist freie Software; vgl. den Quellcode zu den Kopierbedingungen.\n"
#, c-format
@ -1405,7 +1405,7 @@ msgstr "Calcurse - textbasierender Terminkalender"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"
@ -1426,7 +1426,7 @@ msgid ""
"Calcurse home page : http://calcurse.org"
msgstr ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"Alle Rechte vorbehalten.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -43,7 +43,7 @@ msgstr "Try 'calcurse -h' for more information.\n"
#, fuzzy
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
"\n"
@ -1157,7 +1157,7 @@ msgstr "Calcurse - text-based organizer"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -39,7 +39,7 @@ msgstr "Prueba con 'calcurse -h' para mas informacion.\n"
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@ -991,7 +991,7 @@ msgstr "Calcurse - organizador basado en modo texto"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -43,7 +43,7 @@ msgstr "Taper 'calcurse -h' pour plus d'informations.\n"
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
"\n"
@ -1387,7 +1387,7 @@ msgstr "Calcurse - organiseur personnel en mode texte"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -41,7 +41,7 @@ msgstr "Gebruik 'calcurse -h', voor meer informatie.\n"
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
@ -997,7 +997,7 @@ msgstr "Calcurse - tekst-gebaseerde organizer"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -44,7 +44,7 @@ msgstr "Tente \"calcurse -h\" para maiores informações.\n"
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
"\n"
@ -1452,7 +1452,7 @@ msgstr "Calcurse - Organizador baseado em texto"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -47,11 +47,11 @@ msgstr "Выполните 'calcurse -h' для получения справк
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
msgstr ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team.\n"
"Copyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n"
#, c-format
@ -1394,7 +1394,7 @@ msgstr "Calcurse - текстовый органайзер"
#, c-format
msgid ""
"\n"
"Copyright (c) 2004-2012 calcurse Development Team\n"
"Copyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -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-2012 calcurse Development Team.
Copyright (c) 2004-2013 calcurse Development Team.
This is free software; see the source for copying conditions.
")"
else

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -79,7 +79,7 @@ static void usage_try(void)
static void version_arg(void)
{
const char *vtext =
_("\nCopyright (c) 2004-2012 calcurse Development Team.\n"
_("\nCopyright (c) 2004-2013 calcurse Development Team.\n"
"This is free software; see the source for copying conditions.\n");
fprintf(stdout, _("Calcurse %s - text-based organizer\n"), VERSION);

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -146,6 +146,7 @@ static inline void key_add_item(void)
interact_day_item_add();
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
break;
case TOD:
interact_todo_add();
if (todo_hilt() == 0 && todo_nb() == 1)

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -979,6 +979,12 @@ void custom_keys_config(void)
} else
not_recognized = 0;
/* Is the binding used by this action already? If so, just end the reassignment */
if (selrow == keys_get_action(keyval)) {
delwin(grabwin);
break;
}
used = keys_assign_binding(keyval, selrow);
if (used) {
enum key action;

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -736,7 +736,7 @@ void help_screen(void)
hscr[HELP_CREDITS].title = _("Calcurse - text-based organizer");
snprintf(hscr[HELP_CREDITS].text, HELPTEXTSIZ,
_("\nCopyright (c) 2004-2012 calcurse Development Team\n"
_("\nCopyright (c) 2004-2013 calcurse Development Team\n"
"All rights reserved.\n"
"\n"
"Redistribution and use in source and binary forms, with or without\n"

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/*
* Calcurse - text-based organizer
*
* Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
* Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without