Document the reload feature

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

5 files changed, 52 insertions, 0 deletions

diff --git a/.tx/config b/.tx/config
index 8dd803a..b9ac976 100644
--- a/.tx/config
+++ b/.tx/config
@@ -92,6 +92,11 @@ file_filter = po/doc/priority-<lang>.po
 source_file = po/doc/priority.pot
 source_lang = en
 
+[calcurse.doc-reload]
+file_filter = po/doc/reload-<lang>.po
+source_file = po/doc/reload.pot
+source_lang = en
+
 [calcurse.doc-repeat]
 file_filter = po/doc/repeat-<lang>.po
 source_file = po/doc/repeat.pot
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b561f71..73cd8ce 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -36,6 +36,7 @@ nobase_dist_doc_DATA = \
 	other.txt \
 	pipe.txt \
 	priority.txt \
+	reload.txt \
 	repeat.txt \
 	save.txt \
 	tab.txt \
diff --git a/doc/reload.txt b/doc/reload.txt
new file mode 100644
index 0000000..fc771de
--- /dev/null
+++ b/doc/reload.txt
@@ -0,0 +1,10 @@
+Reload
+======
+
+Reload appointments and todo items.
+
+When there are unsaved modifications, calcurse asks you whether you want to
+discard the modifications, keep the local modifications (and cancel the reload
+action) or merge the modifications with the content of the data files. The
+merge operation launches an external merge tool (defaults to vimdiff(1), can be
+changed by setting the 'MERGETOOL' environment variable).
diff --git a/po/doc/reload.pot b/po/doc/reload.pot
new file mode 100644
index 0000000..ccbd635
--- /dev/null
+++ b/po/doc/reload.pot
@@ -0,0 +1,34 @@
+#. extracted from reload.txt
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-28 13:12+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.11.0\n"
+
+#: reload.txt:1
+msgid ""
+"Reload\n"
+"======"
+msgstr ""
+
+#: reload.txt:4
+msgid "Reload appointments and todo items."
+msgstr ""
+
+#: reload.txt:6
+msgid ""
+"When there are unsaved modifications, calcurse asks you whether you want to\n"
+"discard the modifications, keep the local modifications (and cancel the "
+"reload\n"
+"action) or merge the modifications with the content of the data files. The\n"
+"merge operation launches an external merge tool (defaults to vimdiff(1), can "
+"be\n"
+"changed by setting the 'MERGETOOL' environment variable)."
+msgstr ""
diff --git a/src/help.c b/src/help.c
index 13a49fc..69e6be3 100644
--- a/src/help.c
+++ b/src/help.c
@@ -119,6 +119,8 @@ int display_help(const char *topic)
 			topic = "intro";
 		else if (!strcmp(topic, "generic-save"))
 			topic = "save";
+		else if (!strcmp(topic, "generic-reload"))
+			topic = "reload";
 		else if (!strcmp(topic, "generic-copy"))
 			topic = "copy_paste";
 		else if (!strcmp(topic, "generic-paste"))