Merge branch 'develop' into feature/fga/user_moderation_bottomsheet

tools/adb/deeplink_mobile.sh

@@ -6,7 +6,7 @@
 # Please see LICENSE files in the repository root for full details.
 
 # Format is:
-# https://mobile.element.io/element?account_provider=example.org&login_hint=mxid:@alice:example.org
+# https://mobile.element.io/element/?account_provider=example.org&login_hint=mxid:@alice:example.org
 
 adb shell am start -a android.intent.action.VIEW \
-    -d "https://mobile.element.io/element?account_provider=element.io\\&login_hint=mxid:@alice:element.io"
+    -d "https://mobile.element.io/element/?account_provider=element.io\\&login_hint=mxid:@alice:element.io"

tools/localazy/downloadStrings.sh

@@ -38,14 +38,6 @@ if [[ $allFiles == 1 ]]; then
   find . -name 'translations.xml' -exec ./tools/localazy/formatXmlResourcesFile.py {} \;
 fi
 
-set +e
-echo "Moving files from values-id to values-in..."
-find . -type d -name 'values-id' -execdir mv {}/translations.xml {}/../values-in/translations.xml \; 2> /dev/null
-
-echo "Deleting all the folders values-id..."
-find . -type d -name 'values-id' -exec rm -rf {} \; 2> /dev/null
-set -e
-
 echo "Checking forbidden terms..."
 find . -name 'localazy.xml' -exec ./tools/localazy/checkForbiddenTerms.py {} \;
 if [[ $allFiles == 1 ]]; then

tools/localazy/generateLocalazyConfig.py

@@ -65,7 +65,10 @@ for entry in config["modules"]:
             "excludeKeys": list(map(lambda i: "REGEX:" + i, excludeRegex)),
             "conditions": [
                 "!equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
-            ]
+            ],
+            "langAliases": {
+                "id": "in"
+            }
         }
         allActions.append(actionTranslation)
     allRegexToExcludeFromMainModule.extend(entry["includeRegex"])
@@ -88,7 +91,10 @@ if allFiles:
         "excludeKeys": list(map(lambda i: "REGEX:" + i, allRegexToExcludeFromMainModule + regexToAlwaysExclude)),
         "conditions": [
             "!equals: ${langAndroidResNoScript}, en | equals: ${file}, content.json"
-        ]
+        ],
+        "langAliases": {
+            "id": "in"
+        }
     }
     allActions.append(mainActionTranslation)