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

1 files changed, 60 insertions, 60 deletions

diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 8dac77458c..37c52f173c 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="購入" name="Task Buy" />
-	<menu_item_call label="開く" name="Task Open" />
-	<menu_item_call label="再生" name="Task Play" />
-	<menu_item_call label="プロパティ" name="Task Properties" />
-	<menu_item_call label="名前の変更" name="Task Rename" />
-	<menu_item_call label="削除" name="Task Remove" />
-	<menu_item_call label="ゴミ箱を空にする" name="Empty Trash" />
-	<menu_item_call label="遺失物フォルダを空にする" name="Empty Lost And Found" />
-	<menu_item_call label="新しいフォルダ" name="New Folder" />
-	<menu_item_call label="新しいスクリプト" name="New Script" />
-	<menu_item_call label="新しいノート" name="New Note" />
-	<menu_item_call label="新しいジェスチャー" name="New Gesture" />
+	<menu_item_call label="購入" name="Task Buy"/>
+	<menu_item_call label="開く" name="Task Open"/>
+	<menu_item_call label="再生" name="Task Play"/>
+	<menu_item_call label="プロパティ" name="Task Properties"/>
+	<menu_item_call label="名前の変更" name="Task Rename"/>
+	<menu_item_call label="削除" name="Task Remove"/>
+	<menu_item_call label="ゴミ箱を空にする" name="Empty Trash"/>
+	<menu_item_call label="遺失物フォルダを空にする" name="Empty Lost And Found"/>
+	<menu_item_call label="新しいフォルダ" name="New Folder"/>
+	<menu_item_call label="新しいスクリプト" name="New Script"/>
+	<menu_item_call label="新しいノート" name="New Note"/>
+	<menu_item_call label="新しいジェスチャー" name="New Gesture"/>
 	<menu name="New Clothes">
-		<menu_item_call label="新しいシャツ" name="New Shirt" />
-		<menu_item_call label="新しいズボン" name="New Pants" />
-		<menu_item_call label="新しい靴" name="New Shoes" />
-		<menu_item_call label="新しい靴下" name="New Socks" />
-		<menu_item_call label="新しいジャケット" name="New Jacket" />
-		<menu_item_call label="新しいスカート" name="New Skirt" />
-		<menu_item_call label="新しい手袋" name="New Gloves" />
-		<menu_item_call label="新しい下着" name="New Undershirt" />
-		<menu_item_call label="新しいパンツ" name="New Underpants" />
+		<menu_item_call label="新しいシャツ" name="New Shirt"/>
+		<menu_item_call label="新しいズボン" name="New Pants"/>
+		<menu_item_call label="新しい靴" name="New Shoes"/>
+		<menu_item_call label="新しい靴下" name="New Socks"/>
+		<menu_item_call label="新しいジャケット" name="New Jacket"/>
+		<menu_item_call label="新しいスカート" name="New Skirt"/>
+		<menu_item_call label="新しい手袋" name="New Gloves"/>
+		<menu_item_call label="新しい下着" name="New Undershirt"/>
+		<menu_item_call label="新しいパンツ" name="New Underpants"/>
 	</menu>
 	<menu name="New Body Parts">
