From bb7ed1550f6d721879944f9221c66e12ba44c7f3 Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 13:58:40 -0500
Subject: [PATCH 1/8] Add shortcut keys to wordAlignment tool

---
 package-lock.json         | 20 ++++++++++++++++++++
 package.json              |  1 +
 src/tC_apps/wordAlignment |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 608ddbba3a..1cd69b4cb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,6 +50,7 @@
         "react-dnd": "2.5.4",
         "react-dnd-html5-backend": "2.5.4",
         "react-dom": "16.8.6",
+        "react-hotkeys": "2.0.0",
         "react-localize-redux": "3.5.3",
         "react-redux": "5.1.1",
         "react-remarkable": "1.1.3",
@@ -20959,6 +20960,17 @@
         "loose-envify": "^1.0.0"
       }
     },
+    "node_modules/react-hotkeys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-hotkeys/-/react-hotkeys-2.0.0.tgz",
+      "integrity": "sha512-3n3OU8vLX/pfcJrR3xJ1zlww6KS1kEJt0Whxc4FiGV+MJrQ1mYSYI3qS/11d2MJDFm8IhOXMTFQirfu6AVOF6Q==",
+      "dependencies": {
+        "prop-types": "^15.6.1"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      }
+    },
     "node_modules/react-input-autosize": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
@@ -45074,6 +45086,14 @@
         }
       }
     },
+    "react-hotkeys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-hotkeys/-/react-hotkeys-2.0.0.tgz",
+      "integrity": "sha512-3n3OU8vLX/pfcJrR3xJ1zlww6KS1kEJt0Whxc4FiGV+MJrQ1mYSYI3qS/11d2MJDFm8IhOXMTFQirfu6AVOF6Q==",
+      "requires": {
+        "prop-types": "^15.6.1"
+      }
+    },
     "react-input-autosize": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz",
diff --git a/package.json b/package.json
index f06684c3c2..40c15feebe 100644
--- a/package.json
+++ b/package.json
@@ -162,6 +162,7 @@
     "react-dnd": "2.5.4",
     "react-dnd-html5-backend": "2.5.4",
     "react-dom": "16.8.6",
+    "react-hotkeys": "2.0.0",
     "react-localize-redux": "3.5.3",
     "react-redux": "5.1.1",
     "react-remarkable": "1.1.3",
diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment
index 8462583173..af07c02900 160000
--- a/src/tC_apps/wordAlignment
+++ b/src/tC_apps/wordAlignment
@@ -1 +1 @@
-Subproject commit 846258317320bf01fadc3edfb28b72447613088a
+Subproject commit af07c02900a4d59b62792b0be8a7a70c4bca5fa9

From 08994e2848094c28e1f81a60beedbdd882f18e8a Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 14:01:09 -0500
Subject: [PATCH 2/8] Add shortcut keys to wordAlignment tool

---
 src/tC_apps/translationWords | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tC_apps/translationWords b/src/tC_apps/translationWords
index c5dd99bfd9..cb8bc18b8b 160000
--- a/src/tC_apps/translationWords
+++ b/src/tC_apps/translationWords
@@ -1 +1 @@
-Subproject commit c5dd99bfd9fce62b75097863af8fa37812036903
+Subproject commit cb8bc18b8ba68acf7157aae09f9a53cdcaf58b66

From 80f3a81a8f2fd62efcdfd353c6c7147623e97c73 Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 14:14:06 -0500
Subject: [PATCH 3/8] bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 40c15feebe..ed817562e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "translationCore",
   "productName": "translationCore",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "minCompatibleVersion": "3.6.6",
   "manifestVersion": "8",
   "description": "A bridge between TS and TM",

From 6ac6d61efc56017a4344f22055546c59a7ba4ab4 Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 15:48:21 -0500
Subject: [PATCH 4/8] Fix for shortcut keys to wordAlignment tool

---
 package-lock.json         | 4 ++--
 src/tC_apps/wordAlignment | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1cd69b4cb1..f31dedb01f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "translationCore",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "translationCore",
