summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-04-18 09:53:02 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-04-18 16:40:53 -0500
commit1c0bffe87f578403b130015f8fee5560cc075b34 (patch)
treeddf334b5dfd362f9c905ed2e9ed27fd8aa584694 /core
parentb072d2c49d6f61c2b55abf12e04bdf2166dbd4f4 (diff)
downloadnextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.tar.gz
nextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.zip
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core')
-rw-r--r--core/js/oc-dialogs.js2
-rw-r--r--core/js/setupchecks.js2
-rw-r--r--core/js/sharedialoglinkshareview.js2
-rw-r--r--core/js/tests/specs/setupchecksSpec.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 7e059b4bbc0..92f256699af 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -326,7 +326,7 @@ var OCdialogs = {
}
};
buttonlist[0] = {
- text: t('core', 'Ok'),
+ text: t('core', 'OK'),
click: functionToCall,
defaultButton: true
};
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 53b2e46f90a..499709c0696 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -221,7 +221,7 @@
// .ocdata is an empty file in the data directory - if this is readable then the data dir is not protected
if (xhr.status === 200 && xhr.responseText === '') {
messages.push({
- msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest 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.'),
+ msg: t('core', '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.'),
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
});
}
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 36f15a7269d..75e56a23f58 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -17,7 +17,7 @@
var PASSWORD_PLACEHOLDER = '**********';
var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link');
- var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press enter');
+ var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press "Enter ↵"');
var TEMPLATE =
'{{#if shareAllowed}}' +
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 937084aaa24..30a60d3599b 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -108,7 +108,7 @@ describe('OC.SetupChecks tests', function() {
async.done(function( data, s, x ){
expect(data).toEqual([
{
- msg: 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest 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.',
+ msg: '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.',
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
}]);
done();