From 07a1dd10b8b570789d74054892a20c952ee99e54 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 29 Sep 2014 14:10:08 +0100 Subject: postgresql auth plugin: correct function name --- lib/plugins/authpgsql/auth.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authpgsql/auth.php b/lib/plugins/authpgsql/auth.php index 99f3ed443..de41598e0 100644 --- a/lib/plugins/authpgsql/auth.php +++ b/lib/plugins/authpgsql/auth.php @@ -159,9 +159,11 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql { if($first) $sql .= " OFFSET $first"; $result = $this->_queryDB($sql); - foreach($result as $user) - if(($info = $this->_getCachedUserInfo($user['user']))) + foreach($result as $user) { + if(($info = $this->_getUserInfo($user['user']))) { $out[$user['user']] = $info; + } + } $this->_unlockTables(); $this->_closeDB(); -- cgit v1.2.3 From 9d7d72dc83bc9b2cb23ec14fdc83c0c665e8039d Mon Sep 17 00:00:00 2001 From: Davor Turkalj Date: Tue, 30 Sep 2014 22:26:03 +0200 Subject: translation update --- lib/plugins/extension/lang/hr/lang.php | 20 ++++++++++---------- lib/plugins/usermanager/lang/hr/lang.php | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/extension/lang/hr/lang.php b/lib/plugins/extension/lang/hr/lang.php index 4905fe864..f43defcb1 100644 --- a/lib/plugins/extension/lang/hr/lang.php +++ b/lib/plugins/extension/lang/hr/lang.php @@ -6,24 +6,24 @@ * @author Davor Turkalj */ $lang['menu'] = 'Upravitelj dodataka'; -$lang['tab_plugins'] = 'Instalirani dodatci'; -$lang['tab_templates'] = 'Instalirani predlošci'; -$lang['tab_search'] = 'Potraži i instaliraj'; -$lang['tab_install'] = 'Ručno instaliranje'; +$lang['tab_plugins'] = 'Ugrađeni dodatci'; +$lang['tab_templates'] = 'Ugrađeni predlošci'; +$lang['tab_search'] = 'Potraži i ugradi'; +$lang['tab_install'] = 'Ručna ugradnja'; $lang['notimplemented'] = 'Ova mogućnost još nije napravljena'; -$lang['notinstalled'] = 'Dodatak nije instaliran'; +$lang['notinstalled'] = 'Dodatak nije ugrađen'; $lang['alreadyenabled'] = 'Ovaj dodatak je već omogućen'; $lang['alreadydisabled'] = 'Ovaj dodatak je već onemogućen'; $lang['pluginlistsaveerror'] = 'Dogodila se greška pri snimanju liste dodataka'; $lang['unknownauthor'] = 'Nepoznat autor'; $lang['unknownversion'] = 'Nepoznata inačica'; $lang['btn_info'] = 'Prikaži više informacija'; -$lang['btn_update'] = 'Dopuni'; +$lang['btn_update'] = 'Dogradi'; $lang['btn_uninstall'] = 'Ukloni'; $lang['btn_enable'] = 'Omogući'; $lang['btn_disable'] = 'Onemogući'; -$lang['btn_install'] = 'Postavi'; -$lang['btn_reinstall'] = 'Ponovno postavi'; +$lang['btn_install'] = 'Ugradi'; +$lang['btn_reinstall'] = 'Ponovno ugradi'; $lang['js']['reallydel'] = 'Zaista ukloniti ovo proširenje?'; $lang['search_for'] = 'Pretraži proširenja'; $lang['search'] = 'Pretraži'; @@ -34,11 +34,11 @@ $lang['homepage_link'] = 'Upute'; $lang['bugs_features'] = 'Greške'; $lang['tags'] = 'Oznake:'; $lang['author_hint'] = 'Potraži dodatke od ovog autora'; -$lang['installed'] = 'Postavljeno:'; +$lang['installed'] = 'Ugrađeno:'; $lang['downloadurl'] = 'URL adresa preuzimanja:'; $lang['repository'] = 'Repozitorij:'; $lang['unknown'] = 'nepoznat'; -$lang['installed_version'] = 'Postavljena inačica:'; +$lang['installed_version'] = 'Ugrađena inačica:'; $lang['install_date'] = 'Vaše zadnje osvježavanje:'; $lang['available_version'] = 'Dostupna inačica'; $lang['compatible'] = 'Kompatibilan s:'; diff --git a/lib/plugins/usermanager/lang/hr/lang.php b/lib/plugins/usermanager/lang/hr/lang.php index 80613ed6f..a71afb60a 100644 --- a/lib/plugins/usermanager/lang/hr/lang.php +++ b/lib/plugins/usermanager/lang/hr/lang.php @@ -33,7 +33,7 @@ $lang['line'] = 'Linija br.'; $lang['error'] = 'Poruka o grešci'; $lang['summary'] = 'Prikaz korisnika %1$d-%2$d od %3$d nađenih. Ukupno %4$d korisnika.'; $lang['nonefound'] = 'Nema korisnika koji odgovaraju filtru.Ukupno %d korisnika.'; -$lang['delete_ok'] = '%d korisnik obrisano'; +$lang['delete_ok'] = '%d korisnika obrisano'; $lang['delete_fail'] = '%d neuspjelih brisanja.'; $lang['update_ok'] = 'Korisnik uspješno izmijenjen'; $lang['update_fail'] = 'Neuspjela izmjena korisnika'; @@ -49,7 +49,7 @@ $lang['note_group'] = 'Novi korisnik biti će dodijeljen u podrazumij $lang['note_pass'] = 'Lozinka će biti generirana ako se polje ostavi prazno i obavješćivanje korisnika je omogućeno.'; $lang['add_ok'] = 'Korisnik uspješno dodan'; $lang['add_fail'] = 'Neuspješno dodavanje korisnika'; -$lang['notify_ok'] = 'Obavijest korisniku poslana'; +$lang['notify_ok'] = 'Poslana obavijest korisniku'; $lang['notify_fail'] = 'Obavijest korisniku ne može biti poslana'; $lang['import_userlistcsv'] = 'Datoteka s popisom korisnika (CSV):'; $lang['import_header'] = 'Zadnje greške pri uvozu'; -- cgit v1.2.3 From aecab027b93163e5323c66056fa5da665beef091 Mon Sep 17 00:00:00 2001 From: Rainbow Spike Date: Wed, 1 Oct 2014 21:06:29 +1100 Subject: Update lang.php Microfix --- lib/plugins/extension/lang/ru/lang.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php index fa1625f28..7fb39b3e9 100644 --- a/lib/plugins/extension/lang/ru/lang.php +++ b/lib/plugins/extension/lang/ru/lang.php @@ -25,7 +25,7 @@ $lang['js']['reallydel'] = 'Действительно удалить эт $lang['search_for'] = 'Поиск дополнения:'; $lang['search'] = 'Найти'; $lang['extensionby'] = '%s — %s'; -$lang['popularity'] = 'Попоулярность: %s%%'; +$lang['popularity'] = 'Популярность: %s%%'; $lang['bugs_features'] = 'Ошибки'; $lang['tags'] = 'Метки:'; $lang['author_hint'] = 'Найти дополнения этого автора'; @@ -46,23 +46,23 @@ $lang['repo_retry'] = 'Повторить'; $lang['status_installed'] = 'установлено'; $lang['status_not_installed'] = 'не установлено'; $lang['status_protected'] = 'защищено'; -$lang['status_enabled'] = 'включен'; +$lang['status_enabled'] = 'включён'; $lang['status_disabled'] = 'отключено'; $lang['status_unmodifiable'] = 'неизменяемо'; $lang['status_plugin'] = 'плагин'; $lang['status_template'] = 'шаблон'; $lang['status_bundled'] = 'в комплекте'; -$lang['msg_enabled'] = 'Плагин %s включен'; -$lang['msg_disabled'] = 'Плагин %s отключен'; +$lang['msg_enabled'] = 'Плагин %s включён'; +$lang['msg_disabled'] = 'Плагин %s отключён'; $lang['msg_delete_success'] = 'Дополнение удалено'; $lang['msg_template_install_success'] = 'Шаблон %s успешно установлен'; $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён'; $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен'; $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён'; -$lang['noperms'] = 'Папка для расширений не доступна на запись'; -$lang['notplperms'] = 'Папка для шаблонов не доступна на запись'; -$lang['nopluginperms'] = 'Папка плагинов не доступна на запись'; +$lang['noperms'] = 'Папка для расширений не доступна для записи'; +$lang['notplperms'] = 'Папка для шаблонов не доступна для записи'; +$lang['nopluginperms'] = 'Папка плагинов не доступна для записи'; $lang['git'] = 'Это расширение было установлено через git, Вы не можете обновить его тут.'; $lang['install_url'] = 'Установить с адреса URL:'; $lang['install_upload'] = 'Скачать расширение:'; -$lang['repo_error'] = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org и также проверьте настройки соединения прокси.'; +$lang['repo_error'] = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернет.'; -- cgit v1.2.3 From 6c8c1f4632a82459236200e9264c40ecebd4b162 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 3 Oct 2014 17:41:14 +0100 Subject: Fix for issues 877 & 885 related to a bug in PCRE 6.6 --- lib/plugins/authplain/_test/escaping.test.php | 43 +++++++++++++++++++++++++-- lib/plugins/authplain/auth.php | 31 ++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php index cd5294157..5a5f67c82 100644 --- a/lib/plugins/authplain/_test/escaping.test.php +++ b/lib/plugins/authplain/_test/escaping.test.php @@ -13,12 +13,12 @@ */ class helper_plugin_authplain_escaping_test extends DokuWikiTest { - protected $pluginsEnabled = array('authplain'); + protected $pluginsEnabled = array('authplainharness'); protected $auth; protected function reloadUsers() { /* auth caches data loaded from file, but recreated object forces reload */ - $this->auth = new auth_plugin_authplain(); + $this->auth = new auth_plugin_authplainharness(); } function setUp() { @@ -76,7 +76,44 @@ class helper_plugin_authplain_escaping_test extends DokuWikiTest { $this->assertEquals($saved['name'], $user['name']); $this->assertTrue($this->auth->checkPass("testuser", $user['pass'])); } + + // really only required for developers to ensure this plugin will + // work with systems running on PCRE 6.6 and lower. + public function testLineSplit(){ + $this->auth->setPregsplit_safe(false); + + $names = array( + 'plain', + 'ut-fठ8', + 'colon:', + 'backslash\\', + 'alltogether\\ठ:' + ); + $userpass = 'user:password_hash:'; + $other_user_data = ':email@address:group1,group2'; + + foreach ($names as $testname) { + $escaped = str_replace(array('\\',':'),array('\\\\','\\:'),$testname); // escape : & \ + $test_line = $userpass.$escaped.$other_user_data; + $result = $this->auth->splitUserData($test_line); + + $this->assertEquals($testname, $result[2]); + } + } } -?> \ No newline at end of file +class auth_plugin_authplainharness extends auth_plugin_authplain { + + public function setPregsplit_safe($bool) { + $this->_pregsplit_safe = $bool; + } + + public function getPregsplit_safe(){ + return $this->_pregsplit_safe; + } + + public function splitUserData($line){ + return $this->_splitUserData($line); + } +} \ No newline at end of file diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index b3ca988b9..ec5d16e9d 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -17,6 +17,9 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { /** @var array filter pattern */ protected $_pattern = array(); + /** @var bool safe version of preg_split */ + protected $_pregsplit_safe = false; + /** * Constructor * @@ -44,6 +47,8 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $this->cando['getUsers'] = true; $this->cando['getUserCount'] = true; } + + $this->_pregsplit_safe = version_compare(PCRE_VERSION,'6.7','>='); } /** @@ -329,7 +334,7 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { if(empty($line)) continue; /* NB: preg_split can be deprecated/replaced with str_getcsv once dokuwiki is min php 5.3 */ - $row = preg_split('/(?_splitUserData($line); $row = str_replace('\\:', ':', $row); $row = str_replace('\\\\', '\\', $row); @@ -342,6 +347,30 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { } } + protected function _splitUserData($line){ + // due to a bug in PCRE 6.6, preg_split will fail with the regex we use here + // refer github issues 877 & 885 + if ($this->_pregsplit_safe){ + return preg_split('/(? Date: Sat, 4 Oct 2014 11:59:42 +0100 Subject: escaping backslash should be included in split items --- lib/plugins/authplain/_test/escaping.test.php | 2 +- lib/plugins/authplain/auth.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authplain/_test/escaping.test.php b/lib/plugins/authplain/_test/escaping.test.php index 5a5f67c82..cbfbbc587 100644 --- a/lib/plugins/authplain/_test/escaping.test.php +++ b/lib/plugins/authplain/_test/escaping.test.php @@ -97,7 +97,7 @@ class helper_plugin_authplain_escaping_test extends DokuWikiTest { $test_line = $userpass.$escaped.$other_user_data; $result = $this->auth->splitUserData($test_line); - $this->assertEquals($testname, $result[2]); + $this->assertEquals($escaped, $result[2]); } } diff --git a/lib/plugins/authplain/auth.php b/lib/plugins/authplain/auth.php index ec5d16e9d..3d303597c 100644 --- a/lib/plugins/authplain/auth.php +++ b/lib/plugins/authplain/auth.php @@ -356,9 +356,12 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $row = array(); $piece = ''; - for($i=0; $i=$len) break; } else if ($line[$i]==':'){ $row[] = $piece; $piece = ''; -- cgit v1.2.3 From 9c03f73b0f57a7e1bf6a3108813a4004bf66d307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= Date: Mon, 13 Oct 2014 02:12:55 +0200 Subject: AUTH_USER_CHANGE handler can modify passed data Originally AUTH_USER_CHANGE handler could modify the user data, however, auth plugin consequently worked with different copy of the array thus effectively preventing any changes by the AUTH_USER_CHANGE implementer. --- lib/plugins/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/auth.php b/lib/plugins/auth.php index b38b591a3..02e0613dd 100644 --- a/lib/plugins/auth.php +++ b/lib/plugins/auth.php @@ -129,7 +129,7 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin { $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null); $evt = new Doku_Event('AUTH_USER_CHANGE', $eventdata); if($evt->advise_before(true)) { - $result = call_user_func_array(array($this, $validTypes[$type]), $params); + $result = call_user_func_array(array($this, $validTypes[$type]), $evt->data['params']); $evt->data['modification_result'] = $result; } $evt->advise_after(); -- cgit v1.2.3 From dfc5e46cbee86f9c2f44b5bc5f72505dd8847352 Mon Sep 17 00:00:00 2001 From: Yadav Gowda Date: Wed, 15 Oct 2014 21:35:58 +0200 Subject: translation update --- lib/plugins/acl/lang/eu/lang.php | 5 +++-- lib/plugins/popularity/lang/eu/lang.php | 5 +++-- lib/plugins/revert/lang/eu/lang.php | 6 ++++-- lib/plugins/usermanager/lang/eu/lang.php | 5 +++-- 4 files changed, 13 insertions(+), 8 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/eu/lang.php b/lib/plugins/acl/lang/eu/lang.php index f051523d9..bb6ab964a 100644 --- a/lib/plugins/acl/lang/eu/lang.php +++ b/lib/plugins/acl/lang/eu/lang.php @@ -1,7 +1,8 @@ * @author Zigor Astarbe */ diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php index b52ccaee1..b5b80357c 100644 --- a/lib/plugins/popularity/lang/eu/lang.php +++ b/lib/plugins/popularity/lang/eu/lang.php @@ -1,7 +1,8 @@ * @author Zigor Astarbe */ diff --git a/lib/plugins/revert/lang/eu/lang.php b/lib/plugins/revert/lang/eu/lang.php index d3532c070..40be3e382 100644 --- a/lib/plugins/revert/lang/eu/lang.php +++ b/lib/plugins/revert/lang/eu/lang.php @@ -1,9 +1,11 @@ * @author Zigor Astarbe + * @author Yadav Gowda */ $lang['menu'] = 'Berrezartze Kudeatzailea'; $lang['filter'] = 'Bilatu spam duten orriak'; diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php index 5d3a01fc7..1fbe13739 100644 --- a/lib/plugins/usermanager/lang/eu/lang.php +++ b/lib/plugins/usermanager/lang/eu/lang.php @@ -1,7 +1,8 @@ * @author Zigor Astarbe */ -- cgit v1.2.3 From a1298aeaa8cf1dc3bba3fb7ecadb0d989afc42cf Mon Sep 17 00:00:00 2001 From: Aleksandr Selivanov Date: Sat, 18 Oct 2014 18:25:58 +0200 Subject: translation update --- lib/plugins/authad/lang/ru/settings.php | 3 ++- lib/plugins/authpgsql/lang/ru/settings.php | 2 +- lib/plugins/extension/lang/ru/lang.php | 17 +++++++++++------ lib/plugins/usermanager/lang/ru/import.txt | 3 +-- lib/plugins/usermanager/lang/ru/lang.php | 3 ++- 5 files changed, 17 insertions(+), 11 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/authad/lang/ru/settings.php b/lib/plugins/authad/lang/ru/settings.php index c9c6d9f88..0212589d7 100644 --- a/lib/plugins/authad/lang/ru/settings.php +++ b/lib/plugins/authad/lang/ru/settings.php @@ -8,8 +8,9 @@ * @author Artur * @author Erli Moen * @author Владимир + * @author Aleksandr Selivanov */ -$lang['account_suffix'] = 'Суффикс вашего аккаунта типа @my.domain.org'; +$lang['account_suffix'] = 'Суффикс вашего аккаунта. Например, @my.domain.org'; $lang['domain_controllers'] = 'Список DNS-серверов, разделенных запятой. Например:srv1.domain.org,srv2.domain.org'; $lang['admin_password'] = 'Пароль для указанного пользователя.'; $lang['sso'] = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?'; diff --git a/lib/plugins/authpgsql/lang/ru/settings.php b/lib/plugins/authpgsql/lang/ru/settings.php index 65cbce8df..668ba4ef6 100644 --- a/lib/plugins/authpgsql/lang/ru/settings.php +++ b/lib/plugins/authpgsql/lang/ru/settings.php @@ -10,7 +10,7 @@ $lang['server'] = 'Ваш PostgreSQL-сервер'; $lang['port'] = 'Порт вашего PostgreSQL-сервера'; $lang['user'] = 'Имя пользователя PostgreSQL'; -$lang['password'] = 'Пароль для указанного пользователя.'; +$lang['password'] = 'Пароль для указанного пользователя'; $lang['database'] = 'Имя базы данных'; $lang['debug'] = 'Отображать дополнительную отладочную информацию'; $lang['checkPass'] = 'Выражение SQL, осуществляющее проверку пароля'; diff --git a/lib/plugins/extension/lang/ru/lang.php b/lib/plugins/extension/lang/ru/lang.php index 7fb39b3e9..24e6fe224 100644 --- a/lib/plugins/extension/lang/ru/lang.php +++ b/lib/plugins/extension/lang/ru/lang.php @@ -26,7 +26,8 @@ $lang['search_for'] = 'Поиск дополнения:'; $lang['search'] = 'Найти'; $lang['extensionby'] = '%s — %s'; $lang['popularity'] = 'Популярность: %s%%'; -$lang['bugs_features'] = 'Ошибки'; +$lang['homepage_link'] = 'Описание'; +$lang['bugs_features'] = 'Баг-трекер'; $lang['tags'] = 'Метки:'; $lang['author_hint'] = 'Найти дополнения этого автора'; $lang['installed'] = 'Установлено:'; @@ -43,6 +44,8 @@ $lang['conflicts'] = 'Конфликтует с:'; $lang['donate'] = 'Нравится?'; $lang['donate_action'] = 'Купить автору кофе!'; $lang['repo_retry'] = 'Повторить'; +$lang['provides'] = 'Предоставляет:'; +$lang['status'] = 'Статус:'; $lang['status_installed'] = 'установлено'; $lang['status_not_installed'] = 'не установлено'; $lang['status_protected'] = 'защищено'; @@ -59,10 +62,12 @@ $lang['msg_template_install_success'] = 'Шаблон %s успешно уста $lang['msg_template_update_success'] = 'Шаблон %s успешно обновлён'; $lang['msg_plugin_install_success'] = 'Плагин %s успешно установлен'; $lang['msg_plugin_update_success'] = 'Плагин %s успешно обновлён'; -$lang['noperms'] = 'Папка для расширений не доступна для записи'; -$lang['notplperms'] = 'Папка для шаблонов не доступна для записи'; -$lang['nopluginperms'] = 'Папка плагинов не доступна для записи'; -$lang['git'] = 'Это расширение было установлено через git, Вы не можете обновить его тут.'; +$lang['update_available'] = 'Обновление: доступна новая версия %s.'; +$lang['error_badurl'] = 'Ссылки должны начинаться с http или https'; +$lang['noperms'] = 'Папка для расширений недоступна для записи'; +$lang['notplperms'] = 'Папка для шаблонов недоступна для записи'; +$lang['nopluginperms'] = 'Папка плагинов недоступна для записи'; +$lang['git'] = 'Это расширение было установлено через git. Вы не можете обновить его тут.'; $lang['install_url'] = 'Установить с адреса URL:'; $lang['install_upload'] = 'Скачать расширение:'; -$lang['repo_error'] = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернет.'; +$lang['repo_error'] = 'Сайт с плагинами недоступен. Убедитесь, что у сайта есть доступ на www.dokuwiki.org, а также проверьте настройки соединения с Интернетом.'; diff --git a/lib/plugins/usermanager/lang/ru/import.txt b/lib/plugins/usermanager/lang/ru/import.txt index f2049dd0c..c92e47b4c 100644 --- a/lib/plugins/usermanager/lang/ru/import.txt +++ b/lib/plugins/usermanager/lang/ru/import.txt @@ -3,7 +3,6 @@ Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы. Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (%%""%%). Обратный слэш используется как прерывание. -В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». -Повторяющиеся идентификаторы user-id будут игнорироваться. +В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей». Повторяющиеся идентификаторы user-id будут игнорироваться. Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю. \ No newline at end of file diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 8bbfa639c..515de5186 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -68,6 +68,7 @@ $lang['add_ok'] = 'Пользователь успешно доб $lang['add_fail'] = 'Не удалось добавить пользователя'; $lang['notify_ok'] = 'Письмо с уведомлением отправлено'; $lang['notify_fail'] = 'Не удалось отправить письмо с уведомлением'; +$lang['import_userlistcsv'] = 'Файл со списком пользователей (CSV):'; $lang['import_success_count'] = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.'; $lang['import_failure_count'] = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.'; $lang['import_error_fields'] = 'Не все поля заполнены. Найдено %d, а нужно 4.'; @@ -78,4 +79,4 @@ $lang['import_error_upload'] = 'Импорт не удался. CSV-файл $lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.'; $lang['import_error_create'] = 'Невозможно создать пользователя'; $lang['import_notify_fail'] = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.'; -$lang['import_downloadfailures'] = 'Скачать Ошибки в формате CSV для исправления'; +$lang['import_downloadfailures'] = 'Скачать ошибки в формате CSV для исправления'; -- cgit v1.2.3 From 17bc1e4f530dbbc74ad4ba9067782f248d003045 Mon Sep 17 00:00:00 2001 From: Jaroslav Lichtblau Date: Wed, 22 Oct 2014 13:01:09 +0200 Subject: translation update --- lib/plugins/extension/lang/cs/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php index 27b3a94a3..783b488ea 100644 --- a/lib/plugins/extension/lang/cs/lang.php +++ b/lib/plugins/extension/lang/cs/lang.php @@ -55,3 +55,5 @@ $lang['status_unmodifiable'] = 'neměnný'; $lang['status_plugin'] = 'zásuvný modul'; $lang['status_template'] = 'šablona'; $lang['msg_delete_success'] = 'Rozšíření odinstalováno'; +$lang['msg_plugin_install_success'] = 'Zásuvný modul %s úspěšně nainstalován.'; +$lang['msg_plugin_update_success'] = 'Zásuvný modul %s úspěšně aktualizován.'; -- cgit v1.2.3 From ae6f2c31087f39c5c677957200a306b1911c990c Mon Sep 17 00:00:00 2001 From: lioujheyu Date: Mon, 27 Oct 2014 04:16:14 +0100 Subject: translation update --- lib/plugins/extension/lang/zh-tw/intro_plugins.txt | 1 + lib/plugins/extension/lang/zh-tw/lang.php | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 lib/plugins/extension/lang/zh-tw/intro_plugins.txt (limited to 'lib/plugins') diff --git a/lib/plugins/extension/lang/zh-tw/intro_plugins.txt b/lib/plugins/extension/lang/zh-tw/intro_plugins.txt new file mode 100644 index 000000000..b5b77a267 --- /dev/null +++ b/lib/plugins/extension/lang/zh-tw/intro_plugins.txt @@ -0,0 +1 @@ +已經有一些外掛套件被安裝在你的DokuWiki之中。你可以在這裡啟用、禁用，甚至是完全移除它們。如外掛可更新也同時會顯示在這裡，請確保在更新前先閱讀過該套件之文件。 \ No newline at end of file diff --git a/lib/plugins/extension/lang/zh-tw/lang.php b/lib/plugins/extension/lang/zh-tw/lang.php index a86364d7a..79657ffeb 100644 --- a/lib/plugins/extension/lang/zh-tw/lang.php +++ b/lib/plugins/extension/lang/zh-tw/lang.php @@ -5,6 +5,7 @@ * * @author Stan * @author June-Hao Hou + * @author lioujheyu */ $lang['menu'] = '延伸功能管理'; $lang['tab_plugins'] = '已安裝外掛'; @@ -28,20 +29,49 @@ $lang['btn_reinstall'] = '重新安裝'; $lang['js']['reallydel'] = '確定要移除此延伸功能？'; $lang['search_for'] = '搜尋延伸功能：'; $lang['search'] = '搜尋'; +$lang['homepage_link'] = '文件'; $lang['tags'] = '標籤：'; $lang['author_hint'] = '搜尋相同作者的延伸功能'; $lang['installed'] = '已安裝：'; $lang['downloadurl'] = '下載網址：'; +$lang['unknown'] = '未知'; $lang['installed_version'] = '已安裝版本：'; +$lang['install_date'] = '你最後一次更新: '; $lang['available_version'] = '可用版本：'; $lang['compatible'] = '相容於：'; +$lang['depends'] = '依賴於: '; +$lang['similar'] = '類似於: '; +$lang['conflicts'] = '相衝突於: '; +$lang['donate'] = '像這樣？'; +$lang['donate_action'] = '請作者一杯咖啡！'; $lang['repo_retry'] = '再試一次'; $lang['status'] = '狀態：'; $lang['status_installed'] = '已安裝'; $lang['status_not_installed'] = '未安裝'; +$lang['status_protected'] = '已保護'; $lang['status_enabled'] = '作用中'; $lang['status_disabled'] = '停用中'; +$lang['status_unmodifiable'] = '不可更動'; $lang['status_plugin'] = '外掛'; +$lang['status_template'] = '模板'; +$lang['status_bundled'] = '已綑綁內附'; +$lang['msg_enabled'] = '外掛 %s 已啟用'; +$lang['msg_disabled'] = '外掛 %s 已禁用'; +$lang['msg_delete_success'] = '附加元件已移除'; +$lang['msg_template_install_success'] = '模板 %s 以成功安裝'; +$lang['msg_template_update_success'] = '模板 %s 以成功更新'; +$lang['msg_plugin_install_success'] = '外掛 %s 以成功安裝'; +$lang['msg_plugin_update_success'] = '外掛 %s 以成功更新'; +$lang['msg_upload_failed'] = '上傳檔案失敗'; +$lang['missing_dependency'] = '遺失或禁用相依性套件: %s'; +$lang['security_issue'] = '安全性問題: %s'; +$lang['security_warning'] = '安全問題警告: %s'; +$lang['update_available'] = '更新: 已可取得 %s 的新版本'; +$lang['wrong_folder'] = '外掛安裝不正確: 將外掛資料夾從 "%s" 更名至 "%s"。'; +$lang['url_change'] = '網址已變更: 自從上次下載後下載網址已變更。在更新延伸功能前請先檢查新網址是否可用。
新: %s
舊: %s'; +$lang['error_download'] = '無法下載檔案：%s'; +$lang['error_decompress'] = '無法解壓縮檔案。這可能是下載品質不佳所致，在這個情況下你應該再試一次；也有可能是因為無法辨識的壓縮格式，在這個情況下你應該自行下載並手動安裝'; +$lang['error_findfolder'] = '無法辨認延伸功能資料夾，你必須自行下載並手動安裝'; $lang['noperms'] = '延伸功能資料夾無法寫入'; $lang['notplperms'] = '版型資料夾無法寫入'; $lang['nopluginperms'] = '外掛資料夾無法寫入'; -- cgit v1.2.3 From 2ec6a92c13ed276111bbe099aadab33a885397cb Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 19 Nov 2014 19:20:55 +0100 Subject: translation update --- lib/plugins/authad/lang/no/lang.php | 8 ++++++++ lib/plugins/authad/lang/no/settings.php | 2 ++ lib/plugins/authldap/lang/no/settings.php | 2 ++ lib/plugins/authmysql/lang/no/settings.php | 14 ++++++++++++++ lib/plugins/revert/lang/no/lang.php | 1 + 5 files changed, 27 insertions(+) create mode 100644 lib/plugins/authad/lang/no/lang.php create mode 100644 lib/plugins/authmysql/lang/no/settings.php (limited to 'lib/plugins') diff --git a/lib/plugins/authad/lang/no/lang.php b/lib/plugins/authad/lang/no/lang.php new file mode 100644 index 000000000..a1c9c7e8a --- /dev/null +++ b/lib/plugins/authad/lang/no/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['domain'] = 'Loggpå-domene'; diff --git a/lib/plugins/authad/lang/no/settings.php b/lib/plugins/authad/lang/no/settings.php index bab5ce67d..f309ead50 100644 --- a/lib/plugins/authad/lang/no/settings.php +++ b/lib/plugins/authad/lang/no/settings.php @@ -4,6 +4,8 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Christopher Schive + * @author Patrick */ +$lang['account_suffix'] = 'Ditt konto-suffiks F. Eks. @my.domain.org'; $lang['admin_password'] = 'Passordet til brukeren over.'; $lang['expirywarn'] = 'Antall dager på forhånd brukeren varsles om at passordet utgår. 0 for å deaktivere.'; diff --git a/lib/plugins/authldap/lang/no/settings.php b/lib/plugins/authldap/lang/no/settings.php index 6bedb2991..61671ed46 100644 --- a/lib/plugins/authldap/lang/no/settings.php +++ b/lib/plugins/authldap/lang/no/settings.php @@ -4,6 +4,8 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Christopher Schive + * @author Patrick */ $lang['port'] = 'LDAP serverport dersom ingen full URL var gitt over.'; $lang['starttls'] = 'Bruke TLS-forbindelser?'; +$lang['bindpw'] = 'Passord til brukeren over'; diff --git a/lib/plugins/authmysql/lang/no/settings.php b/lib/plugins/authmysql/lang/no/settings.php new file mode 100644 index 000000000..45ab09819 --- /dev/null +++ b/lib/plugins/authmysql/lang/no/settings.php @@ -0,0 +1,14 @@ + + */ +$lang['server'] = 'Din MySQL-server'; +$lang['user'] = 'Ditt MySQL-brukernavn'; +$lang['password'] = 'Passord til brukeren'; +$lang['database'] = 'Database som skal brukes'; +$lang['debug_o_0'] = 'ingen'; +$lang['debug_o_1'] = 'bare ved feil'; +$lang['debug_o_2'] = 'alle SQL-forespørsler'; diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php index 6806dcd93..76da8ca9c 100644 --- a/lib/plugins/revert/lang/no/lang.php +++ b/lib/plugins/revert/lang/no/lang.php @@ -19,6 +19,7 @@ * @author Thomas Juberg * @author Boris * @author Christopher Schive + * @author Patrick */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; -- cgit v1.2.3 From 52f0afd3e452404cf4792276479346237787e636 Mon Sep 17 00:00:00 2001 From: Jaroslav Lichtblau Date: Fri, 21 Nov 2014 21:56:39 +0100 Subject: translation update --- lib/plugins/extension/lang/cs/intro_templates.txt | 1 + lib/plugins/extension/lang/cs/lang.php | 24 +++++++++++++++++++++++ lib/plugins/usermanager/lang/cs/lang.php | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 lib/plugins/extension/lang/cs/intro_templates.txt (limited to 'lib/plugins') diff --git a/lib/plugins/extension/lang/cs/intro_templates.txt b/lib/plugins/extension/lang/cs/intro_templates.txt new file mode 100644 index 000000000..45abe952c --- /dev/null +++ b/lib/plugins/extension/lang/cs/intro_templates.txt @@ -0,0 +1 @@ +Toto jsou šablony, které jsou momentálně nainstalovány v této DokuWiki. Aktuálně používanu šablonu lze vybrat ve [[?do=admin&page=config|Správci rozšíření]]. \ No newline at end of file diff --git a/lib/plugins/extension/lang/cs/lang.php b/lib/plugins/extension/lang/cs/lang.php index 783b488ea..f6db2b153 100644 --- a/lib/plugins/extension/lang/cs/lang.php +++ b/lib/plugins/extension/lang/cs/lang.php @@ -15,6 +15,7 @@ $lang['notimplemented'] = 'Tato vychytávka není dosud implementována'; $lang['notinstalled'] = 'Toto rozšíření není instalováno'; $lang['alreadyenabled'] = 'Toto rozšíření je již povoleno'; $lang['alreadydisabled'] = 'Toto rozšíření je již vypnuto'; +$lang['pluginlistsaveerror'] = 'Došlo k chybě při ukládání seznamu zásuvných modulů'; $lang['unknownauthor'] = 'Neznámý autor'; $lang['unknownversion'] = 'Neznámá verze'; $lang['btn_info'] = 'Zobrazit více informací'; @@ -27,12 +28,15 @@ $lang['btn_reinstall'] = 'Přeinstalovat'; $lang['js']['reallydel'] = 'Opravdu odinstalovat toto rozšíření?'; $lang['search_for'] = 'Hledat rozšíření:'; $lang['search'] = 'Hledat'; +$lang['extensionby'] = '%s od %s'; +$lang['screenshot'] = 'Screenshot %s'; $lang['popularity'] = 'Popularita: %s%%'; $lang['homepage_link'] = 'Dokumenty'; $lang['bugs_features'] = 'Chyby'; $lang['tags'] = 'Štítky:'; $lang['author_hint'] = 'Vyhledat rozšíření podle tohoto autora'; $lang['installed'] = 'Nainstalováno:'; +$lang['downloadurl'] = 'URL stahování:'; $lang['repository'] = 'Repozitář:'; $lang['unknown'] = 'neznámý'; $lang['installed_version'] = 'Nainstalovaná verze:'; @@ -41,6 +45,7 @@ $lang['available_version'] = 'Dostupná verze:'; $lang['compatible'] = 'Kompatibilní s:'; $lang['depends'] = 'Závisí na:'; $lang['similar'] = 'Podobný jako:'; +$lang['conflicts'] = 'Koliduje s:'; $lang['donate'] = 'Líbí se ti to?'; $lang['donate_action'] = 'Kup autorovi kávu!'; $lang['repo_retry'] = 'Opakovat'; @@ -54,6 +59,25 @@ $lang['status_disabled'] = 'zakázaný'; $lang['status_unmodifiable'] = 'neměnný'; $lang['status_plugin'] = 'zásuvný modul'; $lang['status_template'] = 'šablona'; +$lang['status_bundled'] = 'svázaný'; +$lang['msg_enabled'] = 'Zásuvný modul %s povolen'; +$lang['msg_disabled'] = 'Zásuvný modul %s zakázán'; $lang['msg_delete_success'] = 'Rozšíření odinstalováno'; +$lang['msg_template_install_success'] = 'Šablona %s úspěšně nainstalována'; +$lang['msg_template_update_success'] = 'Šablona %s úspěšně aktualizována'; $lang['msg_plugin_install_success'] = 'Zásuvný modul %s úspěšně nainstalován.'; $lang['msg_plugin_update_success'] = 'Zásuvný modul %s úspěšně aktualizován.'; +$lang['msg_upload_failed'] = 'Nahrávání souboru selhalo'; +$lang['missing_dependency'] = 'Chybějící nebo zakázaná závislost: %s'; +$lang['security_issue'] = 'Bezpečnostní problém: %s'; +$lang['security_warning'] = 'Bezpečnostní varování: %s'; +$lang['update_available'] = 'Aktualizace: Je dostupná nová verze %s.'; +$lang['wrong_folder'] = 'Zásuvný modul nesprávně nainstalován: Přejmenujte adresár modulu "%s" na "%s".'; +$lang['error_badurl'] = 'Adresy URL by měly začínat s http nebo https'; +$lang['error_dircreate'] = 'Nelze vytvořit dočasný adresář pro přijetí stahování'; +$lang['error_download'] = 'Nelze stáhnout soubor: %s'; +$lang['error_findfolder'] = 'Nelze rozpoznat adresář pro rozšíření, je třeba stáhnout a instalovat ručně'; +$lang['noperms'] = 'Nelze zapisovat do adresáře pro rozšíření'; +$lang['notplperms'] = 'Nelze zapisovat do odkládacího adresáře'; +$lang['nopluginperms'] = 'Nelze zapisovat do adresáře se zásuvnými moduly'; +$lang['git'] = 'Toto rozšíření bylo nainstalováno přes git, nejspíš ho tady aktualizovat nechcete.'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index bbb560679..6fbfe8535 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -15,6 +15,7 @@ * @author Jakub A. Těšínský (j@kub.cz) * @author mkucera66@seznam.cz * @author Zbyněk Křivka + * @author Jaroslav Lichtblau */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; @@ -62,6 +63,8 @@ $lang['add_ok'] = 'Uživatel úspěšně vytvořen'; $lang['add_fail'] = 'Vytvoření uživatele selhalo'; $lang['notify_ok'] = 'Odeslán mail s upozorněním'; $lang['notify_fail'] = 'Mail s upozorněním nebylo možno odeslat'; +$lang['import_userlistcsv'] = 'Seznam uživatelů (CSV):'; +$lang['import_header'] = 'Poslední selhání importu'; $lang['import_success_count'] = 'Import uživatelů: nalezeno %d uživatelů, %d úspěšně importováno.'; $lang['import_failure_count'] = 'Import uživatelů: %d selhalo. Seznam chybných je níže.'; $lang['import_error_fields'] = 'Nedostatek položek, nalezena/y %d, požadovány 4.'; -- cgit v1.2.3 From 044a73b5792a48ef181c0bcdfcef5317d78798b4 Mon Sep 17 00:00:00 2001 From: Mohammad Sadegh Date: Thu, 27 Nov 2014 12:06:03 +0100 Subject: translation update --- lib/plugins/authldap/lang/fa/settings.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lib/plugins/authldap/lang/fa/settings.php (limited to 'lib/plugins') diff --git a/lib/plugins/authldap/lang/fa/settings.php b/lib/plugins/authldap/lang/fa/settings.php new file mode 100644 index 000000000..1b48da7f5 --- /dev/null +++ b/lib/plugins/authldap/lang/fa/settings.php @@ -0,0 +1,8 @@ + + */ +$lang['bindpw'] = 'رمزعبور کاربر بالا'; -- cgit v1.2.3 From cded11250d495f6039a20f1036c64ea7b230ceb2 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 3 Dec 2014 00:09:45 +0100 Subject: phpdocs syntax plugin base class --- lib/plugins/syntax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 4a301f927..7d2daa70d 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -70,7 +70,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin { * @param int $state The lexer state for the match * @param int $pos The character position of the matched text * @param Doku_Handler $handler The Doku_Handler object - * @return array Return an array with all data you want to use in render + * @return bool|array Return an array with all data you want to use in render, false don't add an instruction */ function handle($match, $state, $pos, Doku_Handler $handler){ trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING); @@ -97,7 +97,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode_Plugin { * @param $format string output format being rendered * @param $renderer Doku_Renderer the current renderer object * @param $data array data created by handler() - * @return boolean rendered correctly? + * @return boolean rendered correctly? (however, returned value is not used at the moment) */ function render($format, Doku_Renderer $renderer, $data) { trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING); -- cgit v1.2.3 From 48b5d5e92851161ee3b3ebc7bf5b6ae6d1f0914d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 3 Dec 2014 16:50:16 +0100 Subject: warn about enabled, but not used auth plugins --- lib/plugins/extension/helper/list.php | 5 +++++ lib/plugins/extension/lang/en/lang.php | 1 + 2 files changed, 6 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/extension/helper/list.php b/lib/plugins/extension/helper/list.php index 9b1988d84..f7e6eb2ca 100644 --- a/lib/plugins/extension/helper/list.php +++ b/lib/plugins/extension/helper/list.php @@ -461,6 +461,7 @@ class helper_plugin_extension_list extends DokuWiki_Plugin { * @return string The HTML code */ function make_actions(helper_plugin_extension_extension $extension) { + global $conf; $return = ''; $errors = ''; @@ -492,6 +493,10 @@ class helper_plugin_extension_list extends DokuWiki_Plugin { $errors .= '

'.$this->getLang('git').'

'; } + if ($extension->isEnabled() && in_array('Auth', $extension->getTypes()) && $conf['auth'] != $extension->getID()) { + $errors .= '

'.$this->getLang('auth').'

'; + } + }else{ if (($canmod = $extension->canModify()) === true) { if ($extension->getDownloadURL()) { diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php index 72c9b9e2d..fc8860c5d 100644 --- a/lib/plugins/extension/lang/en/lang.php +++ b/lib/plugins/extension/lang/en/lang.php @@ -94,6 +94,7 @@ $lang['noperms'] = 'Extension directory is not writable'; $lang['notplperms'] = 'Template directory is not writable'; $lang['nopluginperms'] = 'Plugin directory is not writable'; $lang['git'] = 'This extension was installed via git, you may not want to update it here.'; +$lang['auth'] = 'This auth plugin is not enabled in configuration, consider disabling it.'; $lang['install_url'] = 'Install from URL:'; $lang['install_upload'] = 'Upload Extension:'; -- cgit v1.2.3 From 29eba4294ec095d7a6fe677fb8b8e64e98655bcc Mon Sep 17 00:00:00 2001 From: Omid Hezaveh Date: Mon, 8 Dec 2014 17:21:12 +0100 Subject: translation update --- lib/plugins/authad/lang/fa/settings.php | 10 ++++++++++ lib/plugins/authldap/lang/fa/settings.php | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 lib/plugins/authad/lang/fa/settings.php (limited to 'lib/plugins') diff --git a/lib/plugins/authad/lang/fa/settings.php b/lib/plugins/authad/lang/fa/settings.php new file mode 100644 index 000000000..161479afb --- /dev/null +++ b/lib/plugins/authad/lang/fa/settings.php @@ -0,0 +1,10 @@ + + */ +$lang['admin_password'] = 'رمز کاربر بالایی '; +$lang['use_ssl'] = 'از اس‌اس‌ال استفاده می‌کنید؟ در این صورت تی‌ال‌اس را در پایین فعال نکنید. '; +$lang['use_tls'] = 'از تی‌ال‌اس استفاده می‌کنید؟ در این صورت اس‌اس‌ال را در بالا فعال نکنید. '; diff --git a/lib/plugins/authldap/lang/fa/settings.php b/lib/plugins/authldap/lang/fa/settings.php index 1b48da7f5..49d485afd 100644 --- a/lib/plugins/authldap/lang/fa/settings.php +++ b/lib/plugins/authldap/lang/fa/settings.php @@ -4,5 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Mohammad Sadegh + * @author Omid Hezaveh */ +$lang['starttls'] = 'از تی‌ال‌اس (TLS) استفاده می‌کنید؟'; $lang['bindpw'] = 'رمزعبور کاربر بالا'; -- cgit v1.2.3