diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-18 18:01:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 18:01:50 -0500 |
| commit | 269600a04f18e025313352d3b2293cc10d3c26fa (patch) | |
| tree | ea97f5ea1965ea7328ce9a20585a282419e1ecf2 /apps/user_ldap | |
| parent | 34e0b21f418c7dcc5ab346248873a2ae0ec5ba2b (diff) | |
| parent | 1c0bffe87f578403b130015f8fee5560cc075b34 (diff) | |
| download | nextcloud-server-269600a04f18e025313352d3b2293cc10d3c26fa.tar.gz nextcloud-server-269600a04f18e025313352d3b2293cc10d3c26fa.zip | |
Merge pull request #4369 from nextcloud/fix-translations
Fix translations
Diffstat (limited to 'apps/user_ldap')
4 files changed, 5 insertions, 5 deletions
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'));?>"> </button> + title="<?php p($l->t('Add a new configuration'));?>"> </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" |