Fixed editor tab width preference - just the preference, not implemented
Implemented tab width
Merge branch 'tabWidth01' of github.com:sblatnick/geany
Fix replacing file name in headers upon save as

The code used a Scintilla-specific regex escape (\<) which doesn't work
anymore since the time we switched to full PCRE (which uses \b).  So,
update the regular expression to PCRE.

Also, properly escape the name to search in the unlikely case it has
regular expression escapes in it;  and properly check for word
boundaries even when not searching with an extension.
Increase the number of lines where filename is replaced upon save as

Search the first 4 lines (instead of 3) for Python templates support.
Update of Brazilian Portuguese translation
Update of German translation
Updated Hungarian translations
Merge pull request #117 from kgkilo/hu_po

Updated Hungarian translations
Add icon to Explorer context menu entry
Merge branch 'gentoo90-context-menu-icon'
Upate of Catalan translation
Don't translate program name directive in Pascal file template

Pascal code only accepts an identifier in the program name directive,
but {untitled} wildcard gets replaced with a translated string that may
not be a valid Pascal identifier.  Moreover, the directive being part
of the source of the program it's good practice for it to be in English
anyway.

Closes #3602314.
Update NEWS to reference more bugs and list latest changes
fixed conflict
Merge branch 'master' of github.com:geany/geany