diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 591d1c16cf..3d57384828 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2870,9 +2870,15 @@ bool LLDispatchSetEstateAccess::operator()(
}
- std::string msg = llformat("Banned residents: (%d, max %d)",
- totalBannedAgents,
- ESTATE_MAX_ACCESS_IDS);
+ // FIRE-5998: Unlocalizable label
+ //std::string msg = llformat("Banned residents: (%d, max %d)",
+ // totalBannedAgents,
+ // ESTATE_MAX_ACCESS_IDS);
+ LLStringUtil::format_map_t args;
+ args["[BANNEDAGENTS]"] = llformat("%d", totalBannedAgents);
+ args["[MAXBANNED]"] = llformat("%d", ESTATE_MAX_ACCESS_IDS);
+ std::string msg = LLTrans::getString("RegionInfoBannedResidents", args);
+ //
panel->getChild("ban_resident_label")->setValue(LLSD(msg));
if (banned_agent_name_list)
@@ -2891,9 +2897,15 @@ bool LLDispatchSetEstateAccess::operator()(
if (access_flags & ESTATE_ACCESS_MANAGERS)
{
- std::string msg = llformat("Estate Managers: (%d, max %d)",
- num_estate_managers,
- ESTATE_MAX_MANAGERS);
+ // FIRE-5998: Unlocalizable label
+ //std::string msg = llformat("Estate Managers: (%d, max %d)",
+ // num_estate_managers,
+ // ESTATE_MAX_MANAGERS);
+ LLStringUtil::format_map_t args;
+ args["[ESTATEMANAGERS]"] = llformat("%d", num_estate_managers);
+ args["[MAXMANAGERS]"] = llformat("%d", ESTATE_MAX_MANAGERS);
+ std::string msg = LLTrans::getString("RegionInfoEstateManagers", args);
+ //
panel->getChild("estate_manager_label")->setValue(LLSD(msg));
LLNameListCtrl* estate_manager_name_list =
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index d900d9aea9..c447e1a5c4 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -52,7 +52,7 @@
- Grundbesitzsverwalter:
+ Grundbesitzverwalter:
Zulässige Einwohner:
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index b96619f248..1166616894 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1884,6 +1884,14 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Zulässige Gruppen: ([ALLOWEDGROUPS], max [MAXACCESS])
+
+
+ Grundbesitzverwalter: ([ESTATEMANAGERS], max [MAXMANAGERS])
+
+
+ Verbannte Einwohner: ([BANNEDAGENTS], max [MAXBANNED])
+
+
Parzellenskript-Speicher
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 94ccc09f9b..7d0a1a99d5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2551,8 +2551,12 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
all estates that you manage for [OWNER]
Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])
- Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])
-
+ Allowed Groups: ([ALLOWEDGROUPS], max [MAXACCESS])
+
+ Estate Managers: ([ESTATEMANAGERS], max [MAXMANAGERS])
+ Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])
+
+
Parcel Script Memory
Parcels Listed: [PARCELS]