summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-04-04 17:22:17 -0400
committerOz Linden <oz@lindenlab.com>2016-04-04 17:22:17 -0400
commit4b5be54063a257ed70909332de0721d954d697e3 (patch)
tree492d86b027a6738d83c887c30570ca32867d12ef /indra/newview/skins/default/xui/fr/floater_fast_timers.xml
parent9be58e915a6c69de280ccabd3019e9ac40beed26 (diff)
parent0ac02ca921d4246c1e241ab366b5f435b59d8115 (diff)
merge changes for MAINT-6236 and other translations
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_fast_timers.xml')
-rw-r--r--indra/newview/skins/default/xui/fr/floater_fast_timers.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
index 0100b10557..c64b7a8c00 100644
--- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
@@ -6,5 +6,16 @@
<string name="run">
Courir
</string>
+ <combo_box name="time_scale_combo">
+ <item label="2x valeur moy." name="2x Average"/>
+ <item label="Max." name="Max"/>
+ <item label="Max. récent" name="Recent Max"/>
+ <item label="100 ms" name="100ms"/>
+ </combo_box>
+ <combo_box name="metric_combo">
+ <item label="Durée" name="Time"/>
+ <item label="Nombre d’appels" name="Number of Calls"/>
+ <item label="Hz" name="Hz"/>
+ </combo_box>
<button label="Pauser" name="pause_btn"/>
</floater>