Merge branch 'master' of https://github.com/geany/geany into geany-master

Author: overcq

HACKING

@@ -649,6 +649,11 @@ indentation after ':' is done from on_new_line_added().
 If the Scintilla lexer supports user type keyword highlighting (e.g.
 SCLEX_CPP), update document_highlight_tags() in document.c.
 
+If the filetype is a scripting language and the interpreter can be started
+using a shebang, update find_shebang() in filetypes.c.
+
+Update editor_set_indentation_guides() in editor.c if needed.
+
 Adding a CTags parser
 ^^^^^^^^^^^^^^^^^^^^^
 This assumes the filetype for Geany already exists.

README.I18N

@@ -47,14 +47,6 @@ translated text.
 user-configurable and users may have become accustomed to using the existing
 mnemonic key.
 
-You can also use intl_stats.sh, e.g. by running the following command in the top
-source directory of Geany:
-
-$ po/intl_stats.sh -a it
-
-This will print some information about the Italian translation and checks for
-menu accelerators.
-
 When you have finished your work - which doesn't mean you finished the
 translation, you will not have to work alone - send the file to the translation
 mailing list [3] or directly to Frank Lanitz [4] and he will add the translation

ctags/Makefile.am

@@ -82,6 +82,7 @@ parsers = \
 	parsers/geany_matlab.c \
 	parsers/nsis.c \
 	parsers/objc.c \
+	parsers/ocaml.c \
 	parsers/pascal.c \
 	parsers/perl.c \
 	parsers/perl.h \