diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 10:51:49 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 10:51:49 +0000 |
commit | 87c986dc5809b71a7ee76438111a37838063cb18 (patch) | |
tree | 80771ab88e80db0d6b61485427fb7bcbf021d7b6 /indra/newview/skins/default/xui/de | |
parent | 3614dc007328111462297e9244f370fb5f4a0910 (diff) | |
parent | 6d5442fbbd3adc9a708b894d402c9719f2dfa324 (diff) |
PE merge.
Diffstat (limited to 'indra/newview/skins/default/xui/de')
6 files changed, 23 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml index 7d8a634452..5258364656 100644 --- a/indra/newview/skins/default/xui/de/floater_world_map.xml +++ b/indra/newview/skins/default/xui/de/floater_world_map.xml @@ -5,7 +5,8 @@ Legende </text> </panel> - <panel> + <panel + name="layout_panel_2"> <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position meines Avatars zentrieren"/> <text name="me_label"> Ich @@ -48,12 +49,14 @@ Adult </text> </panel> - <panel> + <panel + name="layout_panel_3"> <text name="find_on_map_label"> Auf Karte anzeigen </text> </panel> - <panel> + <panel + name="layout_panel_4"> <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freunde auf Karte anzeigen"> <combo_box.item label="Meine Freunde: Online" name="item1"/> </combo_box> @@ -71,12 +74,14 @@ <button font="SansSerifSmall" label="SLurl kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLurl zur Verwendung im Web."/> <button label="Auswahl anzeigen" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/> </panel> - <panel> + <panel + name="layout_panel_5"> <text name="zoom_label"> Zoom </text> </panel> - <panel> + <panel + name="layout_panel_6"> <slider label="Zoom" name="zoom slider"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml index 0dca272633..abf8011d9d 100644 --- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml @@ -14,7 +14,7 @@ <layout_panel name="share_btn_panel"> <button label="Teilen" name="share_btn"/> </layout_panel> - <layout_panel name="share_btn_panel"> + <layout_panel name="pay_btn_panel"> <button label="Bezahlen" name="pay_btn"/> </layout_panel> <layout_panel name="call_btn_panel"> 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 fd4da94edc..3af4ee5a1e 100644 --- a/indra/newview/skins/default/xui/de/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml @@ -68,7 +68,7 @@ <text name="maturity_value" value="unbekannt"/> <accordion name="advanced_info_accordion"> <accordion_tab name="parcel_characteristics_tab" title="Parzelle"> - <panel> + <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Einstufung:"/> <text name="rating_value" value="unbekannt"/> <text name="voice_label" value="Voice:"/> @@ -87,7 +87,7 @@ </panel> </accordion_tab> <accordion_tab name="region_information_tab" title="Region"> - <panel> + <panel name="region_information_panel"> <text name="region_name_label" value="Region:"/> <text name="region_name" value="Mooseland"/> <text name="region_type_label" value="Typ:"/> @@ -104,7 +104,7 @@ </panel> </accordion_tab> <accordion_tab name="estate_information_tab" title="Grundstück"> - <panel> + <panel name="estate_information_panel"> <text name="estate_name_label" value="Grundstück:"/> <text name="estate_rating_label" value="Einstufung:"/> <text name="estate_owner_label" value="Eigentümer:"/> @@ -112,7 +112,7 @@ </panel> </accordion_tab> <accordion_tab name="sales_tab" title="Zum Verkauf"> - <panel> + <panel name="sales_panel"> <text name="sales_price_label" value="Preis:"/> <text name="area_label" value="Gebiet:"/> <text name="traffic_label" value="Traffic:"/> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index f580691c0d..626e35dd0b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Text-Chat" name="chat"> + <text name="font_size"> + Schriftgröße: + </text> <radio_group name="chat_font_size"> <radio_item label="Klein" name="radio" value="0"/> <radio_item label="Mittel" name="radio2" value="1"/> <radio_item label="Groß" name="radio3" value="2"/> </radio_group> + <text name="font_colors"> + Schriftfarbe: + </text> <color_swatch label="Sie" name="user"/> <text name="text_box1"> Ich diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml index 825acac79d..81f1ebdf91 100644 --- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml @@ -38,7 +38,7 @@ </panel.string> <text name="title" value="Objektprofil"/> <text name="where" value="(inworld)"/> - <panel label=""> + <panel name="properties_panel" label=""> <text name="Name:"> Name: </text> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index d377d0a00e..4d6599be12 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -753,7 +753,7 @@ Alpha </string> <string name="tattoo"> - Tätowierung + Taetowierung </string> <string name="invalid"> ungültig |