A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings.
This commit is contained in:
@@ -127,6 +127,16 @@ LLMaterialTable::~LLMaterialTable()
|
||||
mMaterialInfoList.clear();
|
||||
}
|
||||
|
||||
void LLMaterialTable::initTableTransNames(std::map<std::string, std::string> namemap)
|
||||
{
|
||||
for (info_list_t::iterator iter = mMaterialInfoList.begin();
|
||||
iter != mMaterialInfoList.end(); ++iter)
|
||||
{
|
||||
LLMaterialInfo *infop = *iter;
|
||||
std::string name = infop->mName;
|
||||
infop->mName = namemap[name];
|
||||
}
|
||||
}
|
||||
void LLMaterialTable::initBasicTable()
|
||||
{
|
||||
// *TODO: Translate
|
||||
|
||||
@@ -110,6 +110,7 @@ public:
|
||||
|
||||
void initBasicTable();
|
||||
|
||||
void initTableTransNames(std::map<std::string, std::string> namemap);
|
||||
|
||||
BOOL add(U8 mcode, const std::string& name, const LLUUID &uuid);
|
||||
BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
|
||||
|
||||
@@ -1216,8 +1216,7 @@ void LLAgent::setAFK()
|
||||
gAwayTimer.start();
|
||||
if (gAFKMenu)
|
||||
{
|
||||
// *TODO:Translate
|
||||
gAFKMenu->setLabel(std::string("Set Not Away"));
|
||||
gAFKMenu->setLabel(LLTrans::getString("AvatarSetNotAway"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1242,8 +1241,7 @@ void LLAgent::clearAFK()
|
||||
LL_INFOS("AFK") << "Clearing Away" << LL_ENDL;
|
||||
if (gAFKMenu)
|
||||
{
|
||||
// *TODO:Translate
|
||||
gAFKMenu->setLabel(std::string("Set Away"));
|
||||
gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1265,8 +1263,7 @@ void LLAgent::setBusy()
|
||||
mIsBusy = TRUE;
|
||||
if (gBusyMenu)
|
||||
{
|
||||
// *TODO:Translate
|
||||
gBusyMenu->setLabel(std::string("Set Not Busy"));
|
||||
gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
|
||||
}
|
||||
LLFloaterMute::getInstance()->updateButtons();
|
||||
}
|
||||
@@ -1280,8 +1277,7 @@ void LLAgent::clearBusy()
|
||||
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_STOP);
|
||||
if (gBusyMenu)
|
||||
{
|
||||
// *TODO:Translate
|
||||
gBusyMenu->setLabel(std::string("Set Busy"));
|
||||
gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
|
||||
}
|
||||
LLFloaterMute::getInstance()->updateButtons();
|
||||
}
|
||||
|
||||
@@ -165,6 +165,18 @@ BOOL LLPanelVolume::postBuild()
|
||||
mSpinPhysicsRestitution = getChild<LLSpinCtrl>("Physics Restitution");
|
||||
mSpinPhysicsRestitution->setCommitCallback(boost::bind(&LLPanelVolume::sendPhysicsRestitution, this, _1, mSpinPhysicsRestitution));
|
||||
}
|
||||
|
||||
std::map<std::string, std::string> material_name_map;
|
||||
material_name_map["Stone"]= LLTrans::getString("Stone");
|
||||
material_name_map["Metal"]= LLTrans::getString("Metal");
|
||||
material_name_map["Glass"]= LLTrans::getString("Glass");
|
||||
material_name_map["Wood"]= LLTrans::getString("Wood");
|
||||
material_name_map["Flesh"]= LLTrans::getString("Flesh");
|
||||
material_name_map["Plastic"]= LLTrans::getString("Plastic");
|
||||
material_name_map["Rubber"]= LLTrans::getString("Rubber");
|
||||
material_name_map["Light"]= LLTrans::getString("Light");
|
||||
|
||||
LLMaterialTable::basic.initTableTransNames(material_name_map);
|
||||
// Start with everyone disabled
|
||||
clearCtrls();
|
||||
|
||||
|
||||
@@ -1739,6 +1739,7 @@ string llGetEnv(string name)
|
||||
Returns a string with the requested data about the region
|
||||
</string>
|
||||
|
||||
|
||||
<string name="LSLTipText_llCastRay">
|
||||
list llCastRay( Vector start, Vector end, list options )
|
||||
Returns a list consisting of the following three values for each hit: UUID, Link number, Hit position.
|
||||
@@ -1803,18 +1804,32 @@ key llAvatarOnLinkSitTarget( integer link )
|
||||
Returns a key that is the UUID of the user seated on the prim.
|
||||
</string>
|
||||
|
||||
|
||||
<!-- No info on these functions yet....
|
||||
<string name="LSLTipText_llSetVelocity">
|
||||
</string>
|
||||
<string name="LSLTipText_llSetRotationalVelocity">
|
||||
</string>
|
||||
-->
|
||||
<!-- Avatar busy/away mode -->
|
||||
<string name="AvatarSetNotAway">Not Away</string>
|
||||
<string name="AvatarSetAway">Away</string>
|
||||
<string name="AvatarSetNotBusy">Not Busy</string>
|
||||
<string name="AvatarSetBusy">Busy</string>
|
||||
|
||||
|
||||
|
||||
<!-- mouselook -->
|
||||
<string name="LeaveMouselook">Press ESC to return to World View</string>
|
||||
<!-- menu accelerators -->
|
||||
<string name="Stone">Stone</string>
|
||||
<string name="Metal">Metal</string>
|
||||
<string name="Glass">Glass</string>
|
||||
<string name="Wood">Wood</string>
|
||||
<string name="Flesh">Flesh</string>
|
||||
<string name="Plastic">Plastic</string>
|
||||
<string name="Rubber">Rubber</string>
|
||||
<string name="Light">Light</string>
|
||||
<!-- menu accelerators -->
|
||||
<string name="accel-mac-control">Ctrl-</string>
|
||||
<string name="accel-mac-command">Cmd-</string>
|
||||
<string name="accel-mac-option">Opt-</string>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user