merge [straight word] in language

allierowan · allierowan · commit 046542ceebee · 2017-10-26T15:51:44.000-07:00
diff --git a/languages/translations/de.json b/languages/translations/de.json
@@ -193,9 +193,9 @@
                 "destination": "{modifier} auffahren Richtung {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "geradeaus auffahren",
+                "name": "geradeaus auffahren auf {way_name}",
+                "destination": "geradeaus auffahren Richtung {destination}"
             },
             "slight left": {
                 "default": "Leicht links auffahren",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/eo.json b/languages/translations/eo.json
@@ -193,9 +193,9 @@
                 "destination": "Enveturu {modifier} direkte al {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Enveturu rekten",
+                "name": "Enveturu rekten al {way_name}",
+                "destination": "Enveturu rekten direkte al {destination}"
             },
             "slight left": {
                 "default": "Enveturu de maldekstre",
diff --git a/languages/translations/es-ES.json b/languages/translations/es-ES.json
@@ -193,9 +193,9 @@
                 "destination": "Incorpórate {modifier} hacia {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Incorpórate recto",
+                "name": "Incorpórate recto por {way_name}",
+                "destination": "Incorpórate recto hacia {destination}"
             },
             "slight left": {
                 "default": "Incorpórate a la izquierda",
diff --git a/languages/translations/es.json b/languages/translations/es.json
@@ -193,9 +193,9 @@
                 "destination": "Gire a {modifier} hacia {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Gire  a recto",
+                "name": "Gire a recto en {way_name}",
+                "destination": "Gire a recto hacia {destination}"
             },
             "slight left": {
                 "default": "Gire a la izquierda",
diff --git a/languages/translations/fr.json b/languages/translations/fr.json
@@ -193,9 +193,9 @@
                 "destination": "Rejoindre {modifier} en direction de {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Rejoindre tout droit",
+                "name": "Rejoindre tout droit sur {way_name}",
+                "destination": "Rejoindre tout droit en direction de {destination}"
             },
             "slight left": {
                 "default": "Rejoindre par la gauche",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/id.json b/languages/translations/id.json
@@ -193,9 +193,9 @@
                 "destination": "Bergabung {modifier} menuju {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Bergabung lurus",
+                "name": "Bergabung lurus ke arah {way_name}",
+                "destination": "Bergabung lurus menuju {destination}"
             },
             "slight left": {
                 "default": "Bergabung di kiri",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/it.json b/languages/translations/it.json
@@ -193,9 +193,9 @@
                 "destination": "Immettiti {modifier} verso {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Immettiti a dritto",
+                "name": "Immettiti dritto in {way_name}",
+                "destination": "Immettiti dritto verso {destination}"
             },
             "slight left": {
                 "default": "Immettiti a sinistra",
diff --git a/languages/translations/nl.json b/languages/translations/nl.json
@@ -193,9 +193,9 @@
                 "destination": "Bij de splitsing {modifier} richting {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Bij de splitsing rechtdoor",
+                "name": "Bij de splitsing rechtdoor naar {way_name}",
+                "destination": "Bij de splitsing rechtdoor richting {destination}"
             },
             "slight left": {
                 "default": "Bij de splitsing links aanhouden",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/pl.json b/languages/translations/pl.json
@@ -193,9 +193,9 @@
                 "destination": "Włącz się {modifier} w kierunku {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Włącz się prosto",
+                "name": "Włącz się prosto na {way_name}",
+                "destination": "Włącz się prosto w kierunku {destination}"
             },
             "slight left": {
                 "default": "Włącz się z lewej strony",
diff --git a/languages/translations/pt-BR.json b/languages/translations/pt-BR.json
@@ -193,9 +193,9 @@
                 "destination": "Entre {modifier} em direção à {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Entre reto",
+                "name": "Entre reto na {way_name}",
+                "destination": "Entre reto em direção à {destination}"
             },
             "slight left": {
                 "default": "Entre à esquerda",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/ro.json b/languages/translations/ro.json
@@ -193,9 +193,9 @@
                 "destination": "Intrați în {modifier} spre {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Intrați în înainte",
+                "name": "Intrați în înainte pe {way_name}",
+                "destination": "Intrați în înainte spre {destination}"
             },
             "slight left": {
                 "default": "Intrați în stânga",
diff --git a/languages/translations/ru.json b/languages/translations/ru.json
@@ -193,9 +193,9 @@
                 "destination": "Перестройтесь {modifier} в направлении {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Перестройтесь прямо",
+                "name": "Перестройтесь прямо на {way_name:accusative}",
+                "destination": "Перестройтесь прямо в направлении {destination}"
             },
             "slight left": {
                 "default": "Перестройтесь левее",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/sv.json b/languages/translations/sv.json
@@ -193,9 +193,9 @@
                 "destination": "Byt till {modifier} körfält mot {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Byt till rakt fram körfält",
+                "name": "Byt till rakt fram körfält in på {way_name}",
+                "destination": "Byt till rakt fram körfält mot {destination}"
             },
             "slight left": {
                 "default": "Byt till vänstra körfältet",
diff --git a/languages/translations/tr.json b/languages/translations/tr.json
@@ -193,9 +193,9 @@
                 "destination": "{destination} istikametinde {modifier} yöne gir"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "düz yöne gir",
+                "name": "{way_name} üzerinde düz yöne gir",
+                "destination": "{destination} istikametinde düz yöne gir"
             },
             "slight left": {
                 "default": "Sola gir",
diff --git a/languages/translations/uk.json b/languages/translations/uk.json
@@ -193,9 +193,9 @@
                 "destination": "Приєднайтеся до потоку {modifier} у напрямку {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Приєднайтеся до потоку прямо",
+                "name": "Приєднайтеся до потоку прямо на {way_name}",
+                "destination": "Приєднайтеся до потоку прямо у напрямку {destination}"
             },
             "slight left": {
                 "default": "Приєднайтеся до потоку ліворуч",
@@ -495,4 +495,4 @@
             }
         }
     }
