Merge branch 'maint'

8 files changed, 71 insertions, 36 deletions

diff --git a/NEWS b/NEWS
index aac8a12..78f0b84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,38 @@
+[03 Aug 2011]
+Version 2.9.1:
+- Bugfixes:
+  * Keep the order of events across restarts (reported by Alan).
+
+  * Fix the build process when disabling documentation generation.
+
+  * Avoid flickering on window resize.
+
+  * Avoid a segfault when resizing the calcurse window.
+
+  * Add missing documentation for the "backword-kill-word" line editing
+    function.
+
+  * Honor the "TMPDIR" environment variable instead of using hardcoded paths
+    for temporary files (reported by Erik Saule).
+
+  * Fix pager invocation when showing the log file during an import (reported
+    by Andraz Levstik).
+
+  * Accept resource parameters in iCal import. Accept additional parameters
+    such as language parameters (reported by Andraz Levstik).
+
+  * Sync the notification item after editing or pasting an appointment. This
+    ensures the information in the notification bar as well as the countdown
+    for the notification daemon are always up-to-date (reported by Andraz
+    Levstik).
+
+  * Fix recurrent appointment notification.
+
+  * Fix flagging of regular appointments.
+
+  * Fix sort order when using command line options to display upcoming
+    appointments and events (reported by Erik Saule).
+
 [29 May 2011]
 Version 2.9.0
 - New features:
diff --git a/po/calcurse.pot b/po/calcurse.pot
index 26e6d2d..8bf0cdd 100644
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: calcurse 2.9.0\n"
+"Project-Id-Version: calcurse 2.9.1\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -290,10 +290,6 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#, c-format
-msgid "layout configuration"
-msgstr ""
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -309,6 +305,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#, c-format
+msgid "layout configuration"
+msgstr ""
+
 msgid "Width +"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 7cfef8f..753e482 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2011-05-11 14:00+0000\n"
 "Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/calcurse/team/"
@@ -373,10 +373,6 @@ msgstr "Rechts"
 msgid "Help"
 msgstr "Hilfe"
 
-#, c-format
-msgid "layout configuration"
-msgstr "Layout Einstellungen"
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -403,6 +399,10 @@ msgstr ""
 "\tt -> Aufgabenfenster\n"
 "\n"
 
+#, c-format
+msgid "layout configuration"
+msgstr "Layout Einstellungen"
+
 msgid "Width +"
 msgstr "Breite +"
 
diff --git a/po/en.po b/po/en.po
index 40a19c5..314ecec 100644
--- a/po/en.po
+++ b/po/en.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.4\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2006-07-03 00:05+0100\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: English/GB <en_GB@li.org>\n"
@@ -327,10 +327,6 @@ msgstr ""
 msgid "Help"
 msgstr "Help"
 
-#, fuzzy, c-format
-msgid "layout configuration"
-msgstr "CalCurse %s | general options"
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -346,6 +342,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "layout configuration"
+msgstr "CalCurse %s | general options"
+
 msgid "Width +"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 01284e9..e534673 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2011-05-11 09:21+0000\n"
 "Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -298,10 +298,6 @@ msgstr ""
 msgid "Help"
 msgstr "Ayuda"
 
-#, c-format
-msgid "layout configuration"
-msgstr ""
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -317,6 +313,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#, c-format
+msgid "layout configuration"
+msgstr ""
+
 msgid "Width +"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 2cc2885..ca5e13a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2011-05-17 13:44+0000\n"
 "Last-Translator: esaule <godrik@mandragor.org>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/calcurse/team/"
@@ -307,10 +307,6 @@ msgstr "Droite"
 msgid "Help"
 msgstr "Aide"
 
-#, c-format
-msgid "layout configuration"
-msgstr "Configuration du placement"
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -338,6 +334,10 @@ msgstr ""
 "       't' -> panneau des tâches\n"
 "\n"
 
+#, c-format
+msgid "layout configuration"
+msgstr "Configuration du placement"
+
 msgid "Width +"
 msgstr "Largeur +"
 
diff --git a/po/nl.po b/po/nl.po
index 8650644..a599763 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2011-05-11 09:21+0000\n"
 "Last-Translator: cryptocrack <transifex@cryptocrack.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -296,10 +296,6 @@ msgstr ""
 msgid "Help"
 msgstr "Hulp"
 
-#, c-format
-msgid "layout configuration"
-msgstr ""
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -315,6 +311,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#, c-format
+msgid "layout configuration"
+msgstr ""
+
 msgid "Width +"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index ef06f10..e66dcff 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2011-05-24 11:20+0200\n"
+"POT-Creation-Date: 2011-07-31 02:54+0200\n"
 "PO-Revision-Date: 2011-05-23 18:06+0000\n"
 "Last-Translator: Rusdec <linux.kernel.it@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/calcurse/team/"
@@ -305,10 +305,6 @@ msgstr "Вправо"
 msgid "Help"
 msgstr "Справка"
 
-#, c-format
-msgid "layout configuration"
-msgstr "Настройки расположения"
-
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
 "displayed inside calcurse screen. \n"
@@ -336,6 +332,10 @@ msgstr ""
 "       't' -> панель списка дел\n"
 "\n"
 
+#, c-format
+msgid "layout configuration"
+msgstr "Настройки расположения"
+
 msgid "Width +"
 msgstr "Ширина +"