diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/nl/floater_top_objects.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
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
Diffstat (limited to 'indra/newview/skins/default/xui/nl/floater_top_objects.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/nl/floater_top_objects.xml | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/nl/floater_top_objects.xml b/indra/newview/skins/default/xui/nl/floater_top_objects.xml new file mode 100644 index 0000000000..2d43b0bfe2 --- /dev/null +++ b/indra/newview/skins/default/xui/nl/floater_top_objects.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="laden…">
+ <text name="title_text">
+ Laden…
+ </text>
+ <scroll_list name="objects_list">
+ <column label="Score" name="score"/>
+ <column label="Naam" name="name"/>
+ <column label="Eigenaar" name="owner"/>
+ <column label="Locatie" name="location"/>
+ <column label="Tijd" name="time"/>
+ <column label="Mono tijd" name="mono_time"/>
+ </scroll_list>
+ <text name="id_text">
+ Object ID:
+ </text>
+ <button label="Toon baken" name="show_beacon_btn"/>
+ <text name="obj_name_text">
+ Object naam:
+ </text>
+ <button label="Filter" name="filter_object_btn"/>
+ <text name="owner_name_text">
+ Eigenaar naam:
+ </text>
+ <button label="Filter" name="filter_owner_btn"/>
+ <button label="Geselecteerde retourneren" name="return_selected_btn"/>
+ <button label="Alles retourneren" name="return_all_btn"/>
+ <button label="Geselecteerde uitschakelen" name="disable_selected_btn"/>
+ <button label="Alles uitschakelen" name="disable_all_btn"/>
+ <button label="Verversen" name="refresh_btn"/>
+ <string name="top_scripts_title">
+ Top scripts
+ </string>
+ <string name="top_scripts_text">
+ [COUNT] scripts besteden in totaal [TIME] ms
+ </string>
+ <string name="scripts_score_label">
+ Tijd
+ </string>
+ <string name="scripts_mono_time_label">
+ Mono tijd
+ </string>
+ <string name="top_colliders_title">
+ Top botsingen
+ </string>
+ <string name="top_colliders_text">
+ Top [COUNT] objecten die veel mogelijke botsingen ervaren.
+ </string>
+ <string name="colliders_score_label">
+ Score
+ </string>
+ <string name="none_descriptor">
+ Geen gevonden.
+ </string>
+</floater>
|