-}
+}
diff --git a/languages/translations/vi.json b/languages/translations/vi.json
@@ -193,9 +193,9 @@
                 "destination": "Nhập sang {modifier} đến {destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "Nhập sang thẳng",
+                "name": "Nhập sang thẳng vào {way_name}",
+                "destination": "Nhập sang thẳng đến {destination}"
             },
             "slight left": {
                 "default": "Nhập sang trái",
diff --git a/languages/translations/zh-Hans.json b/languages/translations/zh-Hans.json
@@ -156,9 +156,9 @@
                 "destination": "{modifier}并道，前往{destination}"
             },
             "straight": {
-                "default": "Merge",
-                "name": "Merge onto {way_name}",
-                "destination": "Merge towards {destination}"
+                "default": "直行并道",
+                "name": "直行并道，上{way_name}",
+                "destination": "直行并道，前往{destination}"
             },
             "uturn": {
                 "default": "调头",
@@ -370,4 +370,4 @@
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,9 @@`
`193`	`193`	`"destination": "{modifier} auffahren Richtung {destination}"`
`194`	`194`	`},`
`195`	`195`	`"straight": {`
`196`		`- "default": "Merge",`
`197`		`- "name": "Merge onto {way_name}",`
`198`		`- "destination": "Merge towards {destination}"`
	`196`	`+ "default": "geradeaus auffahren",`
	`197`	`+ "name": "geradeaus auffahren auf {way_name}",`
	`198`	`+ "destination": "geradeaus auffahren Richtung {destination}"`
`199`	`199`	`},`
`200`	`200`	`"slight left": {`
`201`	`201`	`"default": "Leicht links auffahren",`
`@@ -495,4 +495,4 @@`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`	`}`
`498`		`-}`
	`498`	`+}`