summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Guslisty <pguslisty@productengine.com>2010-06-02 20:47:07 +0300
committerPaul Guslisty <pguslisty@productengine.com>2010-06-02 20:47:07 +0300
commit56f7b85f34ad5c098c7d1956dbe4c63794cf0108 (patch)
tree73f19673cf9cf21c40767bcabd9744117d6dc207
parentf09e53da5f3bc56649c3f08894eb71c5fb907c10 (diff)
EXT-7314 FIXED Localized \"Estate / Full Region\" and \"Mainland / Full Region\" strings
- Added hardcoded \"Estate / Full Region\" and \"Mainland / Full Region\" to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/483/ --HG-- branch : product-engine
-rw-r--r--indra/newview/llfloaterland.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index abdb55ec17..7c5586ec96 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -572,7 +572,7 @@ void LLPanelLandGeneral::refresh()
if (regionp)
{
insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY);
- mLandType->setText(regionp->getSimProductName());
+ mLandType->setText(LLTrans::getString(regionp->getSimProductName()));
}
// estate owner/manager cannot edit other parts of the parcel
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8dd5d64e71..2d424e7ab2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -318,6 +318,10 @@
<!-- For use when we do not have land type back from the server -->
<string name="land_type_unknown">(unknown)</string>
+ <!-- For land type back from the simulator -->
+ <string name="Estate / Full Region">Estate / Full Region</string>
+ <string name="Mainland / Full Region">Mainland / Full Region</string>
+
<!-- File load/save dialogs -->
<string name="all_files">All Files</string>
<string name="sound_files">Sounds</string>