From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 7 Jul 2010 01:02:56 +0000 (-0600)
Subject: wish -> want
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5f6adf20fe681b1d040cbaa824292993daae303d;p=horde.git

wish -> want

Wish connotes that something will hopefully happen.
Want connotes that something will definitely happen.
---

diff --git a/imp/attachment.php b/imp/attachment.php
index 57033bc8b..468ea91f4 100644
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -2,7 +2,7 @@
 /**
  * This file should be the basis for serving hosted attachments.  It
  * should fetch the file from the VFS and funnel it to the client
- * wishing to download the attachment. This will allow for the
+ * wants to download the attachment. This will allow for the
  * exchange of massive attachments without causing mail server havoc.
  *
  * Copyright 2004-2007 Andrew Coleman <mercury@appisolutions.net>
diff --git a/imp/message.php b/imp/message.php
index 72677b782..d7aa9d415 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -470,7 +470,7 @@ if (!$readonly) {
     if (in_array('\\deleted', $flags)) {
         $a_template->set('delete', Horde::widget($self_link->copy()->add('actionID', 'undelete_message'), _("Undelete"), 'widget', '', '', _("Undelete"), true));
     } else {
-        $a_template->set('delete', Horde::widget($self_link->copy()->add('actionID', 'delete_message'), _("Delete"), 'widget', '', ($use_pop) ? "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete these messages?")) . "');" : '', _("_Delete"), true));
+        $a_template->set('delete', Horde::widget($self_link->copy()->add('actionID', 'delete_message'), _("Delete"), 'widget', '', ($use_pop) ? "return window.confirm('" . addslashes(_("Are you sure you want to PERMANENTLY delete these messages?")) . "');" : '', _("_Delete"), true));
     }
 }
 
@@ -616,7 +616,7 @@ if ($show_parts == 'atc') {
 if (count($inlineout['display_ids']) > 2) {
     $a_template->set('download_all', Horde::widget($imp_contents->urlView($imp_contents->getMIMEMessage(), 'download_all'), _("Download All Attachments (in .zip file)"), 'widget', '', '', _("Download All Attachments (in .zip file)"), true));
     if ($strip_atc) {
-        $a_template->set('strip_all', Horde::widget(Horde::selfUrl(true)->remove(array('actionID'))->add(array('actionID' => 'strip_all', 'message_token' => $message_token)), _("Strip All Attachments"), 'widget', '', "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete all attachments?")) . "');", _("Strip All Attachments"), true));
+        $a_template->set('strip_all', Horde::widget(Horde::selfUrl(true)->remove(array('actionID'))->add(array('actionID' => 'strip_all', 'message_token' => $message_token)), _("Strip All Attachments"), 'widget', '', "return window.confirm('" . addslashes(_("Are you sure you want to PERMANENTLY delete all attachments?")) . "');", _("Strip All Attachments"), true));
     }
 
     $show_atc = true;