Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
index c89939f..38b137c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -122,8 +122,11 @@
                                 Transférer
                         </string>
                         <button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
-                        <check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
-                        <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
+                        <text name="Anyone can:">
+                                N&apos;importe qui :
+                        </text>
+                        <check_box label="Bouger" name="checkbox allow everyone move"/>
+                        <check_box label="Copier" name="checkbox allow everyone copy"/>
                         <check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
                         <check_box label="À vendre" name="checkbox for sale"/>
                         <text name="Cost">