diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 87f69ab16d..f8619af585 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -1433,10 +1433,10 @@
     <string name="type.waterway.drain.tunnel">Водопропускная труба</string>
     <string name="type.waterway.river">Рака</string>
     <string name="type.waterway.river.tunnel">Рака</string>
-    <string name="type.waterway.stream">Рака</string>
-    <string name="type.waterway.stream.ephemeral">Рака</string>
-    <string name="type.waterway.stream.intermittent">Рака</string>
-    <string name="type.waterway.stream.tunnel">Рака</string>
+    <string name="type.waterway.stream">Ручай</string>
+    <string name="type.waterway.stream.ephemeral">Ручай</string>
+    <string name="type.waterway.stream.intermittent">Ручай</string>
+    <string name="type.waterway.stream.tunnel">Ручай</string>
     <string name="type.piste_type.snow_park">Снежны парк</string>
     <string name="type.piste_type.hike">Снежная пешаходная сцежка</string>
     <string name="type.piste_type.connection">Падключэнне да трас</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index b67a8e1a38..70e2da1fd6 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -393,8 +393,8 @@
     <string name="read_in_wikipedia">Wikipedia</string>
     <string name="p2p_your_location">La tua posizione</string>
     <string name="p2p_start">Inizia</string>
-    <string name="p2p_from_here">Da</string>
-    <string name="p2p_to_here">A</string>
+    <string name="p2p_from_here">Parti da</string>
+    <string name="p2p_to_here">Vai a</string>
     <string name="p2p_only_from_current">La navigazione è disponibile solo dalla tua posizione attuale.</string>
     <string name="p2p_reroute_from_current">Vuoi che pianifichiamo un percorso dalla tua posizione attuale?</string>
     <!-- Edit open hours/set time and minutes dialog -->
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index a6c6016b11..fa7f6cbfee 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -587,8 +587,8 @@
     </plurals>
     <string name="restore">Restaurar</string>
     <plurals name="tracks">
-        <item quantity="one">%d trajeto</item>
-        <item quantity="other">%d trajetos</item>
+        <item quantity="one">%d trilha</item>
+        <item quantity="other">%d trilhas</item>
     </plurals>
     <string name="privacy_policy">Política de privacidade</string>
     <string name="terms_of_use">Termos de uso</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index cf54a5b66e..5bb8c24390 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -617,8 +617,8 @@
     </plurals>
     <string name="restore">Restaurar</string>
     <plurals name="tracks">
-        <item quantity="one">%d trilha</item>
-        <item quantity="other">%d trilhas</item>
+        <item quantity="one">%d trajeto</item>
+        <item quantity="other">%d trajetos</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Privacidade</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index c2b065831d..248df0fca0 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -1952,10 +1952,10 @@
     <string name="type.waterway.lock_gate">Ecluză</string>
     <string name="type.waterway.river">Râu</string>
     <string name="type.waterway.river.tunnel">Râu</string>
-    <string name="type.waterway.stream">Râu</string>
-    <string name="type.waterway.stream.ephemeral">Râu</string>
-    <string name="type.waterway.stream.intermittent">Râu</string>
-    <string name="type.waterway.stream.tunnel">Râu</string>
+    <string name="type.waterway.stream">Pârâu</string>
+    <string name="type.waterway.stream.ephemeral">Pârâu</string>
+    <string name="type.waterway.stream.intermittent">Pârâu</string>
+    <string name="type.waterway.stream.tunnel">Pârâu</string>
     <string name="type.waterway.waterfall">Cascadă</string>
     <string name="type.wheelchair.limited">Parțial utilat pentru invalizi</string>
     <string name="type.wheelchair.no">Nu este utilat pentru invalizi</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 6866dab2a9..5aea2d96f7 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -2175,10 +2175,10 @@
     <string name="type.waterway.lock_gate">Шлюз</string>
     <string name="type.waterway.river">Река</string>
     <string name="type.waterway.river.tunnel">Река</string>
-    <string name="type.waterway.stream">Река</string>
-    <string name="type.waterway.stream.ephemeral">Река</string>
-    <string name="type.waterway.stream.intermittent">Река</string>
-    <string name="type.waterway.stream.tunnel">Река</string>
+    <string name="type.waterway.stream">Ручей</string>
+    <string name="type.waterway.stream.ephemeral">Ручей</string>
+    <string name="type.waterway.stream.intermittent">Ручей</string>
+    <string name="type.waterway.stream.tunnel">Ручей</string>
     <string name="type.waterway.waterfall">Водопад</string>
     <string name="type.waterway.weir">Плотина</string>
     <string name="type.wheelchair">Инвалидная коляска</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index aff006fd10..05a812b282 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -2154,10 +2154,10 @@
     <string name="type.waterway.lock_gate">Шлюз</string>
     <string name="type.waterway.river">Річка</string>
     <string name="type.waterway.river.tunnel">Річка</string>
