fix wording issues in license prompt

Task-number: QTBUG-42136
Change-Id: Ie4ff1b38af6e7a74490558e80a0e559fee8a5486
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-11-10 16:51:24 +01:00
parent 9308b7d618
commit 4e1d65071b

8
configure vendored
View File

@ -3108,14 +3108,14 @@ if [ "$Edition" = "OpenSource" ]; then
while true; do
if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then
echo "You are licensed to use this software under the terms of"
echo "the Lesser GNU General Public License (LGPL) versions 2.1."
echo "the GNU Lesser General Public License (LGPL) version 2.1."
echo "You are also licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
echo "the GNU Lesser General Public License (LGPL) version 3."
affix="either"
showLGPL2="yes"
else
echo "You are licensed to use this software under the terms of"
echo "the GNU Lesser General Public License (LGPL) versions 3."
echo "the GNU Lesser General Public License (LGPL) version 3."
showLGPL2="no"
affix="the"
fi
@ -3129,7 +3129,7 @@ if [ "$Edition" = "OpenSource" ]; then
echo "Type '3' to view the GNU Lesser General Public License version 3."
fi
if [ "$showLGPL2" = "yes" ]; then
echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
echo "Type 'L' to view the GNU Lesser General Public License version 2.1."
fi
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."