diff options
author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
---|---|---|
committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
commit | 7c3a81f577307143a6d4bb5cef1606db82397cdd (patch) | |
tree | 26c531402dbc8f1224185e7461f3b7584b558614 /indra/newview/skins | |
parent | 0974f18da5f3b1e69191be19153925930efd6a9d (diff) | |
parent | 27bbf79c89fb8c737b88d769b2056304aef69dc3 (diff) |
Merge in lenny work
Diffstat (limited to 'indra/newview/skins')
15 files changed, 207 insertions, 258 deletions
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 5f00fc4f77..f9169ed748 100644 --- a/indra/newview/skins/default/xui/de/floater_about_land.xml +++ b/indra/newview/skins/default/xui/de/floater_about_land.xml @@ -259,18 +259,18 @@ werden. <text left="204" name="other_objects_text" width="48"> [COUNT] </text> - <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/> - <button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben." width="119"/> - <text left="14" name="Selected / sat upon:" width="140"> + <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther"/> + <button label="Zurückgeben" label_selected="Zurückgeben..." name="ReturnOther..." tool_tip="Objekte an ihre Eigentümer zurückgeben."/> + <text name="Selected / sat upon:"> Ausgewählt/gesessen auf: </text> - <text left="204" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus): </text> - <line_editor name="clean other time" right="-10" width="56"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Objekteigentümer: </text> @@ -279,7 +279,7 @@ werden. <name_list name="owner list"> <name_list.columns label="Typ" name="type"/> <name_list.columns label="Name" name="name"/> - <name_list.columns label="Anzahl" name="count" width="80"/> + <name_list.columns label="Anzahl" name="count"/> <name_list.columns label="Aktuellstes" name="mostrecent"/> </name_list> </panel> 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 99bf3e6bc1..e6f11cac60 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1044,7 +1044,7 @@ Leyla Linden </text> left="28" name="Selected / sat upon:" top_pad="5" - width="176"> + width="230"> Selected / sat upon: </text> <text @@ -1053,7 +1053,7 @@ Leyla Linden </text> follows="left|top" height="23" layout="topleft" - left_delta="172" + left_delta="220" name="selected_objects_text" top_delta="0" width="48"> @@ -1143,11 +1143,11 @@ Leyla Linden </text> <name_list.columns label="Count" name="count" - width="60" /> + width="67" /> <name_list.columns label="Most Recent" name="mostrecent" - width="170" /> + width="163" /> </name_list> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 42a9ff551e..65e2462ef8 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -359,9 +359,9 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="35" layout="topleft" - left_delta="25" + left_delta="20" max_val="100" name="WLCurKeyHour" top_pad="4" @@ -374,13 +374,13 @@ increment="5" initial_value="0" label="Min" - label_width="20" + label_width="45" layout="topleft" left_pad="5" max_val="55" name="WLCurKeyMin" top_delta="0" - width="60" /> + width="85" /> <text type="string" length="1" @@ -456,9 +456,9 @@ increment="1" initial_value="0" label="Hour" - label_width="30" + label_width="33" layout="topleft" - left_delta="0" + left_delta="-3" max_val="100" name="WLLengthOfDayHour" top_pad="4" @@ -471,13 +471,13 @@ increment="1" initial_value="0" label="Min" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDayMin" top_delta="0" - width="60" /> + width="65" /> <spinner control_name="WLLengthOfDaySec" decimal_digits="0" @@ -486,13 +486,13 @@ increment="1" initial_value="24" label="Sec" - label_width="20" + label_width="25" layout="topleft" - left_pad="5" + left_pad="2" max_val="59" name="WLLengthOfDaySec" top_delta="0" - width="60"/> + width="65"/> <text type="string" halign="right" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 2a3add161a..3ded5c6678 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -177,36 +177,16 @@ background_visible="true" </accordion> </layout_panel> </layout_stack> - - <layout_stack - name="layout" - orientation="horizontal" - follows="bottom|left|right" - left="8" - top_pad="0" - height="30" - width="292" - border_size="0"> - - <layout_panel - height="30" - layout="topleft" - auto_resize="false" - left="0" - top_pad="0" - name="button_row" - follows="bottom|left|right" - width="313"> <layout_stack follows="bottom|left|right" height="25" layout="topleft" name="button_row_ls" - left="2" + left="6" orientation="horizontal" top_pad="5" - width="309"> + width="297"> <layout_panel follows="bottom|left|right" @@ -215,7 +195,7 @@ background_visible="true" left="0" name="btn_refresh_lp" user_resize="false" - auto_resize="true" + auto_resize="false" width="24"> <button follows="bottom|left|right" @@ -236,7 +216,7 @@ background_visible="true" name="btn_chat_lp" user_resize="false" auto_resize="true" - width="83"> + width="91"> <button follows="bottom|left|right" label="Chat" @@ -244,7 +224,7 @@ background_visible="true" left="1" height="23" top="0" - width="82" /> + width="90" /> </layout_panel> <layout_panel @@ -255,7 +235,7 @@ background_visible="true" name="call_btn_lp" user_resize="false" auto_resize="true" - width="113"> + width="91"> <button follows="bottom|left|right" left="1" @@ -265,7 +245,7 @@ background_visible="true" layout="topleft" tool_tip="Call this group" top="0" - width="112" /> + width="90" /> </layout_panel> <layout_panel @@ -276,7 +256,7 @@ background_visible="true" name="btn_apply_lp" user_resize="false" auto_resize="true" - width="83"> + width="91"> <button follows="bottom|left|right" height="23" @@ -285,18 +265,7 @@ background_visible="true" name="btn_apply" left="1" top="0" - width="82" /> - </layout_panel> - - <layout_panel - follows="bottom|left|right" - height="23" - layout="bottomleft" - left_pad="3" - name="btn_create_lp" - user_resize="false" - auto_resize="true" - width="104"> + width="90" /> <button follows="bottom|left|right" height="23" @@ -307,19 +276,8 @@ background_visible="true" name="btn_create" visible="true" tool_tip="Create a new Group" - width="103" /> + width="90" /> </layout_panel> - </layout_stack> - <!--<button - left_pad="3" - height="23" - label="Cancel" - label_selected="Cancel" - name="btn_cancel" - visible="false" - width="65" />--> - </layout_panel> - - </layout_stack> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index e2cd27c419..78b192d4af 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -344,7 +344,7 @@ name="add_friend_btn_lp" user_resize="false" auto_resize="true" - width="118"> + width="121"> <button follows="bottom|left|right" height="23" @@ -355,7 +355,7 @@ name="add_friend" tool_tip="Offer friendship to the Resident" top="0" - width="117" /> + width="120" /> </layout_panel> <layout_panel @@ -430,8 +430,8 @@ left_pad="3" name="overflow_btn_lp" user_resize="false" - auto_resize="true" - width="27"> + auto_resize="false" + width="24"> <button follows="bottom|left|right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 43513e1ab6..4ccd7b3629 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -14,14 +14,6 @@ tab_stop="false" width="1000"> <panel.string - name="StatBarDaysOfWeek"> - Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday - </panel.string> - <panel.string - name="StatBarMonthsOfYear"> - January:February:March:April:May:June:July:August:September:October:November:December - </panel.string> - <panel.string name="packet_loss_tooltip"> Packet Loss </panel.string> 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 c672f68c5c..92831cc21c 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -221,60 +221,60 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s <text name="Simulator primitive usage:"> Uso de primitivas: </text> - <text left="204" name="objects_available" width="250"> + <text name="objects_available"> [COUNT] de un máx. de [MAX] ([AVAILABLE] disponibles) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims que admite la parcela: </text> - <text left="204" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims en la parcela: </text> - <text left="204" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Del propietario de la parcela: </text> - <text left="204" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/> + <button label="Devolver" name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Set to group:"> Del grupo: </text> - <text left="204" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/> + <button label="Devolver" name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Owned by others:"> Propiedad de otros: </text> - <text left="204" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/> + <button label="Devolver" name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios."/> + <text name="Selected / sat upon:"> Seleccionados / con gente sentada: </text> - <text left="204" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Devolución automát. de objetos de otros (en min., 0 la desactiva): </text> - <line_editor name="clean other time" right="-20"/> - <text name="Object Owners:" width="150"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Propietarios de los objetos: </text> - <button label="Actualizar la lista" label_selected="Actualizar la lista" left="158" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Devolver los objetos" left="270" name="Return objects..." width="164"/> + <button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Devolver los objetos" name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nombre" name="name"/> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 971b725d39..a6404bf14c 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -1660,7 +1660,7 @@ Script nuevo </string> <string name="BusyModeResponseDefault"> - El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI. + El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI. </string> <string name="NoOutfits"> Todavía no tienes vestuario. Intenta con [secondlife:///app/search/all/ Buscar] @@ -3802,7 +3802,7 @@ Denuncia de infracción PM </string> <string name="LocalEstimateUSD"> - [AMOUNT] dólares estadounidenses + [AMOUNT] US$ </string> <string name="Membership"> Membresía 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 5263de4532..b0ef1cf8df 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -225,55 +225,55 @@ ou divisé. <text name="Simulator primitive usage:"> Utilisation des primitives : </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] sur [MAX] ([AVAILABLE] disponibles) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims max. sur la parcelle : </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims sur la parcelle : </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Appartenant au propriétaire : </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Afficher" label_selected="Afficher" name="ShowOwner"/> + <button label="Retour" label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Set to group:"> Données au groupe : </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowGroup" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Afficher" label_selected="Afficher" name="ShowGroup" /> + <button label="Retour" label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Owned by others:"> Appartenant à d'autres : </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/> - <button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/> - <text left="14" name="Selected / sat upon:" width="220"> + <button label="Afficher" label_selected="Afficher" name="ShowOther"/> + <button label="Retour" label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."/> + <text name="Selected / sat upon:"> Sélectionnées/où quelqu'un est assis : </text> - <text left_delta="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Renvoi automatique des objets d'autres résidents (minutes, 0 pour désactiver) : </text> - <line_editor name="clean other time" right="-6" width="36"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Propriétaires : </text> @@ -281,10 +281,9 @@ ou divisé. <button label="Renvoi des objets" label_selected="Renvoyer les objets..." name="Return objects..."/> <name_list label="Plus récents" name="owner list"> <name_list.columns label="Type" name="type"/> - <name_list.columns name="online_status"/> - <name_list.columns label="Nom" name="name" width="100"/> - <name_list.columns label="Nombre" name="count" width="100"/> - <name_list.columns label="Plus récents" name="mostrecent" width="120"/> + <name_list.columns label="Nom" name="name"/> + <name_list.columns label="Nombre" name="count"/> + <name_list.columns label="Plus récents" name="mostrecent"/> </name_list> </panel> <panel label="OPTIONS" name="land_options_panel"> @@ -343,9 +342,9 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. Options du terrain : </text> <check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/> - <check_box bottom="-140" label="Pas de bousculades" left="14" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/> - <check_box bottom="-160" label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/> - <combo_box bottom="-160" left="286" name="land category with adult" width="146"> + <check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/> + <check_box label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/> + <combo_box name="land category with adult"> <combo_box.item label="Toutes catégories" name="item0"/> <combo_box.item label="Appartenant aux Lindens" name="item1"/> <combo_box.item label="Adult" name="item2"/> @@ -360,7 +359,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <combo_box.item label="Shopping" name="item11"/> <combo_box.item label="Autre" name="item12"/> </combo_box> - <combo_box bottom="-160" left="286" name="land category" width="146"> + <combo_box name="land category"> <combo_box.item label="Toutes catégories" name="item0"/> <combo_box.item label="Appartenant aux Lindens" name="item1"/> <combo_box.item label="Art et Culture" name="item3"/> @@ -374,20 +373,20 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche. <combo_box.item label="Shopping" name="item11"/> <combo_box.item label="Autre" name="item12"/> </combo_box> - <check_box bottom="-180" label="Contenu Modéré" name="MatureCheck" tool_tip=""/> - <text bottom="-200" name="Snapshot:"> + <check_box label="Contenu Modéré" name="MatureCheck" tool_tip=""/> + <text name="Snapshot:"> Photo : </text> - <texture_picker bottom="-319" label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> + <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/> <text name="landing_point"> Lieu d'arrivée : [LANDING] </text> <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain."/> <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Effacer le lieu d'arrivée"/> - <text bottom="-343" name="Teleport Routing: "> + <text name="Teleport Routing: "> Règles de téléportation : </text> - <combo_box bottom="-343" left="140" name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140"> + <combo_box name="landing type" tool_tip="Règles de téléportation - Choisissez les règles de téléportation sur votre terrain" width="140"> <combo_box.item label="Bloqué" name="Blocked"/> <combo_box.item label="Lieu d'arrivée fixe" name="LandingPoint"/> <combo_box.item label="Lieu d'arrivée libre" name="Anywhere"/> 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 af83a38746..d6834fa70a 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -224,60 +224,60 @@ o suddivisa. <text name="Simulator primitive usage:"> Uso delle primitive: </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] dei [MAX] ([AVAILABLE] dsponibili) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Oggetti che il terreno supporta: </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Oggetti sul terreno: </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Posseduti dal proprietario: </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowOwner" right="-135" width="60"/> - <button label="Restituisci" name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostra" label_selected="Mostra" name="ShowOwner"/> + <button label="Restituisci" name="ReturnOwner..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Set to group:"> Imposta al gruppo: </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowGroup" right="-135" width="60"/> - <button label="Restituisci" name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Owned by others:" width="180"> + <button label="Mostra" label_selected="Mostra" name="ShowGroup"/> + <button label="Restituisci" name="ReturnGroup..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Owned by others:"> Posseduti da altri: </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostra" label_selected="Mostra" name="ShowOther" right="-135" width="60"/> - <button label="Restituisci" name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostra" label_selected="Mostra" name="ShowOther"/> + <button label="Restituisci" name="ReturnOther..." tool_tip="Restituisci gli oggetti ai loro proprietari."/> + <text name="Selected / sat upon:"> Selezionati / sui quali sei sopra: </text> - <text left="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Restituzione automatica degli oggetti di altri residenti (minuti, 0 per disattivarla): </text> - <line_editor name="clean other time" right="-20"/> - <text name="Object Owners:" width="150"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Proprietari degli oggetti: </text> - <button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" left="158" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." left="270" name="Return objects..." width="164"/> + <button label="Aggiorna Elenco" label_selected="Aggiorna Elenco" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Restituisci oggetti..." label_selected="Restituisci oggetti..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nome" name="name"/> 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 2f5065c05f..2de9e781d4 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -109,7 +109,7 @@ <text name="For Sale: Price L$[PRICE]."> 価格: L$ [PRICE] (L$ [PRICE_PER_SQM] / 平方メートル) </text> - <button label="土地を売る" label_selected="土地を販売..." name="Sell Land..." width="100"/> + <button label="土地を売る" label_selected="土地を販売..." name="Sell Land..."/> <text name="For sale to"> 販売先:[BUYER] </text> @@ -119,7 +119,7 @@ <text name="Selling with no objects in parcel."> オブジェクトは販売しない </text> - <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale" width="100"/> + <button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/> <text name="Claimed:"> 取得日時: </text> @@ -210,72 +210,72 @@ </text> </panel> <panel label="オブジェクト" name="land_objects_panel"> - <panel.string left="200" name="objects_available_text"> + <panel.string name="objects_available_text"> [MAX] の内 [COUNT]([AVAILABLE] 利用可能) </panel.string> - <panel.string left="200" name="objects_deleted_text"> + <panel.string name="objects_deleted_text"> [MAX] の内 [COUNT]([DELETED] を削除) </panel.string> <text name="parcel_object_bonus"> オブジェクトボーナス: [BONUS] </text> - <text name="Simulator primitive usage:" width="500"> + <text name="Simulator primitive usage:"> プリム使用状況: </text> - <text left="200" name="objects_available"> + <text name="objects_available"> [MAX] の内 [COUNT] ([AVAILABLE] 利用可能) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> 区画でサポートされるプリム数: </text> - <text left="200" name="object_contrib_text"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> 区画上のプリム数: </text> - <text left="200" name="total_objects_text"> + <text name="total_objects_text"> [COUNT] </text> - <text name="Owned by parcel owner:" width="300"> + <text name="Owned by parcel owner:"> 区画所有者の所有物: </text> - <text left="200" name="owner_objects_text"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowOwner" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowOwner"/> + <button label="返却" label_selected="返却..." name="ReturnOwner..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Set to group:"> グループに設定: </text> - <text left="200" name="group_objects_text"> + <text name="group_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowGroup" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowGroup"/> + <button label="返却" label_selected="返却..." name="ReturnGroup..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Owned by others:"> 他人の所有物: </text> - <text left="200" name="other_objects_text"> + <text name="other_objects_text"> [COUNT] </text> - <button label="表示" label_selected="表示" name="ShowOther" right="-145"/> - <button label="返却" label_selected="返却..." name="ReturnOther..." right="-15" tool_tip="オブジェクトを所有者に返却します"/> + <button label="表示" label_selected="表示" name="ShowOther"/> + <button label="返却" label_selected="返却..." name="ReturnOther..." tool_tip="オブジェクトを所有者に返却します"/> <text name="Selected / sat upon:"> 選択済み・決定済み: </text> - <text left="200" name="selected_objects_text"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> 他人のオブジェクトを自動返却(分単位、0 で自動返却なし): </text> - <line_editor left_delta="5" name="clean other time" right="-80"/> - <text name="Object Owners:" width="150"> + <line_editor left_delta="5" name="clean other time"/> + <text name="Object Owners:"> オブジェクトの所有者: </text> - <button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/> - <button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." left="256" name="Return objects..."/> + <button label="リスト更新" label_selected="リスト更新" name="Refresh List" tool_tip="オブジェクトのリストを更新します"/> + <button label="オブジェクトを返却する" label_selected="オブジェクトの返却..." name="Return objects..."/> <name_list label="カウント" name="owner list"> <name_list.columns label="タイプ" name="type"/> <name_list.columns name="online_status"/> 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 7b8f1b42ab..4271ad5b82 100644 --- a/indra/newview/skins/default/xui/nl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml @@ -147,31 +147,31 @@ <text name="region_name_lbl"> Naam: </text> - <text name="region_name_text" left="114"> + <text name="region_name_text"> leyla </text> <text name="region_landtype_lbl"> Type: </text> - <text name="region_landtype_text" left="114"> + <text name="region_landtype_text"> Mainland / Homestead </text> <text name="region_maturity_lbl"> Inhoudscategorie: </text> - <text name="region_maturity_text" left="114"> + <text name="region_maturity_text"> Adult </text> <text name="resellable_lbl"> Doorverkopen: </text> - <text name="resellable_clause" left="114"> + <text name="resellable_clause"> Land in deze regio mag niet worden doorverkocht. </text> <text name="changeable_lbl"> Opsplitsen: </text> - <text name="changeable_clause" left="114" width="340"> + <text name="changeable_clause"> Land in deze regio mag niet worden samengevoegd/opgesplitst. </text> <panel.string name="can_resell"> @@ -196,7 +196,7 @@ of opgedeeld. <text name="Simulator primitive usage:"> Simulator primitieven gebruik: </text> - <text name="objects_available" left="214" width="230"> + <text name="objects_available"> [COUNT] van [MAX] ([AVAILABLE] beschikbaar) </text> <panel.string name="objects_available_text"> @@ -205,59 +205,59 @@ of opgedeeld. <panel.string name="objects_deleted_text"> [COUNT] van [MAX] ([DELETED] zullen worden verwijderd) </panel.string> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Primitieven ondersteund door perceel: </text> - <text name="object_contrib_text" left="214" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Primitieven op perceel: </text> - <text name="total_objects_text" left="214" width="48"> + <text name="total_objects_text" > [COUNT] </text> - <text name="Owned by parcel owner:" left="14" width="180" > + <text name="Owned by parcel owner:" > Eigendom van perceeleigenaar: </text> - <text name="owner_objects_text" left="214" width="48"> + <text name="owner_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowOwner" right="-135" width="60"/> - <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Set to group:" left="14" width="180"> + <button label="Toon" label_selected="Toon" name="ShowOwner"/> + <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Set to group:" > Groep toewijzen: </text> - <text name="group_objects_text" left="214" width="48"> + <text name="group_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowGroup" right="-135" width="60"/> - <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Owned by others:" left="14" width="128"> + <button label="Toon" label_selected="Toon" name="ShowGroup"/> + <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Owned by others:"> Eigendom van anderen: </text> - <text name="other_objects_text" left="214" width="48"> + <text name="other_objects_text" > [COUNT] </text> - <button label="Toon" label_selected="Toon" name="ShowOther" right="-135" width="60"/> - <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/> - <text name="Selected / sat upon:" left="14" width="193"> + <button label="Toon" label_selected="Toon" name="ShowOther"/> + <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren."/> + <text name="Selected / sat upon:"> Geselecteerd/Er op gezeten </text> - <text name="selected_objects_text" left="214" width="48"> + <text name="selected_objects_text" > [COUNT] </text> - <text name="Autoreturn" left="4" width="412" height="32" bottom="-196"> + <text name="Autoreturn"> Objecten van andere inwoners automatisch retourneren (minuten): (0 om uit te schakelen) </text> - <line_editor name="clean other time" right="-50" bottom="-179"/> - <text name="Object Owners:" bottom="-213"> + <line_editor name="clean other time"/> + <text name="Object Owners:"> Objecteigenaren: </text> - <button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List" bottom="-213"/> - <button label="Retourneer objecten" name="Return objects..." width="164" bottom="-213"/> - <name_list name="owner list" height="104"> + <button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List"/> + <button label="Retourneer objecten" name="Return objects..."/> + <name_list name="owner list"> <column label="Type" name="type"/> <column label="Naam" name="name"/> <column label="Aantal" name="count"/> @@ -271,20 +271,20 @@ of opgedeeld. <check_box label="Terrein bewerken" name="edit land check" tool_tip="Indien aangevinkt, kan iedereen uw terrein bewerken. Het is het beste om dit uit te laten staan, omdat u zelf altijd uw eigen land kunt bewerken."/> <check_box label="Maak landmarkering" name="check landmark"/> <check_box label="Vliegen" name="check fly" tool_tip="Indien aangevinkt, kunnen inwoners op uw land vliegen. Indien niet aangevinkt, kunnen ze alleen het land binnenvliegen of eroverheen vliegen."/> - <text name="allow_label2" left="162"> + <text name="allow_label2"> Maak objecten: </text> - <check_box label="Alle inwoners" name="edit objects check" left="275"/> + <check_box label="Alle inwoners" name="edit objects check"/> <check_box label="Groep" name="edit group objects check"/> - <text name="allow_label3" left="162"> + <text name="allow_label3"> Objecten binnenlaten: </text> - <check_box label="Alle inwoners" name="all object entry check" left="275"/> + <check_box label="Alle inwoners" name="all object entry check"/> <check_box label="Groep" name="group object entry check"/> - <text name="allow_label4" left="162"> + <text name="allow_label4"> Scripts uitvoeren: </text> - <check_box label="Alle inwoners" name="check other scripts" left="275"/> + <check_box label="Alle inwoners" name="check other scripts"/> <check_box label="Groep" name="check group scripts"/> <text name="land_options_label"> Landopties: @@ -379,8 +379,8 @@ of opgedeeld. <panel.string name="landing_point_none"> (none) </panel.string> - <button width="70" label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar's positie binnen dit perceel."/> - <button width="80" left="311" label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/> + <button label="Instellen" label_selected="Instellen" name="Set" tool_tip="Stelt het landingspunt in waar bezoekers arriveren. Wordt ingesteld op uw avatar's positie binnen dit perceel."/> + <button label="Opschonen" label_selected="Opschonen" name="Clear" tool_tip="Landingspunt leegmaken"/> <text name="Teleport Routing: "> Teleport routering: </text> @@ -473,8 +473,8 @@ hebt geklikt.) <combo_box.item name="Group" label="Groep" /> </combo_box> - <spinner label="Prijs in L$:" name="PriceSpin" label_width="168" width="228" /> - <spinner label="Toegangsuren" name="HoursSpin" label_width="168" width="228" /> + <spinner label="Prijs in L$:" name="PriceSpin" label_width="168" /> + <spinner label="Toegangsuren" name="HoursSpin" label_width="168" /> <text label="Altijd toestaan" name="AllowedText"> Toegestane inwoners </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 c68e1c72ce..0974518a1f 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -223,7 +223,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <text name="Simulator primitive usage:"> Ilość używanych primów: </text> - <text name="objects_available" width="230"> + <text name="objects_available"> [COUNT] z [MAX] ([AVAILABLE] jest dostępne) </text> <text name="Primitives parcel supports:"> @@ -271,11 +271,11 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <text name="Autoreturn"> Zwracaj obiekty innych Rezydentów (minut, 0 = wyłącz): </text> - <text name="Object Owners:" width="108"> + <text name="Object Owners:"> Właściciel obiektów: </text> - <button label="Odśwież listę" label_selected="Odśwież listę" left="112" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." left="224" name="Return objects..."/> + <button label="Odśwież listę" label_selected="Odśwież listę" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Typ" name="type"/> <name_list.columns name="online_status"/> 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 1767a31496..a6b255d432 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -221,60 +221,60 @@ Vá para o menu Mundo > Sobre o terreno ou selecione outro lote para mostrar <text name="Simulator primitive usage:"> Uso de prims: </text> - <text left="214" name="objects_available" width="230"> + <text name="objects_available"> [COUNT] de [MAX] ([AVAILABLE] disponíveis) </text> - <text name="Primitives parcel supports:" width="200"> + <text name="Primitives parcel supports:"> Prims suportados pelo lote: </text> - <text left="214" name="object_contrib_text" width="152"> + <text name="object_contrib_text"> [COUNT] </text> <text name="Primitives on parcel:"> Prims no lote: </text> - <text left="214" name="total_objects_text" width="48"> + <text name="total_objects_text"> [COUNT] </text> - <text left="14" name="Owned by parcel owner:" width="180"> + <text name="Owned by parcel owner:"> Pertencentes ao dono do lote: </text> - <text left="214" name="owner_objects_text" width="48"> + <text name="owner_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/> - <button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Set to group:" width="180"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/> + <button label="Devolver" name="ReturnOwner..." tool_tip="Devolver objetos a seus donos."/> + <text name="Set to group:"> Reservado para o grupo: </text> - <text left="214" name="group_objects_text" width="48"> + <text name="group_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> - <button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Owned by others:" width="128"> + <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/> + <button label="Devolver" name="ReturnGroup..." tool_tip="Devolver objetos a seus donos."/> + <text name="Owned by others:"> Propriedade de outros: </text> - <text left="214" name="other_objects_text" width="48"> + <text name="other_objects_text"> [COUNT] </text> - <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/> - <button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver objetos a seus donos." width="119"/> - <text left="14" name="Selected / sat upon:" width="193"> + <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/> + <button label="Devolver" name="ReturnOther..." tool_tip="Devolver objetos a seus donos."/> + <text name="Selected / sat upon:"> Selecionado/Sentado: </text> - <text left="214" name="selected_objects_text" width="48"> + <text name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn"> Devolver objetos de outros residentes (p/ desligar tecle 0) </text> - <line_editor name="clean other time" right="-10"/> + <line_editor name="clean other time"/> <text name="Object Owners:"> Donos dos objetos: </text> - <button label="Atualizar lista" label_selected="Atualizar lista" left="118" name="Refresh List" tool_tip="Refresh Object List"/> - <button label="Devolver objetos..." label_selected="Devolver objetos..." left="230" name="Return objects..."/> + <button label="Atualizar lista" label_selected="Atualizar lista" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Devolver objetos..." label_selected="Devolver objetos..." name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> <name_list.columns label="Nome" name="name"/> @@ -340,7 +340,7 @@ Apenas lotes maiores podem ser listados na busca. <check_box label="Seguro (sem danos)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, impedindo lutas com danos. Se não ativado, lutas com danos é habilitado."/> <check_box label="Proibido empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. Ativar essa opção ajuda a prevenir comportamentos desordeiros no seu terreno."/> <check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/> - <combo_box left="265" name="land category with adult" width="155"> + <combo_box name="land category with adult"> <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> <combo_box.item label="Adulto" name="item2"/> @@ -355,7 +355,7 @@ Apenas lotes maiores podem ser listados na busca. <combo_box.item label="Compras" name="item11"/> <combo_box.item label="Outros" name="item12"/> </combo_box> - <combo_box left="265" name="land category" width="155"> + <combo_box name="land category"> <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> <combo_box.item label="Artes e cultura" name="item3"/> @@ -382,7 +382,7 @@ Apenas lotes maiores podem ser listados na busca. <text name="Teleport Routing: "> Rota de teletransporte: </text> - <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os teletransportes no seu lote." width="160"> + <combo_box name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os teletransportes no seu lote." width="160"> <combo_box.item label="Bloqueado" name="Blocked"/> <combo_box.item label="Ponto de aterrissagem" name="LandingPoint"/> <combo_box.item label="Qualquer lugar" name="Anywhere"/> diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml index 306487939e..9560a3b418 100644 --- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml @@ -52,8 +52,8 @@ Duração do Ciclo: </text> <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Minuto" name="WLLengthOfDayMin"/> - <spinner label="Segundo" name="WLLengthOfDaySec"/> + <spinner label="Min." name="WLLengthOfDayMin"/> + <spinner label="Seg." name="WLLengthOfDaySec"/> <text name="DayCycleText3"> Visualizar </text> |