diff options
author | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
commit | 50fbf1b6522a235e93ba72c50d0f54e09506604a (patch) | |
tree | 37c31125df63879026f02df9db8a92d14061a629 /inc/lang/id | |
parent | 7980e1acf1a671646747e5b924f2c8e208280a2e (diff) | |
parent | 8a9735e34dc99c24355e0aee74a3cd49aa3b1492 (diff) | |
download | rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.gz rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.bz2 |
Merge branch 'resetpassword'
No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.
* resetpassword:
added a timelimit for password reset tokens
removed commented line
use correct lang string for password mismatch
removed outdated language string. it has to be retranslated
German translation for password reset
honor autopasswd setting for resend password
Conflicts:
inc/lang/no/lang.php
inc/lang/sl/lang.php
Diffstat (limited to 'inc/lang/id')
-rw-r--r-- | inc/lang/id/lang.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 9df252225..2302d4f6f 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -42,7 +42,6 @@ $lang['btn_subscribe'] = 'Ikuti Perubahan'; $lang['btn_unsubscribe'] = 'Berhenti Ikuti Perubahan'; $lang['btn_profile'] = 'Ubah Profil'; $lang['btn_reset'] = 'Reset'; -$lang['btn_resendpwd'] = 'Kirim password baru'; $lang['btn_draft'] = 'Edit draft'; $lang['btn_draftdel'] = 'Hapus draft'; $lang['btn_register'] = 'Daftar'; @@ -74,7 +73,6 @@ $lang['profnoempty'] = 'Mohon mengisikan nama atau alamat email.'; $lang['profchanged'] = 'Profil User berhasil diubah.'; $lang['pwdforget'] = 'Lupa Password? Dapatkan yang baru'; $lang['resendna'] = 'Wiki ini tidak mendukung pengiriman ulang password.'; -$lang['resendpwd'] = 'Kirim password baru untuk'; $lang['resendpwdmissing'] = 'Maaf, Anda harus mengisikan semua field.'; $lang['resendpwdnouser'] = 'Maaf, user ini tidak ditemukan.'; $lang['resendpwdbadauth'] = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.'; |