Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strings fix ups

Browse Source 
Order was a little incorrect
Minor change to hippogridmanager.cpp
This commit is contained in:
Lirusaito
2013-03-12 01:26:19 -04:00
parent e08f4316ab
commit 2ae966fe6b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/hippogridmanager.cpp
View File

@@ -553,7 +553,7 @@ std::string HippoGridInfo::getDirectoryFee() const
{ {
std::string fee; std::string fee;
formatFee(fee, mDirectoryFee, true); formatFee(fee, mDirectoryFee, true);
if (fee != LLTrans::getString("hippo_label_free")) fee += "/" + LLTrans::getString("hippo_label_week"); if (mDirectoryFee != 0) fee += "/" + LLTrans::getString("hippo_label_week");
return fee; return fee;
} }

10
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -5,9 +5,6 @@
that are returned from one component and may appear in many places--> that are returned from one component and may appear in many places-->
<strings> <strings>
<string name="CURRENCY">L$</string>
<string name="GRID_OWNER">Linden Lab</string>
<string name="hippo_label_free">free</string> <string name="hippo_label_free">free</string>
<string name="hippo_label_week">week</string> <string name="hippo_label_week">week</string>
<string name="TeleportOfferMaturity"> <string name="TeleportOfferMaturity">
@@ -16,9 +13,6 @@
<string name="TeleportLureMaturity"> <string name="TeleportLureMaturity">
[NAME]'s teleport lure is to [DESTINATION] [NAME]'s teleport lure is to [DESTINATION]
</string> </string>
<string name="AvatarIdle">
Idle [MINUTES]min
</string>
<!-- Default Args - these arguments will be replaced in all strings --> <!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string> <string name="SECOND_LIFE">Second Life</string>
@@ -27,6 +21,9 @@
<string name="SECOND_LIFE_GRID">Second Life Grid</string> <string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Second Life Support Portal</string> <string name="SUPPORT_SITE">Second Life Support Portal</string>
<string name="CURRENCY">L$</string>
<string name="GRID_OWNER">Linden Lab</string>
<!-- starting up --> <!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupDetectingHardware">Detecting hardware...</string>
<string name="StartupLoading">Loading [APP_NAME]...</string> <string name="StartupLoading">Loading [APP_NAME]...</string>
@@ -194,6 +191,7 @@
<!-- llvoavatar. Displayed in the avatar's chat bubble --> <!-- llvoavatar. Displayed in the avatar's chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string> <string name="AvatarEditingAppearance">(Editing Appearance)</string>
<string name="AvatarAway">Away</string> <string name="AvatarAway">Away</string>
<string name="AvatarIdle">Idle [MINUTES]min</string>
<string name="AvatarBusy">Busy</string> <string name="AvatarBusy">Busy</string>
<string name="AvatarMuted">Muted</string> <string name="AvatarMuted">Muted</string>
<!-- "AvatarLangolier" is used for an avatar that teleported into a Time Frozen scene (only their moving tag is visible). <!-- "AvatarLangolier" is used for an avatar that teleported into a Time Frozen scene (only their moving tag is visible).