translation update
Merge pull request #354 from dokuwiki-translate/lang_update_350

Translation update (sk)
Merge remote-tracking branch 'dokutranslatefork/lang_update_351' into fixsklocalization

Conflicts:
	lib/plugins/authmysql/lang/sk/settings.php
	lib/plugins/authpgsql/lang/sk/settings.php
Merge pull request #356 from dokuwiki-translate/lang_update_354

Translation update (pt-br)
Merge pull request #357 from dokuwiki-translate/lang_update_355

Translation update (ko)
Merge pull request #358 from dokuwiki-translate/lang_update_356

Translation update (fa)
Merge pull request #360 from dokuwiki-translate/lang_update_360

Translation update (ja)
Merge pull request #363 from dokuwiki-translate/lang_update_363

Translation update (hi)
Merge pull request #364 from splitbrain/fixsklocalization

Fixsklocalization
Merge pull request #348 from splitbrain/candochecksUsermanager

Cando check and localization improvements of usermanager
Merge pull request #346 from hArpanet/patch-2

Bugfix: DOKU_CONF path in plugin.php
Merge pull request #347 from hArpanet/patch-1

Bugfix: DOKU_CONF path in pageutils.php
Merge pull request #361 from splitbrain/FS#2860

RS#2860 fix configuration option key to 'template'
translation update
translation update
Merge pull request #367 from dokuwiki-translate/lang_update_366

Translation update (sk)
Merge pull request #366 from dokuwiki-translate/lang_update_364

Translation update (ko)
translation update
Merge pull request #369 from dokuwiki-translate/lang_update_370

Translation update (nl)
translation update