From 9f56dad9582c8585a92c54baf28c928b2d3bb7d2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 3 Apr 2013 15:35:45 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 and other projects

---
 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml

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

diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
-- 
cgit v1.2.3


From 80772aa1ad62a89129f24508e2005b20fec88854 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:49:11 -0700
Subject: sync with viewer-development (per DRTVWR-309)

---
 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml

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

diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
deleted file mode 100644
index 79880dd16d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
-	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
-</toggleable_menu>
-- 
cgit v1.2.3


From 774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Apr 2013 13:56:53 -0700
Subject: FIX INTL-114 translation for 9 languages of major update from CHUI
 (based on latest merge with viewer-development)

---
 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml

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

diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
-- 
cgit v1.2.3