Skip to content
Snippets Groups Projects
Commit b5046d0f authored by Cinder Roxley's avatar Cinder Roxley
Browse files

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

parents 69bd0565 d9a822ac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.pre-commit-config.yaml
+ 1
− 1
View file @ b5046d0f
...@@ -12,7 +12,7 @@ repos: ...@@ -12,7 +12,7 @@ repos:
- id: indent-with-spaces - id: indent-with-spaces
files: \.(cpp|c|h|inl|py|glsl|cmake)$ files: \.(cpp|c|h|inl|py|glsl|cmake)$
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0 rev: v5.0.0
hooks: hooks:
- id: check-xml - id: check-xml
- id: mixed-line-ending - id: mixed-line-ending
indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
+ 4
− 1
View file @ b5046d0f
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
<panel name="bottom_panel"> <panel name="bottom_panel">
<layout_stack name="bottom_panel_ls"> <layout_stack name="bottom_panel_ls">
<layout_panel name="save_btn_lp"> <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>
<layout_panel name="wear_btn_lp"> <layout_panel name="wear_btn_lp">
<button label="Porter" name="wear_btn"/> <button label="Porter" name="wear_btn"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment