summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-26 19:00:27 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-26 19:00:27 +0200
commita5227864bd7ca930b41041ff80b20c30474f5f8c (patch)
tree0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default
parent3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff)
parentb74e1d942352e81e0cc00e21ef3b351152b32248 (diff)
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/textures/arrow_down.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/locked_image.j2cbin6140 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/map_infohub.tgabin1068 -> 0 bytes
-rw-r--r--indra/newview/skins/default/xui/da/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/da/floater_buy_currency.xml2
-rw-r--r--indra/newview/skins/default/xui/da/floater_tos.xml4
-rw-r--r--indra/newview/skins/default/xui/da/menu_profile_overflow.xml1
-rw-r--r--indra/newview/skins/default/xui/da/panel_edit_pick.xml5
-rw-r--r--indra/newview/skins/default/xui/da/panel_main_inventory.xml30
-rw-r--r--indra/newview/skins/default/xui/da/panel_nearby_media.xml23
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_advanced.xml3
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_chat.xml6
-rw-r--r--indra/newview/skins/default/xui/da/panel_preferences_setup.xml5
-rw-r--r--indra/newview/skins/default/xui/da/strings.xml205
-rw-r--r--indra/newview/skins/default/xui/de/floater_about_land.xml34
-rw-r--r--indra/newview/skins/default/xui/de/floater_gesture.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_tools.xml10
-rw-r--r--indra/newview/skins/default/xui/de/menu_land.xml2
-rw-r--r--indra/newview/skins/default/xui/de/mime_types.xml8
-rw-r--r--indra/newview/skins/default/xui/de/notifications.xml72
-rw-r--r--indra/newview/skins/default/xui/de/panel_place_profile.xml8
-rw-r--r--indra/newview/skins/default/xui/de/panel_region_general.xml2
-rw-r--r--indra/newview/skins/default/xui/de/strings.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml18
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml46
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml42
-rw-r--r--indra/newview/skins/default/xui/es/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_customize.xml2
-rw-r--r--indra/newview/skins/default/xui/es/floater_gesture.xml2
-rw-r--r--indra/newview/skins/default/xui/es/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_people.xml4
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_advanced.xml2
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml8
-rw-r--r--indra/newview/skins/default/xui/fr/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_bulk_perms.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/floater_gesture.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/floater_tools.xml12
-rw-r--r--indra/newview/skins/default/xui/fr/floater_water.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/floater_windlight_options.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_nearby_media.xml8
-rw-r--r--indra/newview/skins/default/xui/it/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_activeim.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_avatar_picker.xml8
-rw-r--r--indra/newview/skins/default/xui/it/floater_bulk_perms.xml24
-rw-r--r--indra/newview/skins/default/xui/it/floater_buy_object.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_color_picker.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_gesture.xml20
-rw-r--r--indra/newview/skins/default/xui/it/floater_land_holdings.xml6
-rw-r--r--indra/newview/skins/default/xui/it/floater_live_lsleditor.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_moveview.xml26
-rw-r--r--indra/newview/skins/default/xui/it/floater_postcard.xml4
-rw-r--r--indra/newview/skins/default/xui/it/floater_preferences.xml6
-rw-r--r--indra/newview/skins/default/xui/it/floater_preview_sound.xml6
-rw-r--r--indra/newview/skins/default/xui/it/floater_region_info.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_script_queue.xml8
-rw-r--r--indra/newview/skins/default/xui/it/floater_search.xml6
-rw-r--r--indra/newview/skins/default/xui/it/floater_select_key.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_texture_ctrl.xml2
-rw-r--r--indra/newview/skins/default/xui/it/inspect_avatar.xml2
-rw-r--r--indra/newview/skins/default/xui/it/menu_avatar_self.xml8
-rw-r--r--indra/newview/skins/default/xui/it/menu_login.xml2
-rw-r--r--indra/newview/skins/default/xui/it/menu_object.xml11
-rw-r--r--indra/newview/skins/default/xui/it/menu_participant_list.xml18
-rw-r--r--indra/newview/skins/default/xui/it/menu_viewer.xml73
-rw-r--r--indra/newview/skins/default/xui/it/panel_classified_info.xml12
-rw-r--r--indra/newview/skins/default/xui/it/panel_edit_classified.xml16
-rw-r--r--indra/newview/skins/default/xui/it/panel_edit_hair.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_edit_profile.xml22
-rw-r--r--indra/newview/skins/default/xui/it/panel_edit_shape.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_group_notify.xml4
-rw-r--r--indra/newview/skins/default/xui/it/panel_group_roles.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_landmarks.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_login.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_navigation_bar.xml10
-rw-r--r--indra/newview/skins/default/xui/it/panel_outfits_inventory.xml15
-rw-r--r--indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml8
-rw-r--r--indra/newview/skins/default/xui/it/panel_people.xml7
-rw-r--r--indra/newview/skins/default/xui/it/panel_places.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_preferences_setup.xml26
-rw-r--r--indra/newview/skins/default/xui/it/panel_profile.xml64
-rw-r--r--indra/newview/skins/default/xui/it/panel_region_covenant.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_region_debug.xml6
-rw-r--r--indra/newview/skins/default/xui/it/panel_side_tray.xml15
-rw-r--r--indra/newview/skins/default/xui/it/sidepanel_item_info.xml55
-rw-r--r--indra/newview/skins/default/xui/it/sidepanel_task_info.xml20
-rw-r--r--indra/newview/skins/default/xui/ja/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_gesture.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_region_estate.xml2
-rw-r--r--indra/newview/skins/default/xui/nl/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/floater_about_land.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_about_land.xml2
93 files changed, 714 insertions, 460 deletions
diff --git a/indra/newview/skins/default/textures/arrow_down.tga b/indra/newview/skins/default/textures/arrow_down.tga
deleted file mode 100644
index 81dc9d3b6c..0000000000
--- a/indra/newview/skins/default/textures/arrow_down.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c
deleted file mode 100644
index 9e8998d675..0000000000
--- a/indra/newview/skins/default/textures/locked_image.j2c
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga
deleted file mode 100644
index 545b8e532c..0000000000
--- a/indra/newview/skins/default/textures/map_infohub.tga
+++ /dev/null
Binary files differ
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 8525b324ab..fd1fe4aa19 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -392,7 +392,7 @@ Kun større parceller kan vises i søgning.
<text left="4" name="at URL:">
Hjemmeside:
</text>
- <button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
+ <button label="Vælg" name="set_media_url"/>
<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
<text left="4" name="Description:">
Beskrivelse:
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index 49c2264956..ec6ac5b2a8 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -37,7 +37,7 @@
Estimerer...
</text>
<text name="buy_action">
- [NAME] L$ [PRICE]
+ [ACTION]
</text>
<text name="total_label">
Min nye beholdning vil være
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index 6f61d9b310..c87fe8162f 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -2,9 +2,9 @@
<floater name="modal container" title="">
<button label="Fortsæt" label_selected="Fortsæt" name="Continue"/>
<button label="Annullér" label_selected="Annullér" name="Cancel"/>
- <check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/>
+ <check_box label="Jeg er enig med &quot;Terms of Service and Privacy Policy&quot;" name="agree_chk"/>
<text name="tos_heading">
- Læs venligst følgende servicebetingelser grundigt. For at kunne logge på [SECOND_LIFE], skal du acceptere aftalen.
+ Læs venligst følgende &quot;Terms of Service and Privacy Policy&quot; grundigt. For at fortsætte med at logge på [SECOND_LIFE], skal du acceptere aftale.
</text>
<text_editor name="tos_text">
TOS_TEXT
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
index 9609b424a1..6745007c99 100644
--- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<toggleable_menu name="profile_overflow_menu">
+ <menu_item_call label="Kort" name="show_on_map"/>
<menu_item_call label="Betal" name="pay"/>
<menu_item_call label="Del" name="share"/>
<menu_item_call label="Blokér" name="block"/>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
index 41db2be5e8..dcc4e7a4b6 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Redigér Pick" name="panel_edit_pick">
+ <panel.string name="location_notice">
+ (vil blive opdateret ved gemning)
+ </panel.string>
<text name="title">
Redigér favorit
</text>
@@ -22,7 +25,7 @@
</panel>
</scroll_container>
<panel label="bottom_panel" name="bottom_panel">
- <button label="Gem [WHAT]" name="save_changes_btn"/>
+ <button label="Gem favorit Pick" name="save_changes_btn"/>
<button label="Annullér" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
index ac3a2844db..16bd22c21a 100644
--- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Ting" name="main inventory panel">
- <panel.string name="Title">
- Ting
+ <panel.string name="ItemcountFetching">
+ Henter [ITEM_COUNT] Genstande... [FILTER]
</panel.string>
- <filter_editor label="Filter" name="inventory search editor"/>
- <tab_container name="inventory filter tabs">
- <inventory_panel label="Alle ting" name="All Items"/>
- <inventory_panel label="Nye ting" name="Recent Items"/>
- </tab_container>
- <panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>
- <button name="add_btn" tool_tip="Opret ny genstand"/>
- <dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>
- </panel>
+ <panel.string name="ItemcountCompleted">
+ [ITEM_COUNT] Genstande [FILTER]
+ </panel.string>
+ <text name="ItemcountText">
+ Genstande:
+ </text>
<menu_bar name="Inventory Menu">
<menu label="Filer" name="File">
<menu_item_call label="Åben" name="Open"/>
@@ -61,4 +57,14 @@
<menu_item_check label="System-mapper i toppen" name="System Folders To Top"/>
</menu>
</menu_bar>
+ <filter_editor label="Filter" name="inventory search editor"/>
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="Alle ting" name="All Items"/>
+ <inventory_panel label="Nye ting" name="Recent Items"/>
+ </tab_container>
+ <panel name="bottom_panel">
+ <button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>
+ <button name="add_btn" tool_tip="Opret ny genstand"/>
+ <dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
index 32905a2deb..407d9f7c87 100644
--- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
@@ -19,10 +19,17 @@
<button label="Mere &gt;&gt;" label_selected="Mindre &lt;&lt;" name="more_less_btn" tool_tip="Avanceret opsætning"/>
</panel>
<panel name="nearby_media_panel">
+ <text name="nearby_media">
+ Media i nærheden
+ </text>
+ <text name="show">
+ Vis:
+ </text>
<combo_box name="show_combo">
<combo_box.item label="Overalt" name="All"/>
<combo_box.item label="På dette sted" name="WithinParcel"/>
<combo_box.item label="Udenfor dette sted" name="OutsideParcel"/>
+ <combo_box.item label="På andre avatarer" name="OnOthers"/>
</combo_box>
<scroll_list name="media_list">
<scroll_list.columns label="I nærheden" name="media_proximity"/>
@@ -31,28 +38,28 @@
<scroll_list.columns label="Navn" name="media_name"/>
<scroll_list.columns label="Debug" name="media_debug"/>
</scroll_list>
- <panel>
+ <panel name="media_controls_panel">
<layout_stack name="media_controls">
<layout_panel name="stop">
- <button name="stop_btn" tool_tip="Stop valgte medie"/>
+ <button name="stop_btn" tool_tip="Stop valgte media"/>
</layout_panel>
<layout_panel name="play">
- <button name="play_btn" tool_tip="Afspil valgte medie"/>
+ <button name="play_btn" tool_tip="Afspil valgte media"/>
</layout_panel>
<layout_panel name="pause">
- <button name="pause_btn" tool_tip="Pause valgte medie"/>
+ <button name="pause_btn" tool_tip="Pause valgte media"/>
</layout_panel>
<layout_panel name="volume_slider_ctrl">
- <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/>
+ <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Lydstyrke for valgte media"/>
</layout_panel>
<layout_panel name="mute">
- <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/>
+ <button name="mute_btn" tool_tip="Sluk for lyd på valgte media"/>
</layout_panel>
<layout_panel name="zoom">
- <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/>
+ <button name="zoom_btn" tool_tip="Zoom ind til valgte media"/>
</layout_panel>
<layout_panel name="unzoom">
- <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/>
+ <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte media"/>
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index 30665dfa0e..b6ff4a6d90 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -3,6 +3,9 @@
<panel.string name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
+ <panel.string name="middle_mouse">
+ Midterste mus
+ </panel.string>
<slider label="Synsvinkel" name="camera_fov"/>
<slider label="Distance" name="camera_offset_scale"/>
<text name="heading2">
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index df71e29cb9..df97193598 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -45,6 +45,12 @@
</text>
<check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/>
<check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/>
+ <text name="show_ims_in_label">
+ Vis IM&apos;er i:
+ </text>
+ <text name="requires_restart_label">
+ (kræver genstart)
+ </text>
<radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)">
<radio_item label="Separate vinduer" name="radio" value="0"/>
<radio_item label="Faner" name="radio2" value="1"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 279e288096..8202c78947 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -34,9 +34,12 @@
Web:
</text>
<radio_group name="use_external_browser">
- <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value="0"/>
<radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/>
+ <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value=""/>
</radio_group>
+ <check_box initial_value="sand" label="Aktivér plugins" name="browser_plugins_enabled"/>
+ <check_box initial_value="sand" label="Acceptér cookies" name="cookies_enabled"/>
+ <check_box initial_value="sand" label="Aktivér Javascript" name="browser_javascript_enabled"/>
<check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/>
<text name="Proxy location">
Proxy placering:
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index e2bb7751b2..bce197113f 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -14,7 +14,22 @@
Detekterer hardware...
</string>
<string name="StartupLoading">
- Indlæser
+ Henter [APP_NAME]...
+ </string>
+ <string name="StartupClearingCache">
+ Tømmer cache...
+ </string>
+ <string name="StartupInitializingTextureCache">
+ Initialiserer tekstur cache...
+ </string>
+ <string name="StartupInitializingVFS">
+ Initialiserer VFS...
+ </string>
+ <string name="ProgressRestoring">
+ Gendanner...
+ </string>
+ <string name="ProgressChangingResolution">
+ Ændrer opløsning...
</string>
<string name="LoginInProgress">
Logger p. [APP_NAME] kan virke laast. Vent venligst.
@@ -76,12 +91,33 @@
<string name="LoginFailedNoNetwork">
Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse.
</string>
+ <string name="LoginFailed">
+ Login fejlede.
+ </string>
<string name="Quit">
Afslut
</string>
<string name="AgentLostConnection">
Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
</string>
+ <string name="SavingSettings">
+ Gemmer indstillinger...
+ </string>
+ <string name="LoggingOut">
+ Logger ud...
+ </string>
+ <string name="ShuttingDown">
+ Lukker ned...
+ </string>
+ <string name="YouHaveBeenDisconnected">
+ Du er blevet frakoblet den region du var i.
+ </string>
+ <string name="SentToInvalidRegion">
+ Du blev sendt til en ugyldig region.
+ </string>
+ <string name="TestingDisconnect">
+ Tester frakobling af klient
+ </string>
<string name="TooltipPerson">
Person
</string>
@@ -136,6 +172,24 @@
<string name="TooltipAgentUrl">
Klik for at se beboers profil
</string>
+ <string name="TooltipAgentMute">
+ Klik for at slukke for denne beboer
+ </string>
+ <string name="TooltipAgentUnmute">
+ Klik for at fjern slukning for denne beboer
+ </string>
+ <string name="TooltipAgentIM">
+ Klik for at sende IM til denne beboer
+ </string>
+ <string name="TooltipAgentPay">
+ Klik for at betale denne beboer
+ </string>
+ <string name="TooltipAgentOfferTeleport">
+ Klik for at tilbyde teleport til denne beboer
+ </string>
+ <string name="TooltipAgentRequestFriend">
+ Klik for at sende venneforespørgsel
+ </string>
<string name="TooltipGroupUrl">
Klik for at se denne gruppes beskrivelse
</string>
@@ -168,6 +222,24 @@
<string name="SLurlLabelShowOnMap">
Vis kort for
</string>
+ <string name="SLappAgentMute">
+ Sluk
+ </string>
+ <string name="SLappAgentUnmute">
+ Fjern sluk
+ </string>
+ <string name="SLappAgentIM">
+ IM
+ </string>
+ <string name="SLappAgentPay">
+ Betal
+ </string>
+ <string name="SLappAgentOfferTeleport">
+ Tilbyd teleport til
+ </string>
+ <string name="SLappAgentRequestFriend">
+ Venneforespørgsel
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
Luk (⌘W)
</string>
@@ -318,6 +390,9 @@
<string name="symbolic link">
link
</string>
+ <string name="symbolic folder link">
+ link til mappe
+ </string>
<string name="AvatarAway">
Væk
</string>
@@ -826,6 +901,7 @@
Intet indhold
</string>
<string name="WornOnAttachmentPoint" value=" (båret på [ATTACHMENT_POINT])"/>
+ <string name="ActiveGesture" value="[GESLABEL] (aktiv)"/>
<string name="Chat" value=" Chat : "/>
<string name="Sound" value=" Lyd : "/>
<string name="Wait" value=" --- Vent : "/>
@@ -919,6 +995,9 @@
<string name="InvFolder My Outfits">
Mine sæt
</string>
+ <string name="InvFolder Accessories">
+ Tilbehør
+ </string>
<string name="InvFolder Friends">
Venner
</string>
@@ -1436,6 +1515,9 @@
<string name="PanelContentsNewScript">
Nyt script
</string>
+ <string name="PanelContentsTooltip">
+ Indhold i objekt
+ </string>
<string name="BusyModeResponseDefault">
Beboeren du sendte en besked er &apos;optaget&apos;, hvilket betyder at han/hun ikke vil forstyrres. Din besked vil blive vis i hans/hendes IM panel til senere visning.
</string>
@@ -1553,7 +1635,10 @@
Annullér
</string>
<string name="UploadingCosts">
- Uploader [%s] omkostninger
+ Uploader [NAME] pris L$ [AMOUNT]
+ </string>
+ <string name="BuyingCosts">
+ At købe dette koster L$ [AMOUNT]
</string>
<string name="UnknownFileExtension">
Ukendt fil efternavn [.%s]
@@ -3271,4 +3356,120 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="unread_chat_multiple">
[SOURCES] har sagt noget nyt
</string>
+ <string name="paid_you_ldollars">
+ [NAME] betalte dig L$[AMOUNT]
+ </string>
+ <string name="you_paid_ldollars">
+ Du betalte [NAME] L$[AMOUNT] [REASON].
+ </string>
+ <string name="you_paid_ldollars_no_reason">
+ Du betalte [NAME] L$[AMOUNT].
+ </string>
+ <string name="you_paid_ldollars_no_name">
+ Du betalte L$[AMOUNT] [REASON].
+ </string>
+ <string name="for a parcel of land">
+ for en parcel land
+ </string>
+ <string name="for a land access pass">
+ for en billet til land
+ </string>
+ <string name="for deeding land">
+ for dedikering af land
+ </string>
+ <string name="to create a group">
+ for at oprette gruppe
+ </string>
+ <string name="to join a group">
+ for at blive medlem i gruppe
+ </string>
+ <string name="to upload">
+ for at uploade
+ </string>
+ <string name="giving">
+ Giver L$ [AMOUNT]
+ </string>
+ <string name="uploading_costs">
+ Pris for upload er L$ [AMOUNT]
+ </string>
+ <string name="this_costs">
+ Prisen er L$ [AMOUNT]
+ </string>
+ <string name="buying_selected_land">
+ Køber valgte land L$ [AMOUNT]
+ </string>
+ <string name="this_object_costs">
+ Dette objekt koster L$ [AMOUNT]
+ </string>
+ <string name="group_role_everyone">
+ Enhver
+ </string>
+ <string name="group_role_officers">
+ Administratorer
+ </string>
+ <string name="group_role_owners">
+ Ejere
+ </string>
+ <string name="uploading_abuse_report">
+ Uploader...
+
+Krænkelsesanmeldelse
+ </string>
+ <string name="New Shape">
+ Ny kropsbygning
+ </string>
+ <string name="New Skin">
+ Ny hud
+ </string>
+ <string name="New Hair">
+ Nyt hår
+ </string>
+ <string name="New Eyes">
+ Nye øjne
+ </string>
+ <string name="New Shirt">
+ Ny trøje
+ </string>
+ <string name="New Pants">
+ Nye bukser
+ </string>
+ <string name="New Shoes">
+ Nye sko
+ </string>
+ <string name="New Socks">
+ Nye strømper
+ </string>
+ <string name="New Jacket">
+ Ny jakke
+ </string>
+ <string name="New Gloves">
+ Nye handsker
+ </string>
+ <string name="New Undershirt">
+ Ny undertrøje
+ </string>
+ <string name="New Underpants">
+ Nye underbukser
+ </string>
+ <string name="New Skirt">
+ Ny nederdel
+ </string>
+ <string name="New Alpha">
+ Ny alpha
+ </string>
+ <string name="New Tattoo">
+ Ny tatovering
+ </string>
+ <string name="Invalid Wearable">
+ Kan ikke tages på
+ </string>
+ <string name="New Script">
+ Nyt script
+ </string>
+ <string name="New Folder">
+ Ny folder
+ </string>
+ <string name="Contents">
+ Indhold
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 81c2f97263..5322febe27 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -24,7 +24,7 @@
<tab_container name="landtab" tab_min_width="40" width="489">
<panel label="ALLGEMEIN" name="land_general_panel">
<panel.string name="new users only">
- Nur neue Einwohner
+ Nur neue Benutzer
</panel.string>
<panel.string name="anyone">
Jeder
@@ -151,15 +151,13 @@
Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
</panel.string>
<panel.string name="can_change">
- Gekauftes Land in dieser Region kann zusammengelegt und
-geteilt werden.
+ Gekauftes Land in dieser Region kann zusammengelegt und geteilt werden.
</panel.string>
<panel.string name="can_not_change">
- Gekauftes Land in dieser Region kann nicht zusammengelegt
-und geteilt werden.
+ Gekauftes Land in dieser Region kann nicht zusammengelegt und geteilt werden.
</panel.string>
<text name="estate_section_lbl">
- Grundstück:
+ Grundbesitz:
</text>
<text name="estate_name_text">
Mainland
@@ -171,7 +169,7 @@ und geteilt werden.
(keiner)
</text>
<text_editor name="covenant_editor">
- Für dieses Grundstück fehlt der Vertrag.
+ Für diesen Grundbesitz fehlt der Vertrag.
</text_editor>
<text name="covenant_timestamp_text">
Letzte Änderung am Mittwoch, den 31. Dez. 1969, 16:00:00
@@ -278,8 +276,8 @@ werden.
<name_list name="owner list">
<name_list.columns label="Typ" name="type"/>
<name_list.columns label="Name" name="name"/>
- <name_list.columns label="Zählen" name="count" width="80"/>
- <name_list.columns label="Aktuellster" name="mostrecent"/>
+ <name_list.columns label="Anzahl" name="count" width="80"/>
+ <name_list.columns label="Aktuellstes" name="mostrecent"/>
</name_list>
</panel>
<panel label="OPTIONEN" name="land_options_panel">
@@ -337,8 +335,8 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<text name="land_options_label">
Landoptionen:
</text>
- <check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Falls nicht aktiviert, sind Kampfschäden aktiviert."/>
- <check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
+ <check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Ansonsten sind Kampfschäden aktiviert."/>
+ <check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Stoßen durch Skripte. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
<check_box label="Ort in Suche anzeigen (30 L$/Woche)" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
<combo_box name="land category with adult">
<combo_box.item label="Alle Kategorien" name="item0"/>
@@ -377,7 +375,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<text name="landing_point">
Landepunkt: [LANDING]
</text>
- <button label="Festlegen" label_selected="Festlegen" left="234" name="Set" right="-88" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
+ <button label="Festlegen" label_selected="Festlegen" left="234" name="Set" right="-88" tool_tip="Legt Ihren Standort als Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70"/>
<button label="Löschen" label_selected="Löschen" left="312" name="Clear" tool_tip="Landepunkt löschen" width="70"/>
<text name="Teleport Routing: ">
Teleport-Route:
@@ -396,7 +394,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<text name="at URL:">
Homepage:
</text>
- <button label="Festlegen" label_selected="Einstellen..." name="set_media_url"/>
+ <button label="Festlegen" name="set_media_url"/>
<check_box label="URL ausblenden" name="hide_media_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar."/>
<text name="Description:">
Inhalt:
@@ -436,18 +434,18 @@ Nur große Parzellen können in der Suche aufgeführt werden.
Voice:
</text>
<check_box label="Voice aktivieren" name="parcel_enable_voice_channel"/>
- <check_box label="Voice aktivieren (vom Grundstück eingerichtet)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+ <check_box label="Voice aktivieren (vom Grundbesitz eingerichtet)" name="parcel_enable_voice_channel_is_estate_disabled"/>
<check_box label="Voice auf diese Parzelle beschränken" name="parcel_enable_voice_channel_local"/>
</panel>
<panel label="ZUGANG" name="land_access_panel">
<panel.string name="access_estate_defined">
- (Durch Grundstück festgelegt)
+ (Durch Grundbesitz festgelegt)
</panel.string>
<panel.string name="allow_public_access">
Öffentlichen Zugang erlauben ([MATURITY])
</panel.string>
<panel.string name="estate_override">
- Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
+ Eine oder mehrere dieser Optionen gelten auf Grundbesitzebene
</panel.string>
<text name="Limit access to this parcel to:">
Zugang zu dieser Parzelle
@@ -456,8 +454,8 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<text name="Only Allow" width="400">
Zugang auf Einwohner beschränken, die überprüft wurden von:
</text>
- <check_box label="Zahlungsinformation gespeichert [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen."/>
- <check_box label="Altersüberprüfung [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung verbannen. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+ <check_box label="Zahlungsinformation gespeichert [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Einwohner ohne Zahlungsinformation nicht zulassen."/>
+ <check_box label="Altersüberprüfung [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Einwohner ohne Altersüberprüfung nicht zulassen. Weitere Informationen finden Sie im [SUPPORT_SITE]."/>
<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
index 0b27b362c3..7b35da8d5c 100644
--- a/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_gesture.xml
@@ -9,7 +9,7 @@
<floater.string name="copy_name">
Kopie von [COPY_NAME]
</floater.string>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
+ <scroll_list name="gesture_list">
<scroll_list.columns label="Name" name="name"/>
<scroll_list.columns label="Chat" name="trigger"/>
<scroll_list.columns label="" name="key"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 46023bcf19..bb28f1b33f 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -7,7 +7,7 @@
Klicken und ziehen, um die ausgewählte Seite zu dehnen
</floater.string>
<floater.string name="status_move">
- Maus verschiebt, Umschalt-Taste und Maus kopiert
+ Maus verschiebt, Umschalt + Maus kopiert
</floater.string>
<floater.string name="status_modifyland">
Klicken und halten, um das Land zu bearbeiten
@@ -70,7 +70,7 @@
<check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/>
<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="10"/>
- <combo_box name="combobox grid mode" tool_tip="Wählen Sie das Rasterlineal aus, um das Objekt zu positionieren.">
+ <combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus.">
<combo_box.item label="Globales Raster" name="World"/>
<combo_box.item label="Lokales Raster" name="Local"/>
<combo_box.item label="Referenzraster" name="Reference"/>
@@ -238,10 +238,10 @@
</panel>
</panel>
<panel label="Objekt" name="Object">
- <check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
- <check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
+ <check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass das Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
+ <check_box label="Physisch" name="Physical Checkbox Ctrl" tool_tip="Gestattet, dass das Objekt geschoben und von Schwerkraft beeinflusst wird"/>
<check_box label="Temporär" name="Temporary Checkbox Ctrl" tool_tip="Bewirkt, dass das Objekt 1 Minute nach seiner Erstellung gelöscht wird."/>
- <check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verursacht, dass Objekt nicht mit anderen Objekten oder Avataren kollidiert"/>
+ <check_box label="Phantom" name="Phantom Checkbox Ctrl" tool_tip="Verhindert, dass das Objekt mit anderen Objekten oder Avataren kollidiert"/>
<text name="label position">
Position (Meter)
</text>
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
index 9b1e6727b7..de679da3d8 100644
--- a/indra/newview/skins/default/xui/de/menu_land.xml
+++ b/indra/newview/skins/default/xui/de/menu_land.xml
@@ -5,5 +5,5 @@
<menu_item_call label="Dieses Land kaufen" name="Land Buy"/>
<menu_item_call label="Pass kaufen" name="Land Buy Pass"/>
<menu_item_call label="Bauen" name="Create"/>
- <menu_item_call label="Terrain bearbeiten" name="Edit Terrain"/>
+ <menu_item_call label="Land bearbeiten" name="Edit Terrain"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index e01649e911..de93107e94 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -22,14 +22,6 @@
Video wiedergeben
</playtip>
</widgetset>
- <widgetset name="none">
- <label name="none_label">
- Keine Inhalte
- </label>
- <tooltip name="none_tooltip">
- Keine Medien gefunden
- </tooltip>
- </widgetset>
<widgetset name="image">
<label name="image_label">
Bild
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 71accab699..c2f25c84b8 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1189,7 +1189,7 @@ Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 un
Es sind maximal [MAX_MANAGER] verbannte Einwohner erlaub.
</notification>
<notification name="OwnerCanNotBeDenied">
- Der Eigentümer des Grundstücks kann nicht zur Liste der „Verbannten Einwohner“ hinzugefügt werden.
+ Der Eigentümer des Grundbesitzes kann nicht zur Liste der „Verbannten Einwohner“ hinzugefügt werden.
</notification>
<notification name="CanNotChangeAppearanceUntilLoaded">
Das Aussehen lässt sich erst ändern, wenn Kleider und Form/Gestalt geladen sind.
@@ -1426,67 +1426,67 @@ Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachricht
Zu [CLASSIFIED] teleportieren?
<usetemplate ignoretext="Bestätigen, dass ich zu einer Position in Anzeigen teleportieren möchte." name="okcancelignore" notext="Abbrechen" yestext="Teleportieren"/>
</notification>
- <notification label="Nachricht an alle auf diesem Grundstück" name="MessageEstate">
- Geben Sie eine kurze Nachricht ein, die an jede Person auf Ihrem Grundstück gesendet wird.
+ <notification label="Nachricht an alle auf diesem Grundbesitz" name="MessageEstate">
+ Geben Sie eine kurze Nachricht ein, die an jede Person auf Ihrem Grundbesitz gesendet wird.
<form name="form">
<input name="message"/>
<button name="OK" text="OK"/>
<button name="Cancel" text="Abbrechen"/>
</form>
</notification>
- <notification label="Linden-Grundstück ändern" name="ChangeLindenEstate">
- Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
+ <notification label="Linden-Grundbesitz ändern" name="ChangeLindenEstate">
+ Sie sind im Begriff, einen Grundbesitz in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen auf das Benutzererlebnis hat. Auf dem Mainland werden tausende Regionen geändert, was den Spaceserver stark belastet.
Fortfahren?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
- <notification label="Zugang zu Linden-Grundstück ändern" name="ChangeLindenAccess">
- Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
+ <notification label="Zugang zu Linden-Grundbesitz ändern" name="ChangeLindenAccess">
+ Sie sind im Begriff, die Zugangsliste für einen Grundbesitz in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern.
Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ per Hack in und aus dem Raster zu entfernen.
Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belastet.
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
- <notification label="Grundstück wählen" name="EstateAllowedAgentAdd">
- Nur für dieses Grundstück oder für alle [ALL_ESTATES] zur Erlaubnisliste hinzufügen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateAllowedAgentAdd">
+ Nur für diesen Grundbesitz oder für alle [ALL_ESTATES] zur Erlaubnisliste hinzufügen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Dieser Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateAllowedAgentRemove">
- Nur für dieses Grundstück oder für alle [ALL_ESTATES] von Erlaubnisliste entfernen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateAllowedAgentRemove">
+ Nur für diesen Grundbesitz oder für alle [ALL_ESTATES] von Erlaubnisliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateAllowedGroupAdd">
- Nur für dieses Grundstück oder für alle [ALL_ESTATES] zur Gruppen-Erlaubnisliste hinzufügen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateAllowedGroupAdd">
+ Nur für diesen Grundbesitz oder für alle [ALL_ESTATES] zur Gruppen-Erlaubnisliste hinzufügen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateAllowedGroupRemove">
- Nur für dieses Grundstück oder für alle [ALL_ESTATES] von Gruppen-Erlaubnisliste entfernen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateAllowedGroupRemove">
+ Nur für diesen Grundbesitz oder für alle [ALL_ESTATES] von Gruppen-Erlaubnisliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateBannedAgentAdd">
- Zugang nur für dieses Grundstück oder für [ALL_ESTATES] verweigern?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateBannedAgentAdd">
+ Zugang nur für diesen Grundbesitz oder für [ALL_ESTATES] verweigern?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateBannedAgentRemove">
- Einwohner nur für dieses Grundstück oder für alle [ALL_ESTATES] von der Bannliste entfernen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateBannedAgentRemove">
+ Einwohner nur für diesen Grundbesitz oder für alle [ALL_ESTATES] von der Bannliste entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateManagerAdd">
- Verwalter nur für dieses Grundstück oder für [ALL_ESTATES] festlegen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateManagerAdd">
+ Verwalter nur für diesen Grundbesitz oder für [ALL_ESTATES] festlegen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
- <notification label="Grundstück wählen" name="EstateManagerRemove">
- Verwalter nur für dieses Grundstück oder für [ALL_ESTATES] entfernen?
- <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundstücke" yestext="Dieses Grundstück"/>
+ <notification label="Grundbesitz wählen" name="EstateManagerRemove">
+ Verwalter nur für diesen Grundbesitz oder für [ALL_ESTATES] entfernen?
+ <usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Alle Grundbesitze" yestext="Diesen Grundbesitz"/>
</notification>
<notification label="Rauswurf bestätigen" name="EstateKickUser">
- Benutzer [EVIL_USER] von diesem Grundstück werfen?
+ Benutzer [EVIL_USER] von diesem Grundbesitz werfen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="EstateChangeCovenant">
- Möchten Sie den Grundstücksvertrag wirklich ändern?
+ Möchten Sie den Grundbesitzvertrag wirklich ändern?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="RegionEntryAccessBlocked">
@@ -1570,14 +1570,14 @@ Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstuf
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ProblemImportingEstateCovenant">
- Problem beim Import des Grundstückvertrags.
+ Problem beim Import des Grundbesitzvertrags.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ProblemAddingEstateManager">
- Es gibt Probleme beim Hinzufügen eines neuen Grundstücksverwalters. Bei mindestens einem Grundstück ist die Verwalterliste voll.
+ Es gibt Probleme beim Hinzufügen eines neuen Grundbesitzverwalters. Bei mindestens einem Grundbesitz ist die Verwalterliste voll.
</notification>
<notification name="ProblemAddingEstateGeneric">
- Problem beim Hinzufügen zu dieser Grundstücksliste. Bei mindestens einem Grundstück ist die Liste voll.
+ Problem beim Hinzufügen zu dieser Grundbesitzliste. Bei mindestens einem Grundbesitz ist die Liste voll.
</notification>
<notification name="UnableToLoadNotecardAsset">
Notizkarten-Asset konnte nicht geladen werden.
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
index 82e5febf8d..ed1421aa60 100644
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -83,7 +83,7 @@
<text name="scripts_value" value="Ein"/>
<text name="damage_label" value="Schaden:"/>
<text name="damage_value" value="Aus"/>
- <button label="Land-Info" name="about_land_btn"/>
+ <button label="Über Land" name="about_land_btn"/>
</panel>
</accordion_tab>
<accordion_tab name="region_information_tab" title="Region">
@@ -100,12 +100,12 @@
<text name="region_group">
The Mighty Moose of mooseville soundvillemoose
</text>
- <button label="Region/Grundstück" name="region_info_btn"/>
+ <button label="Region/Grundbesitz" name="region_info_btn"/>
</panel>
</accordion_tab>
- <accordion_tab name="estate_information_tab" title="Grundstück">
+ <accordion_tab name="estate_information_tab" title="Grundbesitz">
<panel name="estate_information_panel">
- <text name="estate_name_label" value="Grundstück:"/>
+ <text name="estate_name_label" value="Grundbesitz:"/>
<text name="estate_rating_label" value="Einstufung:"/>
<text name="estate_owner_label" value="Eigentümer:"/>
<text name="covenant_label" value="Vertrag:"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
index 2bf8721c86..be8507ebbd 100644
--- a/indra/newview/skins/default/xui/de/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_general.xml
@@ -33,7 +33,7 @@
<icons_combo_box label="Moderat" name="access_combo">
<icons_combo_box.item label="Adult" name="Adult" value="42"/>
<icons_combo_box.item label="Moderat" name="Mature" value="21"/>
- <icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+ <icons_combo_box.item label="Generell" name="PG" value="13"/>
</icons_combo_box>
<button label="Übernehmen" name="apply_btn"/>
<button label="Einen Einwohner nach Hause teleportieren..." name="kick_btn"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 3507762119..fd05f02ceb 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1263,7 +1263,7 @@
Oben links
</string>
<string name="Center">
- Zentrieren
+ Mitte
</string>
<string name="Bottom Left">
Unten links
@@ -1369,13 +1369,13 @@
Fehler
</string>
<string name="RegionInfoAllEstatesOwnedBy">
- alle Grundstücke gehören [OWNER]
+ alle Grundbesitze gehören [OWNER]
</string>
<string name="RegionInfoAllEstatesYouOwn">
- alle Grundstücke, die Sie besitzen
+ alle Grundbesitze, die Sie besitzen
</string>
<string name="RegionInfoAllEstatesYouManage">
- alle Grundstücke, die Sie für [OWNER] verwalten
+ alle Grundbesitze, die Sie für [OWNER] verwalten
</string>
<string name="RegionInfoAllowedResidents">
Zulässige Einwohner: ([ALLOWEDAGENTS], max [MAXACCESS])
@@ -1570,10 +1570,10 @@
(Gruppe)
</string>
<string name="RegionNoCovenant">
- Für dieses Grundstück liegt kein Vertrag vor.
+ Für diesen Grundbesitz liegt kein Vertrag vor.
</string>
<string name="RegionNoCovenantOtherOwner">
- Für dieses Grundstück liegt kein Vertrag vor. Das Land auf diesem Grundstück wird vom Grundstückseigentümer und nicht von Linden Lab verkauft. Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundstückseigentümer in Verbindung.
+ Für diesen Grundbesitz liegt kein Vertrag vor. Das Land auf diesem Grundbesitz wird vom Grundbesitzer und nicht von Linden Lab verkauft. Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundbesitzer in Verbindung.
</string>
<string name="covenant_last_modified">
Zuletzt geändert:
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 3be2d1b4e1..51bd7a0a16 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -559,21 +559,26 @@ Leyla Linden </text>
left="0"
top="0"
help_topic="land_covenant_tab"
- name="land_covenant_panel">
+ name="land_covenant_panel"
+ word_wrap="true">
<panel.string
- name="can_resell">
+ name="can_resell"
+ word_wrap="true">
Purchased land in this region may be resold.
</panel.string>
<panel.string
- name="can_not_resell">
+ name="can_not_resell"
+ word_wrap="true">
Purchased land in this region may not be resold.
</panel.string>
<panel.string
- name="can_change">
+ name="can_change"
+ word_wrap="true">
Purchased land in this region may be joined or subdivided.
</panel.string>
<panel.string
- name="can_not_change">
+ name="can_not_change"
+ word_wrap="true">
Purchased land in this region may not be joined or subdivided.
</panel.string>
<text
@@ -748,6 +753,7 @@ Leyla Linden </text>
left_pad="10"
mouse_opaque="false"
name="resellable_clause"
+ word_wrap="true"
width="330">
Land in this region may not be resold.
</text>
@@ -1619,7 +1625,7 @@ Only large parcels can be listed in search.
layout="topleft"
left_pad="5"
name="set_media_url"
- width="50"
+ width="70"
top_delta="0"/>
<check_box
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 89712efbb7..7dcf2aab99 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- can_minimize="false"
- can_close="true"
+ can_minimize="true"
+ can_close="false"
follows="left|top"
height="340"
layout="topleft"
@@ -23,7 +23,7 @@
</floater.string>
<view
height="160"
- width="225"
+ width="230"
layout="topleft"
name="thumbnail_placeholder"
top_pad="30"
@@ -45,74 +45,74 @@
follows="left|top"
height="20"
layout="topleft"
- left="15"
+ left="10"
max_length="500"
name="description"
- top_pad="20"
- width="225"
+ top_pad="15"
+ width="230"
label="Description"/>
<button
- label="Share to Web"
+ label="Share Snapshot"
name="share"
- top_pad="15"
- left="15"
+ top_pad="20"
+ left="10"
width="130"/>
<button
label="Share to Web"
name="share_to_web"
top_delta="0"
- left="15"
+ left="10"
width="130"/>
<button
label="Save to My Inventory"
name="save_to_inventory"
top_delta="0"
- left="15"
+ left="10"
width="130"/>
<button
label="Save Snapshot"
name="save"
top_pad="7"
- left="15"
+ left="10"
width="130"/>
<button
label="Email Snapshot"
name="share_to_email"
top_delta="0"
- left="15"
+ left="10"
width="130"/>
<button
label="Save to My Computer"
name="save_to_computer"
top_delta="0"
- left="15"
+ left="10"
width="130"/>
<button
label="Set As Profile Pic"
name="set_profile_pic"
top_pad="7"
- left="15"
+ left="10"
width="130"/>
<button
label="Back"
name="cancel"
top_delta="0"
- left="15"
+ left="10"
width="130"/>
<button
- follows="right"
- height="22"
- layout="topleft"
- right="-12"
+ follows="left"
+ height="22"
+ layout="topleft"
+ left="210"
name="show_advanced"
image_overlay="TabIcon_Close_Off"
top_delta="1"
width="30"/>
<button
- follows="right"
+ follows="left"
height="22"
layout="topleft"
- right="-12"
+ left="210"
visible="false"
name="hide_advanced"
image_overlay="TabIcon_Open_Off"
@@ -121,7 +121,7 @@
<panel
visible="false"
left="250"
- top="35"
+ top="17"
name="snapshot_advanced"
filename="panel_snapshot_advanced.xml"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c27b251112..fd046c3695 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -249,10 +249,10 @@
<check_box
left="10"
follows="left|top"
- height="16"
+ height="28"
control_name="EditLinkedParts"
label="Edit linked"
- layout="topleft"
+ layout="topleft"
name="checkbox edit linked parts" >
<check_box.commit_callback
function="BuildTool.selectComponent"/>
@@ -265,7 +265,7 @@
left="13"
name="RenderingCost"
tool_tip="Shows the rendering cost calculated for this object"
- top_pad="9"
+ top_pad="2"
type="string"
width="100">
þ: [COUNT]
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d1e0746d9d..cc68ec2bdc 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -204,7 +204,7 @@ height="16"
name="forgot_password_text"
top_pad="12"
right="-10"
- width="180">
+ width="210">
Forgot your name or password?
</text>
<text
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index d14712a7fa..53dda1927a 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,34 +2,34 @@
<panel
can_resize="true"
can_close="false"
- mouse_opaque="true"
- bg_opaque_image="Volume_Background"
- bg_alpha_image="Volume_Background"
- background_opaque="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ background_opaque="true"
background_visible="true"
layout="topleft"
width="270"
- height="235"
+ height="230"
name="nearby_media"
help_topic="nearby_media">
+ <string name="media_item_count_format">(%ld media items)</string>
<string name="empty_item_text">&lt;empty&gt;</string>
<string name="parcel_media_name">Parcel Streaming Media</string>
<string name="parcel_audio_name">Parcel Streaming Audio</string>
<string name="playing_suffix">(playing)</string>
<panel
bevel_style="in"
- background_visible="false"
+ background_visible="false"
follows="left|right|top"
top="0"
- height="30"
+ height="35"
name="minimized_controls"
left="0">
<button
name="all_nearby_media_disable_btn"
follows="left"
tool_tip="Turn all nearby media off"
- left="15"
- width="60"
+ left="8"
+ width="66"
height="22"
label="Stop All">
<button.commit_callback
@@ -40,7 +40,7 @@
follows="left"
tool_tip="Turn all nearby media on"
left_pad="4"
- width="60"
+ width="66"
height="22"
label="Start All">
<button.commit_callback
@@ -68,8 +68,8 @@
follows="right"
tool_tip="Advanced Controls"
top_delta="0"
- right="-10"
- width="60"
+ right="-8"
+ width="66"
height="22"
toggle="true"
label="More &gt;&gt;"
@@ -95,7 +95,6 @@
follows="top|left"
font="SansSerif"
left="10"
- name="nearby_media"
width="100">
Nearby Media
</text>
@@ -106,7 +105,6 @@
font="SansSerif"
top_pad="15"
left="10"
- name="show"
width="40">
Show:
</text>
@@ -135,7 +133,6 @@
name="OnOthers" />
</combo_box>
<scroll_list
- name="media_list"
follows="left|top|bottom|right"
column_padding="0"
height="105"
@@ -144,7 +141,8 @@
bg_stripe_color="0.25 0.25 0.25 0.25"
top_pad="8"
left="10"
- right="-10">
+ right="-10"
+ name="media_list">
<scroll_list.columns
type="checkbox"
width="-1"
@@ -181,7 +179,6 @@
top_pad="5"
height="30"
left="10"
- name="media_controls_panel"
right="-10">
<layout_stack
name="media_controls"
@@ -190,12 +187,14 @@
height="26"
layout="topleft"
top="4"
- left="10"
+ left="8"
right="-10"
border_size="0"
+ mouse_opaque="false"
orientation="horizontal">
<layout_panel
name="stop"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -223,6 +222,7 @@
</layout_panel>
<layout_panel
name="play"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -250,6 +250,7 @@
</layout_panel>
<layout_panel
name="pause"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -276,6 +277,7 @@
</layout_panel>
<layout_panel
name="volume_slider_ctrl"
+ mouse_opaque="false"
auto_resize="true"
user_resize="false"
follows="left|right"
@@ -300,6 +302,7 @@
</layout_panel>
<layout_panel
name="mute"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -328,6 +331,7 @@
</layout_panel>
<layout_panel
name="zoom"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -355,6 +359,7 @@
</layout_panel>
<layout_panel
name="unzoom"
+ mouse_opaque="false"
auto_resize="false"
user_resize="false"
layout="topleft"
@@ -383,6 +388,7 @@
<layout_panel
name="right_bookend"
width="0"
+ mouse_opaque="false"
user_resize="false" />
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index a10530a5ed..c453d415b4 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -394,7 +394,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
Página inicial:
</text>
<line_editor left="97" name="media_url"/>
- <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+ <button label="Definir" name="set_media_url"/>
<check_box label="Ocultar la URL del media" left="97" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/>
<text name="Description:">
Descripción:
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index 4b332cd9c3..8daf2bed15 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -9,7 +9,7 @@
<button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
<button label="Cabeza" label_selected="Cabeza" name="Head"/>
<button label="Ojos" label_selected="Ojos" name="Eyes"/>
- <button label="Ojos" label_selected="Orejas" name="Ears"/>
+ <button label="Orejas" label_selected="Orejas" name="Ears"/>
<button label="Nariz" label_selected="Nariz" name="Nose"/>
<button label="Boca" label_selected="Boca" name="Mouth"/>
<button label="Barbilla" label_selected="Barbilla" name="Chin"/>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index 1dc1d54295..d90de8c9f4 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -9,7 +9,7 @@
<floater.string name="copy_name">
Copia de [COPY_NAME]
</floater.string>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
+ <scroll_list name="gesture_list">
<scroll_list.columns label="Nombre" name="name"/>
<scroll_list.columns label="Chat" name="trigger"/>
<scroll_list.columns label="Tecla" name="shortcut"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 1e27ac130f..cc6a442508 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -914,7 +914,7 @@ no tienes el permiso de comprar terreno para el grupo que tienes activado actual
<notification label="Añadir como amigo" name="AddFriend">
Los amigos pueden darse permiso para localizarse en el mapa y para saber si el otro está conectado.
-¿Ofrecer a [NAME] que sea su amigo?
+¿Ofrecer a [NAME] que sea tu amigo?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification label="Añadir como amigo" name="AddFriendWithMessage">
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 55e3df5a0a..6008c6a934 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -11,7 +11,7 @@
<string name="no_groups_msg" value="[secondlife:///app/search/groups Intenta encontrar grupos a los que unirte.]"/>
<filter_editor label="Filtrar" name="filter_input"/>
<tab_container name="tabs">
- <panel label="CERCANÍA" name="nearby_panel">
+ <panel label="CERCANA" name="nearby_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="nearby_view_sort_btn" tool_tip="Opciones"/>
<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
@@ -20,7 +20,7 @@
<panel label="MIS AMIGOS" name="friends_panel">
<accordion name="friends_accordion">
<accordion_tab name="tab_online" title="Conectado"/>
- <accordion_tab name="tab_all" title="Todas"/>
+ <accordion_tab name="tab_all" title="Todos"/>
</accordion>
<panel label="bottom_panel" name="bottom_panel">
<button name="friends_viewsort_btn" tool_tip="Opciones"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 39bf247a47..a7c13b05b6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -17,7 +17,7 @@
<check_box label="Las teclas del cursor siempre para moverme" name="arrow_keys_move_avatar_check"/>
<check_box label="Correr siempre: atajo de teclado" name="tap_tap_hold_to_run"/>
<check_box label="Al hablar, mover los labios del avatar" name="enable_lip_sync"/>
- <check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+ <check_box label="Chat en bocadillos" name="bubble_text_chat"/>
<slider label="Opacidad" name="bubble_chat_opacity"/>
<color_swatch name="background" tool_tip="Elegir el color de los bocadillos del chat"/>
<check_box label="Mostrar los errores de los scripts en:" name="show_script_errors"/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 04268d911e..a8fc7f6b58 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -972,7 +972,7 @@
Partes del cuerpo
</string>
<string name="InvFolder Trash">
- la Papelera
+ Papelera
</string>
<string name="InvFolder Photo Album">
Álbum de fotos
@@ -1920,7 +1920,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Cortos
</string>
<string name="Attached Earlobes">
- Lóbulos cortos
+ Lóbulos
</string>
<string name="Back Fringe">
Nuca: largo
@@ -3090,7 +3090,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Sweep Forward
</string>
<string name="Tall">
- Alta
+ Más
</string>
<string name="Taper Back">
Cubierta trasera
@@ -3192,7 +3192,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Pelo blanco
</string>
<string name="Wide">
- Ancho
+ Aumentar
</string>
<string name="Wide Back">
Completa
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 55d7d28231..5d630cdf48 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -400,7 +400,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
Page d&apos;accueil :
</text>
<line_editor left="97" name="media_url"/>
- <button label="Choisir" label_selected="Définir..." name="set_media_url"/>
+ <button label="Choisir" name="set_media_url"/>
<check_box label="Masquer l&apos;URL" left="97" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML."/>
<text name="Description:">
Description :
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
index 241cf1af09..503fe5c154 100644
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFIER LES DROITS RELATIFS AU CONTENU">
+<floater name="floaterbulkperms" title="MODIFIER LES DROITS">
<floater.string name="nothing_to_modify_text">
- La sélection contient des contenus non modifiables.
+ Certains contenus sont non modifiables.
</floater.string>
<floater.string name="status_text">
Droits paramétrés sur [NAME]
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index 113df0acc4..1e0f5672a4 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -9,9 +9,9 @@
<floater.string name="copy_name">
Copie de [COPY_NAME]
</floater.string>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
- <scroll_list.columns label="Nom" name="name" width="145"/>
- <scroll_list.columns label="Chat" name="trigger" width="85"/>
+ <scroll_list name="gesture_list">
+ <scroll_list.columns label="Nom" name="name"/>
+ <scroll_list.columns label="Chat" name="trigger"/>
<scroll_list.columns label="" name="key"/>
<scroll_list.columns label="Touche" name="shortcut"/>
</scroll_list>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 40765b9e06..663f1da7b6 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -61,7 +61,7 @@
<radio_item label="Bouger" name="radio position"/>
<radio_item label="Pivoter (Ctrl)" name="radio rotate"/>
<radio_item label="Étirer (Ctrl+Maj)" name="radio stretch"/>
- <radio_item label="Sélectionner une face" name="radio select face"/>
+ <radio_item label="Choisir une face" name="radio select face"/>
</radio_group>
<check_box label="Modification liée" name="checkbox edit linked parts"/>
<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
@@ -96,7 +96,7 @@
<check_box initial_value="true" label="Centrer" name="checkbox copy centers"/>
<check_box label="Pivoter" name="checkbox copy rotates"/>
<radio_group name="land_radio_group">
- <radio_item label="Sélectionner le terrain" name="radio select land"/>
+ <radio_item label="Choisir le terrain" name="radio select land"/>
<radio_item label="Aplatir" name="radio flatten"/>
<radio_item label="Élever" name="radio raise"/>
<radio_item label="Abaisser" name="radio lower"/>
@@ -280,7 +280,7 @@
<combo_box.item label="Caoutchouc" name="Rubber"/>
</combo_box>
<text name="text cut">
- Découpe du tracé (début/fin)
+ Découpe du tracé (déb./fin)
</text>
<spinner label="D" name="cut begin"/>
<spinner label="F" name="cut end"/>
@@ -339,8 +339,8 @@
<text name="text revolutions">
Révolutions
</text>
- <texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
- <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Inverse le sculptie le long de l&apos;axe X"/>
+ <texture_picker label="Texture de la sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+ <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Inverse la sculptie le long de l&apos;axe X"/>
<check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les normales des sculpties, qui apparaissent alors à l&apos;envers"/>
<text name="label sculpt type">
Type de raccord
@@ -355,7 +355,7 @@
</panel>
<panel label="Attributs" name="Features">
<text name="select_single">
- Sélectionnez un prim pour modifier les attributs.
+ Choisissez une prim pour changer les attributs.
</text>
<text name="edit_object">
Modifier les attributs de l&apos;objet :
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 6d697b40d3..96723b0fe6 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCÉE">
+<floater name="Water Floater" title="ÉDITEUR D&apos;EAU AVANCÉ">
<floater.string name="WLDefaultWaterNames">
Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
</floater.string>
<text name="KeyFramePresetsText" width="120">
- Préréglages eau :
+ Préréglages :
</text>
<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/>
<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/>
@@ -34,7 +34,7 @@
Décalage Fresnel
</text>
<text name="DensMultText">
- Réfraction au dessus
+ Réfraction au-dessus
</text>
<text name="WaterScaleBelowText">
Réfraction en dessous
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index 9f93302b71..74f1697449 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706">
<text name="KeyFramePresetsText">
- Préréglages ciel :
+ Préréglages :
</text>
<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 6bf8a94c68..d7757b3d9d 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -14,20 +14,20 @@
</string>
<panel name="minimized_controls">
<button label="Arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias près de vous"/>
- <button label="Jouer" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias près de vous"/>
+ <button label="Lire" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias près de vous"/>
<button name="open_prefs_btn" tool_tip="Ouvrir les préférences de média"/>
<button label="Plus &gt;&gt;" label_selected="Moins &lt;&lt;" name="more_less_btn" tool_tip="Options avancées"/>
</panel>
<panel name="nearby_media_panel">
<text name="nearby_media">
- Média près de vous
+ Médias locaux
</text>
<text name="show">
- Afficher :
+ Voir :
</text>
<combo_box name="show_combo">
<combo_box.item label="Tout" name="All"/>
- <combo_box.item label="Dans cette parcelle" name="WithinParcel"/>
+ <combo_box.item label="Sur cette parcelle" name="WithinParcel"/>
<combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/>
<combo_box.item label="Sur les autres avatars" name="OnOthers"/>
</combo_box>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index a58135953b..4b361f6fa6 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -397,7 +397,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
Home Page:
</text>
<line_editor left="97" name="media_url"/>
- <button label="Imposta..." label_selected="Imposta..." name="set_media_url" width="63"/>
+ <button label="Imposta" name="set_media_url"/>
<check_box label="Nascondi indirizzo URL Media" left="94" name="hide_media_url" tool_tip="Abilitando questa opzione nasconderai l&apos;indirizzo url dei media a tutte le persone non autorizzate a vedere le informazioni del terreno. Nota che questo non è disponibile per contenuto di tipo HTML."/>
<text name="Description:">
Descrizione:
diff --git a/indra/newview/skins/default/xui/it/floater_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml
index d19882fa48..0c1f0448e1 100644
--- a/indra/newview/skins/default/xui/it/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/it/floater_activeim.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="ATTIVA IM"/>
+<floater name="floater_activeim" title="IM ATTIVO"/>
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
index e583d0b8b5..7c037801e9 100644
--- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
@@ -21,18 +21,18 @@
<tab_container name="ResidentChooserTabs">
<panel label="Cerca" name="SearchPanel">
<text name="InstructSearchResidentName">
- Scrivi parte del nome di una persona:
+ Comincia a digitare il nome della persona:
</text>
<button label="Vai" label_selected="Vai" name="Find"/>
</panel>
<panel label="Amici" name="FriendsPanel">
<text name="InstructSelectFriend">
- Seleziona una persona:
+ Scegli una persona:
</text>
</panel>
<panel label="Vicino a me" name="NearMePanel">
<text name="InstructSelectResident">
- Seleziona una persona nei dintorni:
+ Scegli una persona nei dintorni
</text>
<slider bottom_delta="-36" label="Range" name="near_me_range"/>
<text name="meters">
@@ -43,5 +43,5 @@
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>
- <button label="Cancella" label_selected="Cancella" name="cancel_btn"/>
+ <button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
index 12ebd8f114..89f4a0cb71 100644
--- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
@@ -13,27 +13,27 @@
Conclusa richiesta di modifica dei permessi.
</floater.string>
<check_box label="Animazioni" name="check_animation"/>
- <icon name="icon_animation" tool_tip="Animazioni"/>
+ <icon name="icon_animation" tool_tip="Animazione"/>
<check_box label="Parti del corpo" name="check_bodypart"/>
- <icon name="icon_bodypart" tool_tip="Parti del Corpo"/>
+ <icon name="icon_bodypart" tool_tip="Parti del corpo"/>
<check_box label="Abiti" name="check_clothing"/>
<icon name="icon_clothing" tool_tip="Vestiario"/>
<check_box label="Gesture" name="check_gesture"/>
- <icon name="icon_gesture" tool_tip="Gestures"/>
+ <icon name="icon_gesture" tool_tip="Gesture"/>
<check_box label="Notecard" name="check_notecard"/>
- <icon name="icon_notecard" tool_tip="Notecards"/>
+ <icon name="icon_notecard" tool_tip="Biglietti"/>
<check_box label="Oggetti" name="check_object"/>
<icon name="icon_object" tool_tip="Oggetti"/>
<check_box label="Script" name="check_script"/>
- <icon name="icon_script" tool_tip="Scripts"/>
+ <icon name="icon_script" tool_tip="Script"/>
<check_box label="Suoni" name="check_sound"/>
<icon name="icon_sound" tool_tip="Suoni"/>
<check_box label="Texture" name="check_texture"/>
- <icon name="icon_texture" tool_tip="Textures"/>
- <button label="√ Tutto" label_selected="Tutti" name="check_all"/>
- <button label="Pulisci" label_selected="Nessuno" name="check_none"/>
+ <icon name="icon_texture" tool_tip="Texture"/>
+ <button label="√ Tutti" label_selected="Tutti" name="check_all"/>
+ <button label="Cancella" label_selected="Nessuno" name="check_none"/>
<text name="newperms">
- Nuovo Permessi del Contenuto
+ Nuovi permessi del contenuto
</text>
<text name="GroupLabel">
Gruppo:
@@ -44,11 +44,11 @@
</text>
<check_box label="Copia" name="everyone_copy"/>
<text name="NextOwnerLabel">
- Prossimo proprietario:
+ Proprietario successivo:
</text>
<check_box label="Modificare" name="next_owner_modify"/>
<check_box label="Copiare" name="next_owner_copy"/>
- <check_box initial_value="true" label="Transfer" name="next_owner_transfer" tool_tip="Prossimo proprietario può donare o rivendere questo oggetto"/>
+ <check_box initial_value="true" label="Trasferisci" name="next_owner_transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
<button label="OK" name="apply"/>
- <button label="Cancella" name="close"/>
+ <button label="Annulla" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
index 5f3413931b..895d8aa746 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="COMPRA COPIA DELL&apos;OGGETTO">
+<floater name="contents" title="ACQUISTA COPIA DELL&apos;OGGETTO">
<text name="contents_text">
Contiene:
</text>
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 63859c0183..38d4a0a037 100644
--- a/indra/newview/skins/default/xui/it/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml
@@ -27,7 +27,7 @@
<check_box label="Applica adesso" name="apply_immediate"/>
<button left_delta="150" name="color_pipette"/>
<button label="Annulla" label_selected="Annulla" left_delta="55" name="cancel_btn"/>
- <button label="Ok" label_selected="Ok" name="select_btn"/>
+ <button label="OK" label_selected="OK" name="select_btn"/>
<text name="Current color:">
Colore attuale:
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
index eefa3bb392..b9419ebc22 100644
--- a/indra/newview/skins/default/xui/it/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_gesture.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Posti" name="gestures" title="GESTURES">
+<floater label="Luoghi" name="gestures" title="GESTURE">
<floater.string name="loading">
- Caricando...
+ Caricamento in corso...
</floater.string>
<floater.string name="playing">
- (Riproducendo)
+ (Riproduzione in corso)
</floater.string>
<floater.string name="copy_name">
Copia di [COPY_NAME]
</floater.string>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
- <scroll_list.columns label="Nome" name="name" width="129"/>
- <scroll_list.columns label="Chat" name="trigger" width="106"/>
- <scroll_list.columns label="Pulsante" name="shortcut" width="65"/>
+ <scroll_list name="gesture_list">
+ <scroll_list.columns label="Nome" name="name"/>
+ <scroll_list.columns label="Chat" name="trigger"/>
+ <scroll_list.columns label="Pulsante" name="shortcut"/>
</scroll_list>
<panel label="bottom_panel" name="bottom_panel">
- <menu_button name="gear_btn" tool_tip="Più opzioni"/>
+ <menu_button name="gear_btn" tool_tip="Altre opzioni"/>
<button name="new_gesture_btn" tool_tip="Crea nuova gesture"/>
- <button name="activate_btn" tool_tip="Attiva/Disattiva la gesture selezionata"/>
- <button name="del_btn" tool_tip="Cancella questa gesture"/>
+ <button name="activate_btn" tool_tip="Attiva/Disattiva gesture selezionata"/>
+ <button name="del_btn" tool_tip="Elimina questa gesture"/>
</panel>
<button label="Modifica" name="edit_btn"/>
<button label="Play" name="play_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
index 9f2884448d..1b2f2605f7 100644
--- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="LA MIA TERRA">
+<floater name="land holdings floater" title="IL MIO TERRENO">
<scroll_list name="parcel list">
- <column label="Parcel" name="name"/>
+ <column label="Lotto" name="name"/>
<column label="Regione" name="location"/>
<column label="Tipo" name="type"/>
<column label="Area" name="area"/>
</scroll_list>
<button label="Teletrasportati" label_selected="Teletrasportati" name="Teleport" tool_tip="Teletrasportati al centro di questo terreno."/>
- <button label="Mappa" label_selected="Mappa" name="Show on Map" tool_tip="Mostra questa terra nella mappa del mondo" width="130"/>
+ <button label="Mappa" label_selected="Mappa" name="Show on Map" tool_tip="Mostra il terreno sulla mappa del mondo" width="130"/>
<text name="contrib_label">
Contributi ai tuoi gruppi:
</text>
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
index e5bd374501..0bd2b02323 100644
--- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
In esecuzione
</floater.string>
<floater.string name="Title">
- Script: [NAME]
+ SCRIPT: [NAME]
</floater.string>
<button label="Ripristina" label_selected="Ripristina" name="Reset"/>
<check_box initial_value="true" label="In esecuzione" left="4" name="running"/>
diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml
index f6ec08dbbd..26d861c566 100644
--- a/indra/newview/skins/default/xui/it/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/it/floater_moveview.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="move_floater">
<string name="walk_forward_tooltip">
- Cammina in avanti (premi Freccia Sù o W)
+ Cammina in avanti (premi freccia su o W)
</string>
<string name="walk_back_tooltip">
- Cammina indietro (premi Freccia Giù o S)
+ Cammina indietro (premi freccia giù o S)
</string>
<string name="run_forward_tooltip">
- Corri in avanti (premi Freccia Sù o W)
+ Corri in avanti (premi freccia su o W)
</string>
<string name="run_back_tooltip">
- Corri indietro (premi Freccia Giù o S)
+ Corri indietro (premi freccia giù o S)
</string>
<string name="fly_forward_tooltip">
- Vola in avanti (premi Freccia Sù o W)
+ Vola in avanti (premi freccia su o W)
</string>
<string name="fly_back_tooltip">
- Vola indietro (premi Freccia Giù o S)
+ Vola indietro (premi freccia giù o S)
</string>
<string name="walk_title">
Cammina
@@ -28,16 +28,16 @@
Vola
</string>
<panel name="panel_actions">
- <button label="" label_selected="" name="turn left btn" tool_tip="Gira a sinistra (premi Freccia Sinistra o A)"/>
- <button label="" label_selected="" name="turn right btn" tool_tip="Gira a destra (premi Freccia Destra o D)"/>
+ <button label="" label_selected="" name="turn left btn" tool_tip="Gira a sinistra (premi freccia sinistra o A)"/>
+ <button label="" label_selected="" name="turn right btn" tool_tip="Gira a destra (premi freccia destra o D)"/>
<button label="" label_selected="" name="move up btn" tool_tip="Vola in alto, premi E"/>
<button label="" label_selected="" name="move down btn" tool_tip="Vola in basso, premi C"/>
- <joystick_turn name="forward btn" tool_tip="Cammina in avanti (premi Freccia Sù o W)"/>
- <joystick_turn name="backward btn" tool_tip="Cammina indietro (premi Freccia Giù o S)"/>
+ <joystick_turn name="forward btn" tool_tip="Cammina in avanti (premi freccia su o W)"/>
+ <joystick_turn name="backward btn" tool_tip="Cammina indietro (premi freccia giù o S)"/>
</panel>
<panel name="panel_modes">
- <button label="" name="mode_walk_btn" tool_tip="Modalità per camminare"/>
- <button label="" name="mode_run_btn" tool_tip="Modalità per correre"/>
- <button label="" name="mode_fly_btn" tool_tip="Modalità di volo"/>
+ <button label="" name="mode_walk_btn" tool_tip="Modalità cammina"/>
+ <button label="" name="mode_run_btn" tool_tip="Modalità corsa"/>
+ <button label="" name="mode_fly_btn" tool_tip="Modalità volo"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_postcard.xml b/indra/newview/skins/default/xui/it/floater_postcard.xml
index de246db826..cb2916268a 100644
--- a/indra/newview/skins/default/xui/it/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/it/floater_postcard.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ISTANTANEA IN EMAIL">
+<floater name="Postcard" title="INVIA FOTO VIA E-MAIL">
<text name="to_label" width="135">
Email del destinatario:
</text>
@@ -35,6 +35,6 @@
Vieni a vedere!
</string>
<string name="upload_message">
- Spedendo...
+ Invio...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 9854f99344..5ffe7f4802 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -5,11 +5,11 @@
<tab_container name="pref core" tab_width="146" width="646">
<panel label="Generale" name="general"/>
<panel label="Grafica" name="display"/>
- <panel label="Privacy" name="im"/>
+ <panel label="Riservatezza" name="im"/>
<panel label="Audio e media" name="audio"/>
<panel label="Chat" name="chat"/>
<panel label="Notifiche" name="msgs"/>
- <panel label="Configurazione" name="input"/>
- <panel label="Avanzato" name="advanced1"/>
+ <panel label="Impostazione" name="input"/>
+ <panel label="Avanzate" name="advanced1"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
index 7f437c87dd..8eb9573e54 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview_sound">
<floater.string name="Title">
- Suono: [NAME]
+ Suono : [NAME]
</floater.string>
<text name="desc txt">
Descrizione:
</text>
- <button label="Riproduci in Second Life" label_selected="Riproduci in Second Life" name="Sound play btn" tool_tip="Riproduci questo suono in modo che gli altri possano sentirlo"/>
- <button label="Avvia localmente" label_selected="Avvia localmente" name="Sound audition btn" tool_tip="Riproduci questo suono in modo che solo tu possa sentirlo"/>
+ <button label="Riproduci in Second Life" label_selected="Riproduci in Second Life" name="Sound play btn" tool_tip="Riproduci questo suono in modo che anche gli altri possano udirlo"/>
+ <button label="Avvia localmente" label_selected="Avvia localmente" name="Sound audition btn" tool_tip="Riproduci questo suono in modo che solo tu possa udirlo"/>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml
index 98808e4b55..dc2c24ca56 100644
--- a/indra/newview/skins/default/xui/it/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/it/floater_region_info.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="REGIONE/PROPRIETA&apos;"/>
+<floater name="regioninfo" title="Regione/proprietà immobiliare"/>
diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml
index 728fbe8c8d..f4117d30a2 100644
--- a/indra/newview/skins/default/xui/it/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_queue.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="RESETTA IL PROGRESSO">
+<floater name="queue" title="AZZERA AVANZAMENTO">
<floater.string name="Starting">
- Conteggio [START] degli [COUNT] articoli.
+ Avvio di [START] di [COUNT] oggetti.
</floater.string>
<floater.string name="Done">
- Eseguito.
+ Fine.
</floater.string>
<floater.string name="Resetting">
- Resettando
+ Ripristino in corso
</floater.string>
<floater.string name="Running">
In esecuzione
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
index 6afdd2437e..05f5dfe719 100644
--- a/indra/newview/skins/default/xui/it/floater_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_search.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_search" title="TROVA">
<floater.string name="loading_text">
- Caricando...
+ Caricamento in corso...
</floater.string>
<floater.string name="done_text">
- Eseguito
+ Fine
</floater.string>
<layout_stack name="stack1">
<layout_panel name="browser_layout">
<text name="refresh_search">
- Redo search to reflect current God level
+ Ripeti ricerca in modo che rifletta il livello di diritti Admin attuale
</text>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml
index c8c0f94c46..014bc76ffb 100644
--- a/indra/newview/skins/default/xui/it/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/it/floater_select_key.xml
@@ -2,6 +2,6 @@
<floater name="modal container" title="">
<button label="Annulla" label_selected="Annulla" name="Cancel"/>
<text name="Save item as:">
- Premi un tasto per definirlo come comando di attivazione della funzione Parla.
+ Premi una chiave per configurarla come pulsante da premere per parlare.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index 06418fa0ee..7b77584ba0 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -16,7 +16,7 @@
<search_editor label="Filtro texture" name="inventory search editor"/>
<check_box label="Applica adesso" name="apply_immediate_check"/>
<button label="Annulla" label_selected="Annulla" name="Cancel"/>
- <button label="Ok" label_selected="Ok" name="Select"/>
+ <button label="OK" label_selected="OK" name="Select"/>
<string name="pick title">
Scegli:
</string>
diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml
index cfc1d66c87..ec5561a5b2 100644
--- a/indra/newview/skins/default/xui/it/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/it/inspect_avatar.xml
@@ -13,7 +13,7 @@
<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
<button label="Aggiungi amico" name="add_friend_btn"/>
<button label="IM" name="im_btn"/>
- <button label="Altro" name="view_profile_btn"/>
+ <button label="Profilo" name="view_profile_btn"/>
<panel name="moderator_panel">
<button label="Disattiva voce" name="disable_voice"/>
<button label="Attiva voce" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index d89741f8d0..09219cb843 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Self Pie">
<menu_item_call label="Alzati" name="Stand Up"/>
- <context_menu label="Togli &gt;" name="Take Off &gt;">
- <context_menu label="Abiti &gt;" name="Clothes &gt;">
+ <context_menu label="Togli ▶" name="Take Off &gt;">
+ <context_menu label="Abiti ▶" name="Clothes &gt;">
<menu_item_call label="Camicia" name="Shirt"/>
<menu_item_call label="Pantaloni" name="Pants"/>
<menu_item_call label="Gonna" name="Skirt"/>
@@ -16,8 +16,8 @@
<menu_item_call label="Alpha (Trasparenza)" name="Self Alpha"/>
<menu_item_call label="Tutti gli abiti" name="All Clothes"/>
</context_menu>
- <context_menu label="HUD &gt;" name="Object Detach HUD"/>
- <context_menu label="Stacca &gt;" name="Object Detach"/>
+ <context_menu label="HUD ▶" name="Object Detach HUD"/>
+ <context_menu label="Stacca ▶" name="Object Detach"/>
<menu_item_call label="Stacca tutto" name="Detach All"/>
</context_menu>
<menu_item_call label="Il mio aspetto" name="Appearance..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index e14f5010dc..36eeadc478 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -21,8 +21,8 @@
</menu>
<menu_item_call label="Mostra impostazioni di debug" name="Debug Settings"/>
<menu_item_call label="Impostazioni colori interfaccia" name="UI/Color Settings"/>
- <menu_item_call label="Mostra la finestra laterale" name="Show Side Tray"/>
<menu label="Test interfaccia utente" name="UI Tests"/>
+ <menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
<menu_item_call label="Mostra messaggio critico" name="Critical"/>
<menu_item_call label="Test browser Web" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 07dfb0750b..237b6b3a0e 100644
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -7,17 +7,20 @@
<menu_item_call label="Siediti qui" name="Object Sit"/>
<menu_item_call label="Alzati" name="Object Stand Up"/>
<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
- <context_menu label="Metti &gt;" name="Put On">
+ <menu_item_call label="Zoom avanti" name="Zoom In"/>
+ <context_menu label="Indossa ▶" name="Put On">
<menu_item_call label="Indossa" name="Wear"/>
- <context_menu label="Attacca &gt;" name="Object Attach"/>
- <context_menu label="Attacca HUD &gt;" name="Object Attach HUD"/>
+ <context_menu label="Attacca ▶" name="Object Attach"/>
+ <context_menu label="Attacca HUD ▶" name="Object Attach HUD"/>
</context_menu>
- <context_menu label="Rimuovi &gt;" name="Remove">
+ <context_menu label="Togli ▶" name="Remove">
<menu_item_call label="Segnala abuso" name="Report Abuse..."/>
<menu_item_call label="Blocca" name="Object Mute"/>
<menu_item_call label="Restituisci" name="Return..."/>
<menu_item_call label="Elimina" name="Delete"/>
</context_menu>
+ <menu_item_call label="Acquista" name="Pie Object Bye"/>
+ <menu_item_call label="Prendi" name="Pie Object Take"/>
<menu_item_call label="Prendi copia" name="Take Copy"/>
<menu_item_call label="Paga" name="Pay..."/>
<menu_item_call label="Acquista" name="Buy..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml
index 9aa4212d35..e641d38508 100644
--- a/indra/newview/skins/default/xui/it/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/it/menu_participant_list.xml
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Participant List Context Menu">
+ <menu_item_check label="Ordina in base al nome" name="SortByName"/>
+ <menu_item_check label="Ordina in base a intervenuti recenti" name="SortByRecentSpeakers"/>
<menu_item_call label="Vedi profilo" name="View Profile"/>
<menu_item_call label="Aggiungi amico" name="Add Friend"/>
<menu_item_call label="IM" name="IM"/>
<menu_item_call label="Chiama" name="Call"/>
<menu_item_call label="Condividi" name="Share"/>
<menu_item_call label="Paga" name="Pay"/>
- <menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
- <menu_item_check label="Disattiva testo" name="MuteText"/>
- <menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
- <menu_item_call label="Disattiva audio di questo participante" name="ModerateVoiceMuteSelected"/>
- <menu_item_call label="Disattiva audio di tutti gli altri" name="ModerateVoiceMuteOthers"/>
- <menu_item_call label="Riattiva audio di questo participante" name="ModerateVoiceUnMuteSelected"/>
- <menu_item_call label="Disattiva audio di tutti gli altri" name="ModerateVoiceUnMuteOthers"/>
+ <menu_item_check label="Blocca voce" name="Block/Unblock"/>
+ <menu_item_check label="Blocca testo" name="MuteText"/>
+ <context_menu label="Opzioni moderatore &gt;" name="Moderator Options">
+ <menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
+ <menu_item_call label="Disattiva audio di questo participante" name="ModerateVoiceMuteSelected"/>
+ <menu_item_call label="Disattiva audio di tutti gli altri" name="ModerateVoiceMuteOthers"/>
+ <menu_item_call label="Riattiva audio di questo participante" name="ModerateVoiceUnMuteSelected"/>
+ <menu_item_call label="Disattiva audio di tutti gli altri" name="ModerateVoiceUnMuteOthers"/>
+ </context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index e6d04793c9..36b44abf4b 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -9,8 +9,8 @@
<menu_item_call label="Il mio profilo" name="Profile"/>
<menu_item_call label="Il mio aspetto" name="Appearance"/>
<menu_item_check label="Il mio inventario" name="Inventory"/>
- <menu_item_call label="Mostra inventario su barra laterale" name="ShowSidetrayInventory"/>
- <menu_item_call label="Le mie gesture" name="Gestures"/>
+ <menu_item_check label="Il mio inventario" name="ShowSidetrayInventory"/>
+ <menu_item_check label="Le mie gesture" name="Gestures"/>
<menu label="Il mio stato" name="Status">
<menu_item_call label="Assente" name="Set Away"/>
<menu_item_call label="Non disponibile" name="Set Busy"/>
@@ -24,35 +24,36 @@
<menu_item_call label="I miei gruppi" name="My Groups"/>
<menu_item_check label="Chat nei dintorni" name="Nearby Chat"/>
<menu_item_call label="Persone vicine" name="Active Speakers"/>
- <menu_item_check label="Multimedia vicini" name="Nearby Media"/>
</menu>
<menu label="Mondo" name="World">
- <menu_item_check label="Sposta" name="Movement Controls"/>
- <menu_item_check label="Visualizza" name="Camera Controls"/>
- <menu_item_call label="Informazioni sui terreni" name="About Land"/>
- <menu_item_call label="Regione/proprietà immobiliare" name="Region/Estate"/>
- <menu_item_call label="Acquista terreno" name="Buy Land"/>
+ <menu_item_check label="Mini mappa" name="Mini-Map"/>
+ <menu_item_check label="Mappa del mondo" name="World Map"/>
+ <menu_item_call label="Istantanea" name="Take Snapshot"/>
+ <menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
+ <menu label="Profilo del posto" name="Land">
+ <menu_item_call label="Informazioni sui terreni" name="About Land"/>
+ <menu_item_call label="Regione/proprietà immobiliare" name="Region/Estate"/>
+ </menu>
+ <menu_item_call label="Acquista questo terreno" name="Buy Land"/>
<menu_item_call label="Il mio terreno" name="My Land"/>
- <menu label="Mostra" name="Land">
+ <menu label="Mostra" name="LandShow">
+ <menu_item_check label="Comandi del movimento" name="Movement Controls"/>
+ <menu_item_check label="Comandi visualizzazione" name="Camera Controls"/>
<menu_item_check label="Linee di divieto" name="Ban Lines"/>
<menu_item_check label="Marcatori" name="beacons"/>
<menu_item_check label="Linee di confine" name="Property Lines"/>
<menu_item_check label="Proprietari di terreno" name="Land Owners"/>
+ <menu_item_check label="Coordinate" name="Coordinates"/>
+ <menu_item_check label="Proprietà del lotto" name="Parcel Properties"/>
</menu>
- <menu label="Punti di riferimento" name="Landmarks">
- <menu_item_call label="Crea punto di riferimento qui" name="Create Landmark Here"/>
- <menu_item_call label="Imposta come Casa mia" name="Set Home to Here"/>
- </menu>
- <menu_item_call label="Home" name="Teleport Home"/>
- <menu_item_check label="Mini mappa" name="Mini-Map"/>
- <menu_item_check label="Mappa del mondo" name="World Map"/>
- <menu_item_call label="Istantanea" name="Take Snapshot"/>
+ <menu_item_call label="Teleport a Casa" name="Teleport Home"/>
+ <menu_item_call label="Imposta come Casa mia" name="Set Home to Here"/>
<menu label="Sole" name="Environment Settings">
<menu_item_call label="Alba" name="Sunrise"/>
<menu_item_call label="Mezzogiorno" name="Noon"/>
<menu_item_call label="Tramonto" name="Sunset"/>
<menu_item_call label="Mezzanotte" name="Midnight"/>
- <menu_item_call label="Usa l&apos;ora della proprietà" name="Revert to Region Default"/>
+ <menu_item_call label="Orario della proprietà" name="Revert to Region Default"/>
<menu_item_call label="Editor dell&apos;ambiente" name="Environment Editor"/>
</menu>
</menu>
@@ -78,10 +79,12 @@
</menu>
<menu_item_call label="Collegamento" name="Link"/>
<menu_item_call label="Scollega" name="Unlink"/>
+ <menu_item_check label="Modifica le parti collegate" name="Edit Linked Parts"/>
<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
<menu label="Oggetto" name="Object">
- <menu_item_call label="Acquista" name="Menu Object Take"/>
+ <menu_item_call label="Acquista" name="Menu Object Buy"/>
+ <menu_item_call label="Prendi" name="Menu Object Take"/>
<menu_item_call label="Prendi copia" name="Take Copy"/>
<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
@@ -94,25 +97,18 @@
<menu_item_call label="Imposta script come non in esecuzione" name="Set Scripts to Not Running"/>
</menu>
<menu label="Opzioni" name="Options">
- <menu_item_check label="Modifica le parti collegate" name="Edit Linked Parts"/>
<menu_item_call label="Definisci diritti di caricamento predefiniti" name="perm prefs"/>
<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
- <menu label="Selezione" name="Selection">
- <menu_item_check label="Seleziona solo i miei oggetti" name="Select Only My Objects"/>
- <menu_item_check label="Seleziona solo gli oggetti spostabili" name="Select Only Movable Objects"/>
- <menu_item_check label="Seleziona cerchiando" name="Select By Surrounding"/>
- </menu>
- <menu label="Mostra" name="Show">
- <menu_item_check label="Seleziona mostra nascosti" name="Show Hidden Selection"/>
- <menu_item_check label="Seleziona mostra il raggio luminoso per la selezione" name="Show Light Radius for Selection"/>
- <menu_item_check label="Mostra il raggio indicatore" name="Show Selection Beam"/>
- </menu>
- <menu label="Griglia" name="Grid">
- <menu_item_check label="Posiziona nella griglia" name="Snap to Grid"/>
- <menu_item_call label="Posiziona coordinate XY dell&apos;oggetto sulla griglia" name="Snap Object XY to Grid"/>
- <menu_item_call label="Usa la selezione per la griglia" name="Use Selection for Grid"/>
- <menu_item_call label="Opzioni della griglia" name="Grid Options"/>
- </menu>
+ <menu_item_check label="Seleziona solo i miei oggetti" name="Select Only My Objects"/>
+ <menu_item_check label="Seleziona solo gli oggetti spostabili" name="Select Only Movable Objects"/>
+ <menu_item_check label="Seleziona circostante" name="Select By Surrounding"/>
+ <menu_item_check label="Seleziona mostra nascosti" name="Show Hidden Selection"/>
+ <menu_item_check label="Seleziona mostra il raggio luminoso per la selezione" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Mostra il raggio indicatore" name="Show Selection Beam"/>
+ <menu_item_check label="Posiziona nella griglia" name="Snap to Grid"/>
+ <menu_item_call label="Posiziona coordinate XY dell&apos;oggetto sulla griglia" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Usa la selezione per la griglia" name="Use Selection for Grid"/>
+ <menu_item_call label="Opzioni della griglia" name="Grid Options"/>
</menu>
<menu label="Seleziona parti collegate" name="Select Linked Parts">
<menu_item_call label="Seleziona parte successiva" name="Select Next Part"/>
@@ -127,10 +123,10 @@
<menu_item_call label="Segnala bug" name="Report Bug"/>
</menu>
<menu label="Avanzate" name="Advanced">
- <menu_item_check label="Imposta ncome assente dopo 30 minuti" name="Go Away/AFK When Idle"/>
<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
<menu_item_call label="Ridisegna le texture" name="Rebake Texture"/>
<menu_item_call label="Imposta dimensioni dell&apos;interfaccia sui valori predefiniti" name="Set UI Size to Default"/>
+ <menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
<menu_item_check label="Limita distanza di selezione" name="Limit Select Distance"/>
<menu_item_check label="Disabilita vincoli fotocamera" name="Disable Camera Distance"/>
<menu_item_check label="Foto ad alta risoluzione" name="HighResSnapshot"/>
@@ -177,8 +173,8 @@
<menu_item_check label="Esegui thread multipli" name="Run Multiple Threads"/>
<menu_item_call label="Pulisci cache di gruppo" name="ClearGroupCache"/>
<menu_item_check label="Fluidità mouse" name="Mouse Smoothing"/>
- <menu_item_check label="Mostra IM nella Chat nei dintorni" name="IMInChat"/>
<menu label="Scorciatoie" name="Shortcuts">
+ <menu_item_call label="Immagine ([COST]L$)..." name="Upload Image"/>
<menu_item_check label="Cerca" name="Search"/>
<menu_item_call label="Rilascia tasti" name="Release Keys"/>
<menu_item_call label="Imposta dimensioni dell&apos;interfaccia sui valori predefiniti" name="Set UI Size to Default"/>
@@ -218,6 +214,7 @@
<menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/>
<menu_item_check label="Fotocamera" name="Camera"/>
<menu_item_check label="Vento" name="Wind"/>
+ <menu_item_check label="Badge" name="Badge"/>
</menu>
<menu label="Mostra informazioni" name="Display Info">
<menu_item_check label="Mostra orario" name="Show Time"/>
diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml
index 518a2ddb67..3d363d9c75 100644
--- a/indra/newview/skins/default/xui/it/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_classified_info.xml
@@ -15,20 +15,20 @@
<panel.string name="auto_renew_off">
Disattivato
</panel.string>
- <text name="title" value="Info sugli Annunci"/>
+ <text name="title" value="Informazioni inserzione"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <text_editor name="classified_name" value="[nome]"/>
+ <text_editor name="classified_name" value="[name]"/>
<text name="classified_location_label" value="Luogo:"/>
- <text_editor name="classified_location" value="[caricando...]"/>
+ <text_editor name="classified_location" value="[loading...]"/>
<text name="content_type_label" value="Tipo di contenuto:"/>
- <text_editor name="content_type" value="[tipo di contenuto]"/>
+ <text_editor name="content_type" value="[content type]"/>
<text name="category_label" value="Categoria:"/>
- <text_editor name="category" value="[categoria]"/>
+ <text_editor name="category" value="[category]"/>
<text name="creation_date_label" value="Data di creazione:"/>
<text_editor name="creation_date" tool_tip="Data di creazione" value="[date]"/>
<text name="price_for_listing_label" value="Prezzo per inserzione:"/>
- <text_editor name="price_for_listing" tool_tip="Prezzo di listino." value="[price]"/>
+ <text_editor name="price_for_listing" tool_tip="Prezzo per inserzione:" value="[price]"/>
<layout_stack name="descr_stack">
<layout_panel name="clickthrough_layout_panel">
<text name="click_through_label" value="Clic:"/>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
index 144acd4938..bbe8ebbc32 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifica gli Annunci" name="panel_edit_classified">
+<panel label="Modifica inserzione" name="panel_edit_classified">
<panel.string name="location_notice">
- (sarà aggiornato dopo il salvataggio)
+ (si aggiornerà dopo il salvataggio)
</panel.string>
<string name="publish_label">
Pubblica
@@ -10,7 +10,7 @@
Salva
</string>
<text name="title">
- Modifica gli Annunci
+ Modifica inserzione
</text>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
@@ -27,9 +27,9 @@
Luogo:
</text>
<text name="classified_location">
- caricando...
+ caricamento...
</text>
- <button label="Imposta sul luogo attuale" name="set_to_curr_location_btn"/>
+ <button label="Imposta come luogo attuale" name="set_to_curr_location_btn"/>
<text name="category_label" value="Categoria:"/>
<text name="content_type_label" value="Tipo di contenuto:"/>
<icons_combo_box label="Contenuto generale" name="content_type">
@@ -37,12 +37,12 @@
<icons_combo_box.item label="Contenuto generale" name="pg_ci" value="Generale"/>
</icons_combo_box>
<text name="price_for_listing_label" value="Prezzo per inserzione:"/>
- <spinner label="L$" name="price_for_listing" tool_tip="Fissare il Prezzo." value="50"/>
- <check_box label="Auto-rinnovo settimanale" name="auto_renew"/>
+ <spinner label="L$" name="price_for_listing" tool_tip="Prezzo per inserzione:" value="50"/>
+ <check_box label="Rinnovo automatico ogni settimana" name="auto_renew"/>
</panel>
</scroll_container>
<panel label="bottom_panel" name="bottom_panel">
<button label="[LABEL]" name="save_changes_btn"/>
- <button label="Cancella" name="cancel_btn"/>
+ <button label="Annulla" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
index 137a5cabeb..534ff457ff 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
@@ -7,6 +7,6 @@
<accordion_tab name="hair_color_tab" title="Colore"/>
<accordion_tab name="hair_style_tab" title="Stile"/>
<accordion_tab name="hair_eyebrows_tab" title="Sopracciglia"/>
- <accordion_tab name="hair_facial_tab" title="Facciale"/>
+ <accordion_tab name="hair_facial_tab" title="Del viso"/>
</accordion>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
index 92ec6f9450..3ecf4bcaf2 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Modifica del profilo" name="edit_profile_panel">
+<panel label="Modifica profilo" name="edit_profile_panel">
<string name="CaptionTextAcctInfo">
[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
</string>
<string name="RegisterDateFormat">
- [REG_DATE] ([ETA&apos;])
+ [REG_DATE] ([AGE])
</string>
<string name="AcctTypeResident" value="Residente"/>
<string name="AcctTypeTrial" value="Prova"/>
@@ -26,26 +26,26 @@
<icon label="" name="2nd_life_edit_icon" tool_tip="Clicca per selezionare un&apos;immagine"/>
</panel>
<panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Mondo Reale:"/>
+ <text name="real_world_photo_title_text" value="Mondo reale:"/>
</panel>
<icon label="" name="real_world_edit_icon" tool_tip="Clicca per selezionare un&apos;immagine"/>
<text name="title_homepage_text">
- Homepage:
+ Home page:
</text>
<check_box label="Mostrami nei risultati della ricerca" name="show_in_search_checkbox"/>
- <text name="title_acc_status_text" value="Mio Account:"/>
- <text_editor name="acc_status_text" value="Residente. No payment info on file."/>
- <text name="my_account_link" value="[[URL] Vai al mio pannello personale]"/>
- <text name="title_partner_text" value="Mio Partner:"/>
+ <text name="title_acc_status_text" value="Il mio account:"/>
+ <text_editor name="acc_status_text" value="Residente. Nessuna informazione di pagamento disponibile."/>
+ <text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
+ <text name="title_partner_text" value="Il mio partner:"/>
<panel name="partner_data_panel">
<name_box initial_value="(recupero)" name="partner_text"/>
</panel>
- <text name="partner_edit_link" value="[[URL] Modifica]"/>
+ <text name="partner_edit_link" value="[[URL] Edit]"/>
</panel>
</panel>
</scroll_container>
<panel name="profile_me_buttons_panel">
- <button label="Salva le modifiche" name="save_btn"/>
- <button label="Cancella" name="cancel_btn"/>
+ <button label="Salva modifiche" name="save_btn"/>
+ <button label="Annulla" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
index f22b393ecd..cc0676b43c 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
@@ -5,8 +5,8 @@
Sesso:
</text>
<radio_group name="sex_radio">
- <radio_item label="Femminile" name="radio"/>
- <radio_item label="Maschile" name="radio2"/>
+ <radio_item label="Femmina" name="radio"/>
+ <radio_item label="Maschio" name="radio2"/>
</radio_group>
</panel>
<accordion name="wearable_accordion">
@@ -17,7 +17,7 @@
<accordion_tab name="shape_nose_tab" title="Naso"/>
<accordion_tab name="shape_mouth_tab" title="Bocca"/>
<accordion_tab name="shape_chin_tab" title="Mento"/>
- <accordion_tab name="shape_torso_tab" title="Busto"/>
+ <accordion_tab name="shape_torso_tab" title="Torace"/>
<accordion_tab name="shape_legs_tab" title="Gambe"/>
</accordion>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml
index ca88723b02..91a41353a5 100644
--- a/indra/newview/skins/default/xui/it/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notify.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="instant_message" name="panel_group_notify">
<panel label="header" name="header">
- <text name="title" value="Nome di chi spedisce / Nome del Gruppo"/>
+ <text name="title" value="Nome del mittente / Nome del gruppo"/>
</panel>
- <text name="attachment" value="Attachment"/>
+ <text name="attachment" value="Allegato"/>
<button label="OK" name="btn_ok"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
index 78b189656f..ef6f85390a 100644
--- a/indra/newview/skins/default/xui/it/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml
@@ -55,7 +55,7 @@ in questo gruppo. C&apos;è una vasta gamma di abilità.
</tab_container>
<panel name="members_footer">
<text name="static">
- Membri assegnati
+ Ruoli assegnati
</text>
<text name="static2">
Abilità permesse
diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml
index 3e87a9b2c1..74cd9e6fb1 100644
--- a/indra/newview/skins/default/xui/it/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/it/panel_landmarks.xml
@@ -3,12 +3,12 @@
<accordion name="landmarks_accordion">
<accordion_tab name="tab_favorites" title="Barra dei Preferiti"/>
<accordion_tab name="tab_landmarks" title="I miei punti di riferimento"/>
- <accordion_tab name="tab_inventory" title="Mio Inventario"/>
+ <accordion_tab name="tab_inventory" title="Il mio inventario"/>
<accordion_tab name="tab_library" title="Libreria"/>
</accordion>
<panel name="bottom_panel">
<button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
- <button name="add_btn" tool_tip="Aggiungi nuovo landmark"/>
- <dnd_button name="trash_btn" tool_tip="Rimuovi landmark selezionato"/>
+ <button name="add_btn" tool_tip="Aggiungi un nuovo punto di riferimento"/>
+ <dnd_button name="trash_btn" tool_tip="Rimuovi il punto di riferimento selezionato"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index eeed465080..bbf93ceb87 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -13,7 +13,7 @@
</text>
<line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
<line_editor label="Cognome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
- <check_box label="Ricorda" name="remember_check"/>
+ <check_box label="Ricorda password" name="remember_check"/>
<text name="start_location_text">
Inizia da:
</text>
diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
index 2f0d40bb49..8e72167759 100644
--- a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="navigation_bar">
<panel name="navigation_panel">
- <pull_button name="back_btn" tool_tip="Ritorna al luogo precedente"/>
- <pull_button name="forward_btn" tool_tip="Vai ad un luogo"/>
- <button name="home_btn" tool_tip="Teleport a casa mia"/>
- <location_input label="Luogo" name="location_combo"/>
+ <pull_button name="back_btn" tool_tip="Torna al luogo precedente"/>
+ <pull_button name="forward_btn" tool_tip="Procedi un luogo in avanti"/>
+ <button name="home_btn" tool_tip="Teleport a casa"/>
+ <location_input label="Posizione" name="location_combo"/>
<search_combo_box label="Cerca" name="search_combo_box" tool_tip="Cerca">
<combo_editor label="Cerca [SECOND_LIFE]" name="search_combo_editor"/>
</search_combo_box>
@@ -13,6 +13,6 @@
<label name="favorites_bar_label" tool_tip="Trascina qui i punti di riferimento per un accesso rapido ai tuoi posti preferiti in Second Life.">
Barra dei Preferiti
</label>
- <chevron_button name="&gt;&gt;" tool_tip="Mostra più dei miei Preferiti"/>
+ <chevron_button name="&gt;&gt;" tool_tip="Mostra altri Preferiti"/>
</favorites_bar>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
index 48fc4302c1..58055d91c7 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Cose" name="Outfits">
- <accordion name="outfits_accordion">
- <accordion_tab name="tab_cof" title="Vestiario attuale"/>
- <accordion_tab name="tab_outfits" title="Il mio vestiario"/>
- </accordion>
+ <tab_container name="appearance_tabs">
+ <inventory_panel label="I MIEI ABITI" name="outfitslist_tab"/>
+ <inventory_panel label="INDOSSA" name="cof_tab"/>
+ </tab_container>
+ <panel name="bottom_panel">
+ <button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
+ <dnd_button name="trash_btn" tool_tip="Rimuovi l&apos;articolo selezionato"/>
+ <button label="Salva vestiario" name="make_outfit_btn" tool_tip="Salva questo aspetto fisico come un vestito"/>
+ <button label="Indossa" name="wear_btn" tool_tip="Indossa il vestiario selezionato"/>
+ <button label="M" name="look_edit_btn"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
index 7cfb29f128..9e1a45b129 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="menu_gear_default">
- <menu_item_call label="Sostituisci il Vestiario attuale" name="wear"/>
- <menu_item_call label="Aggiungi al Vestiario attuale" name="add"/>
- <menu_item_call label="Rimuovi dal Vestiario attuale" name="remove"/>
- <menu_item_call label="Rinomina" name="rename"/>
+ <menu_item_call label="Sostituisci vestiario attuale" name="wear"/>
+ <menu_item_call label="Aggiungi al vestiario attuale" name="add"/>
+ <menu_item_call label="Rimuovi dal vestiario attuale" name="remove"/>
+ <menu_item_call label="Modifica nome" name="rename"/>
<menu_item_call label="Rimuovi link" name="remove_link"/>
<menu_item_call label="Elimina vestito" name="delete"/>
</menu>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index 62d11871a8..acbc2cf326 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -17,7 +17,7 @@
<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
</panel>
</panel>
- <panel label="AMICI" name="friends_panel">
+ <panel label="I MIEI AMICI" name="friends_panel">
<accordion name="friends_accordion">
<accordion_tab name="tab_online" title="Online"/>
<accordion_tab name="tab_all" title="Tutto"/>
@@ -32,7 +32,7 @@
Se stai cercando qualcuno da frequentare, [secondlife:///app/worldmap try the Map].
</text>
</panel>
- <panel label="GRUPPI" name="groups_panel">
+ <panel label="I MIEI GRUPPI" name="groups_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="groups_viewsort_btn" tool_tip="Opzioni"/>
<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
@@ -47,12 +47,13 @@ Se stai cercando qualcuno da frequentare, [secondlife:///app/worldmap try the Ma
</panel>
</tab_container>
<panel name="button_bar">
- <button label="Profilo" name="view_profile_btn" tool_tip="Mostra foto, gruppi, e informazioni di altri residenti"/>
+ <button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
<button label="Condividi" name="share_btn"/>
<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
+ <button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
index b147fe9d3f..bdb852ba62 100644
--- a/indra/newview/skins/default/xui/it/panel_places.xml
+++ b/indra/newview/skins/default/xui/it/panel_places.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Luoghi" name="places panel">
- <string name="landmarks_tab_title" value="MIEI LANDMARKS"/>
- <string name="teleport_history_tab_title" value="TELEPORT PRECEDENTI"/>
+ <string name="landmarks_tab_title" value="I MIEI PUNTI DI RIFERIMENTO"/>
+ <string name="teleport_history_tab_title" value="CRONOLOGIA TELEPORT"/>
<filter_editor label="Filtra i miei luoghi" name="Filter"/>
<panel name="button_panel">
<button label="Teleport" name="teleport_btn" tool_tip="Teleport alla zona selezionata"/>
@@ -9,7 +9,7 @@
<button label="Modifica" name="edit_btn" tool_tip="Modifica le informazioni del punto di riferimento"/>
<button label="▼" name="overflow_btn" tool_tip="Mostra opzioni addizionali"/>
<button label="Salva" name="save_btn"/>
- <button label="Cancella" name="cancel_btn"/>
+ <button label="Annulla" name="cancel_btn"/>
<button label="Chiudi" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 62be52c052..cedf93beed 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Impostazione" name="Input panel">
- <button bottom_delta="-40" label="Altri Dispositivi" name="joystick_setup_button" width="165"/>
+ <button bottom_delta="-40" label="Altri dispositivi" name="joystick_setup_button" width="165"/>
<text name="Mouselook:">
- Mouselook:
+ Soggettiva:
</text>
<text name=" Mouse Sensitivity">
- Sensibilità del Mouse
+ Sensibilità mouse
</text>
<check_box label="Inverti" name="invert_mouse"/>
<text name="Network:">
- Network:
+ Rete:
</text>
<text name="Maximum bandwidth">
- Banda Massima
+ Capacità massima di banda
</text>
<text name="text_box2">
kbps
</text>
- <check_box label="Custom port" name="connection_port_enabled"/>
+ <check_box label="Porta personalizzata" name="connection_port_enabled"/>
<spinner label="Numero porta:" name="connection_port"/>
<text name="cache_size_label_l">
- Cache size
+ Dimensioni cache
</text>
<text name="text_box5">
MB
@@ -28,14 +28,14 @@
<text name="Cache location">
Ubicazione della cache:
</text>
- <button label="Browse" label_selected="Browse" name="set_cache"/>
- <button label="Resetta" label_selected="Reimposta" name="reset_cache"/>
+ <button label="Sfoglia" label_selected="Sfoglia" name="set_cache"/>
+ <button label="Reimposta" label_selected="Reimposta" name="reset_cache"/>
<text name="Web:">
Web:
</text>
<radio_group name="use_external_browser">
- <radio_item label="Usa il mio browser (IE, Firefox, Safari)" name="external" tool_tip="Usa il default system web browser per aiuto, web links, etc. Non raccomandato se utilizzi lo schermo pieno(full screen)." value="1"/>
- <radio_item label="Usa il built-in browser" name="internal" tool_tip="Usa il built-in web browser per aiuto, web links, etc. Questo browser apre come una nuova finestra all&apos;interno [APP_NAME]." value=""/>
+ <radio_item label="Usa il mio browser (IE, Firefox, Safari)" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Sconsigliato durante l&apos;esecuzione a tutto schermo." value="1"/>
+ <radio_item label="Utilizza il browser Web integrato" name="internal" tool_tip="Utilizza il browser Web integrato per l&apos;aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value=""/>
</radio_group>
<check_box initial_value="vero" label="Abilita plugin" name="browser_plugins_enabled"/>
<check_box initial_value="vero" label="Accetta cookie" name="cookies_enabled"/>
@@ -44,6 +44,6 @@
<text name="Proxy location">
Ubicazione proxy:
</text>
- <line_editor name="web_proxy_editor" tool_tip="Nome o indirizzo IP del proxy che vorresti usare"/>
- <spinner label="Port number:" name="web_proxy_port"/>
+ <line_editor name="web_proxy_editor" tool_tip="Il nome o l&apos;indirizzo IP del proxy che preferisci usare"/>
+ <spinner label="Numero porta:" name="web_proxy_port"/>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile.xml b/indra/newview/skins/default/xui/it/panel_profile.xml
index ae9e8c1f75..9927ecbb88 100644
--- a/indra/newview/skins/default/xui/it/panel_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_profile.xml
@@ -12,37 +12,41 @@
</string>
<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=it-IT"/>
<string name="no_partner_text" value="Nessuno"/>
+ <string name="no_group_text" value="Nessuno"/>
<string name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="second_life_image_panel">
- <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="title_rw_descr_text" value="Mondo reale:"/>
- </panel>
- <text name="me_homepage_text">
- Home page:
- </text>
- <text name="title_member_text" value="Iscritto dal:"/>
- <text name="title_acc_status_text" value="Stato account:"/>
- <text name="acc_status_text" value="Residente. Nessuna informazione di pagamento disponibile."/>
- <text name="title_partner_text" value="Partner:"/>
- <text name="title_groups_text" value="Gruppi:"/>
- </panel>
- </scroll_container>
- <panel name="profile_buttons_panel">
- <button label="Aggiungi amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/>
- <button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/>
- <button label="Chiama" name="call" tool_tip="Chiama questo residente"/>
- <button label="Mappa" name="show_on_map_btn" tool_tip="Mostra il residente sulla mappa"/>
- <button label="Teleport" name="teleport" tool_tip="Offri teleport"/>
- <button label="▼" name="overflow_btn" tool_tip="Paga o condividi l&apos;inventario con il residente"/>
- </panel>
- <panel name="profile_me_buttons_panel">
- <button label="Modifica profilo" name="edit_profile_btn"/>
- <button label="Modifica aspetto fisico" name="edit_appearance_btn"/>
- </panel>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <scroll_container name="profile_scroll">
+ <panel name="profile_scroll_panel">
+ <panel name="second_life_image_panel">
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <text name="title_rw_descr_text" value="Mondo reale:"/>
+ </panel>
+ <text name="title_member_text" value="Residente dal:"/>
+ <text name="title_acc_status_text" value="Stato account:"/>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(recupero)" name="partner_text"/>
+ </panel>
+ <text name="title_groups_text" value="Gruppi:"/>
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel name="profile_buttons_panel">
+ <button label="Aggiungi amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/>
+ <button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/>
+ <button label="Chiama" name="call" tool_tip="Chiama questo residente"/>
+ <button label="Mappa" name="show_on_map_btn" tool_tip="Mostra il residente sulla mappa"/>
+ <button label="Teleport" name="teleport" tool_tip="Offri teleport"/>
+ <button label="▼" name="overflow_btn" tool_tip="Paga del denaro o condividi qualcosa dall&apos;inventario con il residente"/>
+ </layout_panel>
+ <layout_panel name="profile_me_buttons_panel">
+ <button label="Modifica profilo" name="edit_profile_btn" tool_tip="Modifica le tue informazioni personali"/>
+ <button label="Modifica aspetto fisico" name="edit_appearance_btn" tool_tip="Crea/modifica il tuo aspetto: parti del corpo, abiti ecc."/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
index f7aeef60b9..0d3117ca7a 100644
--- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
@@ -31,7 +31,7 @@
della proprietà.
</text>
<text bottom_delta="-36" name="covenant_instructions">
- Trascina e inserisci un biglietto per cambiare il Regolamento di questa proprietà immobiliare.
+ Trascina e incolla un biglietto per cambiare il Regolamento di questa proprietà.
</text>
<text name="region_section_lbl">
Regione
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
index 9e81d42410..45b3a016f4 100644
--- a/indra/newview/skins/default/xui/it/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml
@@ -26,9 +26,9 @@
<text name="options_text_lbl">
Opzioni:
</text>
- <check_box label="Con scripts" name="return_scripts" tool_tip="Ritorna solo gli oggetti che hanno scripts"/>
- <check_box label="Sulla terra di qualcun&apos;altro" name="return_other_land" tool_tip="Restituisci solo gli oggetti che sono in terreni appartenenti a qualcun altro"/>
- <check_box label="In ogni regione di questa proprietà" name="return_estate_wide" tool_tip="Restituisci tutti gli oggetti nelle varie regioni che costituiscono l&apos;insieme dei possedimenti terrieri"/>
+ <check_box label="Con script" name="return_scripts" tool_tip="Restituisci solo oggetti che hanno script"/>
+ <check_box label="Sul terreno di un altro residente" name="return_other_land" tool_tip="Restituisci solo gli oggetti che sono in terreni appartenenti a qualcun altro"/>
+ <check_box label="In tutte le regioni di questa proprietà" name="return_estate_wide" tool_tip="Restituisci tutti gli oggetti nelle varie regioni che costituiscono l&apos;insieme dei possedimenti terrieri"/>
<button label="Restituisci" name="return_btn"/>
<button label="Visualizza l&apos;elenco dei maggiori collidenti..." name="top_colliders_btn" tool_tip="Elenco degli oggetti che stanno potenzialmente subendo le maggiori collisioni" width="280"/>
<button label="?" left="297" name="top_colliders_help"/>
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray.xml b/indra/newview/skins/default/xui/it/panel_side_tray.xml
index 281c3fbe24..846dcb69f0 100644
--- a/indra/newview/skins/default/xui/it/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/it/panel_side_tray.xml
@@ -2,25 +2,28 @@
<!-- Side tray cannot show background because it is always
partially on screen to hold tab buttons. -->
<side_tray name="sidebar">
+ <sidetray_tab description="Apri/chiudi la barra laterale." name="sidebar_openclose" tab_title="Apri/chiudi la barra laterale"/>
<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
<panel label="casa" name="panel_home"/>
</sidetray_tab>
+ <sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="My Profile">
+ <panel_container name="panel_container">
+ <panel label="Io" name="panel_me"/>
+ </panel_container>
+ </sidetray_tab>
<sidetray_tab description="Trova amici, contatti e persone nelle vicinanze." name="sidebar_people" tab_title="People">
<panel_container name="panel_container">
- <panel label="Informazioni sul gruppo" name="panel_group_info_sidetray"/>
+ <panel label="Profilo del gruppo" name="panel_group_info_sidetray"/>
<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
</panel_container>
</sidetray_tab>
<sidetray_tab description="Trova luoghi dove andare e luoghi già visitati." label="Luoghi" name="sidebar_places" tab_title="Places">
<panel label="Luoghi" name="panel_places"/>
</sidetray_tab>
- <sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="My Profile">
- <panel label="Io" name="panel_me"/>
+ <sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="My Inventory">
+ <panel label="Modifica inventario" name="sidepanel_inventory"/>
</sidetray_tab>
<sidetray_tab description="Cambia il tuo aspetto ed il tuo look attuale." name="sidebar_appearance" tab_title="My Appearance">
<panel label="Modifica aspetto fisico" name="sidepanel_appearance"/>
</sidetray_tab>
- <sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="My Inventory">
- <panel label="Modifica inventario" name="sidepanel_inventory"/>
- </sidetray_tab>
</side_tray>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
index e4f97eacc6..e1ad1452ff 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Caratteristiche dell&apos;articolo in inventario">
+<panel name="item properties" title="Profilo dell&apos;oggetto">
<panel.string name="unknown">
(sconosciuto)
</panel.string>
@@ -15,7 +15,8 @@
<panel.string name="acquiredDate">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</panel.string>
- <text name="title" value="Caratteristiche dell&apos;articolo"/>
+ <text name="title" value="Profilo dell&apos;oggetto"/>
+ <text name="where" value="(Inventario)"/>
<panel label="">
<text name="LabelItemNameTitle">
Nome:
@@ -37,34 +38,36 @@
<text name="LabelAcquiredDate">
mer 24 maggio 12:50:46 2006
</text>
- <text name="OwnerLabel">
- Tu:
- </text>
- <check_box label="Modifica" name="CheckOwnerModify"/>
- <check_box label="Copia" name="CheckOwnerCopy"/>
- <check_box label="Rivendi" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Chiunque:
- </text>
- <check_box label="Copia" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Gruppo:
- </text>
- <check_box label="Condividi" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Proprietario successivo:
- </text>
- <check_box label="Modifica" name="CheckNextOwnerModify"/>
- <check_box label="Copia" name="CheckNextOwnerCopy"/>
- <check_box label="Rivendi" name="CheckNextOwnerTransfer"/>
+ <panel name="perms_inv">
+ <text name="perm_modify">
+ Tu puoi:
+ </text>
+ <check_box label="Modifica" name="CheckOwnerModify"/>
+ <check_box label="Copia" name="CheckOwnerCopy"/>
+ <check_box label="Trasferisci" name="CheckOwnerTransfer"/>
+ <text name="AnyoneLabel">
+ Chiunque:
+ </text>
+ <check_box label="Copia" name="CheckEveryoneCopy"/>
+ <text name="GroupLabel">
+ Gruppo:
+ </text>
+ <check_box label="Condividi" name="CheckShareWithGroup" tool_tip="Consenti a tutti i membri del gruppo selezionato di condividere i tuoi diritti di modifica di questo oggetto. Per attivare le restrizioni per ruolo devi prima effettuare la cessione."/>
+ <text name="NextOwnerLabel">
+ Proprietario successivo:
+ </text>
+ <check_box label="Modifica" name="CheckNextOwnerModify"/>
+ <check_box label="Copia" name="CheckNextOwnerCopy"/>
+ <check_box label="Trasferisci" name="CheckNextOwnerTransfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
+ </panel>
<check_box label="In vendita" name="CheckPurchase"/>
<combo_box name="combobox sale copy">
<combo_box.item label="Copia" name="Copy"/>
<combo_box.item label="Originale" name="Original"/>
</combo_box>
- <spinner label="Prezzo:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <spinner label="Prezzo: L$" name="Edit Cost"/>
+ </panel>
+ <panel name="button_panel">
+ <button label="Annulla" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 383d576fe5..67870d9b76 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="object properties" title="Profilo dell&apos;oggetto">
<panel.string name="text deed continued">
- Intesta
+ Cessione
</panel.string>
<panel.string name="text deed">
- Intesta
+ Cessione
</panel.string>
<panel.string name="text modify info 1">
- Puoi modificare questo oggetto
+ Tu puoi modificare questo oggetto
</panel.string>
<panel.string name="text modify info 2">
- Puoi modificare questi oggetti
+ Tu puoi modificare questi oggetti
</panel.string>
<panel.string name="text modify info 3">
Non puoi modificare questo oggetto
@@ -19,22 +19,22 @@
Non puoi modificare questi oggetti
</panel.string>
<panel.string name="text modify warning">
- Questo oggetto ha parti unite
+ Questo oggetto ha parti collegate
</panel.string>
<panel.string name="Cost Default">
Prezzo: L$
</panel.string>
<panel.string name="Cost Total">
- Prezzo Totale: L$
+ Prezzo totale: L$
</panel.string>
<panel.string name="Cost Per Unit">
- Prezzo Per: L$
+ Prezzo per: L$
</panel.string>
<panel.string name="Cost Mixed">
- Prezzo assortito
+ Prezzo misto
</panel.string>
<panel.string name="Sale Mixed">
- Vendita assortita
+ Vendita mista
</panel.string>
<text name="title" value="Profilo dell&apos;oggetto"/>
<text name="where" value="(in Second Life)"/>
@@ -123,7 +123,7 @@
<panel name="button_panel">
<button label="Apri" name="open_btn"/>
<button label="Paga" name="pay_btn"/>
- <button label="Compra" name="buy_btn"/>
+ <button label="Acquista" name="buy_btn"/>
<button label="Dettagli" name="details_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index e59397ee0c..c9c01bc2a4 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -395,7 +395,7 @@
<text name="at URL:">
ホームページ:
</text>
- <button label="設定" label_selected="設定..." name="set_media_url"/>
+ <button label="設定" name="set_media_url"/>
<check_box label="URL を非表示" name="hide_media_url" tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーにはメディア URL が表示されません。 これは HTML タイプには使用できませんのでご注意ください。"/>
<text name="Description:">
説明:
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index a79854bcef..1ed5ad31db 100644
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
@@ -9,7 +9,7 @@
<floater.string name="copy_name">
[COPY_NAME] のコピー
</floater.string>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
+ <scroll_list name="gesture_list">
<scroll_list.columns label="名前" name="name"/>
<scroll_list.columns label="チャット" name="trigger"/>
<scroll_list.columns label="" name="key"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 36cf993ef7..5b2ef36045 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -19,7 +19,7 @@
次のアカウントのみアクセスを許可:
</text>
<check_box label="支払情報登録済" name="limit_payment" tool_tip="未確認の住人の立入を禁止します"/>
- <check_box label="年齢確認" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人の立入を禁止します。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
+ <check_box label="年齢確認済" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人の立入を禁止します。 詳しい情報は [SUPPORT_SITE] をご覧下さい。"/>
<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
<button label="?" name="voice_chat_help"/>
<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index 8f27e08f66..7b8f1b42ab 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -407,7 +407,7 @@ of opgedeeld.
<text name="at URL:">
Media URL:
</text>
- <button label="Instellen..." label_selected="Instellen..." name="set_media_url" width="66"/>
+ <button label="Instellen" name="set_media_url"/>
<text name="Description:">
Omschrijving:
</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index 77b57391e5..6f5cc18104 100644
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -395,7 +395,7 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki.
<text name="at URL:">
URL Mediów:
</text>
- <button label="Ustaw..." label_selected="Ustaw..." name="set_media_url"/>
+ <button label="Ustaw" name="set_media_url"/>
<check_box label="Ukryj URL Mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym użytkownikom. Nie dotyczy to jednak typów HTML."/>
<text name="Description:">
Opis:
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 15be468cbc..885221997a 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -396,7 +396,7 @@ Apenas lotes maiores podem ser listados na busca.
Página web:
</text>
<line_editor left="97" name="media_url"/>
- <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+ <button label="Definir" name="set_media_url"/>
<check_box label="Esconder a URL da Mídia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponível para tipos HTML."/>
<text name="Description:">
Descrição: