From owner-svn-src-all@freebsd.org Mon Dec 12 21:23:49 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E703C7400E; Mon, 12 Dec 2016 21:23:49 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B8729D41; Mon, 12 Dec 2016 21:23:48 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBCLNlO0041360; Mon, 12 Dec 2016 21:23:47 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBCLNlSQ041359; Mon, 12 Dec 2016 21:23:47 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201612122123.uBCLNlSQ041359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Mon, 12 Dec 2016 21:23:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309949 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2016 21:23:49 -0000 Author: dteske Date: Mon Dec 12 21:23:47 2016 New Revision: 309949 URL: https://svnweb.freebsd.org/changeset/base/309949 Log: Utilize provided i18n strings Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 21:20:56 2016 (r309948) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 21:23:47 2016 (r309949) @@ -61,7 +61,7 @@ country_set() fi if [ "$error_str" ]; then $DIALOG \ - --title "Error" \ + --title "$msg_error" \ --backtitle "$DIALOG_BACKTITLE" \ --yes-label Change \ --no-label Ignore \ @@ -114,7 +114,7 @@ dialog_country_select() regdomain=$( sh -c "$DIALOG \ --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ - --cancel-label \"Skip\" \ + --cancel-label \"$msg_skip\" \ --default-item \"$default_regdomain\" \ --no-items \ --stdout \ @@ -128,7 +128,7 @@ dialog_country_select() country=$( sh -c "$DIALOG \ --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ - --cancel-label \"Skip\" \ + --cancel-label \"$msg_skip\" \ --default-item \"$default_country\" \ --stdout \ --menu \"Select your country.\" \ @@ -157,14 +157,14 @@ EOF # (wpa_cli ping >/dev/null 2>/dev/null || ([ "$BSDINSTALL_CONFIGCURRENT" ] && wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf")) || - ($DIALOG --backtitle "$DIALOG_BACKTITLE" --title "Error" --msgbox \ + ($DIALOG --backtitle "$DIALOG_BACKTITLE" --title "$msg_error" --msgbox \ "Could not start wpa_supplicant!" 0 0; exit 1) || exit 1 # See if we succeeded wpa_cli ping >/dev/null 2>/dev/null if [ $? -ne 0 -a ! "$BSDINSTALL_CONFIGCURRENT" ]; then $DIALOG \ - --title "Error" \ + --title "$msg_error" \ --backtitle "$DIALOG_BACKTITLE" \ --msgbox "Wireless cannot be configured without making changes to the local system!" \ 0 0 @@ -208,7 +208,7 @@ while :; do $DIALOG \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ - --ok-label "Skip" \ + --ok-label "$msg_skip" \ --pause "Waiting 5 seconds to scan for wireless networks..." \ 9 40 5 || exit 1 @@ -221,7 +221,7 @@ while :; do ' | sort | uniq ) if [ ! "$NETWORKS" ]; then - f_dialog_title "Error" + f_dialog_title "$msg_error" $DIALOG \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \