summaryrefslogtreecommitdiffstats
path: root/apps
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 /apps
parentb072d2c49d6f61c2b55abf12e04bdf2166dbd4f4 (diff)
downloadnextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.tar.gz
nextcloud-server-1c0bffe87f578403b130015f8fee5560cc075b34.zip
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/Controller/GlobalStoragesController.php2
-rw-r--r--apps/files_external/lib/Controller/StoragesController.php4
-rw-r--r--apps/files_external/lib/Controller/UserGlobalStoragesController.php6
-rw-r--r--apps/files_external/lib/Controller/UserStoragesController.php2
-rw-r--r--apps/files_external/lib/Service/StoragesService.php8
-rw-r--r--apps/updatenotification/lib/Notification/Notifier.php2
-rw-r--r--apps/user_ldap/js/wizard/wizardTabLoginFilter.js2
-rw-r--r--apps/user_ldap/templates/part.wizard-groupfilter.php2
-rw-r--r--apps/user_ldap/templates/part.wizard-loginfilter.php2
-rw-r--r--apps/user_ldap/templates/part.wizard-server.php4
-rw-r--r--apps/workflowengine/js/admin.js2
-rw-r--r--apps/workflowengine/js/filemimetypeplugin.js2
12 files changed, 19 insertions, 19 deletions
diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
index c6a19004e8e..69056225f8a 100644
--- a/apps/files_external/lib/Controller/GlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -170,7 +170,7 @@ class GlobalStoragesController extends StoragesController {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index d962848bd78..dd2bf69a0a6 100644
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -306,7 +306,7 @@ abstract class StoragesController extends Controller {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
@@ -331,7 +331,7 @@ abstract class StoragesController extends Controller {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
index 4acbc156261..22c9c867855 100644
--- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -122,7 +122,7 @@ class UserGlobalStoragesController extends StoragesController {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
@@ -162,7 +162,7 @@ class UserGlobalStoragesController extends StoragesController {
} else {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" is not user editable', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" is not user editable', array($id))
],
Http::STATUS_FORBIDDEN
);
@@ -170,7 +170,7 @@ class UserGlobalStoragesController extends StoragesController {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php
index db078346313..724bdd01463 100644
--- a/apps/files_external/lib/Controller/UserStoragesController.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -198,7 +198,7 @@ class UserStoragesController extends StoragesController {
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php
index 43839a17d76..4e38ea96259 100644
--- a/apps/files_external/lib/Service/StoragesService.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -147,14 +147,14 @@ abstract class StoragesService {
$mount = $this->dbConfig->getMountById($id);
if (!is_array($mount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
$config = $this->getStorageConfigFromDBMount($mount);
if ($this->isApplicable($config)) {
return $config;
} else {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
}
@@ -377,7 +377,7 @@ abstract class StoragesService {
$existingMount = $this->dbConfig->getMountById($id);
if (!is_array($existingMount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found while updating storage');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
}
$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
@@ -456,7 +456,7 @@ abstract class StoragesService {
$existingMount = $this->dbConfig->getMountById($id);
if (!is_array($existingMount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
$this->dbConfig->removeMount($id);
diff --git a/apps/updatenotification/lib/Notification/Notifier.php b/apps/updatenotification/lib/Notification/Notifier.php
index bef57b0d867..e512825da04 100644
--- a/apps/updatenotification/lib/Notification/Notifier.php
+++ b/apps/updatenotification/lib/Notification/Notifier.php
@@ -98,7 +98,7 @@ class Notifier implements INotifier {
}
$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
- ->setParsedMessage($l->t('Please check the nextcloud and server log files for errors.'));
+ ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
} elseif ($notification->getObjectType() === 'core') {
$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index d08a744f9ee..a2537539ede 100644
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -160,7 +160,7 @@ OCA = OCA || {};
} else if(message === 'connection error') {
message = t('user_ldap', 'A connection error to LDAP / AD occurred, please check host, port and credentials.');
} else if(message === 'missing placeholder') {
- message = t('user_ldap', 'The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
+ message = t('user_ldap', 'The "%uid" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
}
}
OC.Notification.showTemporary(message, {isHTML: isHtml});
diff --git a/apps/user_ldap/templates/part.wizard-groupfilter.php b/apps/user_ldap/templates/part.wizard-groupfilter.php
index 5c406450f6f..640b0bccb8a 100644
--- a/apps/user_ldap/templates/part.wizard-groupfilter.php
+++ b/apps/user_ldap/templates/part.wizard-groupfilter.php
@@ -53,7 +53,7 @@
</p>
<p class="ldap_count">
<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
- <?php p($l->t('Verify settings and count groups'));?>
+ <?php p($l->t('Verify settings and count the groups'));?>
</button>
<span id="ldap_group_count"></span>
</p>
diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
index a13931d9327..779b3fdb9a1 100644
--- a/apps/user_ldap/templates/part.wizard-loginfilter.php
+++ b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -9,7 +9,7 @@
</label>
<input type="checkbox" id="ldap_loginfilter_username"
- title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>"
+ title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or sAMAccountName and will be detected.'));?>"
name="ldap_loginfilter_username" value="1" />
</p>
<p>
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 56d351eb10b..f4f2abe0f91 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -25,7 +25,7 @@
</select>
<button type="button" id="ldap_action_add_configuration"
name="ldap_action_add_configuration" class="icon-add icon-default-style"
- title="<?php p($l->t('Add a new and blank configuration'));?>">&nbsp;</button>
+ title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
<button type="button" id="ldap_action_copy_configuration"
name="ldap_action_copy_configuration"
class="ldapIconCopy icon-default-style"
@@ -42,7 +42,7 @@
<input type="text" class="host" id="ldap_host"
name="ldap_host"
placeholder="<?php p($l->t('Host'));?>"
- title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://'));?>"
+ title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
/>
<span class="hostPortCombinatorSpan">
<input type="number" id="ldap_port" name="ldap_port"
diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js
index 7f9a709ec14..ab122a8cd65 100644
--- a/apps/workflowengine/js/admin.js
+++ b/apps/workflowengine/js/admin.js
@@ -187,7 +187,7 @@
this.saving = false;
this.originalModel = JSON.parse(JSON.stringify(this.model));
- this.message = t('workflowengine', 'Successfully saved');
+ this.message = t('workflowengine', 'Saved');
this.errorMessage = '';
this.render();
};
diff --git a/apps/workflowengine/js/filemimetypeplugin.js b/apps/workflowengine/js/filemimetypeplugin.js
index fd3f6a9ae63..17c092d209f 100644
--- a/apps/workflowengine/js/filemimetypeplugin.js
+++ b/apps/workflowengine/js/filemimetypeplugin.js
@@ -27,7 +27,7 @@
getCheck: function() {
return {
'class': 'OCA\\WorkflowEngine\\Check\\FileMimeType',
- 'name': t('workflowengine', 'File mime type'),
+ 'name': t('workflowengine', 'File MIME type'),
'operators': [
{'operator': 'is', 'name': t('workflowengine', 'is')},
{'operator': '!is', 'name': t('workflowengine', 'is not')},