diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index 005b1866bd..fcf50d5956 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -192,6 +192,8 @@ Enjoy your stay in the World of Veloren."#, "hud.settings.fluid_rendering_mode.cheap": "Cheap", "hud.settings.fluid_rendering_mode.shiny": "Shiny", "hud.settings.cloud_rendering_mode.regular": "Regular", + "hud.settings.fullscreen": "Fullscreen", + "hud.settings.save_window_size": "Save window size", "hud.settings.music_volume": "Music Volume", "hud.settings.sound_effect_volume": "Sound Effects Volume", diff --git a/assets/voxygen/i18n/fr_FR.ron b/assets/voxygen/i18n/fr_FR.ron index f2fa2acf06..d1cbbb75c6 100644 --- a/assets/voxygen/i18n/fr_FR.ron +++ b/assets/voxygen/i18n/fr_FR.ron @@ -166,13 +166,15 @@ Profitez de votre séjour dans le monde de Veloren."#, "hud.settings.view_distance": "Distance d'affichage", "hud.settings.maximum_fps": "Limite FPS", - "hud.settings.fov": "Champs de vision (FOV)", + "hud.settings.fov": "Champs de vision (degrés)", "hud.settings.antialiasing_mode": "Mode anticrénelage", "hud.settings.cloud_rendering_mode": "Rendu des nuages", "hud.settings.fluid_rendering_mode": "Rendu des fluides", "hud.settings.fluid_rendering_mode.cheap": "Rapide", "hud.settings.fluid_rendering_mode.shiny": "Qualité", "hud.settings.cloud_rendering_mode.regular": "Normal", + "hud.settings.fullscreen": "Plein écran", + "hud.settings.save_window_size": "Sauvegarder la taille de fenêtre", "hud.settings.music_volume": "Volume de la musique", "hud.settings.sound_effect_volume": "Volume des effets", @@ -262,7 +264,7 @@ Commandes du tchat: "hud.social": "Social", "hud.social.friends": "Amis", - "hud.social.Faction": "Faction", + "hud.social.faction": "Faction", "hud.social.online": "Jeu en ligne", "hud.social.not_yet_available": "Pas encore disponible", "hud.social.play_online_fmt": "{nb_player} joueurs en ligne", diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs index 9a67ed00d9..ac77d83da9 100644 --- a/voxygen/src/hud/settings_window.rs +++ b/voxygen/src/hud/settings_window.rs @@ -1518,7 +1518,7 @@ impl<'a> Widget for SettingsWindow<'a> { .set(state.ids.max_fps_value, ui); // FOV - Text::new("Field of View (deg)") + Text::new(&self.localized_strings.get("hud.settings.fov")) .down_from(state.ids.max_fps_slider, 10.0) .font_size(14) .font_id(self.fonts.cyri) @@ -1665,7 +1665,7 @@ impl<'a> Widget for SettingsWindow<'a> { } // Fullscreen - Text::new("Fullscreen") + Text::new(&self.localized_strings.get("hud.settings.fullscreen")) .font_size(14) .font_id(self.fonts.cyri) .down_from(state.ids.fluid_mode_list, 8.0) @@ -1693,7 +1693,7 @@ impl<'a> Widget for SettingsWindow<'a> { .hover_image(self.imgs.settings_button_hover) .press_image(self.imgs.settings_button_press) .down_from(state.ids.fullscreen_label, 12.0) - .label("Save window size") + .label(&self.localized_strings.get("hud.settings.save_window_size")) .label_font_size(14) .label_color(TEXT_COLOR) .label_font_id(self.fonts.cyri) diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 1f86ff48c8..b49d3ca359 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -256,7 +256,9 @@ impl<'a> Widget for Skillbar<'a> { Rectangle::fill_with([82.0 * 4.0, 40.0 * 4.0], color::TRANSPARENT) .mid_top_with_margin_on(ui.window, 300.0) .set(state.ids.level_align, ui); - let level_up_text = format!("Level {}", self.stats.level.level() as u32); + let level_up_text = &localized_strings + .get("char_selection.level_fmt") + .replace("{level_nb}", &self.stats.level.level().to_string()); Text::new(&level_up_text) .middle_of(state.ids.level_align) .font_size(30) diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 9fc2fe0adb..5d4e65a910 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -600,14 +600,18 @@ impl CharSelectionUi { .color(TEXT_COLOR) .set(self.ids.character_names[i], ui_widgets); - Text::new("Level 1") //TODO Insert real level here as soon as they get saved - .down_from(self.ids.character_names[i], 4.0) - .font_size(17) - .font_id(self.fonts.cyri) - .color(TEXT_COLOR) - .set(self.ids.character_levels[i], ui_widgets); + Text::new( + &localized_strings + .get("char_selection.level_fmt") + .replace("{level_nb}", "1"), + ) //TODO Insert real level here as soon as they get saved + .down_from(self.ids.character_names[i], 4.0) + .font_size(17) + .font_id(self.fonts.cyri) + .color(TEXT_COLOR) + .set(self.ids.character_levels[i], ui_widgets); - Text::new("Uncanny Valley") + Text::new(&localized_strings.get("char_selection.uncanny_valley")) .down_from(self.ids.character_levels[i], 4.0) .font_size(17) .font_id(self.fonts.cyri)