Merge pull request #4369 from nextcloud/fix-translations

author Morris Jobke <hey@morrisjobke.de>

Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)

committer GitHub <noreply@github.com>

Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)
author Morris Jobke <hey@morrisjobke.de>
Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)
committer GitHub <noreply@github.com>
Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)
diff --cc settings/Controller/ChangePasswordController.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)
committer	GitHub <noreply@github.com>
	Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)