From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/pt/menu_people_nearby.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/pt/menu_people_nearby.xml

(limited to 'indra/newview/skins/default/xui/pt/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


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

---
 .../skins/default/xui/pt/menu_people_nearby.xml    | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/pt/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_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)

---
 .../skins/default/xui/pt/menu_people_nearby.xml    | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui/pt/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 51464fed68..7c720f262b 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Exibir perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Chamada de voz" name="voice_call"/>
-	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
+	<menu_item_call label="Ver perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_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)

---
 .../skins/default/xui/pt/menu_people_nearby.xml    | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/pt/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_menu>
-- 
cgit v1.2.3