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, 22 insertions, 22 deletions

diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index d65af04b69..d2340de471 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="Inventory Finder" title="Propriedades de iten recente">

-	<check_box label="Animação" name="check_animation" />

-	<check_box label="Cartões de chamadas" name="check_calling_card" />

-	<check_box label="Roupas" name="check_clothing" />

-	<check_box label="Gestos" name="check_gesture" />

-	<check_box label="Landmarks" name="check_landmark" />

-	<check_box label="Anotações" name="check_notecard" />

-	<check_box label="Objetos" name="check_object" />

-	<check_box label="Scripts" name="check_script" />

-	<check_box label="Sons" name="check_sound" />

-	<check_box label="Texturas" name="check_texture" />

-	<check_box label="Fotos" name="check_snapshot" />

-	<button label="Tudo" label_selected="Tudo" name="All" />

-	<button label="Nenhum" label_selected="Nenhum" name="None" />

-	<check_box label="Sempre mostrar as pastas" name="check_show_empty" />

-	<check_box label="Desde o Logoff" name="check_since_logoff" />

-	<text type="string" length="1" name="- OR -">

-		- OR -

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Inventory Finder" title="itens_de_inventário_recentes">

+	<check_box label="Animação" name="check_animation"/>

+	<check_box label="Cartões de chamadas" name="check_calling_card"/>

+	<check_box label="Roupas" name="check_clothing"/>

+	<check_box label="Gestos" name="check_gesture"/>

+	<check_box label="Landmarks" name="check_landmark"/>

+	<check_box label="Anotações" name="check_notecard"/>

+	<check_box label="Objetos" name="check_object"/>

+	<check_box label="Scripts" name="check_script"/>

+	<check_box label="Sons" name="check_sound"/>

+	<check_box label="Texturas" name="check_texture"/>

+	<check_box label="Fotos" name="check_snapshot"/>

+	<button label="Tudo" label_selected="Tudo" name="All"/>

+	<button label="Nenhum" label_selected="Nenhum" name="None"/>

+	<check_box label="Sempre mostrar as pastas" name="check_show_empty"/>

+	<check_box label="Desde o Logoff" name="check_since_logoff"/>

+	<text length="1" name="- OR -" type="string">

+		- OU -

 	</text>

-	<spinner label="Horas Atrás" name="spin_hours_ago" />

-	<spinner label="Dias Atrás" name="spin_days_ago" />

-	<button label="Fechar" label_selected="Fechar" name="Close" />

+	<spinner label="Horas Atrás" name="spin_hours_ago"/>

+	<spinner label="Dias Atrás" name="spin_days_ago"/>

+	<button label="Fechar" label_selected="Fechar" name="Close"/>

 </floater>