svn commit: r309949 - head/usr.sbin/bsdinstall/scripts

[Devin Teske]

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" \