diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-13 01:18:01 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-13 01:18:01 +0100 |
| commit | bc43dd704fc89188faadb42d313a41f8b2929c0c (patch) | |
| tree | e3d55e4b2cff99d4bdae91475a7249381c846ba9 /apps/user_webdavauth | |
| parent | 14e3d77d64a83704d224ca91b5736ec2e94ee01b (diff) | |
| parent | 68fa0b7dcc4a45e4f44b754626440091608ccc85 (diff) | |
| download | nextcloud-server-bc43dd704fc89188faadb42d313a41f8b2929c0c.tar.gz nextcloud-server-bc43dd704fc89188faadb42d313a41f8b2929c0c.zip | |
Merge branch 'master' into fixing-1424-master
Conflicts:
settings/js/users.js
Diffstat (limited to 'apps/user_webdavauth')
| -rw-r--r-- | apps/user_webdavauth/l10n/et_EE.php | 3 | ||||
| -rw-r--r-- | apps/user_webdavauth/l10n/ru.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php index 9bd32954b05..f4f74860358 100644 --- a/apps/user_webdavauth/l10n/et_EE.php +++ b/apps/user_webdavauth/l10n/et_EE.php @@ -1,3 +1,4 @@ <?php $TRANSLATIONS = array( -"WebDAV URL: http://" => "WebDAV URL: http://" +"WebDAV Authentication" => "WebDAV autentimine", +"URL: http://" => "URL: http://" ); diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php index 245a5101341..f12982fc406 100644 --- a/apps/user_webdavauth/l10n/ru.php +++ b/apps/user_webdavauth/l10n/ru.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"URL: http://" => "URL: http://" +"WebDAV Authentication" => "Идентификация WebDAV", +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud отправит пользовательские данные на этот URL. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными." ); |