diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:15:05 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:15:05 -0800 |
| commit | a5366f06edf5aa1b75328e26011989eba7c601ca (patch) | |
| tree | d59e759007efd85c03befc5a987dd6cb2dfbfc24 /indra/newview/skins/default | |
| parent | f95529b3f309f3ff24851697728c6c94a3218a2a (diff) | |
ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug setting
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_snapshot.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 5e3c7d4e3d..771035b40d 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -381,7 +381,6 @@ top_pad="8" width="180" name="auto_snapshot_check" /> - <!-- If we ever want to add filters to the snapshot panel... <text type="string" length="1" @@ -389,7 +388,7 @@ height="13" layout="topleft" left="10" - name="layer_type_label" + name="filter_list_label" top_pad="10" width="50"> Filter: @@ -408,6 +407,5 @@ name="NoFilter" value="NoFilter" /> </combo_box> - --> </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 92913f678d..51576f71a8 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -171,16 +171,17 @@ Please try logging in again in a minute.</string> <!-- SLShare: User Friendly Filter Names Translation --> <string name="BlackAndWhite">Black & White</string> <string name="Colors1970">1970's Colors</string> - <string name="Heatwave">Heat Wave</string> <string name="Intense">Intense</string> - <string name="JulesVerne">Jules Verne</string> - <string name="Newspaper">Newspaper</string> - <string name="Overcast">Overcast</string> + <string name="Newspaper">Newsprint</string> <string name="Sepia">Sepia</string> <string name="Spotlight">Spotlight</string> <string name="Video">Video</string> - - <!-- Tooltip --> + <string name="Autocontrast">Autocontrast</string> + <string name="LensFlare">Lens Flare</string> + <string name="Miniature">Miniature</string> + <string name="Toycamera">Toy Camera</string> + + <!-- Tooltip --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> |