diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
| commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
| tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default/xui/de/menu_land.xml | |
| parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/de/menu_land.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/de/menu_land.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml index 9b1e6727b7..de679da3d8 100644 --- a/indra/newview/skins/default/xui/de/menu_land.xml +++ b/indra/newview/skins/default/xui/de/menu_land.xml @@ -5,5 +5,5 @@ <menu_item_call label="Dieses Land kaufen" name="Land Buy"/> <menu_item_call label="Pass kaufen" name="Land Buy Pass"/> <menu_item_call label="Bauen" name="Create"/> - <menu_item_call label="Terrain bearbeiten" name="Edit Terrain"/> + <menu_item_call label="Land bearbeiten" name="Edit Terrain"/> </context_menu> |