fix #9110 - i18n: fix errors in usage of plural forms

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6507 0c6e7542-c601-0410-84e7-c038aed88b3b
see #9309 - fix matching of `place_of_worship` presets

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6508 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror