Merge remote-tracking branch 'upstream/MK3_3.11.0' into MK3_3.11.0_Improve_languages2

Fix Swedish merge issues

Firmware/config.h

@@ -69,7 +69,7 @@
 #define COMMUNITY_LANG_GROUP1_HU // Community Hungarian language
 #define COMMUNITY_LANG_GROUP1_HR // Community Croatian language
 #define COMMUNITY_LANG_GROUP1_SK // Community Slovak language
-//#define COMMUNITY_LANG_GROUP1_SV // Community Swedish language
+#define COMMUNITY_LANG_GROUP1_SV // Community Swedish language
 #define COMMUNITY_LANG_GROUP1_NO // Community Norwegian language
 //#define COMMUNITY_LANG_GROUP1_DA // Community Danish language
 //#define COMMUNITY_LANG_GROUP1_SL // Community Slovanian language

lang/lang-export.sh

@@ -198,7 +198,7 @@ sync
 sed -i 's/$/\r/' $OUTFILE
 
 #replace HD44780 A00 'äöüß' to UTF-8 'äöüß'
-if [ "$LNG" = "de" ]; then
+if [[ "$LNG" = "de" || "$LNG" = "sv" ]]; then
  #replace 'A00 ROM ä' with 'ä' 
   sed -i 's/\\xe1/\xc3\xa4/g' $OUTFILE
   #replace 'A00 ROM ü' with 'ü'

lang/lang-import.sh

@@ -150,8 +150,9 @@ if [ "$LNG" = "cz" ]; then
  sed -i 's/\xc5\xbe/z/g' $LNG'_filtered.po'
 fi
 
-#replace in german translation https://en.wikipedia.org/wiki/German_orthography
-if [ "$LNG" = "de" ]; then
+#replace in German translation https://en.wikipedia.org/wiki/German_orthography
+#replace in Swedish as well
+if [[ "$LNG" = "de" || "$LNG" = "sv" ]]; then
 #replace UTF-8 'äöüß' to HD44780 A00 'äöüß'
  #replace 'ä' with 'A00 ROM ä'
  sed -i 's/\xc3\xa4/\\xe1/g' $LNG'_filtered.po'
@@ -266,10 +267,10 @@ if [ "$LNG" = "nl" ]; then
 fi
 
 if [ "$LNG" = "sv" ]; then
-#repace 'Å' with 'Aa'
-sed -i 's/\xc3\x85/Aa/g' $LNG'_filtered.po'
-#repace 'å' with 'aa'
-sed -i 's/\xc3\xA5/aa/g' $LNG'_filtered.po'
+#repace 'Å' with 'A'
+sed -i 's/\xc3\x85/A/g' $LNG'_filtered.po'
+#repace 'å' with 'a'
+sed -i 's/\xc3\xA5/a/g' $LNG'_filtered.po'
 fi
 
 #https://en.wikipedia.org/wiki/Norwegian_orthography éèêóòôù ÅåÆæØø