From 80096519d5e122fb7d93bd012dd1402aeb11780b Mon Sep 17 00:00:00 2001
From: Blake McAnally <bwm003@gmail.com>
Date: Sun, 7 Jul 2024 08:37:58 -0500
Subject: [PATCH] update protobufs

---
 Localizable.xcstrings                          | 18 +++++++++---------
 .../xcschemes/WidgetsExtension.xcscheme        |  1 -
 README.md                                      |  2 +-
 protobufs                                      |  2 +-
 scripts/gen_protos.sh                          |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index 1e056d2f..e0a7b644 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -5985,55 +5985,55 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Router Client - Mesh Pakete werden bevorzugt über diesen Node gerouted. Der Router Client kann parallel auch von einer Client-App genutzt werden."
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Combination of both ROUTER and CLIENT. Not for mobile devices."
+            "value" : "Combination of both ROUTER and CLIENT. Not for mobile devices. Deprecated"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Combinaison des modes ROUTER et CLIENT. Pas pour les appareils mobiles."
           }
         },
         "he" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "קומבינציה של ROUTER וCLIENT. לא למכשירים ניידים."
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Router Client - Hybryda ról klienta i routera. Podobnie jak w przypadku routera, z tym że Router Client może być używany zarówno jako router, jak i klient połączony z aplikacją. Radia BLE/Wi-Fi i ekran OLED nie zostaną uśpione."
           }
         },
         "pt-PT" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Combinação de ROTEADOR e CLIENTE. Não para dispositivos móveis."
           }
         },
         "se" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Kombination av både ROUTER och CLIENT. Inte för mobila enheter."
           }
         },
         "zh-Hans" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "路由客户端模式 - 优先转发 Mesh 网络中其他节点的消息，App 也可以连接到电台进行收发操作。"
           }
         },
         "zh-Hant-TW" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "路由客户端模式 - 優先轉發 Mesh 網路中其他中繼點的消息，App 也可以連接到電台進行收發操作。"
           }
         }
diff --git a/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme b/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme
index decd8381..880339bc 100644
--- a/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme
+++ b/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme
@@ -89,7 +89,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/README.md b/README.md
index 0db0708e..1b8bed5a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ open Meshtastic.xcworkspace
 ## Updating Protobufs:
 - run:
   ```bash
-  scripts/gen_protos.sh
+  ./scripts/gen_protos.sh
   ```
 - build, test, commit changes
 
diff --git a/protobufs b/protobufs
index 4da558d0..1198b7db 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 4da558d0f73c46ef91b74431facee73c09affbfc
+Subproject commit 1198b7dbabf9768cb0143d2897707b4c7a51a5da
diff --git a/scripts/gen_protos.sh b/scripts/gen_protos.sh
index 0967e9df..a587a8e3 100755
--- a/scripts/gen_protos.sh
+++ b/scripts/gen_protos.sh
@@ -4,7 +4,7 @@
 if [ ! -d "./protobufs" ]; then
   git submodule update --init
 else 
-  git submodule update
+  git submodule update --remote --merge
 fi
 
 # simple sanity checking for executable