-      "version": "3.6.6",
+      "version": "3.6.7",
       "license": "GPL-2.0",
       "dependencies": {
         "@craco/craco": "5.6.4",
diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment
index af07c02900..9653bd9425 160000
--- a/src/tC_apps/wordAlignment
+++ b/src/tC_apps/wordAlignment
@@ -1 +1 @@
-Subproject commit af07c02900a4d59b62792b0be8a7a70c4bca5fa9
+Subproject commit 9653bd942554f1536df4239b5654a790c38aa769

From 71d323f1ebce01741614b6766dab987c4bb398d7 Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 15:51:51 -0500
Subject: [PATCH 5/8] Fix for shortcut keys to wordAlignment tool

---
 src/tC_apps/wordAlignment | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment
index 9653bd9425..b9287867cb 160000
--- a/src/tC_apps/wordAlignment
+++ b/src/tC_apps/wordAlignment
@@ -1 +1 @@
-Subproject commit 9653bd942554f1536df4239b5654a790c38aa769
+Subproject commit b9287867cba96f56ff7fd1f1de2b201e99af17e6

From 8fc97cc20ed02fea9e85e62d2fda2ba85644ffdb Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 18:38:40 -0500
Subject: [PATCH 6/8] Fix for shortcut keys to wordAlignment tool. replaced mac
 x64 build with arm64 build

---
 .github/workflows/main.yml | 20 ++++++++++----------
 src/tC_apps/wordAlignment  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 84be9cd108..cf7b611443 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -470,22 +470,22 @@ jobs:
           echo "Building $APP_VERSION-$HASH"
           npm run build-macos
 
-      #     x64
-      - name: Set x64 MAX artifact name
-        run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV
+      #     arm64
+      - name: Set arm64 MAX artifact name
+        run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-macos-arm64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV
 
-      - name: Set x64 LITE artifact name
+      - name: Set arm64 LITE artifact name
         if: ${{ env.TRIM == '1' }}
-        run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
+        run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-macos-arm64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
 
-      - name: bundle x64 macOS
-        run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64
+      - name: bundle arm64 macOS
+        run: ./node_modules/.bin/gulp release-macos-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64
 
       - uses: actions/upload-artifact@v4
-        name: Upload x64 artifacts
+        name: Upload arm64 artifacts
         with:
-          name: ${{ env.ARTIFACT_X64 }}
-          path: artifacts/x64/
+          name: ${{ env.ARTIFACT_ARM64 }}
+          path: artifacts/arm64/
 
       #     universal build
       - name: Set universal MAX artifact name
diff --git a/src/tC_apps/wordAlignment b/src/tC_apps/wordAlignment
index b9287867cb..3c1eeee9ca 160000
--- a/src/tC_apps/wordAlignment
+++ b/src/tC_apps/wordAlignment
@@ -1 +1 @@
-Subproject commit b9287867cba96f56ff7fd1f1de2b201e99af17e6
+Subproject commit 3c1eeee9ca404997bba7805fa4b9f1821777c9b0

From c8c4801a1bcd06838fa859c1180e1c565d3e93af Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 18:58:21 -0500
Subject: [PATCH 7/8] Fix for macos arm build

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ed817562e8..f5a3a138c2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "electronite-start": "electronite . ",
     "electronite-start-logging": "electronite . --enable-logging",
     "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns",
-    "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,x64 --icon=src/images/icon.icns",
+    "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,arm64 --icon=src/images/icon.icns",
     "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns",
     "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico",
     "react-start": "craco start",

From 949f29ace98a7d2372516279dc4de80810386027 Mon Sep 17 00:00:00 2001
From: PhotoNomad0 <bruce.mclean@unfoldingword.org>
Date: Thu, 5 Dec 2024 21:48:24 -0500
Subject: [PATCH 8/8] Revert for macos arm64 build to x64

---
 .github/workflows/main.yml | 20 ++++++++++----------
 package.json               |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf7b611443..84be9cd108 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -470,22 +470,22 @@ jobs:
           echo "Building $APP_VERSION-$HASH"
           npm run build-macos
 
-      #     arm64
-      - name: Set arm64 MAX artifact name
-        run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-macos-arm64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV
+      #     x64
+      - name: Set x64 MAX artifact name
+        run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-MAX-$HASH.dmg")" >> $GITHUB_ENV
 
-      - name: Set arm64 LITE artifact name
+      - name: Set x64 LITE artifact name
         if: ${{ env.TRIM == '1' }}
-        run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-macos-arm64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
+        run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
 
-      - name: bundle arm64 macOS
-        run: ./node_modules/.bin/gulp release-macos-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64
+      - name: bundle x64 macOS
+        run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64
 
       - uses: actions/upload-artifact@v4
-        name: Upload arm64 artifacts
+        name: Upload x64 artifacts
         with:
-          name: ${{ env.ARTIFACT_ARM64 }}
-          path: artifacts/arm64/
+          name: ${{ env.ARTIFACT_X64 }}
+          path: artifacts/x64/
 
       #     universal build
       - name: Set universal MAX artifact name
diff --git a/package.json b/package.json
index f5a3a138c2..ed817562e8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "electronite-start": "electronite . ",
     "electronite-start-logging": "electronite . --enable-logging",
     "electronite-build": "electronite-packager ./build --out=dist --icon=src/images/icon.icns",
-    "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,arm64 --icon=src/images/icon.icns",
+    "electronite-build-macos": "electronite-packager ./build --out=dist --arch=universal,x64 --icon=src/images/icon.icns",
     "electronite-build-linux": "electronite-packager ./build --out=dist --arch=x64,arm64 --icon=src/images/icon.icns",
     "electronite-build-win": "electronite-packager ./build --out=dist --arch=ia32,x64 --icon=src/images/icon.ico",
     "react-start": "craco start",