diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-31 21:39:17 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-31 21:39:17 -0700 |
| commit | 39e6447d98a36eb196f9ed6a3b06f0390f1ed084 (patch) | |
| tree | a8dd5a40c0d10b006e076b16e3403ec956ed7020 | |
| parent | 786df38c2a034b976c23479326ec3790d3e025c4 (diff) | |
| parent | 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff) | |
Pull from lindenlab/viewer-development
| -rw-r--r-- | BuildParams | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_preview_gesture.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/fr/menu_object.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/fr/strings.xml | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams index d481072185..8ca056db49 100644 --- a/BuildParams +++ b/BuildParams @@ -19,7 +19,7 @@ email_status_this_is_os = true # ======================================== # Report changes since... -viewer-development.show_changes_since = 2-1-release +viewer-development.show_changes_since = last_sprint # Build Settings viewer-development_coverity.coverity_product = viewer diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml index de8d25a494..7828d2df97 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml @@ -19,7 +19,7 @@ Prévisualiser </floater.string> <floater.string name="none_text"> - -Aucun choix- + - Choisir - </floater.string> <floater.string name="Title"> Geste : [NAME] diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml index 6492a83e06..257c44795f 100644 --- a/indra/newview/skins/default/xui/fr/menu_object.xml +++ b/indra/newview/skins/default/xui/fr/menu_object.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Object Pie"> - <menu_item_call label="Toucher" name="Object Touch"/> - <menu_item_call label="Éditer" name="Edit..."/> + <menu_item_call label="Toucher" name="Object Touch"> + <on_enable parameter="Toucher" name="EnableTouch"/> + </menu_item_call> + <menu_item_call label="Modifier" name="Edit..."/> <menu_item_call label="Construire" name="Build"/> <menu_item_call label="Ouvrir" name="Open"/> <menu_item_call label="M'asseoir ici" name="Object Sit"/> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 1204d3325a..f221e42e9a 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -1062,9 +1062,9 @@ <string name="Sound" value=" Son :"/> <string name="Wait" value=" --- Attendre :"/> <string name="AnimFlagStop" value=" Arrêter l'animation :"/> - <string name="AnimFlagStart" value=" Démarrer l'animation :"/> + <string name="AnimFlagStart" value=" Lancer l'animation :"/> <string name="Wave" value=" Faire signe"/> - <string name="GestureActionNone" value="Aucune"/> + <string name="GestureActionNone" value="À choisir"/> <string name="HelloAvatar" value=" Bonjour, avatar !"/> <string name="ViewAllGestures" value=" Tout afficher >>"/> <string name="GetMoreGestures" value="Plus >>"/> |