mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5759 from nextcloud/backport-translations-stuff-12 

[stable12] Backport translation fixes
This commit is contained in:
Roeland Jago Douma 2017-07-20 14:25:11 +02:00 committed by GitHub
parent ad1c6a0fc2 a91ce85fed
commit 07ebc7b1c3
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php
View File

@ -214,7 +214,7 @@ class MountPublicLinkController extends Controller {
$result = json_decode($body, true);
if (is_array($result) && isset($result['remoteUrl'])) {
return new JSONResponse(['message' => $this->l->t('Federated Share request was successful, you will receive a invitation. Check your notifications.')]);
return new JSONResponse(['message' => $this->l->t('Federated Share request sent, you will receive an invitation. Check your notifications.')]);
}
// if we doesn't get the expected response we assume that we try to add
@ -303,7 +303,7 @@ class MountPublicLinkController extends Controller {
$storage->getScanner()->scanAll();
return new JSONResponse(
[
'message' => $this->l->t('Federated Share successfully added'),
'message' => $this->l->t('Federated share added'),
'legacyMount' => '1'
]
);

4
apps/files_external/js/statusmanager.js
View File

@ -102,7 +102,7 @@ OCA.External.StatusManager = {
var message;
if (mountData.location === 3) {
// In this case the error is because mount point use Login credentials and don't exist in the session
message = t('files_external', 'Couldn\'t access. Please logout and login to activate this mount point');
message = t('files_external', 'Couldn\'t access. Please log out and in again to activate this mount point');
} else {
message = t('files_external', 'Couldn\'t get the information from the remote server: {code} {type}', {
code: jqxhr.status,
@ -267,7 +267,7 @@ OCA.External.StatusManager = {
// check if we have a list first
if (list === undefined && !self.emptyWarningShown) {
self.emptyWarningShown = true;
OC.Notification.show(t('files_external', 'Couldn\'t get the list of Windows network drive mount points: empty response from the server'),
OC.Notification.show(t('files_external', 'Couldn\'t fetch list of Windows network drive mount points: Empty response from server'),
{type: 'error'}
);
return;

2
apps/oauth2/templates/admin.php
View File

@ -32,7 +32,7 @@ $clients = $_['clients'];
<div id="oauth2" class="section">
<h2><?php p($l->t('OAuth 2.0 clients')); ?></h2>
<p class="settings-hint"><?php p($l->t('OAuth 2.0 allows external services to request access to your %s.', [$themingDefaults->getName()])); ?></p>
<p class="settings-hint"><?php p($l->t('OAuth 2.0 allows external services to request access to %s.', [$themingDefaults->getName()])); ?></p>
<table class="grid">
<thead>

8
apps/user_ldap/ajax/testConfiguration.php
View File

@ -67,19 +67,19 @@ try {
$ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
} catch (\Exception $e) {
if($e->getCode() === 1) {
OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.')));
OCP\JSON::error(array('message' => $l->t('Invalid configuration: Anonymous binding is not allowed.')));
exit;
}
}
OCP\JSON::success(array('message'
=> $l->t('The configuration is valid and the connection could be established!')));
=> $l->t('Valid configuration, connection established!')));
} else {
OCP\JSON::error(array('message'
=> $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
=> $l->t('Valid configuration, but binding failed. Please check the server settings and credentials.')));
}
} else {
OCP\JSON::error(array('message'
=> $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
=> $l->t('Invalid configuration. Please have a look at the logs for further details.')));
}
} catch (\Exception $e) {
OCP\JSON::error(array('message' => $e->getMessage()));

6
apps/user_ldap/js/wizard/wizardTabLoginFilter.js
View File

@ -142,16 +142,16 @@ OCA = OCA || {};
var usersFound = parseInt(result.changes.ldap_test_loginname, 10);
if(usersFound < 1) {
var filter = $('<p>').text(result.changes.ldap_test_effective_filter).html();
message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>' + filter);
message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command-line validation): <br/>' + filter);
console.warn(filter);
isHtml = true;
} else if(usersFound === 1) {
message = t('user_ldap', 'User found and settings verified.');
} else if(usersFound > 1) {
message = t('user_ldap', 'Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter.');
message = t('user_ldap', 'Consider narrowing your search, as it encompassed many users, only the first one of whom will be able to log in.');
}
} else {
message = t('user_ldap', 'An unspecified error occurred. Please check the settings and the log.');
message = t('user_ldap', 'An unspecified error occurred. Please check log and settings.');
if(!_.isUndefined(result.message) && result.message) {
message = result.message;
}

4
apps/user_ldap/lib/Wizard.php
View File

@ -107,7 +107,7 @@ class Wizard extends LDAPUtility {
} else if ($type === 'objects') {
$result = $this->access->countObjects($limit);
} else {
throw new \Exception('internal error: invalid object type', 500);
throw new \Exception('Internal error: Invalid object type', 500);
}
return $result;
@ -244,7 +244,7 @@ class Wizard extends LDAPUtility {
}
};
throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.'));
throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.'));
}
/**

4
settings/js/apps.js
View File

@ -479,7 +479,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
$.post(OC.webroot + '/index.php/disableapp', {appid: appId}, function() {
OC.Settings.Apps.showErrorMessage(
appId,
t('settings', 'Error: this app cannot be enabled because it makes the server unstable')
t('settings', 'Error: This app can not be enabled because it makes the server unstable')
);
appItems.forEach(function(appItem) {
appItem.data('errormsg', t('settings', 'Error while enabling app'));
@ -493,7 +493,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
}).fail(function() {
OC.Settings.Apps.showErrorMessage(
appId,
t('settings', 'Error: could not disable broken app')
t('settings', 'Error: Could not disable broken app')
);
appItems.forEach(function(appItem) {
appItem.data('errormsg', t('settings', 'Error while disabling broken app'));