19 files changed, 106 insertions, 58 deletions
diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 236326b4e32..299554fe190 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -33,7 +33,6 @@ use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index 8d26f2c1942..3f9ef172365 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -30,7 +30,6 @@
 
 namespace OC\Core\Controller;
 
-use OCA\Encryption\Exceptions\PrivateKeyMissingException;
 use \OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use \OCP\AppFramework\Http\TemplateResponse;
@@ -206,6 +205,7 @@ class LostController extends Controller {
 	/**
 	 * @PublicPage
 	 * @BruteForceProtection(action=passwordResetEmail)
+	 * @AnonRateThrottle(limit=10, period=300)
 	 *
 	 * @param string $user
 	 * @return JSONResponse
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index fd4811d3ff6..9f379ad30d7 100644
--- a/core/Controller/TwoFactorChallengeController.php
+++ b/core/Controller/TwoFactorChallengeController.php
@@ -143,6 +143,8 @@ class TwoFactorChallengeController extends Controller {
 	 * @NoCSRFRequired
 	 * @UseSession
 	 *
+	 * @UserRateThrottle(limit=5, period=100)
+	 *
 	 * @param string $challengeProviderId
 	 * @param string $challenge
 	 * @param string $redirect_url
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 6e18dcc1f8b..4690b86f995 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -31,7 +31,9 @@ OC.Lostpassword = {
 						user : $('#user').val()
 					},
 					OC.Lostpassword.sendLinkDone
-				);
+				).fail(function() {
+					OC.Lostpassword.sendLinkError(OC.Lostpassword.sendErrorMsg);
+				});
 			}
 		}
 	},
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 6017714b305..4904ed493cc 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -60,14 +60,14 @@
 			'<input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" />' +
 			'<label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' +
 			'    {{/if}}' +
-			'<div id="linkPass" class="linkPass {{#unless isPasswordSet}}hidden{{/unless}}">' +
+			'<div id="linkPass" class="oneline linkPass {{#unless isPasswordSet}}hidden{{/unless}}">' +
 			'    <label for="linkPassText-{{cid}}" class="hidden-visually">{{passwordLabel}}</label>' +
 			'    {{#if showPasswordCheckBox}}' +
 			'    <input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    {{else}}' +
 			'    <input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholderInitial}}" />' +
 			'    {{/if}}' +
-			'    <span class="icon-loading-small hidden"></span>' +
+			'    <span class="icon icon-loading-small hidden"></span>' +
 			'</div>' +
 			'{{else}}' +
 			// FIXME: this doesn't belong in this view
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 16a2be0c4a9..3b09d13a7e2 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -22,7 +22,7 @@
 		'<div class="oneline">' +
 		'    <input id="shareWith-{{cid}}" class="shareWithField" type="text" placeholder="{{sharePlaceholder}}" />' +
 		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'{{{remoteShareInfo}}}' +
+		'{{{shareInfo}}}' +
 		'</div>' +
 		'{{/if}}' +
 		'<div class="shareeListView subView"></div>' +
@@ -30,9 +30,9 @@
 		'<div class="expirationView subView"></div>' +
 		'<div class="loading hidden" style="height: 50px"></div>';
 
-	var TEMPLATE_REMOTE_SHARE_INFO =
-		'<a target="_blank" class="icon icon-info shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
-		'title="{{tooltip}}"></a>';
+	var TEMPLATE_SHARE_INFO =
+		'<span class="icon icon-info shareWithRemoteInfo hasTooltip" ' +
+		'title="{{tooltip}}"></span>';
 
 	/**
 	 * @class OCA.Share.ShareDialogView
@@ -135,7 +135,7 @@
 			var $shareWithField = $('.shareWithField'),
 				view = this,
 				$loading = this.$el.find('.shareWithLoading'),
-				$remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
+				$shareInfo = this.$el.find('.shareWithRemoteInfo');
 
 			var count = oc_config['sharing.minSearchStringLength'];
 			if (search.term.trim().length < count) {
@@ -160,7 +160,7 @@
 
 			$loading.removeClass('hidden');
 			$loading.addClass('inlineblock');
-			$remoteShareInfo.addClass('hidden');
+			$shareInfo.addClass('hidden');
 
 			$shareWithField.removeClass('error')
 				.tooltip('hide');
@@ -177,7 +177,7 @@
 				function (result) {
 					$loading.addClass('hidden');
 					$loading.removeClass('inlineblock');
-					$remoteShareInfo.removeClass('hidden');
+					$shareInfo.removeClass('hidden');
 					if (result.ocs.meta.statuscode === 100) {
 						var users   = result.ocs.data.exact.users.concat(result.ocs.data.users);
 						var groups  = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
@@ -314,7 +314,7 @@
 			).fail(function() {
 				$loading.addClass('hidden');
 				$loading.removeClass('inlineblock');
-				$remoteShareInfo.removeClass('hidden');
+				$shareInfo.removeClass('hidden');
 				OC.Notification.show(t('core', 'An error occurred. Please try again'));
 				window.setTimeout(OC.Notification.hide, 5000);
 			});
@@ -359,22 +359,22 @@
 			var $loading = this.$el.find('.shareWithLoading');
 			$loading.removeClass('hidden')
 				.addClass('inlineblock');
-			var $remoteShareInfo = this.$el.find('.shareWithRemoteInfo');
-			$remoteShareInfo.addClass('hidden');
+			var $shareInfo = this.$el.find('.shareWithRemoteInfo');
+			$shareInfo.addClass('hidden');
 
 			this.model.addShare(s.item.value, {success: function() {
 				$(e.target).val('')
 					.attr('disabled', false);
 				$loading.addClass('hidden')
 					.removeClass('inlineblock');
-				$remoteShareInfo.removeClass('hidden');
+				$shareInfo.removeClass('hidden');
 			}, error: function(obj, msg) {
 				OC.Notification.showTemporary(msg);
 				$(e.target).attr('disabled', false)
 					.autocomplete('search', $(e.target).val());
 				$loading.addClass('hidden')
 					.removeClass('inlineblock');
-				$remoteShareInfo.removeClass('hidden');
+				$shareInfo.removeClass('hidden');
 			}});
 		},
 
@@ -412,7 +412,7 @@
 				cid: this.cid,
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
-				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				shareInfo: this._renderShareInfoPart(),
 				isSharingAllowed: this.model.sharePermissionPossible()
 			}));
 
@@ -457,47 +457,42 @@
 			this.linkShareView.showLink = this._showLink;
 		},
 
-		_renderRemoteShareInfoPart: function() {
-			var remoteShareInfo = '';
-			if(this.configModel.get('isRemoteShareAllowed')) {
-				var infoTemplate = this._getRemoteShareInfoTemplate();
-				remoteShareInfo = infoTemplate({
-					docLink: this.configModel.getFederatedShareDocLink(),
-					tooltip: t('core', 'Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud')
+		_renderShareInfoPart: function() {
+			var shareInfo = '';
+			var infoTemplate = this._getShareInfoTemplate();
+
+			if(this.configModel.get('isMailShareAllowed') && this.configModel.get('isRemoteShareAllowed')) {
+				shareInfo = infoTemplate({
+					tooltip: t('core', 'Share with other people by entering a user or group, a federated cloud ID or an email address.')
+				});
+			} else if(this.configModel.get('isRemoteShareAllowed')) {
+				shareInfo = infoTemplate({
+					tooltip: t('core', 'Share with other people by entering a user or group or a federated cloud ID.')
+				});
+			} else if(this.configModel.get('isMailShareAllowed')) {
+				shareInfo = infoTemplate({
+					tooltip: t('core', 'Share with other people by entering a user or group or an email address.')
 				});
 			}
 
-			return remoteShareInfo;
+			return shareInfo;
 		},
 
 		_renderSharePlaceholderPart: function () {
-			var allowGroupSharing = this.configModel.get('allowGroupSharing');
 			var allowRemoteSharing = this.configModel.get('isRemoteShareAllowed');
 			var allowMailSharing = this.configModel.get('isMailShareAllowed');
 
-			if (!allowGroupSharing && !allowRemoteSharing && allowMailSharing) {
-				return t('core', 'Share with users or by mail...');
-			}
-			if (!allowGroupSharing && allowRemoteSharing && !allowMailSharing) {
-				return t('core', 'Share with users or remote users...');
-			}
-			if (!allowGroupSharing && allowRemoteSharing && allowMailSharing) {
-				return t('core', 'Share with users, remote users or by mail...');
-			}
-			if (allowGroupSharing && !allowRemoteSharing && !allowMailSharing) {
-				return t('core', 'Share with users or groups...');
-			}
-			if (allowGroupSharing && !allowRemoteSharing && allowMailSharing) {
-				return t('core', 'Share with users, groups or by mail...');
+			if (!allowRemoteSharing && allowMailSharing) {
+				return t('core', 'Name or email address...');
 			}
-			if (allowGroupSharing && allowRemoteSharing && !allowMailSharing) {
-				return t('core', 'Share with users, groups or remote users...');
+			if (allowRemoteSharing && !allowMailSharing) {
+				return t('core', 'Name or federated cloud ID...');
 			}
-			if (allowGroupSharing && allowRemoteSharing && allowMailSharing) {
-				return t('core', 'Share with users, groups, remote users or by mail...');
+			if (allowRemoteSharing && allowMailSharing) {
+				return t('core', 'Name, federated cloud ID or email address...');
 			}
 
-			return 	t('core', 'Share with users...');
+			return 	t('core', 'Name...');
 		},
 
 		/**
@@ -520,8 +515,8 @@
 		 * @returns {Function}
 		 * @private
 		 */
-		_getRemoteShareInfoTemplate: function() {
-			return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
+		_getShareInfoTemplate: function() {
+			return this._getTemplate('shareInfo', TEMPLATE_SHARE_INFO);
 		}
 	});
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index bff006f7ef3..bc3ea88aa56 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -802,7 +802,7 @@
 							isLinkShare: true,
 							id: share.id,
 							token: share.token,
