lvs-log-swap -> lvs-log-summary, +lvs-log-description
+ja ns i18n
Merge remote-tracking branch 'origin/dev' into VOLDEV-18

Conflicts:
	extensions/wikia/LicensedVideoSwap/LicensedVideoSwap.i18n.php
from change on origin/dev
MWEB-1057: changed error message which appears while deleting a map when user does not have proper rights
Merge pull request #5215 from Wikia/MWEB-1057

MWEB-1057: P3 fix for Wikia Maps - changing error message presented to a user
Merge pull request #5182 from WikiaVolDev/VOLDEV-90

VOLDEV-90 - Japanese namespace i18n
Merge branch 'dev' into VOLDEV-18

Conflicts:
	extensions/wikia/LicensedVideoSwap/LicensedVideoSwap.i18n.php
detect when a custom wordmark is a vignette url. if so, don't do url rewriting
Merge pull request #2079 from WikiaVolDev/VOLDEV-18

VOLDEV-18: Licensed Video Swap leaves hardcoded log action in Recent Changes
make people feel bad /cc @drsnyder
Merge pull request #5221 from Wikia/PLATFORM-561

custom wordmark urls
VE-1627: Fix for problem with Wikia One

No Wikia One have an ID (which previously it didn't) which makes certain conditions evaluate incorrectly.

https://wikia-inc.atlassian.net/browse/VE-1627
Merge pull request #5222 from Wikia/VE-1627

VE-1627: Fix for problem with Wikia One