Merge pull request #8633 from nextcloud/rakekniven-i18n-fix

Improved translation strings

4 files changed, 11 insertions, 4 deletions

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 014dd7a3c2b..ffe1e972071 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1143,7 +1143,7 @@ MountConfigListView.prototype = _.extend({
 		}
 		var storage = new this._storageConfigClass(configId);
 
-		OC.dialogs.confirm(t('files_external', 'Are you sure you want to delete this external storage', {
+		OC.dialogs.confirm(t('files_external', 'Are you sure you want to delete this external storage?', {
 				storage: this.mountPoint
 			}), t('files_external', 'Delete storage?'), function(confirm) {
 			if (confirm) {
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index e7865b90cf0..74f6a6f036d 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -221,7 +221,7 @@ class ThemingController extends Controller {
 			UPLOAD_ERR_OK => $this->l10n->t('There is no error, the file uploaded with success'),
 			UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
 			UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-			UPLOAD_ERR_PARTIAL => $this->l10n->t('The uploaded file was only partially uploaded'),
+			UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
 			UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
 			UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
 			UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Failed to write file to disk.'),
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index debc1b71e47..25c5686dda1 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -526,7 +526,7 @@ class ThemingControllerTest extends TestCase {
 		return [
 			[UPLOAD_ERR_INI_SIZE, 'The uploaded file exceeds the upload_max_filesize directive in php.ini'],
 			[UPLOAD_ERR_FORM_SIZE, 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'],
-			[UPLOAD_ERR_PARTIAL, 'The uploaded file was only partially uploaded'],
+			[UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'],
 			[UPLOAD_ERR_NO_FILE, 'No file was uploaded'],
 			[UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'],
 			[UPLOAD_ERR_CANT_WRITE, 'Failed to write file to disk.'],
diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js
index 3c6eb1adc45..24e76bd84c7 100644
--- a/apps/user_ldap/js/wizard/wizardTabElementary.js
+++ b/apps/user_ldap/js/wizard/wizardTabElementary.js
@@ -286,7 +286,14 @@ OCA = OCA || {};
 					} else if(objectsFound > 1000) {
 						message = t('user_ldap', 'More than 1,000 directory entries available.');
 					} else {
-						message = t('user_ldap', objectsFound + ' entries available within the provided Base DN');
+						message = n(
+							'user_ldap',
+							'{objectsFound} entry available within the provided Base DN',
+							'{objectsFound} entries available within the provided Base DN',
+							objectsFound,
+							{
+							objectsFound: objectsFound
+							});
 					}
 				} else {
 					message = view.overrideErrorMessage(payload.data.message);