diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-07-30 10:50:52 +0200 |
| commit | af07997c5ff7cc096965159d90158e3710d2d019 (patch) | |
| tree | defaf770e77a679436eb56291185905b547640d0 /lib/plugins/usermanager/lang/zh-tw/lang.php | |
| parent | bdac741579f8c6f00248d5d3ec635d4c2e08fb1e (diff) | |
| parent | 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 (diff) | |
| download | rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.gz rpg-af07997c5ff7cc096965159d90158e3710d2d019.tar.bz2 | |
Merge branch 'master' into configmgr_improvements
Conflicts:
inc/auth.php
inc/template.php
lib/plugins/authad/lang/zh/settings.php
lib/plugins/authldap/lang/en/settings.php
lib/plugins/authldap/lang/zh/settings.php
lib/plugins/authmysql/lang/zh/settings.php
lib/plugins/config/settings/config.class.php
lib/plugins/usermanager/admin.php
Diffstat (limited to 'lib/plugins/usermanager/lang/zh-tw/lang.php')
| -rw-r--r-- | lib/plugins/usermanager/lang/zh-tw/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php index 1db35cc82..980d974cc 100644 --- a/lib/plugins/usermanager/lang/zh-tw/lang.php +++ b/lib/plugins/usermanager/lang/zh-tw/lang.php @@ -33,7 +33,7 @@ $lang['modify'] = '儲存變更'; $lang['search'] = '搜尋'; $lang['search_prompt'] = '開始搜尋'; $lang['clear'] = '重設篩選條件'; -$lang['filter'] = '篩選條件(Filter)'; +$lang['filter'] = '篩選條件 (Filter)'; $lang['summary'] = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。'; $lang['nonefound'] = '找不到帳號。共有 %d 個帳號。'; $lang['delete_ok'] = '已刪除 %d 個帳號'; @@ -49,7 +49,7 @@ $lang['edit_usermissing'] = '找不到選取的帳號，可能已被刪除 $lang['user_notify'] = '通知使用者'; $lang['note_notify'] = '通知信只會在指定使用者新密碼時寄送。'; $lang['note_group'] = '如果沒有指定群組，新使用者將會列入至預設群組(%s)當中。'; -$lang['note_pass'] = '如果沒有輸入這個欄位而且有勾選通知使用者，則會自動產生一組密碼。'; +$lang['note_pass'] = '如果勾選了通知使用者，而沒有輸入這個欄位，則會自動產生一組密碼。'; $lang['add_ok'] = '已新增使用者'; $lang['add_fail'] = '無法新增使用者'; $lang['notify_ok'] = '通知信已寄出'; |