summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2009-03-05 02:05:06 +0000
committerMark Palange <palange@lindenlab.com>2009-03-05 02:05:06 +0000
commitcdbd97c41fb43ced0fa55e77eac65057ac2b71ad (patch)
tree0cd30b2d480537685ee5a5f8cd901304ccccf069 /indra/newview
parent6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (diff)
QAR-1293 - Mergeback of changes made in Viewer 1.22 RC10
svn merge -r112338-112378 svn+ssh://svn/lindenlab.com/svn/linden/branches/viewer/viewer_1-22 to trunk
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpreviewtexture.cpp3
-rw-r--r--indra/newview/skins/default/xui/fr/floater_report_abuse.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_about_land.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/floater_tools.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/menu_viewer.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_region_general.xml2
6 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index dac461a912..d18cfe85fb 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -303,7 +303,8 @@ void LLPreviewTexture::saveAs()
if( mLoadingFullImage ) return;
LLFilePicker& file_picker = LLFilePicker::instance();
- if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, LLDir::getScrubbedFileName(getItem()->getName())) )
+ const LLViewerInventoryItem* item = getItem() ;
+ if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) )
{
// User canceled or we failed to acquire save file.
return;
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 1fbc727009..c9b065ca73 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -172,7 +172,7 @@
<text name="bug_aviso">
Indiquez la date, le lieu, la nature de l&apos;infraction, ainsi que
tout chat ou IM relatif à l&apos;infraction, en étant aussi précis
-que possible. Pensez à indiquer un objet.
+que possible. Pensez à indiquer un objet si possible.
</text>
<text bottom_delta="-16" name="incomplete_title">
Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index c1d944bd0e..15a4c91a36 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -61,9 +61,9 @@
<text length="1" name="DwellText" type="string">
</text>
- <button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..."/>
+ <button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..." width="125" left="130"/>
<button label="グループ用に購入..." label_selected="グループ用に購入..." name="Buy For Group..."/>
- <button label="入場許可を購入..." label_selected="入場許可を購入..." name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。"/>
+ <button label="入場許可を購入..." label_selected="入場許可を購入..." name="Buy Pass..." tool_tip="この土地への一時的なアクセスを許可します。" width="125" left="130"/>
<button label="土地を放棄..." label_selected="土地を放棄..." name="Abandon Land..."/>
<button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..."/>
<button label="Lindenセール..." label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index d88f0b89f2..ab204965f6 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -76,7 +76,7 @@
<check_box label="土地を隆起させる" name="radio raise" />
<check_box label="土地を低くする" name="radio lower" />
<check_box label="土地を滑らかにする" name="radio smooth" />
- <check_box label="土地を荒らす" name="radio noise" />
+ <check_box label="土地を凸凹にする" name="radio noise" />
<check_box label="土地を元に戻す" name="radio revert" />
<combo_box name="combobox brush size">
<combo_item name="Small">
@@ -558,7 +558,7 @@
</combo_item>
</combo_box>
<text name="tex scale">
- 顔ごとに繰り返す
+ 面ごとに繰り返す
</text>
<spinner label="水平(U)" name="TexScaleU" />
<check_box label="反転" name="checkbox flip s" />
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index bc7b0742df..af870a0231 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -132,7 +132,7 @@
<menu_item_call label="正午" name="Noon"/>
<menu_item_call label="日没" name="Sunset"/>
<menu_item_call label="深夜" name="Midnight"/>
- <menu_item_call label="地域デフォルトに戻す" name="Revert to Region Default"/>
+ <menu_item_call label="地域の標準設定に戻す" name="Revert to Region Default"/>
<menu_item_separator label="-----------" name="separator"/>
<menu_item_call label="環境編集" name="Environment Editor"/>
</menu>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index cd1b7cea69..a0e72b37a4 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -27,7 +27,7 @@
<check_box label="土地の検索表示をブロック" name="block_parcel_search_check"
tool_tip="検索結果で、この地域と区画を人に見せる" />
<button label="?" name="parcel_search_help" />
- <spinner label="人物の制限" name="agent_limit_spin" />
+ <spinner label="アバター数上限" name="agent_limit_spin" />
<button label="?" name="agent_limit_help" />
<spinner label="物体ボーナス" name="object_bonus_spin" />
<button label="?" name="object_bonus_help" />