From 62d44d15767e784e2292a1ee47ebd477df0720e0 Mon Sep 17 00:00:00 2001
From: Chrysostomus <mattitheman@gmail.com>
Date: Sat, 11 Feb 2017 01:40:59 +0800
Subject: [PATCH 1/2] Add a pause to basestrap, fox english translation

---
 manjaro-architect          | 6 ++++++
 translations/english.trans | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/manjaro-architect b/manjaro-architect
index 301a1c9..1e74ecc 100755
--- a/manjaro-architect
+++ b/manjaro-architect
@@ -2330,7 +2330,13 @@ install_manjaro_de_wm() {
             sleep 2
       fi
     fi
+    # Stop for a moment so user can see if there were errors
+    echo "press Enter to continue"
+    read
     # Clear the packages file for installation of "common" packages
+    echo ""
+    echo ""
+    echo ""
     echo "" > ${PACKAGES}
 
     # Offer to install various "common" packages.
diff --git a/translations/english.trans b/translations/english.trans
index 8255397..783c719 100644
--- a/translations/english.trans
+++ b/translations/english.trans
@@ -296,7 +296,7 @@ _InstNMErrBody="\nNetwork connection manager has been installed and enabled.\n\n
 
 # Welcome
 _WelTitle="Welcome to"
-_WelBody="\nThis installer will download the latest packages from the Msnjaro repositories. \n\nMENU OPTIONS: Select by pressing the option number or by using the up/down arrow keys before pressing [enter] to confirm. Switch between buttons by using [Tab] or the left/right arrow keys before pressing [enter] to confirm. Long lists can be navigated using the [pg up] and [pg down] keys, and/or by pressing the first letter of the desired option.\n\nCONFIGURATION & PACKAGE OPTIONS: Default packages in checklists will be pre-checked. Use the [Spacebar] to de/select."
+_WelBody="\nThis installer will download the latest packages from the Manjaro repositories. \n\nMENU OPTIONS: Select by pressing the option number or by using the up/down arrow keys before pressing [enter] to confirm. Switch between buttons by using [Tab] or the left/right arrow keys before pressing [enter] to confirm. Long lists can be navigated using the [pg up] and [pg down] keys, and/or by pressing the first letter of the desired option.\n\nCONFIGURATION & PACKAGE OPTIONS: Default packages in checklists will be pre-checked. Use the [Spacebar] to de/select."
 
 # Preparation Menu
 _PrepMenuTitle="Prepare Installation"

From 2db21032887119677f3f03cfe9a2a6dd482ed228 Mon Sep 17 00:00:00 2001
From: Chrysostomus <mattitheman@gmail.com>
Date: Sat, 11 Feb 2017 01:44:43 +0800
Subject: [PATCH 2/2] rearrange the main menu

---
 manjaro-architect | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manjaro-architect b/manjaro-architect
index 1e74ecc..fa520fd 100755
--- a/manjaro-architect
+++ b/manjaro-architect
@@ -2999,8 +2999,8 @@ main_menu_online() {
     --menu "$_MMBody" 0 0 9 \
   "1" "$_PrepMenuTitle" \
   "2" "$_InstBsMenuTitle" \
-  "3" "$_ConfBseMenuTitle" \
-  "4" "$_InstGrMenuTitle" \
+  "3" "$_InstGrMenuTitle" \
+  "4" "$_ConfBseMenuTitle" \
   "5" "$_InstNMMenuTitle" \
     "6" "$_InstMultMenuTitle" \
     "7" "$_SecMenuTitle" \
@@ -3024,9 +3024,9 @@ main_menu_online() {
              ;;
         "2") install_base_menu
              ;;
-        "3") config_base_menu
+        "3") install_graphics_menu
              ;;
-        "4") install_graphics_menu
+        "4") config_base_menu
              ;;
         "5") install_network_menu
       ;;