diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-06-26 11:07:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-06-26 11:07:20 +0200 |
| commit | 5ddba4576a304c9e62b028c97ee466d79de12429 (patch) | |
| tree | 03199c579f9302f0ed1e0b47f9c597a7f9bd2fc7 /lib/plugins/authldap | |
| parent | 5114259bf530b89afbb21bd693b1da3f96016b7f (diff) | |
| parent | 71c46303d9cd8a321e58a7e7255d13f0d5a5c4eb (diff) | |
| download | rpg-5ddba4576a304c9e62b028c97ee466d79de12429.tar.gz rpg-5ddba4576a304c9e62b028c97ee466d79de12429.tar.bz2 | |
Merge branch 'master' into styler
* master: (26 commits)
translation update
translation update
Replace old constructor call by __construct() in dokuwiki_xmlrpc_server
translation update
change two spaces to a space
translation update
translation update
translation update
translation update
Upgrade to jQuery 1.11.3 and jQueryUI 1.11.4 closes #1175
update confToHash() inline documentation for new parameter
translation update
Plugins can send usage data
fixed isBundled() check when remote info is unavailable
avoid accessing nonexistant array key. fixes #1165
translation update
Define the negation character in a constant
Ensure single value negation is not affected by white space differences
Ensure filtering only removes empty string values (not other values which PHP evaluates to false)
translation update
...
Diffstat (limited to 'lib/plugins/authldap')
| -rw-r--r-- | lib/plugins/authldap/lang/ja/settings.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/authldap/lang/ja/settings.php b/lib/plugins/authldap/lang/ja/settings.php index 6cff0ea67..717b5a6d9 100644 --- a/lib/plugins/authldap/lang/ja/settings.php +++ b/lib/plugins/authldap/lang/ja/settings.php @@ -7,6 +7,7 @@ * @author Hideaki SAWADA <sawadakun@live.jp> * @author Hideaki SAWADA <chuno@live.jp> * @author PzF_X <jp_minecraft@yahoo.co.jp> + * @author Ikuo Obataya <i.obataya@gmail.com> */ $lang['server'] = 'LDAPサーバー。ホスト名（<code>localhost</code>）又は完全修飾URL（<code>ldap://server.tld:389</code>）'; $lang['port'] = '上記が完全修飾URLでない場合、LDAPサーバーポート'; |