Merge branch 'develop' into julioromano/poll_history_entry_point

tools/localazy/config.json

@@ -116,7 +116,8 @@
         "screen_dm_details_.*",
         "screen_room_notification_settings_.*",
         "screen_notification_settings_edit_failed_updating_default_mode",
-        "screen_polls_history_title"
+        "screen_polls_history_title",
+        "screen_start_chat_error_starting_chat"
       ]
     },
     {

tools/localazy/downloadStrings.sh

@@ -46,6 +46,14 @@ if [[ $allFiles == 1 ]]; then
   find . -name 'translations.xml' -print0 -exec bash -c "echo \"\" >> \"{}\"" \; >> /dev/null
 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 "Removing the generated config"
 rm ./tools/localazy/localazy.json
 

tools/localazy/generateLocalazyConfig.py

@@ -31,7 +31,7 @@ baseAction = {
     }
 }
 
-# Store all regex specific to module, to eclude the corresponding keyx from the common string module
+# Store all regex specific to module, to exclude the corresponding key from the common string module
 allRegexToExcludeFromMainModule = []
 # All actions that will be serialized in the localazy config
 allActions = []