-							password: share.password,
+							password: share.share_with,
 							link: link,
 							permissions: share.permissions,
 							// currently expiration is only effective for link shares.
diff --git a/core/js/tests/specs/jquery.avatarSpec.js b/core/js/tests/specs/jquery.avatarSpec.js
index 9bb10c41be7..dab78500d0b 100644
--- a/core/js/tests/specs/jquery.avatarSpec.js
+++ b/core/js/tests/specs/jquery.avatarSpec.js
@@ -186,7 +186,7 @@ describe('jquery.avatar tests', function() {
 		});
 
 		it('with ie8 fix', function() {
-			sinon.stub(Math, 'random', function() {
+			sinon.stub(Math, 'random').callsFake(function() {
 				return 0.5;
 			});
 
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 307adea85ff..95349bc4875 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -19,7 +19,7 @@
 *
 */
 
-/* global oc_appconfig */
+/* global oc_appconfig, sinon */
 describe('OC.Share.ShareDialogView', function() {
 	var $container;
 	var oldAppConfig;
@@ -90,7 +90,7 @@ describe('OC.Share.ShareDialogView', function() {
 			linkShare: {isLinkShare: false}
 		});
 
-		autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+		autocompleteStub = sinon.stub($.fn, 'autocomplete').callsFake(function() {
 			// dummy container with the expected attributes
 			if (!$(this).length) {
 				// simulate the real autocomplete that returns
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 192d927ac04..30a517b1520 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -55,7 +55,7 @@ OC.L10N.register(
     "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in %n Sekunden nochmals geladen"],
     "Saving..." : "Speichere…",
     "Dismiss" : "Ausblenden",
-    "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir",
+    "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von Dir",
     "Authentication required" : "Legitimierung benötigt",
     "Password" : "Passwort",
     "Cancel" : "Abbrechen",
@@ -255,7 +255,7 @@ OC.L10N.register(
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt JavaScript zum ordnungsgemäßen Betrieb. Bitte aktiviere {linkstart}JavaScript{linkend} und lade die Seite neu.",
     "More apps" : "Weitere Apps",
     "Search" : "Suche",
-    "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir:",
+    "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von Dir:",
     "Confirm your password" : "Bestätige dein Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktiere den Administrator.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index dacfcdeb740..07b5ad82433 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -53,7 +53,7 @@
     "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem beim Laden der Seite, Seite wird in %n Sekunde nochmals geladen","Problem beim Laden der Seite, Seite wird in %n Sekunden nochmals geladen"],
     "Saving..." : "Speichere…",
     "Dismiss" : "Ausblenden",
-    "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir",
+    "This action requires you to confirm your password" : "Dieser Vorgang benötigt eine Passwortbestätigung von Dir",
     "Authentication required" : "Legitimierung benötigt",
     "Password" : "Passwort",
     "Cancel" : "Abbrechen",
@@ -253,7 +253,7 @@
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt JavaScript zum ordnungsgemäßen Betrieb. Bitte aktiviere {linkstart}JavaScript{linkend} und lade die Seite neu.",
     "More apps" : "Weitere Apps",
     "Search" : "Suche",
-    "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir:",
+    "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von Dir:",
     "Confirm your password" : "Bestätige dein Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
     "Please contact your administrator." : "Bitte kontaktiere den Administrator.",
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
index 1a14d77c036..5ae71cf8723 100644
--- a/core/l10n/fi.js
+++ b/core/l10n/fi.js
@@ -18,6 +18,9 @@ OC.L10N.register(
     "Couldn't reset password because the token is expired" : "Salasanaa ei voitu palauttaa, koska valtuutus on vanhentunut",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Salasanan palautusviestiä ei voitu lähettää sähköpostitse, koska käyttäjätunnukselle ei ole määritetty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "Password reset" : "Salasanan palautus",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Paina oheista painiketta palauttaaksesi salasanasi. Jos et ole pyytänyt salasanan palautusta, jätä tämä sähköpostiviesti huomioimatta.",
+    "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Paina oheista linkkiä palauttaaksesi salasanasi. Jos et ole pyytänyt salasanan palautusta, jätä tämä sähköpostiviesti huomioimatta.",
+    "Reset your password" : "Palauta salasanasi",
     "%s password reset" : "%s salasanan palautus",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
@@ -69,6 +72,7 @@ OC.L10N.register(
     "No files in here" : "Täällä ei ole tiedostoja",
     "Choose" : "Valitse",
     "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
     "read-only" : "vain luku",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
@@ -97,6 +101,7 @@ OC.L10N.register(
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Jotkin tiedostot eivät ole läpäisseet eheystarkistusta. Lisätietoa ongelman korjaamiseksi on <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ohjeissamme</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listaa virheelliset tiedostot…</a> / <a href=\"{rescanEndpoint}\">Uudelleen skannaa…</a>)",
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache ei ole oikein määritelty. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Suosittelemme paremman suorituskyvyn saavuttamiseksi ↗</a> käyttämään seuraavia asetuksia <code>php.ini</code>-asetustiedostossa:",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Data-hakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan Internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään HTTP-palvelimen asetukset siten, ettei data-hakemisto ole suoraan käytettävissä Internetistä tai siirtämään data-hakemiston HTTP-palvelimen juurihakemiston ulkopuolelle.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritelty vähintään \"{seconds}\" sekuntiin. Paremman tietoturvan vuoksi suosittelemme määrittelemään HSTS:n, kuten <a href=\"{docUrl}\" rel=\"noreferrer\">tietoturvavinkeissämme</a> neuvotaan.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissämme</a> neuvotaan.",
@@ -108,9 +113,10 @@ OC.L10N.register(
     "Error setting expiration date" : "Virhe vanhenemispäivää asetettaessa",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Set expiration date" : "Aseta vanhenemispäivä",
-    "Expiration" : "Erääntyminen",
+    "Expiration" : "Vanheneminen",
     "Expiration date" : "Vanhenemispäivä",
     "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Valitse salasana julkiselle linkille tai paina \"Enter ↵\"",
     "Copied!" : "Kopioitu!",
     "Copy" : "Kopioi",
     "Not supported!" : "Ei tuettu!",
@@ -128,11 +134,20 @@ OC.L10N.register(
     "Send" : "Lähetä",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjältä {owner}",
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjältä {owner}",
+    "Choose a password for the mail share" : "Valitse salasana sähköpostijaolle",
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} jakoi linkillä",
     "group" : "ryhmä",
     "remote" : "etä",
     "email" : "sähköposti",
+    "shared by {sharer}" : "jakanut {sharer}",
     "Unshare" : "Lopeta jakaminen",
+    "Can reshare" : "Voi uudelleenjakaa",
+    "Can edit" : "Voi muokata",
+    "Can create" : "Voi luoda",
+    "Can change" : "Voi vaihtaa",
+    "Can delete" : "Voi poistaa",
+    "Secure drop (upload only)" : "Tiedostojen pudotus (vain lähetys)",
+    "Access control" : "Pääsynhallinta",
     "Could not unshare" : "Jakamisen lopettaminen epäonnistui",
     "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.",
     "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Vähintään {count} kirjain vaaditaan automaattiseen täydentämiseen","Vähintään {count} kirjainta vaaditaan automaattiseen täydentämiseen"],
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
index 1077c4f5111..b03814367d3 100644
--- a/core/l10n/fi.json
+++ b/core/l10n/fi.json
@@ -16,6 +16,9 @@
     "Couldn't reset password because the token is expired" : "Salasanaa ei voitu palauttaa, koska valtuutus on vanhentunut",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Salasanan palautusviestiä ei voitu lähettää sähköpostitse, koska käyttäjätunnukselle ei ole määritetty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "Password reset" : "Salasanan palautus",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Paina oheista painiketta palauttaaksesi salasanasi. Jos et ole pyytänyt salasanan palautusta, jätä tämä sähköpostiviesti huomioimatta.",
+    "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Paina oheista linkkiä palauttaaksesi salasanasi. Jos et ole pyytänyt salasanan palautusta, jätä tämä sähköpostiviesti huomioimatta.",
+    "Reset your password" : "Palauta salasanasi",
     "%s password reset" : "%s salasanan palautus",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
@@ -67,6 +70,7 @@
     "No files in here" : "Täällä ei ole tiedostoja",
     "Choose" : "Valitse",
     "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
     "read-only" : "vain luku",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
@@ -95,6 +99,7 @@
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Jotkin tiedostot eivät ole läpäisseet eheystarkistusta. Lisätietoa ongelman korjaamiseksi on <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ohjeissamme</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listaa virheelliset tiedostot…</a> / <a href=\"{rescanEndpoint}\">Uudelleen skannaa…</a>)",
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP Opcache ei ole oikein määritelty. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Suosittelemme paremman suorituskyvyn saavuttamiseksi ↗</a> käyttämään seuraavia asetuksia <code>php.ini</code>-asetustiedostossa:",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Data-hakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan Internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään HTTP-palvelimen asetukset siten, ettei data-hakemisto ole suoraan käytettävissä Internetistä tai siirtämään data-hakemiston HTTP-palvelimen juurihakemiston ulkopuolelle.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritelty vähintään \"{seconds}\" sekuntiin. Paremman tietoturvan vuoksi suosittelemme määrittelemään HSTS:n, kuten <a href=\"{docUrl}\" rel=\"noreferrer\">tietoturvavinkeissämme</a> neuvotaan.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissämme</a> neuvotaan.",
@@ -106,9 +111,10 @@
     "Error setting expiration date" : "Virhe vanhenemispäivää asetettaessa",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Set expiration date" : "Aseta vanhenemispäivä",
-    "Expiration" : "Erääntyminen",
+    "Expiration" : "Vanheneminen",
     "Expiration date" : "Vanhenemispäivä",
     "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Valitse salasana julkiselle linkille tai paina \"Enter ↵\"",
     "Copied!" : "Kopioitu!",
     "Copy" : "Kopioi",
     "Not supported!" : "Ei tuettu!",
@@ -126,11 +132,20 @@
     "Send" : "Lähetä",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjältä {owner}",
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjältä {owner}",
+    "Choose a password for the mail share" : "Valitse salasana sähköpostijaolle",
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} jakoi linkillä",
     "group" : "ryhmä",
     "remote" : "etä",
     "email" : "sähköposti",
+    "shared by {sharer}" : "jakanut {sharer}",
     "Unshare" : "Lopeta jakaminen",
+    "Can reshare" : "Voi uudelleenjakaa",
+    "Can edit" : "Voi muokata",
+    "Can create" : "Voi luoda",
+    "Can change" : "Voi vaihtaa",
+    "Can delete" : "Voi poistaa",
+    "Secure drop (upload only)" : "Tiedostojen pudotus (vain lähetys)",
+    "Access control" : "Pääsynhallinta",
     "Could not unshare" : "Jakamisen lopettaminen epäonnistui",
     "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.",
     "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["Vähintään {count} kirjain vaaditaan automaattiseen täydentämiseen","Vähintään {count} kirjainta vaaditaan automaattiseen täydentämiseen"],
diff --git a/core/l10n/it.js b/core/l10n/it.js
index e62a7c3037b..eb24ade2563 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
     "Couldn't reset password because the token is expired" : "Impossibile reimpostare la password poiché il token è scaduto",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "Password reset" : "Ripristino password",
+    "Reset your password" : "Ripristina la password",
     "%s password reset" : "Ripristino password di %s",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
@@ -68,6 +70,7 @@ OC.L10N.register(
     "No files in here" : "Qui non c'è alcun file",
     "Choose" : "Scegli",
     "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
     "read-only" : "sola lettura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
@@ -112,6 +115,7 @@ OC.L10N.register(
     "Expiration" : "Scadenza",
     "Expiration date" : "Data di scadenza",
     "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Scegli una password per il collegamento pubblico o premi \"Invio ↵\"",
     "Copied!" : "Copiati!",
     "Copy" : "Copia",
     "Not supported!" : "Non supportato!",
@@ -133,6 +137,7 @@ OC.L10N.register(
     "group" : "gruppo",
     "remote" : "remota",
     "email" : "email",
+    "shared by {sharer}" : "condiviso da {sharer}",
     "Unshare" : "Rimuovi condivisione",
     "Can reshare" : "Può ri-condividere",
     "Can edit" : "Può modificare",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 651aef1e592..7edeef0bde5 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -15,6 +15,8 @@
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
     "Couldn't reset password because the token is expired" : "Impossibile reimpostare la password poiché il token è scaduto",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "Password reset" : "Ripristino password",
+    "Reset your password" : "Ripristina la password",
     "%s password reset" : "Ripristino password di %s",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
@@ -66,6 +68,7 @@
     "No files in here" : "Qui non c'è alcun file",
     "Choose" : "Scegli",
     "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
     "read-only" : "sola lettura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
@@ -110,6 +113,7 @@
     "Expiration" : "Scadenza",
     "Expiration date" : "Data di scadenza",
     "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Scegli una password per il collegamento pubblico o premi \"Invio ↵\"",
     "Copied!" : "Copiati!",
     "Copy" : "Copia",
     "Not supported!" : "Non supportato!",
@@ -131,6 +135,7 @@
     "group" : "gruppo",
     "remote" : "remota",
     "email" : "email",
+    "shared by {sharer}" : "condiviso da {sharer}",
     "Unshare" : "Rimuovi condivisione",
     "Can reshare" : "Può ri-condividere",
     "Can edit" : "Può modificare",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 57b9bfe2e87..dc23a8ac3d0 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "No files in here" : "Hier geen bestanden",
     "Choose" : "Kies",
     "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
     "read-only" : "Alleen lezen",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
@@ -102,6 +103,7 @@ OC.L10N.register(
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "De PHP Opcache is niet juist geconfigureerd. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Voor betere prestaties adviseren we  ↗</a> de volgende instellingen te gebruiken in <code>php.ini</code>:",
     "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren met klem om deze functie in te schakelen.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze<a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Je bent met deze site verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
@@ -116,6 +118,7 @@ OC.L10N.register(
     "Expiration" : "Vervaltermijn",
     "Expiration date" : "Vervaldatum",
     "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Kies een wachtwoord voor de openbare link of druk op \"Enter ↵\"",
     "Copied!" : "Gekopieerd!",
     "Copy" : "Kopiëren",
     "Not supported!" : "Niet ondersteund!",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index e84fa40d743..f5decaab53d 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -70,6 +70,7 @@
     "No files in here" : "Hier geen bestanden",
     "Choose" : "Kies",
     "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "OK" : "OK",
     "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
     "read-only" : "Alleen lezen",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
@@ -100,6 +101,7 @@
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "De PHP Opcache is niet juist geconfigureerd. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Voor betere prestaties adviseren we  ↗</a> de volgende instellingen te gebruiken in <code>php.ini</code>:",
     "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren met klem om deze functie in te schakelen.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze<a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Je bent met deze site verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
@@ -114,6 +116,7 @@
     "Expiration" : "Vervaltermijn",
     "Expiration date" : "Vervaldatum",
     "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Kies een wachtwoord voor de openbare link of druk op \"Enter ↵\"",
     "Copied!" : "Gekopieerd!",
     "Copy" : "Kopiëren",
     "Not supported!" : "Niet ondersteund!",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 694d8c88f89..d8f2f4a47cc 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Couldn't reset password because the token is invalid" : "令牌无效, 无法重置密码",
     "Couldn't reset password because the token is expired" : "令牌已过期, 无法重置密码",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "该用户没有设置电子邮件地址, 无发送重置邮件. 请联系管理员.",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "点击下面的按钮来重置你的密码。如果你并没有请求密码重置，请忽略这封邮件。",
     "%s password reset" : "重置 %s 的密码",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件, 请联系管理员.",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件, 请检查您的用户名是否正确.",
@@ -98,6 +99,7 @@ OC.L10N.register(
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP opcache配置不正确.<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">为更好的性能，我们建议↗</a> 使用下列设置<code>php.ini</code>:",
     "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP的函数“set_time_limit\"是不可用的，这导致脚本在运行中被中止，暂停你的安装，我们强烈建议你开启这个函数",
     "Error occurred while checking server setup" : "检查服务器设置时出错",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据存储目录可以从互联网上直接访问。.htaccess文件没有生效，请配置你的网页服务器以避免数据存储目录可从外部访问或将数据存储目录转移到网页服务器根目录之外。",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP 请求头 \"{header}\" 没有配置为 \"{expected}\". 这是一个潜在的安全或隐私风险, 我们建议您调整这项设置.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 请求头 \"Strict-Transport-Security\" 没有配置为至少 “{seconds}” 秒. 出于增强安全性考虑, 我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</a>中的说明启用 HSTS.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点, 我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>中的说明配置服务器强制使用 HTTPS.",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 0c06d84152e..2d445544c0f 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -15,6 +15,7 @@
     "Couldn't reset password because the token is invalid" : "令牌无效, 无法重置密码",
     "Couldn't reset password because the token is expired" : "令牌已过期, 无法重置密码",
     "Could not send reset email because there is no email address for this username. Please contact your administrator." : "该用户没有设置电子邮件地址, 无发送重置邮件. 请联系管理员.",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "点击下面的按钮来重置你的密码。如果你并没有请求密码重置，请忽略这封邮件。",
     "%s password reset" : "重置 %s 的密码",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件, 请联系管理员.",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件, 请检查您的用户名是否正确.",
@@ -96,6 +97,7 @@
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP opcache配置不正确.<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">为更好的性能，我们建议↗</a> 使用下列设置<code>php.ini</code>:",
     "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP的函数“set_time_limit\"是不可用的，这导致脚本在运行中被中止，暂停你的安装，我们强烈建议你开启这个函数",
     "Error occurred while checking server setup" : "检查服务器设置时出错",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据存储目录可以从互联网上直接访问。.htaccess文件没有生效，请配置你的网页服务器以避免数据存储目录可从外部访问或将数据存储目录转移到网页服务器根目录之外。",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP 请求头 \"{header}\" 没有配置为 \"{expected}\". 这是一个潜在的安全或隐私风险, 我们建议您调整这项设置.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 请求头 \"Strict-Transport-Security\" 没有配置为至少 “{seconds}” 秒. 出于增强安全性考虑, 我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</a>中的说明启用 HSTS.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点, 我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>中的说明配置服务器强制使用 HTTPS.",