From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 76237 invoked by alias); 10 Nov 2017 14:43:54 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 75985 invoked by uid 89); 10 Nov 2017 14:43:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1554, claims X-HELO: limerock01.mail.cornell.edu Received: from limerock01.mail.cornell.edu (HELO limerock01.mail.cornell.edu) (128.84.13.241) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 10 Nov 2017 14:43:51 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite4.serverfarm.cornell.edu [10.16.197.9]) by limerock01.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id vAAEhnW2015930; Fri, 10 Nov 2017 09:43:49 -0500 Received: from nothing.nyroc.rr.com (mta-68-175-129-7.twcny.rr.com [68.175.129.7] (may be forged)) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id vAAEheGU015853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 10 Nov 2017 09:43:48 -0500 From: Ken Brown To: cygwin-apps@cygwin.com Subject: [PATCH setup 3/5] Remove "Try again?" from exit message. Date: Fri, 10 Nov 2017 14:43:00 -0000 Message-Id: <20171110144339.12616-4-kbrown@cornell.edu> In-Reply-To: <20171110144339.12616-1-kbrown@cornell.edu> References: <20171110144339.12616-1-kbrown@cornell.edu> X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-11/txt/msg00040.txt.bz2 --- download.cc | 2 +- res.rc | 1 + resource.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/download.cc b/download.cc index a430f7f..841f680 100644 --- a/download.cc +++ b/download.cc @@ -266,7 +266,7 @@ do_download_thread (HINSTANCE h, HWND owner) if (source == IDC_SOURCE_DOWNLOAD) { if (errors) - Logger ().setExitMsg (IDS_DOWNLOAD_INCOMPLETE); + Logger ().setExitMsg (IDS_DOWNLOAD_INCOMPLETE_EXIT); else if (!unattended_mode) Logger ().setExitMsg (IDS_DOWNLOAD_COMPLETE); return IDD_DESKTOP; diff --git a/res.rc b/res.rc index 76a871f..d1f0871 100644 --- a/res.rc +++ b/res.rc @@ -526,6 +526,7 @@ BEGIN IDS_ERR_CHDIR "Could not change dir to %s: %s [%.8x]" IDS_OLD_SETUP_VERSION "This setup is version %s, but setup.ini claims version %s is available.\nYou might want to upgrade to get the latest features and bug fixes." IDS_DOWNLOAD_INCOMPLETE "Download Incomplete. Try again?" + IDS_DOWNLOAD_INCOMPLETE_EXIT "Download incomplete. Check %s for details" IDS_INSTALL_ERROR "Installation error (%s), Continue with other packages?" IDS_INSTALL_INCOMPLETE "Installation incomplete. Check %s for details" IDS_CORRUPT_PACKAGE "Package file %s has a corrupt local copy, please remove and retry." diff --git a/resource.h b/resource.h index 172b2c8..98a4a0f 100644 --- a/resource.h +++ b/resource.h @@ -40,6 +40,7 @@ #define IDS_ELEVATED 139 #define IDS_INSTALLEDB_VERSION 140 #define IDS_TRUSTSYNC_TOOLTIP 141 +#define IDS_DOWNLOAD_INCOMPLETE_EXIT 142 // Dialogs -- 2.15.0