diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
| commit | 5b9da4e8d91acd075dfaf33fb489c480c25e9ade (patch) | |
| tree | f296e32b384b341d9c626a4305cd7cd8924c9986 /indra/newview/skins/default/xui/en/strings.xml | |
| parent | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (diff) | |
| parent | 144b8349b3f0773ac575e178a0e3109d963be9a8 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 344e0eb66f..d3855f4374 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2165,7 +2165,7 @@ Clears (deletes) the media and all params from the given face. <!-- Region/Estate Covenant --> <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> - <string name="covenant_last_modified">Last Modified:</string> + <string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space --> <string name="none_text" value=" (none) " /> <string name="never_text" value=" (never) " /> @@ -3117,5 +3117,6 @@ Abuse Report</string> <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> <string name="DefaultMimeType">none/none</string> + <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> </strings> |