Merge https://github.com/friendica/red into pending_merge

1 files changed, 5 insertions, 3 deletions

diff --git a/mod/removeme.php b/mod/removeme.php
index 492738b77..52145d639 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -9,6 +9,7 @@ function removeme_post(&$a) {
 		return;
 
 	if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
+		notice( t('Password not correct.') . EOL);
 		return;
 
 	if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
@@ -21,6 +22,7 @@ function removeme_post(&$a) {
 	$account = $a->get_account();
 
 	if(! account_verify_password($account['account_email'],$_POST['qxz_password']))
+		notice( t('Password not correct.') . EOL);
 		return;
 
 	if($account['account_password_changed'] != NULL_DATE) {
@@ -55,12 +57,12 @@ function removeme_content(&$a) {
 		'$basedir' => $a->get_baseurl(),
 		'$hash' => $hash,
 		'$title' => t('Remove This Channel'),
-		'$desc' => t('This will completely remove this channel from the network. Once this has been done it is not recoverable.'),
+		'$desc' => array(t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!')),
 		'$passwd' => t('Please enter your password for verification:'),
-		'$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network')),
+		'$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), array(t('No'),t('Yes'))),
 		'$submit' => t('Remove Channel')
 	));
 
 	return $o;		
 
-}
\ No newline at end of file
+}