-		<menu_item_call label="新しいシェイプ(体型)" name="New Shape" />
-		<menu_item_call label="新しいスキン" name="New Skin" />
-		<menu_item_call label="新しい髪" name="New Hair" />
-		<menu_item_call label="新しい眼" name="New Eyes" />
+		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
+		<menu_item_call label="新しいスキン" name="New Skin"/>
+		<menu_item_call label="新しい髪" name="New Hair"/>
+		<menu_item_call label="新しい眼" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="テレポート" name="Landmark Open" />
-	<menu_item_call label="開く" name="Animation Open" />
-	<menu_item_call label="開く" name="Sound Open" />
-	<menu_item_call label="アイテムを除外" name="Purge Item" />
-	<menu_item_call label="アイテムを復元" name="Restore Item" />
-	<menu_item_call label="開く" name="Open" />
-	<menu_item_call label="プロパティ" name="Properties" />
-	<menu_item_call label="名前の変更" name="Rename" />
-	<menu_item_call label="UUIDをコピー" name="Copy Asset UUID" />
-	<menu_item_call label="コピー" name="Copy" />
-	<menu_item_call label="貼り付け" name="Paste" />
-	<menu_item_call label="削除" name="Delete" />
-	<menu_item_call label="服装に追加" name="Add To Outfit" />
-	<menu_item_call label="服装を置換" name="Replace Outfit" />
-	<menu_item_call label="アイテムを取り外す" name="Take Off Items" />
-	<menu_item_call label="会議チャット開始" name="Conference Chat Folder" />
-	<menu_item_call label="再生" name="Sound Play" />
-	<menu_item_call label="ランドマーク情報" name="Teleport To Landmark" />
-	<menu_item_call label="世界で再生" name="Animation Play" />
-	<menu_item_call label="ローカルに再生" name="Animation Audition" />
-	<menu_item_call label="インスタント・メッセージを送信"
-	     name="Send Instant Message" />
-	<menu_item_call label="テレポートを贈る..." name="Offer Teleport..." />
-	<menu_item_call label="会議チャット開始" name="Conference Chat" />
-	<menu_item_call label="アクティブ" name="Activate" />
-	<menu_item_call label="非アクティブ" name="Deactivate" />
-	<menu_item_call label="自分から取り外す" name="Detach From Yourself" />
-	<menu_item_call label="装着" name="Object Wear" />
-	<menu label="装着先" name="Attach To" />
-	<menu label="HUD装着先" name="Attach To HUD" />
-	<menu_item_call label="装着" name="Wearable Wear" />
-	<menu_item_call label="編集" name="Wearable Edit" />
-	<menu_item_call label="取り外す" name="Take Off" />
-	<menu_item_call label="－－オプションなし－－" name="--no options--" />
+	<menu_item_call label="テレポート" name="Landmark Open"/>
+	<menu_item_call label="開く" name="Animation Open"/>
+	<menu_item_call label="開く" name="Sound Open"/>
+	<menu_item_call label="アイテムを除外" name="Purge Item"/>
+	<menu_item_call label="アイテムを復元" name="Restore Item"/>
+	<menu_item_call label="開く" name="Open"/>
+	<menu_item_call label="プロパティ" name="Properties"/>
+	<menu_item_call label="名前の変更" name="Rename"/>
+	<menu_item_call label="UUIDをコピー" name="Copy Asset UUID"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="貼り付け" name="Paste"/>
+	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="アイテムを取り外す" name="Take Off Items"/>
+	<menu_item_call label="服装に追加" name="Add To Outfit"/>
+	<menu_item_call label="服装を置換" name="Replace Outfit"/>
+	<menu_item_call label="会議チャット開始" name="Conference Chat Folder"/>
+	<menu_item_call label="再生" name="Sound Play"/>
+	<menu_item_call label="ランドマーク情報" name="Teleport To Landmark"/>
+	<menu_item_call label="世界で再生" name="Animation Play"/>
+	<menu_item_call label="ローカルに再生" name="Animation Audition"/>
+	<menu_item_call label="インスタント・メッセージを送信" name="Send Instant Message"/>
+	<menu_item_call label="テレポートを贈る..." name="Offer Teleport..."/>
+	<menu_item_call label="会議チャット開始" name="Conference Chat"/>
+	<menu_item_call label="アクティブ" name="Activate"/>
+	<menu_item_call label="非アクティブ" name="Deactivate"/>
+	<menu_item_call label="自分から取り外す" name="Detach From Yourself"/>
+	<menu_item_call label="前回あった位置に戻す" name="Restore to Last Position"/>
+	<menu_item_call label="装着" name="Object Wear"/>
+	<menu label="装着先" name="Attach To"/>
+	<menu label="HUD装着先" name="Attach To HUD"/>
+	<menu_item_call label="編集" name="Wearable Edit"/>
+	<menu_item_call label="装着" name="Wearable Wear"/>
+	<menu_item_call label="取り外す" name="Take Off"/>
+	<menu_item_call label="－－オプションなし－－" name="--no options--"/>
 </menu>