From e4cd80fabeb67e2112d5485de7c4b08d0d83dd54 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 29 Jun 2011 21:13:56 -0400
Subject: STORM-1462 [TRANSLATED BUT IN EN] ALL LANGS - Untranslated "Cancel"
 button on Edit Pick page This affected all languages but NL due to
 name="layout_panel1" not being unique.

---
 indra/newview/skins/default/xui/ja/panel_edit_pick.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/ja')

diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index 4fb031b677..39ea1df1e3 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="ピックを保存" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="取り消し" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
-- 
cgit v1.2.3


From 22346d0b0adc6208ed9645b28b4cd79f67d73808 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 6 Jul 2011 17:42:35 +0300
Subject: STORM-1472 FIXED Favorites folder in inventory does not translate
 properly

Reason:
Instead of changing value of existing strings (Favorite and favorite) a new string(My Favorites) with wrong key was added.

Solution:
Deleted unnecessary string ("My Favorites") and added proper translation to the existing strings (Favorite and favorite).
---
 indra/newview/skins/default/xui/ja/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/ja')

diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index ff22221aab..fa6d25d238 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1238,9 +1238,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="InvFolder My Inventory">
 		持ち物
 	</string>
-	<string name="InvFolder My Favorites">
-		お気に入り
-	</string>
 	<string name="InvFolder Library">
 		ライブラリ
 	</string>
-- 
cgit v1.2.3