diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/ja/sidepanel_appearance.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/sidepanel_appearance.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/sidepanel_appearance.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml index 30cef9ccc0..3919ed0bc8 100644 --- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml @@ -2,7 +2,7 @@ <panel label="アウトフィット" name="appearance panel"> <string name="No Outfit" value="アウトフィットなし"/> <string name="Unsaved Changes" value="保存されていない変更"/> - <string name="Now Wearing" value="着用しています..."/> + <string name="Now Wearing" value="着用しています…"/> <string name="Changing outfits" value="アウトフィットの変更"/> <panel name="panel_currentlook"> <button label="E" name="editappearance_btn"/> @@ -11,9 +11,9 @@ （状態） </text> <text name="currentlook_name"> - MyOutfit With a really Long Name like MOOSE + MOOSEみたいな長い名前の私のアウトフィット </text> <button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/> </panel> - <filter_editor label="アウトフィットをフィルター" name="Filter"/> + <filter_editor label="アウトフィットをフィルタ" name="Filter"/> </panel> |