diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 16:42:48 +0300 |
| commit | 62d9b8cbf263f93143352a33d2735a36ce5112b6 (patch) | |
| tree | f70ee2ecf319f810507a6c66fbd66ba3602c41b1 /indra/newview/skins/default | |
| parent | 8d34d1a9c5ae321ce59b20f8673beed0312a41fe (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge downstream code and become version 3.8.4
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 41c6ffd37c..70ba4d5077 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5804,7 +5804,7 @@ You cannot undo this action. name="ConfirmUnlink" type="alertmodal"> <unique/> - This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution. + This is a large selection with linksets. If you unlink it, you may not be able to link it again. You may wish to take copies of linksets into your inventory as a precaution. <tag>confirm</tag> <usetemplate ignoretext="Confirm when unlinking a linkset" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4eb6e2462d..bc91028f3b 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2320,6 +2320,22 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f <string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string> <string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string> + <string name="Marketplace Validation Log"></string> + <string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string> + <string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string> + <string name="Marketplace Validation Error Subfolder In Stock">: Error: stock folder cannot contain subfolders</string> + <string name="Marketplace Validation Warning Empty">: Warning: folder doesn't contain any items</string> + <string name="Marketplace Validation Warning Create Stock">: Warning: creating stock folder</string> + <string name="Marketplace Validation Warning Create Version">: Warning: creating version folder</string> + <string name="Marketplace Validation Warning Move">: Warning : moving items</string> + <string name="Marketplace Validation Warning Delete">: Warning: folder content transfered to stock folder, removing empty folder</string> + <string name="Marketplace Validation Error Stock Item">: Error: no-copy items must be contained by a stock folder</string> + <string name="Marketplace Validation Warning Unwrapped Item">: Warning: items must be contained by a version folder</string> + <string name="Marketplace Validation Error">: Error: </string> + <string name="Marketplace Validation Warning">: Warning: </string> + <string name="Marketplace Validation Error Empty Version">: Warning: version folder must contain at least 1 item</string> + <string name="Marketplace Validation Error Empty Stock">: Warning: stock folder must contain at least 1 item</string> + <string name="Marketplace Validation No Error">No errors or warnings to report</string> <string name="Marketplace Error None">No errors</string> <string name="Marketplace Error Prefix">Error: </string> |