summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/da/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/da/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/de/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_camera.xml20
-rw-r--r--indra/newview/skins/default/xui/es/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/fr/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/it/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/nl/floater_camera.xml18
-rw-r--r--indra/newview/skins/default/xui/nl/floater_color_picker.xml2
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_camera.xml18
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_camera.xml20
-rw-r--r--indra/newview/skins/default/xui/pt/floater_color_picker.xml2
17 files changed, 109 insertions, 73 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
index 0eb090d2e4..c52f7ab832 100644
--- a/indra/newview/skins/default/xui/da/floater_camera.xml
+++ b/indra/newview/skins/default/xui/da/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Roter kamera omkring fokus
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Zoom kamera mod fokus
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Flyt kamera op og ned, til venstre og højre
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Flyt kamera op og ned, til venstre og højre"/>
+ <joystick_zoom name="zoom" tool_tip="Zoom kamera mod fokus"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index e6cc5774ed..c8e1fc813b 100644
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -26,6 +26,6 @@
Nuværende Farve:
</text>
<text name="(Drag below to save.)">
- (Træk ned og gem.)
+ (Træk ned og gem)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index 198b5b07f2..f44db713d8 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
+<floater name="camera_floater">
+ <floater.string name="rotate_tooltip">
Kamera um Fokus drehen
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Kamera auf Fokus zoomen
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Kamera nach oben, unten, links und rechts bewegen
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
+ <joystick_zoom name="zoom" tool_tip="Kamera auf Fokus zoomen"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index f53a1135dc..fa2f616249 100644
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -27,6 +27,6 @@
</text>
<text name="(Drag below to save.)">
(Nach unten ziehen,
- um zu speichern.)
+ um zu speichern)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index 0246f0d440..3aeb4e5771 100644
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Girar la cámara alrededor de lo enfocado
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Hacer zoom con la cámara en lo enfocado
- </string>
- <string name="move_tooltip">
- Mover la cámara arriba y abajo, izquierda y derecha.
- </string>
+ </floater.string>
+ <floater.string name="move_tooltip">
+ Mover la cámara arriba y abajo, izquierda y derecha
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Mover la cámara arriba y abajo, izquierda y derecha"/>
+ <joystick_zoom name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index c220c48cb0..616c373d18 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -26,6 +26,6 @@
</text>
<text name="(Drag below to save.)">
(Arrástrelo abajo
- para guardarlo.)
+ para guardarlo)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 9f280b7265..8ea640853f 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
+<floater name="camera_floater">
+ <floater.string name="rotate_tooltip">
Faire tourner la caméra autour du point central
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Zoomer en direction du point central
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Déplacer la caméra vers le haut et le bas, la gauche et la droite
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/>
+ <joystick_zoom name="zoom" tool_tip="Zoomer en direction du point central"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index adab86dac0..94bcad070e 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -27,6 +27,6 @@
</text>
<text left="8" name="(Drag below to save.)" width="114">
(Faire glisser dessous
-pour enregistrer.)
+pour enregistrer)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
index 9655ed2211..823be8f4a1 100644
--- a/indra/newview/skins/default/xui/it/floater_camera.xml
+++ b/indra/newview/skins/default/xui/it/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Ruota la telecamera Intorno all&apos;Inquadratura
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Avvicina la telecamera nell&apos;inquadratura
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Muovi la telecamera su e giù e a sinistra e destra
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Muovi la telecamera su e giù e a sinistra e destra"/>
+ <joystick_zoom name="zoom" tool_tip="Avvicina la telecamera nell&apos;inquadratura"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml
index 93188c29ac..1e6d7bc3f0 100644
--- a/indra/newview/skins/default/xui/it/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml
@@ -33,6 +33,6 @@
</text>
<text name="(Drag below to save.)">
(Trascina qui sotto
- per salvare.)
+ per salvare)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 46e7b1990d..bb87b194a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
+<floater name="camera_floater">
+ <floater.string name="rotate_tooltip">
フォーカスを中心にカメラを回転
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
フォーカスに向けてカメラをズーム
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
カメラを上下左右に移動
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="カメラを上下左右に移動"/>
+ <joystick_zoom name="zoom" tool_tip="フォーカスに向けてカメラをズーム"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_camera.xml b/indra/newview/skins/default/xui/nl/floater_camera.xml
index a6b843a0a2..81a3ed8a58 100644
--- a/indra/newview/skins/default/xui/nl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/nl/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Roteer camera rond focus
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Zoom camera naar focus
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Beweeg camera omhoog en omlaag, links en rechts
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Beweeg camera omhoog en omlaag, links en rechts"/>
+ <joystick_zoom name="zoom" tool_tip="Zoom camera naar focus"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_color_picker.xml b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
index 25294e17e2..a357e874f7 100644
--- a/indra/newview/skins/default/xui/nl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/nl/floater_color_picker.xml
@@ -26,6 +26,6 @@
</text>
<text name="(Drag below to save.)">
(Sleep naar beneden
- om op te slaan.)
+ om op te slaan)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
index 24da91c081..5957018144 100755
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Obracaj kamerę wokół obiektu
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Najedź kamerą w kierunku obiektu
- </string>
- <string name="move_tooltip">
+ </floater.string>
+ <floater.string name="move_tooltip">
Poruszaj kamerą w dół/górę oraz w prawo/lewo
- </string>
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w dół/górę oraz w prawo/lewo"/>
+ <joystick_zoom name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index a380423cdf..d6ffe1837a 100755
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -26,6 +26,6 @@
Obecny Kolor:
</text>
<text name="(Drag below to save.)">
- (Przeciągnij tutaj.)
+ (Przeciągnij tutaj)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
index 4dc6997606..b61e261148 100644
--- a/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
+<floater name="camera_floater" title="">
+ <floater.string name="rotate_tooltip">
Girar a Câmera ao redor do Foco
- </string>
- <string name="zoom_tooltip">
+ </floater.string>
+ <floater.string name="zoom_tooltip">
Aproximar a Câmera in direção ao Foco
- </string>
- <string name="move_tooltip">
- Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
- </string>
+ </floater.string>
+ <floater.string name="move_tooltip">
+ Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita
+ </floater.string>
+ <panel name="controls">
+ <joystick_track name="cam_track_stick" tool_tip="Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita"/>
+ <joystick_zoom name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco"/>
+ </panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 95dd53ccd4..76da972b5d 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -27,6 +27,6 @@
</text>
<text name="(Drag below to save.)">
(Arraste abaixo
- para salvar.)
+ para salvar)
</text>
</floater>