Merge branch 'master' of https://github.com/splitbrain/dokuwiki

Conflicts:
	lib/exe/xmlrpc.php

1 files changed, 0 insertions, 2 deletions

diff --git a/inc/lang/id-ni/lang.php b/inc/lang/id-ni/lang.php
index 9c04f0259..1a4d03498 100644
--- a/inc/lang/id-ni/lang.php
+++ b/inc/lang/id-ni/lang.php
@@ -38,7 +38,6 @@ $lang['btn_backlink']          = 'Link fangawuli';
 $lang['btn_backtomedia']       = 'Angawuli ba filianö Mediafile';
 $lang['btn_profile']           = 'Famohouni pörofile';
 $lang['btn_reset']             = 'Fawu\'a';
-$lang['btn_resendpwd']         = 'Fa\'ohe\'ö kode sibohou';
 $lang['btn_draft']             = 'Fawu\'a wanura';
 $lang['btn_draftdel']          = 'Heta zura';
 $lang['btn_register']          = 'Fasura\'ö';
@@ -69,7 +68,6 @@ $lang['profnoempty']           = 'Lö tetehegö na lö hadöi töi ma imele.';
 $lang['profchanged']           = 'Pörofile zangoguna\'ö no tebohouni.';
 $lang['pwdforget']             = 'Hadia olifu\'ö kode? Fuli halö kode';
 $lang['resendna']              = 'Lö tetehegi ba wiki da\'a wama\'ohe\'ö kode dua kali.';
-$lang['resendpwd']             = 'Tefa\'ohe\'ö kode sibahou khö';
 $lang['resendpwdmissing']      = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
 $lang['resendpwdnouser']       = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.';
 $lang['resendpwdconfirm']      = 'No tefaohe\'ö link famaduhu\'ö ba imele.';