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, 40 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
new file mode 100644
index 0000000000..34588c78eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floaterbulkperms" title="Changement des permissions relatives au contenu">

+	<text name="applyto">

+		Types de contenu

+	</text>

+	<check_box label="Animation" name="check_animation"/>

+	<check_box label="Parties du corps" name="check_bodypart"/>

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

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

+	<check_box label="Repères" name="check_landmark"/>

+	<check_box label="Notes" name="check_notecard"/>

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

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

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

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

+	<button label="Tout cocher" label_selected="Tout" name="check_all"/>

+	<button label="Tout décocher" label_selected="Aucun" name="check_none"/>

+	<check_box label="Partager avec le groupe" name="share_with_group"/>

+	<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>

+	<text name="NextOwnerLabel">

+		Le prochain propriétaire pourra :

+	</text>

+	<check_box label="Modifier" name="next_owner_modify"/>

+	<check_box label="Copier" name="next_owner_copy"/>

+	<check_box label="Revendre/Donner" name="next_owner_transfer"/>

+	<button label="Appliquer" name="apply"/>

+	<button label="Fermer" name="close"/>

+	<string name="nothing_to_modify_text">

+		La sélection contient des contenus non modifiables.

+	</string>

+	<string name="status_text">

+		Permissions paramétrées sur [NAME]

+	</string>

+	<string name="start_text">

+		Demande de changement des permissions lancée...

+	</string>

+	<string name="done_text">

+		Demande de changement des permissions finie.

+	</string>

+</floater>