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/fr/panel_edit_pick.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
index 2364d9bbb2..247e18da82 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="Enregistrer" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="Annuler" 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/fr/strings.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 3ec85551da..077e545851 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1238,9 +1238,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InvFolder My Inventory">
 		Mon inventaire
 	</string>
-	<string name="InvFolder My Favorites">
-		Mes Favoris
-	</string>
 	<string name="InvFolder Library">
 		Bibliothèque
 	</string>
@@ -1299,10 +1296,10 @@ Veuillez réessayer de vous connecter dans une minute.
 		Gestes
 	</string>
 	<string name="InvFolder Favorite">
-		Favoris
+		Mes Favoris
 	</string>
 	<string name="InvFolder favorite">
-		Favoris
+		Mes Favoris
 	</string>
 	<string name="InvFolder Current Outfit">
 		Tenue actuelle
-- 
cgit v1.2.3