-    <string name="type.waterway.stream">Річка</string>
-    <string name="type.waterway.stream.ephemeral">Річка</string>
-    <string name="type.waterway.stream.intermittent">Річка</string>
-    <string name="type.waterway.stream.tunnel">Річка</string>
+    <string name="type.waterway.stream">Струмок</string>
+    <string name="type.waterway.stream.ephemeral">Струмок</string>
+    <string name="type.waterway.stream.intermittent">Струмок</string>
+    <string name="type.waterway.stream.tunnel">Струмок</string>
     <string name="type.waterway.waterfall">Водоспад</string>
     <string name="type.waterway.weir">Гребля</string>
     <string name="type.wheelchair">Iнвалiдний вiзок</string>
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 189be7d451..4ecf2fa86b 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -3939,13 +3939,13 @@
 
 "type.waterway.river.tunnel" = "Рака";
 
-"type.waterway.stream" = "Рака";
+"type.waterway.stream" = "Ручай";
 
-"type.waterway.stream.ephemeral" = "Рака";
+"type.waterway.stream.ephemeral" = "Ручай";
 
-"type.waterway.stream.intermittent" = "Рака";
+"type.waterway.stream.intermittent" = "Ручай";
 
-"type.waterway.stream.tunnel" = "Рака";
+"type.waterway.stream.tunnel" = "Ручай";
 
 "type.waterway.waterfall" = "Waterfall";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 07284720f1..9b97cfd79a 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -534,9 +534,9 @@
 
 "p2p_start" = "Inizia";
 
-"p2p_from_here" = "Da";
+"p2p_from_here" = "Parti da";
 
-"p2p_to_here" = "A";
+"p2p_to_here" = "Vai a";
 
 "p2p_only_from_current" = "La navigazione è disponibile solo dalla tua posizione attuale.";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
index 15592b863b..b2ecb0c6c9 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.stringsdict
@@ -50,9 +50,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d trajeto</string>
+			<string>%d trilha</string>
 			<key>other</key>
-			<string>%d trajetos</string>
+			<string>%d trilhas</string>
 		</dict>
 	</dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
index 38b1585489..4814361865 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.stringsdict
@@ -50,9 +50,9 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>one</key>
-			<string>%d trilha</string>
+			<string>%d trajeto</string>
 			<key>other</key>
-			<string>%d trilhas</string>
+			<string>%d trajetos</string>
 		</dict>
 	</dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 7e665d9a6d..549ac97a2c 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -3939,13 +3939,13 @@
 
 "type.waterway.river.tunnel" = "Râu";
 
-"type.waterway.stream" = "Râu";
+"type.waterway.stream" = "Pârâu";
 
-"type.waterway.stream.ephemeral" = "Râu";
+"type.waterway.stream.ephemeral" = "Pârâu";
 
-"type.waterway.stream.intermittent" = "Râu";
+"type.waterway.stream.intermittent" = "Pârâu";
 
-"type.waterway.stream.tunnel" = "Râu";
+"type.waterway.stream.tunnel" = "Pârâu";
 
 "type.waterway.waterfall" = "Cascadă";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index bc1584e3e9..4538a053c7 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -3939,13 +3939,13 @@
 
 "type.waterway.river.tunnel" = "Река";
 
-"type.waterway.stream" = "Река";
+"type.waterway.stream" = "Ручей";
 
-"type.waterway.stream.ephemeral" = "Река";
+"type.waterway.stream.ephemeral" = "Ручей";
 
-"type.waterway.stream.intermittent" = "Река";
+"type.waterway.stream.intermittent" = "Ручей";
 
-"type.waterway.stream.tunnel" = "Река";
+"type.waterway.stream.tunnel" = "Ручей";
 
 "type.waterway.waterfall" = "Водопад";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index ed1a57d208..59c52747cb 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -3939,13 +3939,13 @@
 
 "type.waterway.river.tunnel" = "Річка";
 
-"type.waterway.stream" = "Річка";
+"type.waterway.stream" = "Струмок";
 
-"type.waterway.stream.ephemeral" = "Річка";
+"type.waterway.stream.ephemeral" = "Струмок";
 
-"type.waterway.stream.intermittent" = "Річка";
+"type.waterway.stream.intermittent" = "Струмок";
 
-"type.waterway.stream.tunnel" = "Річка";
+"type.waterway.stream.tunnel" = "Струмок";
 
 "type.waterway.waterfall" = "Водоспад";