From 5391410f89bfcc789702aab9fd0caeb21b399577 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Wed, 24 Aug 2011 11:40:43 -0700
Subject: [PATCH] sync with viewer-development
---
indra/newview/skins/default/xui/da/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/da/notifications.xml | 2 +-
indra/newview/skins/default/xui/de/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/de/notifications.xml | 2 +-
indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ----------
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
.../newview/skins/default/xui/en/panel_status_bar.xml | 10 +++++-----
indra/newview/skins/default/xui/en/strings.xml | 2 +-
indra/newview/skins/default/xui/es/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/es/notifications.xml | 2 +-
indra/newview/skins/default/xui/fr/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/fr/notifications.xml | 2 +-
indra/newview/skins/default/xui/it/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/it/notifications.xml | 2 +-
indra/newview/skins/default/xui/ja/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/ja/notifications.xml | 2 +-
indra/newview/skins/default/xui/nl/notifications.xml | 2 +-
indra/newview/skins/default/xui/pl/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/pl/notifications.xml | 2 +-
indra/newview/skins/default/xui/pt/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/pt/notifications.xml | 2 +-
indra/newview/skins/default/xui/zh/menu_viewer.xml | 1 -
indra/newview/skins/default/xui/zh/notifications.xml | 2 +-
23 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index d352312d157..c2f7d26dc97 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -140,7 +140,6 @@
<menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/>
<menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/>
<menu_item_check label="Lydløse fotos til disk" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Komprimér fotos til disk" name="CompressSnapshotsToDisk"/>
<menu label="Værktøjer til ydelse" name="Performance Tools">
<menu_item_call label="Lag meter" name="Lag Meter"/>
<menu_item_check label="Statistik bjælke" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index c3999501eb8..3ccdfc036a7 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1335,7 +1335,7 @@ Prøv igen om lidt.
</notification>
<notification name="ObjectGiveItem">
Et object med navnet <nolink>[OBJECTFROMNAME]</nolink> ejet af [NAME_SLURL] har givet dig denne [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Behold"/>
<button name="Discard" text="Smid væk"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index de4c269be68..e0108442067 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="Kamerabeschränkungen deaktivieren" name="Disable Camera Distance"/>
<menu_item_check label="Foto (hohe Auflösung)" name="HighResSnapshot"/>
<menu_item_check label="Fotos auf Festplatte leise speichern" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Fotos auf Festplatte komprimieren" name="CompressSnapshotsToDisk"/>
<menu label="Performance Tools" name="Performance Tools">
<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index abea3442fa3..1971061096c 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2432,7 +2432,7 @@ Versuchen Sie es in einigen Minuten erneut.
</notification>
<notification name="ObjectGiveItem">
Ein Objekt namens <nolink>[OBJECTFROMNAME]</nolink>, das [NAME_SLURL] gehört, hat Ihnen folgende/n/s [OBJECTTYPE] übergeben:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Behalten"/>
<button name="Discard" text="Verwerfen"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 01699955a63..b08e3abb71f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1250,16 +1250,6 @@
function="ToggleControl"
parameter="QuietSnapshotsToDisk" />
</menu_item_check>
- <menu_item_check
- label="Compress Snapshots to Disk"
- name="CompressSnapshotsToDisk">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CompressSnapshotsToDisk" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CompressSnapshotsToDisk" />
- </menu_item_check>
<menu_item_separator/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 310616d57ea..c9ccd44b831 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5903,7 +5903,7 @@ No valid parcel could be found.
name="ObjectGiveItem"
type="offer">
An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button
index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index f51279adb4d..23ad0e95281 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -81,7 +81,7 @@
follows="right|top"
image_color="0 0 0 0"
hover_glow_amount="0"
- left_pad="2"
+ left_pad="5"
top="0"
width="55"
height="18"
@@ -94,14 +94,14 @@
font="SansSerifSmall"
text_readonly_color="TimeTextColor"
follows="right|top"
- halign="right"
+ halign="center"
height="16"
top="5"
layout="topleft"
- left_pad="0"
+ left_pad="5"
name="TimeText"
tool_tip="Current time (Pacific)"
- width="70">
+ width="90">
24:00 AM PST
</text>
<button
@@ -112,7 +112,7 @@
image_pressed="Pause_Press"
image_pressed_selected="Play_Press"
is_toggle="true"
- left_pad="15"
+ left_pad="10"
top="1"
name="media_toggle_btn"
tool_tip="Start/Stop All Media (Music, Video, Web pages)"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f049f857f05..2094275bed5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3414,7 +3414,7 @@ Abuse Report</string>
<string name="Female - Stick tougue out">Female - Stick tougue out</string>
<string name="Female - Wow">Female - Wow</string>
- <string name="/bow">/bow</string>
+ <string name="/bow1">/bow1</string>
<string name="/clap">/clap</string>
<string name="/count">/count</string>
<string name="/extinguish">/extinguish</string>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 049a89aa068..b0d16d1ca47 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="Desactivar los lÃmites de la cámara" name="Disable Camera Distance"/>
<menu_item_check label="Foto en Alta Resolución" name="HighResSnapshot"/>
<menu_item_check label="Silenciar el Guardar una foto" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Comprimir las fotos para el disco duro" name="CompressSnapshotsToDisk"/>
<menu label="Herramientas de rendimiento" name="Performance Tools">
<menu_item_call label="Medidor de lag" name="Lag Meter"/>
<menu_item_check label="EstadÃsticas" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 1a75beed3fb..2ec1b333a92 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2426,7 +2426,7 @@ Por favor, vuelve a intentarlo en unos momentos.
</notification>
<notification name="ObjectGiveItem">
Un objeto de nombre <nolink>[OBJECTFROMNAME]</nolink>, propiedad de [NAME_SLURL], te ha dado este [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Guardar"/>
<button name="Discard" text="Descartar"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index ccea1e45701..46adc79a00d 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="Désactiver les contraintes de la caméra" name="Disable Camera Distance"/>
<menu_item_check label="Photo haute résolution" name="HighResSnapshot"/>
<menu_item_check label="Photos discrètes sur disque" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Compresser les photos sur disque" name="CompressSnapshotsToDisk"/>
<menu label="Outils de performance" name="Performance Tools">
<menu_item_call label="Mesure du lag" name="Lag Meter"/>
<menu_item_check label="Barre de statistiques" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index dd8fdaf50ec..ef95a1a389b 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2418,7 +2418,7 @@ Veuillez réessayer dans quelques minutes.
</notification>
<notification name="ObjectGiveItem">
Un objet nommé <nolink>[OBJECTFROMNAME]</nolink> appartenant à [NAME_SLURL] vous a donné un objet de type [OBJECTTYPE] :
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Garder"/>
<button name="Discard" text="Jeter"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index daeda576ccf..ef40cbda7c6 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="Disabilita vincoli fotocamera" name="Disable Camera Distance"/>
<menu_item_check label="Foto ad alta risoluzione" name="HighResSnapshot"/>
<menu_item_check label="Manda foto su disco senza avvisi" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Comprimi le foto su disco" name="CompressSnapshotsToDisk"/>
<menu label="Strumenti di performance" name="Performance Tools">
<menu_item_call label="Misuratore lag" name="Lag Meter"/>
<menu_item_check label="Barra statistiche" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 88625ef4b76..d09f207af26 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2420,7 +2420,7 @@ Riprova tra qualche istante.
</notification>
<notification name="ObjectGiveItem">
Un oggetto denominato <nolink>[OBJECTFROMNAME]</nolink> di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Prendi"/>
<button name="Discard" text="Rifiuta"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 09b315b0260..223c1e1f11f 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="カメラã®è·é›¢ç§»å‹•ã‚’制é™ã—ãªã„" name="Disable Camera Distance"/>
<menu_item_check label="高解åƒåº¦ã‚¹ãƒŠãƒƒãƒ—ショット" name="HighResSnapshot"/>
<menu_item_check label="シャッター音ã¨ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãªã—ã§ã‚¹ãƒŠãƒƒãƒ—ショットをディスクã«ä¿å˜ã™ã‚‹" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="圧縮ã—ã¦ã‚¹ãƒŠãƒƒãƒ—ショットをディスクã«ä¿å˜ã™ã‚‹" name="CompressSnapshotsToDisk"/>
<menu label="パフォーマンスツール" name="Performance Tools">
<menu_item_call label="ラグ計測器" name="Lag Meter"/>
<menu_item_check label="統計ãƒãƒ¼" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 5f5dad0d3eb..6bff82bec46 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2467,7 +2467,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
</notification>
<notification name="ObjectGiveItem">
[NAME_SLURL] ãŒæ‰€æœ‰ã™ã‚‹ <nolink>[OBJECTFROMNAME]</nolink> ã¨ã„ã†åå‰ã®ã‚ªãƒ–ジェクトãŒã€ã‚ãªãŸã« [OBJECTTYPE] を渡ã—ã¾ã—ãŸï¼š
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="å—ã‘å–ã‚‹"/>
<button name="Discard" text="ç ´æ£„"/>
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index f27b83d3f92..06e6d8ae7ad 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -2698,7 +2698,7 @@ Probeer het alstublieft opnieuw over enkele ogenblikken.
Geen geldig perceel kon gevonden worden.
</notification>
<notification name="ObjectGiveItem">
- Een object genaamd <nolink>[OBJECTFROMNAME]</nolink>, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd [ITEM_SLURL] gegeven.
+ Een object genaamd <nolink>[OBJECTFROMNAME]</nolink>, eigendom van [NAME_SLURL], heeft u een [OBJECTTYPE] genaamd <nolink>[ITEM_SLURL]</nolink> gegeven.
<form name="form">
<button name="Keep" text="Behouden"/>
<button name="Discard" text="Afwijzen"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e869806d04f..fe4662c5a24 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -138,7 +138,6 @@
<menu_item_check label="Wyłącz ograniczenia zasięgu kamery" name="Disable Camera Distance"/>
<menu_item_check label="Wysoka rozdzielczość zdjęć" name="HighResSnapshot"/>
<menu_item_check label="Zapisuj zdjęcia na dysk twardy bez efektu dźwiękowego" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Skompresuj zdjęcie na dysk twardy" name="CompressSnapshotsToDisk"/>
<menu label="Narzędzia" name="Performance Tools">
<menu_item_call label="Pomiar lagów" name="Lag Meter"/>
<menu_item_check label="Statystyki" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 63f976a3146..7d3225ea317 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2385,7 +2385,7 @@ Spróbuj ponowanie za kilka minut.
</notification>
<notification name="ObjectGiveItem">
Obiekt o nazwie <nolink>[OBJECTFROMNAME]</nolink>, należący do [NAME_SLURL] dał Tobie [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Zachowaj"/>
<button name="Discard" text="Wyrzuć"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index c184fb0af3e..ea54afed5ee 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -159,7 +159,6 @@
<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
<menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="Compactar fotos para HD" name="CompressSnapshotsToDisk"/>
<menu label="Ferramentas de desempenho" name="Performance Tools">
<menu_item_call label="Medidor de lag" name="Lag Meter"/>
<menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 0bb02a71994..22de7edfddf 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2401,7 +2401,7 @@ Por favor, tente novamente em alguns instantes.
</notification>
<notification name="ObjectGiveItem">
Um objeto chamado <nolink>[OBJECTFROMNAME]</nolink>, de [NAME_SLURL], lhe deu este(a) [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Segure"/>
<button name="Discard" text="Descarte"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ce588c7e6b1..a51e26c3f42 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -139,7 +139,6 @@
<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
<menu_item_check label="高解æžåº¦å¿«ç…§" name="HighResSnapshot"/>
<menu_item_check label="éœéŸ³æ‹æ”快照到硬碟" name="QuietSnapshotsToDisk"/>
- <menu_item_check label="壓縮快照å˜åˆ°ç¡¬ç¢Ÿ" name="CompressSnapshotsToDisk"/>
<menu label="效能工具" name="Performance Tools">
<menu_item_call label="Lag Meter" name="Lag Meter"/>
<menu_item_check label="統計列" name="Statistics Bar"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index f819ed35e60..1c89e9b5228 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -2418,7 +2418,7 @@ Please try again in a few moments.
</notification>
<notification name="ObjectGiveItem">
An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
+<nolink>[ITEM_SLURL]</nolink>
<form name="form">
<button name="Keep" text="Keep"/>
<button name="Discard" text="Discard"/>
--
GitLab