From 3793b094601f54b098be1dc3805a2879a8603402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B7=E6=96=87=20=E6=A5=8A?= Date: Mon, 16 Nov 2026 11:50:16 +0800 Subject: [PATCH 1/2] Allow renamed road types to save as new --- locales/zh-tw.tsv | 4 ++ src/road_maker.rs | 90 +++++++++++++++++++++++++++++++++----- src/road_maker/filename.rs | 88 ++++++++++++++++++++++++++++++++++++- src/ui_roads.rs | 24 ++++++++-- 4 files changed, 191 insertions(+), 15 deletions(-) diff --git a/locales/zh-tw.tsv b/locales/zh-tw.tsv index d138753..4b623b7 100644 --- a/locales/zh-tw.tsv +++ b/locales/zh-tw.tsv @@ -1910,6 +1910,10 @@ My road 我的道路 · own · 自有 Create the road type 建立道路類型 Road type made: the Roads tool builds with it 道路類型已建立:「道路」工具會用它建造 +Save as a new road type: {file} 另存為新道路類型:{file} +Overwrite: {file} 覆蓋:{file} +Saved as a new road type: {file} 已另存為新道路類型:{file} +Overwritten: {file} 已覆蓋:{file} Change it in the road maker 在道路製作器中變更 Its junctions 其路口 Make a junction where it meets another road (else they only cross) 在它與另一條道路相遇處建立路口(否則只是交叉) diff --git a/src/road_maker.rs b/src/road_maker.rs index 56a3966..66ee313 100644 --- a/src/road_maker.rs +++ b/src/road_maker.rs @@ -662,23 +662,79 @@ impl RoadSpec { } pub fn write_in_maker(&self, content: &Path, left_hand: bool, edit: Option<&MakerTarget>) -> anyhow::Result { + self.write_in_maker_as(content, left_hand, edit, false) + } + + /// Write an edited road under the name currently entered instead of replacing its source. + pub fn write_in_maker_as_new(&self, content: &Path, left_hand: bool, edit: &MakerTarget) -> anyhow::Result { + self.write_in_maker_as(content, left_hand, Some(edit), true) + } + + fn write_in_maker_as(&self, content: &Path, left_hand: bool, edit: Option<&MakerTarget>, save_as: bool) -> anyhow::Result { let mut spec = self.normalised(left_hand); spec.bus_paths = spec.bus_path_indices(); spec.bay_paths = spec.bay_path_indices(); spec.validate().map_err(anyhow::Error::msg)?; - let rel = spec.maker_filename(edit); + let destination_edit = if save_as { None } else { edit }; + let rel = spec.maker_filename(destination_edit); static WRITE: std::sync::Mutex<()> = std::sync::Mutex::new(()); let _guard = WRITE.lock().unwrap_or_else(std::sync::PoisonError::into_inner); - spec.check_maker_target(content, edit)?; + spec.check_maker_target(content, destination_edit)?; let path = crate::doc::safe::own_path(content, &rel); if let Some(edit) = edit { - log::info!("road maker: original filename {:?}, normalized filename {:?}, saved as {:?}", - edit.rel(), spec.maker_filename(None), rel); + log::info!("road maker: original filename {:?}, new filename {:?}, action {}, destination {:?}", + edit.rel(), spec.maker_filename(None), if save_as { "save as" } else { "overwrite" }, rel); + } + if save_as { + spec.copy_edited_assets(edit.unwrap(), &path)?; } spec.write_normalised(&path)?; + if save_as { + spec.copy_edited_marks(edit.unwrap(), &path)?; + } Ok(rel) } + fn copy_edited_assets(&self, edit: &MakerTarget, destination: &Path) -> anyhow::Result<()> { + if !self.effective_strips().iter().any(|s| matches!(s, Strip::BusBay { .. })) { return Ok(()); } + let Some(old_stem) = edit.source().file_stem().and_then(|s| s.to_str()) else { return Ok(()) }; + let source_dir = edit.source().parent().unwrap().join("texture"); + let destination_dir = destination.parent().unwrap().join("texture"); + std::fs::create_dir_all(&destination_dir)?; + let wanted = format!("{old_stem}_bay"); + let source = std::fs::read_dir(&source_dir).ok().and_then(|entries| entries.flatten().map(|entry| entry.path()).find(|path| { + path.file_stem().is_some_and(|stem| stem.to_string_lossy().eq_ignore_ascii_case(&wanted)) + && path.extension().is_some_and(|ext| ["bmp", "dds", "tga", "png", "jpg"].contains(&ext.to_string_lossy().to_ascii_lowercase().as_str())) + })); + let Some(source) = source else { return Ok(()) }; + let extension = source.extension().unwrap().to_string_lossy(); + let target = destination_dir.join(format!("{}_bay.{extension}", self.file_stem())); + Self::copy_maker_file(&source, &target)?; + for ext in ["cfg", "surf"] { + let alongside_source = PathBuf::from(format!("{}.{ext}", source.display())); + if alongside_source.is_file() { + Self::copy_maker_file(&alongside_source, &PathBuf::from(format!("{}.{ext}", target.display())))?; + } + let source = source.with_extension(ext); + if source.is_file() { + Self::copy_maker_file(&source, &target.with_extension(ext))?; + } + } + Ok(()) + } + + fn copy_edited_marks(&self, edit: &MakerTarget, destination: &Path) -> anyhow::Result<()> { + let source = edit.source().with_extension("marks.png"); + if source.is_file() { Self::copy_maker_file(&source, &destination.with_extension("marks.png"))?; } + Ok(()) + } + + fn copy_maker_file(source: &Path, target: &Path) -> anyhow::Result<()> { + std::fs::copy(source, target)?; + log::info!("road maker: copied {} -> {}", source.display(), target.display()); + Ok(()) + } + #[cfg(test)] pub fn reset_bay_texture(&self, content: &Path) -> anyhow::Result<()> { self.reset_bay_texture_in_maker(content, self.test_target(content).as_ref()) @@ -713,11 +769,17 @@ impl RoadSpec { if target.exists() && !reset { log::info!("保留既有灣貼圖: {}", target.display()); } else if source.is_file() && source != target { - if reset { std::fs::copy(source, target)?; } + if reset { + std::fs::copy(source, target)?; + log::info!("road maker: copied {} -> {}", source.display(), target.display()); + } else { use std::io::Write; match std::fs::OpenOptions::new().write(true).create_new(true).open(target) { - Ok(mut file) => file.write_all(&std::fs::read(source)?)?, + Ok(mut file) => { + file.write_all(&std::fs::read(source)?)?; + log::info!("road maker: copied {} -> {}", source.display(), target.display()); + } Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => log::info!("保留既有灣貼圖: {}", target.display()), Err(e) => return Err(e.into()), } @@ -750,12 +812,16 @@ impl RoadSpec { continue; } if t.parent() != Some(tex_dir.as_path()) { - std::fs::copy(t, tex_dir.join(name))?; + let target = tex_dir.join(name); + std::fs::copy(t, &target)?; + log::info!("road maker: copied {} -> {}", t.display(), target.display()); // (its settings and surface sound go with it) for ext in ["cfg", "surf"] { let side = PathBuf::from(format!("{}.{ext}", t.display())); if side.is_file() { - std::fs::copy(&side, tex_dir.join(format!("{}.{ext}", name.to_string_lossy())))?; + let target = tex_dir.join(format!("{}.{ext}", name.to_string_lossy())); + std::fs::copy(&side, &target)?; + log::info!("road maker: copied {} -> {}", side.display(), target.display()); } } } @@ -763,9 +829,12 @@ impl RoadSpec { self.copy_bay_texture(dir, false)?; if self.marked { let img = self.painted_roadway().ok_or_else(|| anyhow::anyhow!(crate::i18n::tr("The roadway texture could not be read", "Не удалось прочитать текстуру проезжей части")))?; - image::DynamicImage::ImageRgba8(img).to_rgb8().save(tex_dir.join(self.roadway_tex_name()))?; + let target = tex_dir.join(self.roadway_tex_name()); + image::DynamicImage::ImageRgba8(img).to_rgb8().save(&target)?; + log::info!("road maker: wrote {}", target.display()); } crate::doc::safe::write_atomic(path, &omsi_cfg::encode_text(&self.sli(left_hand).replace('\n', "\r\n")))?; + log::info!("road maker: wrote {}", path.display()); // (the spec beside it, so the road can be opened in the maker again) let mut saved = serde_json::to_value(self)?; if self.simple_mode_issues().is_empty() { @@ -776,9 +845,10 @@ impl RoadSpec { for field in Self::LEGACY_FIELDS { saved.as_object_mut().unwrap().remove(field); } } crate::doc::safe::write_atomic(&path.with_extension("road.json"), serde_json::to_string_pretty(&saved)?.as_bytes())?; + log::info!("road maker: wrote {}", path.with_extension("road.json").display()); let marks = path.with_extension("marks.png"); match self.hand.as_ref().filter(|h| self.marked && !h.is_empty()) { - Some(h) => h.img.save(&marks)?, + Some(h) => { h.img.save(&marks)?; log::info!("road maker: wrote {}", marks.display()); }, None => { let _ = std::fs::remove_file(&marks); } diff --git a/src/road_maker/filename.rs b/src/road_maker/filename.rs index f8d2ce3..43fbe94 100644 --- a/src/road_maker/filename.rs +++ b/src/road_maker/filename.rs @@ -15,10 +15,14 @@ impl MakerTarget { Some(Self { rel, source, metadata }) } - pub(super) fn rel(&self) -> &str { + pub fn rel(&self) -> &str { &self.rel } + pub(super) fn source(&self) -> &Path { + &self.source + } + fn owns(&self, path: &Path) -> bool { let (Ok(source), Ok(path)) = (self.source.canonicalize(), path.canonicalize()) else { return false }; source == path && std::fs::read(path.with_extension("road.json")).is_ok_and(|bytes| bytes == self.metadata) @@ -30,6 +34,10 @@ impl RoadSpec { edit.map(|target| target.rel.clone()).unwrap_or_else(|| format!("Splines\\openMapper\\{}.sli", self.file_stem())) } + pub fn maker_name_changed(&self, edit: Option<&MakerTarget>) -> bool { + edit.is_some_and(|target| !self.maker_filename(None).eq_ignore_ascii_case(target.rel())) + } + pub fn maker_filename_warning(&self, edit: Option<&MakerTarget>) -> Option { let (stem, replaced) = crate::omsi_name::ascii_stem_with_replacements(&self.name); (stem.is_empty() || replaced).then(|| { @@ -132,4 +140,82 @@ mod tests { } std::fs::remove_dir_all(root).unwrap(); } + + #[test] + fn renamed_road_can_be_saved_as_new_without_changing_the_original() { + let (root, template) = fixture("save-as"); + let original = RoadSpec { name: "Original".into(), ..template }; + let old_rel = original.write_in_maker(&root, false, None).unwrap(); + let old_path = own_path(&root, &old_rel); + let target = MakerTarget::open(old_rel, old_path.clone()).unwrap(); + let before = [std::fs::read(&old_path).unwrap(), std::fs::read(old_path.with_extension("road.json")).unwrap()]; + let renamed = RoadSpec { name: "Renamed road".into(), lane_width: 4.0, ..original }; + let new_rel = renamed.write_in_maker_as_new(&root, false, &target).unwrap(); + let new_path = own_path(&root, &new_rel); + assert_eq!(new_rel, "Splines\\openMapper\\Renamed_road.sli"); + assert!(new_path.is_file() && new_path.with_extension("road.json").is_file()); + assert_eq!(std::fs::read(&old_path).unwrap(), before[0]); + assert_eq!(std::fs::read(old_path.with_extension("road.json")).unwrap(), before[1]); + assert_eq!(RoadSpec::of(&new_path).unwrap().name, "Renamed road"); + std::fs::remove_dir_all(root).unwrap(); + } + + #[test] + fn save_as_copies_the_original_bay_pixels_sidecars_and_marks() { + let (root, template) = fixture("save-as-assets"); + let original = RoadSpec { name: "Old bay".into(), ..template }; + let old_rel = original.write_in_maker(&root, false, None).unwrap(); + let old_path = own_path(&root, &old_rel); + let old_bay = old_path.parent().unwrap().join("texture/Old_bay_bay.png"); + let pixels = image::RgbaImage::from_pixel(4, 4, image::Rgba([7, 31, 211, 255])); + pixels.save(&old_bay).unwrap(); + std::fs::write(format!("{}.cfg", old_bay.display()), b"bay cfg").unwrap(); + std::fs::write(old_bay.with_extension("surf"), b"bay surf").unwrap(); + let old_marks = old_path.with_extension("marks.png"); + image::RgbaImage::from_pixel(HAND_W, HAND_H, image::Rgba([1, 2, 3, 4])).save(&old_marks).unwrap(); + let target = MakerTarget::open(old_rel, old_path).unwrap(); + let renamed = RoadSpec { name: "New bay".into(), ..original }; + let new_rel = renamed.write_in_maker_as_new(&root, false, &target).unwrap(); + let new_path = own_path(&root, &new_rel); + let new_bay = new_path.parent().unwrap().join("texture/New_bay_bay.png"); + assert_eq!(image::open(&new_bay).unwrap().to_rgba8(), pixels); + assert_eq!(std::fs::read(format!("{}.cfg", new_bay.display())).unwrap(), b"bay cfg"); + assert_eq!(std::fs::read(new_bay.with_extension("surf")).unwrap(), b"bay surf"); + assert_eq!(std::fs::read(new_path.with_extension("marks.png")).unwrap(), std::fs::read(old_marks).unwrap()); + std::fs::remove_dir_all(root).unwrap(); + } + + #[test] + fn renamed_road_overwrite_and_unchanged_name_keep_the_existing_filename() { + for (tag, name) in [("overwrite-renamed", "Renamed"), ("overwrite-same", "Original")] { + let (root, template) = fixture(tag); + let original = RoadSpec { name: "Original".into(), ..template }; + let old_rel = original.write_in_maker(&root, false, None).unwrap(); + let old_path = own_path(&root, &old_rel); + let target = MakerTarget::open(old_rel.clone(), old_path.clone()).unwrap(); + let edited = RoadSpec { name: name.into(), lane_width: 4.25, ..original }; + assert_eq!(edited.write_in_maker(&root, false, Some(&target)).unwrap(), old_rel); + assert_eq!(RoadSpec::of(&old_path).unwrap().lane_width, 4.25); + assert!(!own_path(&root, &edited.maker_filename(None)).exists() || edited.maker_filename(None).eq_ignore_ascii_case(&old_rel)); + std::fs::remove_dir_all(root).unwrap(); + } + } + + #[test] + fn save_as_refuses_a_filename_owned_by_another_road_without_changes() { + let (root, template) = fixture("save-as-conflict"); + let original = RoadSpec { name: "Original".into(), ..template.clone() }; + let occupied = RoadSpec { name: "Occupied".into(), lane_width: 3.75, ..template }; + let old_rel = original.write_in_maker(&root, false, None).unwrap(); + let occupied_rel = occupied.write_in_maker(&root, false, None).unwrap(); + let old_path = own_path(&root, &old_rel); + let occupied_path = own_path(&root, &occupied_rel); + let target = MakerTarget::open(old_rel, old_path.clone()).unwrap(); + let before = [std::fs::read(&old_path).unwrap(), std::fs::read(&occupied_path).unwrap()]; + let renamed = RoadSpec { name: "Occupied".into(), lane_width: 5.0, ..original }; + assert!(renamed.write_in_maker_as_new(&root, false, &target).is_err()); + assert_eq!(std::fs::read(old_path).unwrap(), before[0]); + assert_eq!(std::fs::read(occupied_path).unwrap(), before[1]); + std::fs::remove_dir_all(root).unwrap(); + } } diff --git a/src/ui_roads.rs b/src/ui_roads.rs index 250b819..1981784 100644 --- a/src/ui_roads.rs +++ b/src/ui_roads.rs @@ -188,13 +188,27 @@ impl RoadTypes { if let Some(spec) = &mut self.maker { // Reserve the footer before the scrolling body, including wrapped warnings. egui::Panel::bottom("road maker footer").frame(egui::Frame::NONE).show(ui, |ui| { - if let Some(warning) = spec.maker_filename_warning(self.maker_target.as_ref()) { + let renamed = spec.maker_name_changed(self.maker_target.as_ref()); + if let Some(warning) = spec.maker_filename_warning(if renamed { None } else { self.maker_target.as_ref() }) { ui.colored_label(Color32::YELLOW, warning); } ui.add_space(6.0); ui.horizontal(|ui| { - if ui.button(icons::labelled(Icon::CheckCircle, tr("Create the road type", "Создать тип дороги"))).clicked() { - match spec.write_in_maker(&roots.content, left_hand, self.maker_target.as_ref()) { + let new_rel = spec.maker_filename(None); + let original_rel = self.maker_target.as_ref().map(|target| target.rel().to_string()); + let save_as_label = tr("Save as a new road type: {file}", "Сохранить как новый тип дороги: {file}").replace("{file}", &new_rel); + let overwrite_label = tr("Overwrite: {file}", "Перезаписать: {file}").replace("{file}", original_rel.as_deref().unwrap_or_default()); + let save_as = renamed && ui.button(icons::labelled(Icon::CheckCircle, &save_as_label)).clicked(); + let overwrite = renamed && ui.button(icons::labelled(Icon::CheckCircle, &overwrite_label)).clicked(); + let create = !renamed && ui.button(icons::labelled(Icon::CheckCircle, tr("Create the road type", "Создать тип дороги"))).clicked(); + if save_as || overwrite || create { + let wrote_new = save_as || original_rel.is_none(); + let result = if save_as { + spec.write_in_maker_as_new(&roots.content, left_hand, self.maker_target.as_ref().unwrap()) + } else { + spec.write_in_maker(&roots.content, left_hand, self.maker_target.as_ref()) + }; + match result { Ok(rel) => { if spec.pocket > 0.0 { ed.pocket_type = Some(rel.clone()); @@ -205,7 +219,9 @@ impl RoadTypes { self.maker_target = MakerTarget::open(rel.clone(), path); self.picked = Some(rel); self.error = None; - actions.push(Action::ReloadContent(tr("Road type made: the Roads tool builds with it", "Тип дороги создан: инструмент «Дороги» строит им").to_string())); + let message = if wrote_new { tr("Saved as a new road type: {file}", "Сохранено как новый тип дороги: {file}") } + else { tr("Overwritten: {file}", "Перезаписано: {file}") }; + actions.push(Action::ReloadContent(message.replace("{file}", self.maker_target.as_ref().unwrap().rel()))); } Err(e) => self.error = Some(e.to_string()), } From 2e9f78c8e75d2999c396aad928976c976785b425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B7=E6=96=87=20=E6=A5=8A?= Date: Mon, 16 Nov 2026 12:14:09 +0800 Subject: [PATCH 2/2] Complete save-as translation tables --- locales/be.tsv | 4 ++++ locales/ca.tsv | 4 ++++ locales/cs.tsv | 4 ++++ locales/de.tsv | 4 ++++ locales/es.tsv | 4 ++++ locales/fr.tsv | 4 ++++ locales/hi.tsv | 4 ++++ locales/hu.tsv | 4 ++++ locales/id.tsv | 4 ++++ locales/it.tsv | 4 ++++ locales/ja.tsv | 4 ++++ locales/kk.tsv | 4 ++++ locales/ko.tsv | 4 ++++ locales/ms.tsv | 4 ++++ locales/nl.tsv | 4 ++++ locales/pl.tsv | 4 ++++ locales/pt-pt.tsv | 4 ++++ locales/pt.tsv | 4 ++++ locales/sv.tsv | 4 ++++ locales/th.tsv | 4 ++++ locales/tl.tsv | 4 ++++ locales/tr.tsv | 4 ++++ locales/uk.tsv | 4 ++++ locales/vi.tsv | 4 ++++ locales/zh.tsv | 4 ++++ 25 files changed, 100 insertions(+) diff --git a/locales/be.tsv b/locales/be.tsv index 75de47b..9e3371e 100644 --- a/locales/be.tsv +++ b/locales/be.tsv @@ -1901,6 +1901,10 @@ My road Мая дарога · own · уласная Create the road type Стварыць тып дарогі Road type made: the Roads tool builds with it Тып дарогі створаны: інструмент «Дарогі» будуе ім +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Змяніць у канструктары Its junctions Яго скрыжаванні Make a junction where it meets another road (else they only cross) Рабіць скрыжаванне, дзе яна сустракае іншую дарогу (інакш проста перасякаюцца) diff --git a/locales/ca.tsv b/locales/ca.tsv index d924ffc..9f0970b 100644 --- a/locales/ca.tsv +++ b/locales/ca.tsv @@ -1901,6 +1901,10 @@ My road La meva carretera · own · pròpia Create the road type Crea el tipus de carretera Road type made: the Roads tool builds with it Tipus de carretera creat: l'eina Carreteres construeix amb ell +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Canvia'l al creador de carreteres Its junctions Els seus creuaments Make a junction where it meets another road (else they only cross) Fes un creuament on troba una altra carretera (si no, només s'encreuen) diff --git a/locales/cs.tsv b/locales/cs.tsv index f8805b0..91ff2ea 100644 --- a/locales/cs.tsv +++ b/locales/cs.tsv @@ -1901,6 +1901,10 @@ My road Moje silnice · own · vlastní Create the road type Vytvořit typ silnice Road type made: the Roads tool builds with it Typ silnice vytvořen: nástroj Silnice staví s ním +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Změnit v tvůrci silnic Its junctions Jeho křižovatky Make a junction where it meets another road (else they only cross) Vytvořit křižovatku, kde potkává jinou silnici (jinak se jen kříží) diff --git a/locales/de.tsv b/locales/de.tsv index e2c7736..7789f95 100644 --- a/locales/de.tsv +++ b/locales/de.tsv @@ -1901,6 +1901,10 @@ My road Meine Straße · own · eigen Create the road type Straßentyp erstellen Road type made: the Roads tool builds with it Straßentyp erstellt: Das Straßen-Werkzeug baut damit +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Im Straßen-Editor ändern Its junctions Seine Kreuzungen Make a junction where it meets another road (else they only cross) Eine Kreuzung erstellen, wo sie eine andere Straße trifft (sonst kreuzen sie sich nur) diff --git a/locales/es.tsv b/locales/es.tsv index f6292ae..5e6f983 100644 --- a/locales/es.tsv +++ b/locales/es.tsv @@ -1901,6 +1901,10 @@ My road Mi carretera · own · propia Create the road type Crear el tipo de carretera Road type made: the Roads tool builds with it Tipo de carretera creado: la herramienta Carreteras construye con él +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Cambiarlo en el creador de carreteras Its junctions Sus cruces Make a junction where it meets another road (else they only cross) Hacer un cruce donde se encuentra con otra carretera (si no, solo se cruzan) diff --git a/locales/fr.tsv b/locales/fr.tsv index f9edc80..1990bea 100644 --- a/locales/fr.tsv +++ b/locales/fr.tsv @@ -1901,6 +1901,10 @@ My road Ma route · own · perso Create the road type Créer le type de route Road type made: the Roads tool builds with it Type de route créé : l'outil Routes construit avec +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Le modifier dans le créateur de route Its junctions Ses carrefours Make a junction where it meets another road (else they only cross) Faire un carrefour là où elle rencontre une autre route (sinon elles ne font que se croiser) diff --git a/locales/hi.tsv b/locales/hi.tsv index b3acd85..6c909a6 100644 --- a/locales/hi.tsv +++ b/locales/hi.tsv @@ -1901,6 +1901,10 @@ My road मेरी सड़क · own · अपना Create the road type सड़क प्रकार बनाएँ Road type made: the Roads tool builds with it सड़क प्रकार बना: "सड़कें" टूल इसी से बनाता है +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker रोड मेकर में बदलें Its junctions इसके जंक्शन Make a junction where it meets another road (else they only cross) जहाँ यह दूसरी सड़क से मिले वहाँ जंक्शन बनाएँ (वरना सिर्फ़ पार करती हैं) diff --git a/locales/hu.tsv b/locales/hu.tsv index abae467..76ef4c0 100644 --- a/locales/hu.tsv +++ b/locales/hu.tsv @@ -1901,6 +1901,10 @@ My road Az utam · own · saját Create the road type Úttípus létrehozása Road type made: the Roads tool builds with it Úttípus elkészült: az Utak eszköz ezzel épít +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Módosítás az útkészítőben Its junctions Csomópontjai Make a junction where it meets another road (else they only cross) Csomópont készítése, ahol másik úttal találkozik (különben csak keresztezik egymást) diff --git a/locales/id.tsv b/locales/id.tsv index 3d46ef5..4c483b8 100644 --- a/locales/id.tsv +++ b/locales/id.tsv @@ -1901,6 +1901,10 @@ My road Jalan saya · own · milik sendiri Create the road type Buat jenis jalan Road type made: the Roads tool builds with it Jenis jalan dibuat: alat Jalan membangun dengannya +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Ubah di pembuat jalan Its junctions Persimpangannya Make a junction where it meets another road (else they only cross) Buat persimpangan di tempat jalan bertemu jalan lain (jika tidak, hanya bersilangan) diff --git a/locales/it.tsv b/locales/it.tsv index 5781262..73000c6 100644 --- a/locales/it.tsv +++ b/locales/it.tsv @@ -1901,6 +1901,10 @@ My road La mia strada · own · propria Create the road type Crea il tipo di strada Road type made: the Roads tool builds with it Tipo di strada creato: lo strumento Strade costruisce con esso +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Modificalo nel costruttore di strade Its junctions I suoi incroci Make a junction where it meets another road (else they only cross) Crea un incrocio dove incontra un'altra strada (altrimenti si incrociano soltanto) diff --git a/locales/ja.tsv b/locales/ja.tsv index 8f57158..b268255 100644 --- a/locales/ja.tsv +++ b/locales/ja.tsv @@ -1901,6 +1901,10 @@ My road 私の道路 · own · 自作 Create the road type 道路タイプを作成 Road type made: the Roads tool builds with it 道路タイプを作成しました:道路ツールで使用できます +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker 道路メーカーで変更 Its junctions その交差点 Make a junction where it meets another road (else they only cross) 他の道路と出会う所に交差点を作成(オフなら単に交差) diff --git a/locales/kk.tsv b/locales/kk.tsv index f7d024b..d78720c 100644 --- a/locales/kk.tsv +++ b/locales/kk.tsv @@ -1901,6 +1901,10 @@ My road Менің жолым · own · өзіндік Create the road type Жол түрін жасау Road type made: the Roads tool builds with it Жол түрі жасалды: «Жолдар» құралы онымен салады +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Конструкторда өзгерту Its junctions Оның қиылыстары Make a junction where it meets another road (else they only cross) Басқа жолмен түйіскен жерде қиылыс жасау (әйтпесе тек қиылысады) diff --git a/locales/ko.tsv b/locales/ko.tsv index 551dd2f..0e35827 100644 --- a/locales/ko.tsv +++ b/locales/ko.tsv @@ -1901,6 +1901,10 @@ My road 내 도로 · own · 직접 만듦 Create the road type 도로 유형 만들기 Road type made: the Roads tool builds with it 도로 유형을 만들었습니다. 도로 도구가 이것으로 건설합니다 +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker 도로 메이커에서 변경 Its junctions 교차로 Make a junction where it meets another road (else they only cross) 다른 도로와 만나는 곳에 교차로 만들기(아니면 교차만 함) diff --git a/locales/ms.tsv b/locales/ms.tsv index 7d6871a..d9fb5c8 100644 --- a/locales/ms.tsv +++ b/locales/ms.tsv @@ -1901,6 +1901,10 @@ My road Jalan saya · own · sendiri Create the road type Cipta jenis jalan Road type made: the Roads tool builds with it Jenis jalan dibuat: alat Jalan membina dengannya +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Ubah dalam pembuat jalan Its junctions Simpangnya Make a junction where it meets another road (else they only cross) Buat simpang di mana ia bertemu jalan lain (jika tidak ia hanya bersilang) diff --git a/locales/nl.tsv b/locales/nl.tsv index 056a42e..7205a85 100644 --- a/locales/nl.tsv +++ b/locales/nl.tsv @@ -1901,6 +1901,10 @@ My road Mijn weg · own · eigen Create the road type Het wegtype maken Road type made: the Roads tool builds with it Wegtype gemaakt: het gereedschap Wegen bouwt ermee +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Wijzigen in de wegbouwer Its junctions Zijn kruispunten Make a junction where it meets another road (else they only cross) Een kruispunt maken waar hij een andere weg ontmoet (anders kruisen ze alleen) diff --git a/locales/pl.tsv b/locales/pl.tsv index b1a489e..0695b98 100644 --- a/locales/pl.tsv +++ b/locales/pl.tsv @@ -1901,6 +1901,10 @@ My road Moja droga · own · własna Create the road type Utwórz typ drogi Road type made: the Roads tool builds with it Typ drogi utworzony: buduje nim narzędzie „Drogi" +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Zmień w kreatorze drogi Its junctions Jego skrzyżowania Make a junction where it meets another road (else they only cross) Twórz skrzyżowanie, gdzie spotyka inną drogę (inaczej tylko się krzyżują) diff --git a/locales/pt-pt.tsv b/locales/pt-pt.tsv index 869954c..bc5ce1b 100644 --- a/locales/pt-pt.tsv +++ b/locales/pt-pt.tsv @@ -1901,6 +1901,10 @@ My road A minha estrada · own · própria Create the road type Criar o tipo de estrada Road type made: the Roads tool builds with it Tipo de estrada criado: a ferramenta Estradas constrói com ele +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Alterá-lo no criador de estradas Its junctions Os seus cruzamentos Make a junction where it meets another road (else they only cross) Fazer um cruzamento onde encontra outra estrada (senão só se cruzam) diff --git a/locales/pt.tsv b/locales/pt.tsv index 4f86af8..a9d3750 100644 --- a/locales/pt.tsv +++ b/locales/pt.tsv @@ -1901,6 +1901,10 @@ My road Minha estrada · own · própria Create the road type Criar o tipo de estrada Road type made: the Roads tool builds with it Tipo de estrada criado: a ferramenta Estradas constrói com ele +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Alterar no construtor de estradas Its junctions Seus cruzamentos Make a junction where it meets another road (else they only cross) Criar um cruzamento onde ela encontra outra estrada (senão só se cruzam) diff --git a/locales/sv.tsv b/locales/sv.tsv index 8858f65..2fc7712 100644 --- a/locales/sv.tsv +++ b/locales/sv.tsv @@ -1901,6 +1901,10 @@ My road Min väg · own · egen Create the road type Skapa vägtypen Road type made: the Roads tool builds with it Vägtyp skapad: Väg-verktyget bygger med den +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Ändra den i väggeneratorn Its junctions Dess korsningar Make a junction where it meets another road (else they only cross) Gör en korsning där den möter en annan väg (annars korsar de bara) diff --git a/locales/th.tsv b/locales/th.tsv index aa8f6d8..d176cd5 100644 --- a/locales/th.tsv +++ b/locales/th.tsv @@ -1901,6 +1901,10 @@ My road ถนนของฉัน · own · ของตัวเอง Create the road type สร้างชนิดถนน Road type made: the Roads tool builds with it สร้างชนิดถนนแล้ว: เครื่องมือถนนสร้างด้วยชนิดนี้ +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker เปลี่ยนในตัวสร้างถนน Its junctions ทางแยกของมัน Make a junction where it meets another road (else they only cross) สร้างทางแยกตรงที่มันพบถนนอื่น (ไม่เช่นนั้นแค่ตัดกัน) diff --git a/locales/tl.tsv b/locales/tl.tsv index d8fc8b0..54fd31e 100644 --- a/locales/tl.tsv +++ b/locales/tl.tsv @@ -1901,6 +1901,10 @@ My road Aking kalsada · own · sarili Create the road type Gawin ang uri ng kalsada Road type made: the Roads tool builds with it Nagawa ang uri ng kalsada: gagamitin ito ng Roads tool sa pagtatayo +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Baguhin sa road maker Its junctions Mga junction nito Make a junction where it meets another road (else they only cross) Gumawa ng junction kung saan ito nakakasalubong ng ibang kalsada (kung hindi, magkakrus lang) diff --git a/locales/tr.tsv b/locales/tr.tsv index 64a96e2..3af09f7 100644 --- a/locales/tr.tsv +++ b/locales/tr.tsv @@ -1901,6 +1901,10 @@ My road Benim yolum · own · özel Create the road type Yol türünü oluştur Road type made: the Roads tool builds with it Yol türü yapıldı: Yollar aracı bununla yapar +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Yol yapıcıda değiştir Its junctions Kavşakları Make a junction where it meets another road (else they only cross) Başka bir yolla buluştuğu yerde kavşak yap (yoksa yalnızca kesişirler) diff --git a/locales/uk.tsv b/locales/uk.tsv index 7933695..14748d5 100644 --- a/locales/uk.tsv +++ b/locales/uk.tsv @@ -1901,6 +1901,10 @@ My road Моя дорога · own · своя Create the road type Створити тип дороги Road type made: the Roads tool builds with it Тип дороги створено: інструмент «Дороги» будує ним +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Змінити в конструкторі Its junctions Його перехрестя Make a junction where it meets another road (else they only cross) Робити перехрестя, де вона зустрічає іншу дорогу (інакше просто перетинаються) diff --git a/locales/vi.tsv b/locales/vi.tsv index 20246c0..291fef1 100644 --- a/locales/vi.tsv +++ b/locales/vi.tsv @@ -1901,6 +1901,10 @@ My road Đường của tôi · own · của riêng Create the road type Tạo loại đường Road type made: the Roads tool builds with it Đã tạo loại đường: công cụ Đường xây bằng nó +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker Đổi trong trình tạo đường Its junctions Nút giao của nó Make a junction where it meets another road (else they only cross) Tạo nút giao nơi nó gặp đường khác (nếu không chúng chỉ cắt nhau) diff --git a/locales/zh.tsv b/locales/zh.tsv index 4368513..94c3765 100644 --- a/locales/zh.tsv +++ b/locales/zh.tsv @@ -1906,6 +1906,10 @@ My road 我的道路 · own · 自制 Create the road type 创建道路类型 Road type made: the Roads tool builds with it 道路类型已创建:“道路”工具用它来建造 +Save as a new road type: {file} Save as a new road type: {file} +Overwrite: {file} Overwrite: {file} +Saved as a new road type: {file} Saved as a new road type: {file} +Overwritten: {file} Overwritten: {file} Change it in the road maker 在道路制作器中修改 Its junctions 其路口 Make a junction where it meets another road (else they only cross) 在它与另一条道路相遇处生成路口(否则只是交叉)