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/fr/floater_world_map.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/fr/floater_world_map.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_world_map.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml index a3c70e832f..d7eaba3d04 100644 --- a/indra/newview/skins/default/xui/fr/floater_world_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml @@ -21,17 +21,20 @@ Domicile
</text>
<button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+ <text name="classifieds_label">
+ Petites annonces
+ </text>
<icon left="977" name="person"/>
<text name="person_label">
Résident
</text>
- <icon left="973" name="infohub"/>
<check_box label=" " left_delta="60" name="people_chk"/>
+ <icon left="973" name="infohub"/>
<text name="infohub_label">
Infohub
</text>
- <icon left="973" name="telehub"/>
<check_box label=" " left_delta="60" name="infohub_chk"/>
+ <icon left="973" name="telehub"/>
<text name="telehub_label">
Téléhub
</text>
@@ -47,10 +50,8 @@ </text>
<check_box label=" " name="event_chk"/>
<icon left="1113" name="events_mature_icon"/>
- <text name="events_mature_label">
- Événements (A)
- </text>
- <check_box label=" " name="event_mature_chk"/>
+
+ <check_box name="event_mature_chk"/>
<icon left="973" name="avatar_icon"/>
<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
<combo_item name="none_selected">
@@ -64,9 +65,7 @@ </combo_item>
</combo_box>
<icon left="973" name="location_icon"/>
- <line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d'une région" width="155">
- Recherche par nom de région
- </line_editor>
+ <line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d'une région" width="155"/>
<button label="Rechercher" label_selected=">" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
<text left="973" name="search_label">
Résultats de la recherche :
|