Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge branch 'weblate'
Merge remote-tracking branch 'origin/weblate'
Oman neighbourhoods
Merge remote-tracking branch 'origin/weblate'
(forgot to compilemessages on weblate for oman cities)
Merge branch 'weblate'
makemessages for release_2013_06_17
Merge remote-tracking branch 'origin/master' into weblate