diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
| commit | b5ab9c07031ffadb77792c312ca2bb1131d90fb0 (patch) | |
| tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/skins/default/xui/fr/panel_group_land_money.xml | |
| parent | eb6153d2c3cb1e2105804e28f81f894873315545 (diff) | |
| parent | c201038aba861b1166d367fcf5986e33644ec018 (diff) | |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/fr/panel_group_land_money.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/panel_group_land_money.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml index 192dd799ba..dcc27a9be4 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml @@ -23,7 +23,7 @@ <scroll_list.columns label="Parcelle" name="name"/> <scroll_list.columns label="Région" name="location"/> <scroll_list.columns label="Type" name="type"/> - <scroll_list.columns label="Surface" name="area"/> + <scroll_list.columns label="Surf." name="area"/> </scroll_list> <text name="total_contributed_land_label"> Total des contributions : |