aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorValdnet <47037905+Valdnet@users.noreply.github.com>2021-04-22 20:07:39 +0200
committerJoas Schilling <coding@schilljs.com>2021-05-21 11:50:12 +0200
commit77ca79f697e1002997b5ce5b1bd06c91be507d72 (patch)
treebe235f0db590173c8024e4b3170bc22b22c5bbbe /apps
parent4aae71cd77e5117f06cabcc8a3933328f2df6533 (diff)
downloadnextcloud-server-77ca79f697e1002997b5ce5b1bd06c91be507d72.tar.gz
nextcloud-server-77ca79f697e1002997b5ce5b1bd06c91be507d72.zip
l10n: Spelling unification
Spelling unification in Transifex. Signed-off-by: Valdnet 47037905+Valdnet@users.noreply.github.com
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/Lib/Backend/SMB.php2
-rw-r--r--apps/files_external/lib/Lib/Backend/SMB_OC.php2
-rw-r--r--apps/user_ldap/js/wizard/wizardTabLoginFilter.js4
-rw-r--r--apps/user_ldap/js/wizard/wizardTabUserFilter.js2
-rw-r--r--apps/user_ldap/lib/Settings/Section.php4
-rw-r--r--apps/user_ldap/templates/part.wizard-loginfilter.php6
-rw-r--r--apps/user_ldap/templates/settings.php2
-rw-r--r--apps/user_ldap/tests/Settings/SectionTest.php6
8 files changed, 14 insertions, 14 deletions
diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php
index 5344bf5f78c..a21beb6e012 100644
--- a/apps/files_external/lib/Lib/Backend/SMB.php
+++ b/apps/files_external/lib/Lib/Backend/SMB.php
@@ -45,7 +45,7 @@ class SMB extends Backend {
->setIdentifier('smb')
->addIdentifierAlias('\OC\Files\Storage\SMB')// legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
- ->setText($l->t('SMB / CIFS'))
+ ->setText($l->t('SMB/CIFS'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
new DefinitionParameter('share', $l->t('Share')),
diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php
index 439d85164cc..dfec19d11d1 100644
--- a/apps/files_external/lib/Lib/Backend/SMB_OC.php
+++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php
@@ -43,7 +43,7 @@ class SMB_OC extends Backend {
$this
->setIdentifier('\OC\Files\Storage\SMB_OC')
->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
- ->setText($l->t('SMB / CIFS using OC login'))
+ ->setText($l->t('SMB/CIFS using OC login'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
(new DefinitionParameter('username_as_share', $l->t('Username as share')))
diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index 0eef632d85d..616fb6ea350 100644
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -159,9 +159,9 @@ OCA = OCA || {};
if(message === 'Bad search filter') {
message = t('user_ldap', 'The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise.');
} else if(message === 'connection error') {
- message = t('user_ldap', 'A connection error to LDAP / AD occurred, please check host, port and credentials.');
+ 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/js/wizard/wizardTabUserFilter.js b/apps/user_ldap/js/wizard/wizardTabUserFilter.js
index da7cb77568e..b57aa54db69 100644
--- a/apps/user_ldap/js/wizard/wizardTabUserFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabUserFilter.js
@@ -131,7 +131,7 @@ OCA = OCA || {};
if( key === 'ldap_userfilter_groups'
&& message === 'memberOf is not supported by the server'
) {
- message = t('user_ldap', 'The group box was disabled, because the LDAP / AD server does not support memberOf.');
+ message = t('user_ldap', 'The group box was disabled, because the LDAP/AD server does not support memberOf.');
}
return message;
}
diff --git a/apps/user_ldap/lib/Settings/Section.php b/apps/user_ldap/lib/Settings/Section.php
index 308cf6b86ef..b854b0303d9 100644
--- a/apps/user_ldap/lib/Settings/Section.php
+++ b/apps/user_ldap/lib/Settings/Section.php
@@ -55,13 +55,13 @@ class Section implements IIconSection {
}
/**
- * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+ * returns the translated name as it should be displayed, e.g. 'LDAP/AD
* integration'. Use the L10N service to translate it.
*
* @return string
*/
public function getName() {
- return $this->l->t('LDAP / AD integration');
+ return $this->l->t('LDAP/AD integration');
}
/**
diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
index c7cbabb7aba..1cc46ff52c4 100644
--- a/apps/user_ldap/templates/part.wizard-loginfilter.php
+++ b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -5,16 +5,16 @@
</p>
<p>
<label for="ldap_loginfilter_username">
- <?php p($l->t('LDAP / AD Username:'));?>
+ <?php p($l->t('LDAP/AD Username:'));?>
</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>
<label for="ldap_loginfilter_email">
- <?php p($l->t('LDAP / AD Email Address:'));?>
+ <?php p($l->t('LDAP/AD Email Address:'));?>
</label>
<input type="checkbox" id="ldap_loginfilter_email"
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 0f0b33002b8..b6b90d993b9 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -55,7 +55,7 @@ style('user_ldap', 'settings');
?>
<form id="ldap" class="section" action="#" method="post">
- <h2><?php p($l->t('LDAP / AD integration')); ?></h2>
+ <h2><?php p($l->t('LDAP/AD integration')); ?></h2>
<div id="ldapSettings">
<ul>
diff --git a/apps/user_ldap/tests/Settings/SectionTest.php b/apps/user_ldap/tests/Settings/SectionTest.php
index f27ac0843e8..e9b7b00e5cf 100644
--- a/apps/user_ldap/tests/Settings/SectionTest.php
+++ b/apps/user_ldap/tests/Settings/SectionTest.php
@@ -58,10 +58,10 @@ class SectionTest extends TestCase {
$this->l
->expects($this->once())
->method('t')
- ->with('LDAP / AD integration')
- ->willReturn('LDAP / AD integration');
+ ->with('LDAP/AD integration')
+ ->willReturn('LDAP/AD integration');
- $this->assertSame('LDAP / AD integration', $this->section->getName());
+ $this->assertSame('LDAP/AD integration', $this->section->getName());
}
public function testGetPriority() {