diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/ja/panel_preferences_general.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
Diffstat (limited to 'indra/newview/skins/default/xui/ja/panel_preferences_general.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_preferences_general.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index 4c00e9db2c..923e998e55 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -33,10 +33,7 @@ </text> <check_box label="解像度独立スケールを使用" name="ui_auto_scale"/> <spinner label="退席までの時間：" name="afk_timeout_spinner"/> - <check_box label="ミニマップを回転" name="rotate_mini_map_checkbox"/> <check_box label="リンデン・ドル（L$）の支払い/受け取りを通知" name="notify_money_change_checkbox"/> - <check_box label="デフォルト・システムのカラー選択を使用" name="use_system_color_picker_checkbox" tool_tip="Second Life内蔵でない、デフォルト・システムのカラー選択を使用"/> - <check_box label="オーバーレイ・バーに検索パネルを表示" name="show_search_panel" tool_tip="組み込みの検索パネルを表示します。"/> <text length="1" name="start_location_textbox" type="string"> ログイン位置： </text> @@ -100,6 +97,12 @@ <combo_item length="1" name="Portugese" type="string"> Português (ポルトガル語) – ベータ </combo_item> + <combo_item name="Russian"> + Русский (ロシア語) - ベータ + </combo_item> + <combo_item name="Ukrainian"> + Українська (ウクライナ語) - ベータ + </combo_item> <combo_item length="1" name="Chinese" type="string"> 中文 (简体) (中国語) - ベータ </combo_item> |