summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/da/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/de/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml7
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml73
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_list_item.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_notify.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml22
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml1
-rw-r--r--indra/newview/skins/default/xui/en/role_actions.xml3
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/es/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/it/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/strings.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/notifications.xml2
20 files changed, 91 insertions, 49 deletions
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 5b7f196265..513394fa9b 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1426,7 +1426,7 @@ Hvis du ikke forlader regionen, vil du blive logget af.
[MESSAGE]
-Fra objekt: <nolink>[OBJECTNAME]</nolink>, ejer: [NAME]?
+Fra objekt: <nolink>[OBJECTNAME]</nolink>, ejer: [NAME_SLURL]?
<form name="form">
<button name="Gotopage" text="Gå til side"/>
<button name="Cancel" text="Afbryd"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 6196883f99..6fcd025a94 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -3002,7 +3002,7 @@ Wenn Sie in dieser Region bleiben, werden Sie abgemeldet.
[MESSAGE]
-Von Objekt: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, Eigentümer: [NAME]
+Von Objekt: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, Eigentümer: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Zur Seite"/>
<button name="Cancel" text="Abbrechen"/>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 384ae6bb1e..8391bacf51 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -570,8 +570,7 @@
left="0"
top="0"
help_topic="land_covenant_tab"
- name="land_covenant_panel"
- word_wrap="true">
+ name="land_covenant_panel">
<panel.string
name="can_resell"
word_wrap="true">
@@ -1076,7 +1075,7 @@
name="Autoreturn"
top_pad="0"
width="412"
- wrap="true">
+ word_wrap="true">
Auto return other Residents&apos; objects (minutes, 0 for off):
</text>
<line_editor
@@ -1461,7 +1460,7 @@ Only large parcels can be listed in search.
top="150"
name="allow_label5"
width="205"
- wrap="true">
+ word_wrap="true">
Avatars on other parcels can see and chat with avatars on this parcel
</text>
<check_box
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9810242f5d..492d963653 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3575,6 +3575,19 @@ Do you really want to bake the current terrain, make it the center for terrain r
<notification
icon="alertmodal.tga"
+ name="ConfirmTextureHeights"
+ type="alertmodal">
+You're about to use low values greater than high ones for Elevation Ranges. Proceed?
+ <tag>confirm</tag>
+ <usetemplate
+ name="yesnocancelbuttons"
+ yestext="Ok"
+ notext="Cancel"
+ canceltext="Don't ask"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="MaxAllowedAgentOnRegion"
type="alertmodal">
You can only have [MAX_AGENTS] Allowed Residents.
@@ -3852,9 +3865,10 @@ We have downloaded an update to your [APP_NAME] installation.
</notification>
<notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+ icon="alertmodal.tga"
+ name="RequiredUpdateDownloadedVerboseDialog"
+ type="alertmodal"
+ force_urls_external="true">
We have downloaded a required software update.
Version [VERSION] [[INFO_URL] Information about this update]
@@ -3866,9 +3880,10 @@ We must restart [APP_NAME] to install the update.
</notification>
<notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedDialog"
- type="alertmodal">
+ icon="alertmodal.tga"
+ name="RequiredUpdateDownloadedDialog"
+ type="alertmodal"
+ force_urls_external="true">
We must restart [APP_NAME] to install the update.
[[INFO_URL] Information about this update]
<tag>confirm</tag>
@@ -3908,9 +3923,10 @@ see [[INFO_URL] Information about this update]
</notification>
<notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
+ type="alertmodal"
+ force_urls_external="true">
We have downloaded a required software update.
Version [VERSION]
This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
@@ -3924,9 +3940,10 @@ We must restart [APP_NAME] to install the update.
</notification>
<notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedDialog"
- type="alertmodal">
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedDialog"
+ type="alertmodal"
+ force_urls_external="true">
We must restart [APP_NAME] to install the update.
This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
see [[INFO_URL] Information about this update]
@@ -5948,6 +5965,18 @@ Are you sure you want to permanently delete the contents of your Trash?
<notification
icon="alertmodal.tga"
+ name="TrashIsFull"
+ type="alertmodal">
+Your trash is overflowing. This may cause problems logging in.
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="I will empty trash later"
+ yestext="Empty trash now"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="ConfirmClearBrowserCache"
type="alertmodal">
Are you sure you want to delete your travel, web, and search history?
@@ -7493,8 +7522,8 @@ Load web page [URL] ?
[MESSAGE]
-From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME]
- <tag>confirm</tag>
+From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME_SLURL]
+ <tag>confirm</tag>
<form name="form">
<button
index="0"
@@ -8234,15 +8263,15 @@ Are you sure you want to close all IMs?
name="AttachmentSaved" type="notifytip">
Attachment has been saved.
</notification>
-
- <notification
- icon="notifytip.tga"
- name="PresetNotSaved"
- type="notifytip">
-Error saving preset [NAME].
+
+ <notification icon="notify.tga" persist="true"
+ name="AppearanceToXMLSaved" type="notify">
+Appearance has been saved to XML to [PATH]
</notification>
-
- <notification
+
+ <notification icon="notifytip.tga"
+ name="AppearanceToXMLFailed" type="notifytip">
+Failed to save appearance to XML.
icon="notifytip.tga"
name="PresetNotDeleted"
type="notifytip">
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index cfe3aeb7c9..e758a8ce30 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -27,7 +27,7 @@
top="0"
visible="false"
width="320" />
- <icon
+ <group_icon
height="20"
image_name="Generic_Group"
name="group_icon"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index cded4cf31a..4121acdfb0 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -27,7 +27,7 @@
name="header"
top="0"
width="305">
- <icon
+ <group_icon
follows="all"
height="20"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 714dca7fac..93c97ded25 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -21,12 +21,12 @@
Tell me:
</text>
<check_box
- control_name="NotifyMoneyChange"
+ control_name="NotifyMoneySpend"
height="16"
- label="When I spend or get L$"
+ label="When I spend L$"
layout="topleft"
left_delta="50"
- name="notify_money_change_checkbox"
+ name="notify_money_spend_checkbox"
top_pad="4"
width="300" />
<check_box
@@ -34,10 +34,18 @@
height="16"
label="When my friends log in or out"
layout="topleft"
- left_delta="0"
- name="friends_online_notify_checkbox"
- top_pad="4"
- width="300" />
+ left_delta="150"
+ name="friends_online_notify_checkbox"
+ width="300" />
+ <check_box
+ control_name="NotifyMoneyReceived"
+ height="16"
+ label="When I get L$"
+ layout="topleft"
+ left_delta="-150"
+ top_pad="4"
+ name="notify_money_received_checkbox"
+ width="300" />
<text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index c02352ac37..a9b8e197bc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -323,6 +323,7 @@
function="Pref.PrefLoad"
parameter="graphic"/>
</button>
+ min_val="0.125"
<button
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index c2e7c706d6..4d20ecb9b6 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -105,9 +105,6 @@
<action description="Always allow &apos;Create Objects&apos;"
longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
name="land allow create" value="25" />
- <action description="Always allow &apos;Create Landmark&apos;"
- longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
- name="land allow landmark" value="26" />
<action description="Allow &apos;Set Home to Here&apos; on group land"
longdescription="Members in a Role with this Ability can use World menu &gt; Landmarks &gt; Set Home to Here on a parcel deeded to this group."
name="land allow set home" value="28" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e9b7cadc96..ae63546082 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3538,6 +3538,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
<string name="OnlineStatus">Online</string>
<string name="OfflineStatus">Offline</string>
+ <string name="not_online_msg">User not online - message will be stored and delivered later.</string>
+ <string name="not_online_inventory">User not online - inventory has been saved.</string>
<!-- voice calls -->
<string name="answered_call">Your call has been answered</string>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 167089297d..b52497eb85 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2996,7 +2996,7 @@ Si permaneces en esta región serás desconectado.
[MESSAGE]
-Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]
+Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Cargar"/>
<button name="Cancel" text="Cancelar"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 1c4d5db1cf..080ea741c5 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2988,7 +2988,7 @@ Si vous restez dans cette région, vous serez déconnecté(e).
[MESSAGE]
-Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME]
+Venant de l&apos;objet : &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propriétaire : [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Charger"/>
<button name="Cancel" text="Annuler"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 3bdf93bcc9..358f38a137 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2993,7 +2993,7 @@ Se rimani qui verrai scollegato da Second Life.
[MESSAGE]
-Dall&apos;oggetto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietario: [NAME]
+Dall&apos;oggetto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietario: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Caricare"/>
<button name="Cancel" text="Annulla"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 822aafe88f..a573e86e5f 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -3032,7 +3032,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
[MESSAGE]
-送信元のオブジェクト:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者:[NAME]
+送信元のオブジェクト:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者:[NAME_SLURL]
<form name="form">
<button name="Gotopage" text="ページに移動"/>
<button name="Cancel" text="取り消し"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 8f973dbe52..e92bdb8820 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2647,7 +2647,7 @@ Nastąpi wylogowanie jeżeli zostaniesz w tym regionie.
[MESSAGE]
-Od obiektu: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, właściciela: [NAME]?
+Od obiektu: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, właściciela: [NAME_SLURL]?
<form name="form">
<button name="Gotopage" text="Załaduj" />
<button name="Cancel" text="Anuluj" />
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index fc5a9fabf9..cf7400117d 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2977,7 +2977,7 @@ Se permanecer aqui, você será desconectado.
[MESSAGE]
-Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, de: [NAME]
+Do objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, de: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Carregar"/>
<button name="Cancel" text="Cancelar"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index b2bb8c59aa..fabc064525 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -2988,7 +2988,7 @@ http://secondlife.com/download.
[MESSAGE]
-Из объекта: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, владелец: [NAME]
+Из объекта: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, владелец: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Перейти на страницу"/>
<button name="Cancel" text="Отмена"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 191d99bb21..04bb55c965 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -4246,6 +4246,12 @@ support@secondlife.com.
<string name="OfflineStatus">
Оффлайн
</string>
+ <string name="not_online_msg">
+ Пользователь оффлайн - сообщение будет сохранено и доставлено позже.
+ </string>
+ <string name="not_online_inventory">
+ Пользователь оффлайн - инвентарь сохранен.
+ </string>
<string name="answered_call">
На ваш звонок ответили
</string>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 4a116254c8..a982dc03ed 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -2988,7 +2988,7 @@ Bu bölgede kalmaya devam ederseniz oturumunuz sonlandırılacak.
[MESSAGE]
-Kaynak nesne: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, sahibi: [NAME]
+Kaynak nesne: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, sahibi: [NAME_SLURL]
<form name="form">
<button name="Gotopage" text="Sayfaya git"/>
<button name="Cancel" text="İptal"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 3b9c5a5041..3f08496a68 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -2977,7 +2977,7 @@ SHA1 指紋:[MD5_DIGEST]
[MESSAGE]
-來源物件:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;(所有人:[NAME])
+來源物件:&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;(所有人:[NAME_SLURL])
<form name="form">
<button name="Gotopage" text="前往頁面"/>
<button name="Cancel" text="取消"/>