Merge remote-tracking branch 'github/main' into feature/HereticFixes

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
       - id: indent-with-spaces
         files: \.(cpp|c|h|inl|py|glsl|cmake)$
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-xml
       - id: mixed-line-ending

indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml

@@ -14,7 +14,10 @@
 	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel_ls">
 			<layout_panel name="save_btn_lp">
-				<button label="Enregistrer sous" name="save_btn"/>
+				<button label="Enregistrer" name="save_btn"/>
+			</layout_panel>
+			<layout_panel name="save_as_btn_lp">
+				<button label="Enregistrer sous..." name="save_as_btn"/>
 			</layout_panel>
 			<layout_panel name="wear_btn_lp">
 				<button label="Porter" name="wear_btn"/>