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/floater_forget_user.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/floater_forget_user.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_forget_user.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_forget_user.xml b/indra/newview/skins/default/xui/ja/floater_forget_user.xml index 63d6d05a5e..349bb11d3e 100644 --- a/indra/newview/skins/default/xui/ja/floater_forget_user.xml +++ b/indra/newview/skins/default/xui/ja/floater_forget_user.xml @@ -1,2 +1,8 @@ -<?xml version="1.0" ?> -<floater name="groups" title="記憶されたユーザー名"/> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="groups" title="記録済みのユーザ名"> + <scroll_list name="user_list"> + <scroll_list.columns name="user"/> + </scroll_list> + <button label="削除" label_selected="削除" name="forget"/> + <check_box height="20" label="このユーザー名のローカルデータも削除する" name="delete_data" tool_tip="削除対象：チャット履歴、最後のセッションのスクリーンショット、ブラウザのCookie、テレポート履歴、ツールバー設定など。一部のローカルファイルは、グリッド間で共有されます。"/> +</floater> |