summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/colors.xml4
-rw-r--r--indra/newview/skins/default/textures/icons/Info_Small.pngbin0 -> 371 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
-rw-r--r--indra/newview/skins/default/xui/da/strings.xml108
-rw-r--r--indra/newview/skins/default/xui/de/floater_god_tools.xml12
-rw-r--r--indra/newview/skins/default/xui/de/notifications.xml36
-rw-r--r--indra/newview/skins/default/xui/de/strings.xml104
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_avatar_picker.xml7
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_land.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_incoming_call.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_inspect.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_map.xml7
-rw-r--r--indra/newview/skins/default/xui/en/floater_moveview.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_nearby_chat.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_notecard.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_report_abuse.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_script_debug_panel.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_telehub.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_inspectors.xml31
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_textbox.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_widgets.xml57
-rw-r--r--indra/newview/skins/default/xui/en/floater_ui_preview.xml2
-rw-r--r--indra/newview/skins/default/xui/en/inspect_avatar.xml216
-rw-r--r--indra/newview/skins/default/xui/en/inspect_object.xml162
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml114
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml129
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_audio_device.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_land_money.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_progress.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_script_ed.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_side_tray.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_teleport_history_item.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_world_map.xml8
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml807
-rw-r--r--indra/newview/skins/default/xui/en/widgets/line_editor.xml7
-rw-r--r--indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml10
-rw-r--r--indra/newview/skins/default/xui/en/widgets/text.xml14
-rw-r--r--indra/newview/skins/default/xui/en/widgets/text_editor.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/textbase.xml4
-rw-r--r--indra/newview/skins/default/xui/es/floater_god_tools.xml14
-rw-r--r--indra/newview/skins/default/xui/es/floater_postcard.xml2
-rw-r--r--indra/newview/skins/default/xui/es/notifications.xml40
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml106
-rw-r--r--indra/newview/skins/default/xui/fr/floater_god_tools.xml12
-rw-r--r--indra/newview/skins/default/xui/fr/notifications.xml40
-rw-r--r--indra/newview/skins/default/xui/fr/strings.xml105
-rw-r--r--indra/newview/skins/default/xui/it/floater_postcard.xml2
-rw-r--r--indra/newview/skins/default/xui/it/notifications.xml39
-rw-r--r--indra/newview/skins/default/xui/it/strings.xml105
-rw-r--r--indra/newview/skins/default/xui/ja/floater_god_tools.xml24
-rw-r--r--indra/newview/skins/default/xui/ja/notifications.xml41
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml104
-rw-r--r--indra/newview/skins/default/xui/nl/floater_postcard.xml2
-rw-r--r--indra/newview/skins/default/xui/nl/floater_telehub.xml2
-rw-r--r--indra/newview/skins/default/xui/nl/notifications.xml42
-rw-r--r--indra/newview/skins/default/xui/nl/strings.xml106
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_about_land.xml2
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_god_tools.xml14
-rwxr-xr-xindra/newview/skins/default/xui/pl/floater_postcard.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/notifications.xml42
-rwxr-xr-xindra/newview/skins/default/xui/pl/strings.xml105
-rw-r--r--indra/newview/skins/default/xui/pt/floater_god_tools.xml14
-rw-r--r--indra/newview/skins/default/xui/pt/floater_postcard.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/notifications.xml40
-rw-r--r--indra/newview/skins/default/xui/pt/strings.xml104
77 files changed, 2118 insertions, 936 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 7e22e17188..eb62c442db 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -2,7 +2,6 @@
<colors>
<!-- Named Colors -->
-
<color
name="EmphasisColor"
value="0.38 0.694 0.573 1" />
@@ -90,6 +89,9 @@
name="AlertCautionTextColor"
reference="Black" />
<color
+ name="AgentLinkColor"
+ reference="White" />
+ <color
name="AlertTextColor"
value="0.58 0.66 0.84 1" />
<color
diff --git a/indra/newview/skins/default/textures/icons/Info_Small.png b/indra/newview/skins/default/textures/icons/Info_Small.png
new file mode 100644
index 0000000000..81078c32dc
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Info_Small.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8a6e9486a2..f106796cd9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -137,6 +137,7 @@
<texture name="Icon_Undock_Press" file_name="windows/Icon_Undock_Press.png" preload="false" />
<texture name="Info" file_name="icons/Info.png" preload="false" />
+ <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
<texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
<texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index dda5e9bd1a..9849f2f56d 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -513,4 +513,112 @@
<string name="GraphicsQualityHigh">
Høj
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Linden sted</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Kunst &amp; kultur</string>
+ <string name="Business">Business</string>
+ <string name="Educational">Uddannelse</string>
+ <string name="Gaming">Spil</string>
+ <string name="Hangout">Afslapning</string>
+ <string name="Newcomer Friendly">Nybegynder venligt</string>
+ <string name="Parks&amp;Nature">Parker &amp; natur</string>
+ <string name="Residential">Beboelse</string>
+ <string name="Shopping">Indkøb</string>
+ <string name="Other">Andet</string>
+
+ <string name="ringing">
+ Forbinder til stemmechat...
+ </string>
+ <string name="connected">
+ Forbundet
+ </string>
+ <string name="unavailable">
+ Stemmechat er ikke tilladt hvor du befinder dig
+ </string>
+ <string name="hang_up">
+ Stemme chat er afbrudt
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ &apos;[OBJECTNAME]&apos;, en genstand, ejet af &apos;[OWNERNAME]&apos;, lokaliseret i [REGIONNAME] på [REGIONPOS], er afvist tilladelse til: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Tag Linden dollars (L$) fra dig
+ </string>
+ <string name="ActOnControlInputs">
+ Reagér på dine kontrol-taster
+ </string>
+ <string name="RemapControlInputs">
+ Ændre dine kontrol-taster
+ </string>
+ <string name="AnimateYourAvatar">
+ Animér din avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Sæt på din avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Fjern ejerskabet og sæt til offentlig
+ </string>
+ <string name="LinkAndDelink">
+ Sammenkæd og adskil andre genstande
+ </string>
+ <string name="AddAndRemoveJoints">
+ Tilføj og fjern sammenkødninger med andre genstande
+ </string>
+ <string name="ChangePermissions">
+ Ændre dens tilladelser
+ </string>
+ <string name="TrackYourCamera">
+ Spor dit kamera
+ </string>
+ <string name="ControlYourCamera">
+ Kontrollér dit kamera
+ </string>
+ <string name="only_user_message">
+ Du er den eneste deltager i denne samtale
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] er ikke logget på.
+ </string>
+ <string name="invite_message">
+ Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
+ </string>
+ <string name="muted_message">
+ Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet.
+ </string>
+ <string name="generic_request_error">
+ Kunne ikke etablere forbindelse, prøv igen senere
+ </string>
+ <string name="insufficient_perms_error">
+ Du har ikke de fornødne rettigheder.
+ </string>
+ <string name="session_does_not_exist_error">
+ Denne samtale er lukket ned
+ </string>
+ <string name="no_ability_error">
+ Du har ikke den mulighed.
+ </string>
+ <string name="not_a_mod_error">
+ Du er ikke moderator for denne samtale.
+ </string>
+ <string name="muted_error">
+ Du er blevet &quot;blokeret&quot;.
+ </string>
+ <string name="add_session_event">
+ Ikke muligt at tilføge brugere til samtale med [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Ikke muligt at sende din besked til samtalen med [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Du er blevet fjernet fra gruppen.
+ </string>
+ <string name="close_on_no_ability">
+ Du har ikke længere mulighed for at deltage i samtalen
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 39c064b265..c7cfb5d9d3 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -115,17 +115,17 @@
Ziel:
</text>
<combo_box name="destination">
- <combo_box.item name="Selection" label="Auswahl" />
- <combo_box.item name="AgentRegion" label="Avatar-Region" />
+ <combo_box.item name="item1" label="Auswahl" />
+ <combo_box.item name="item2" label="Avatar-Region" />
</combo_box>
<text name="Request:">
Anfrage:
</text>
<combo_box name="request">
- <combo_box.item name="colliders&lt;steps&gt;" label="Kollisionsobjekte &lt;Schritte&gt;" />
- <combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt;" />
- <combo_box.item name="objects&lt;pattern&gt;" label="Objekte &lt;Muster&gt;" />
- <combo_box.item name="rez&lt;asset_id&gt;" label="lt;asset_id&gt; erstellen" />
+ <combo_box.item name="item1" label="Kollisionsobjekte &lt;Schritte&gt;" />
+ <combo_box.item name="item2" label="Skripts &lt;Zähler&gt;,&lt;Optionales Muster&gt;" />
+ <combo_box.item name="item3" label="Objekte &lt;Muster&gt;" />
+ <combo_box.item name="item4" label="lt;asset_id&gt; erstellen" />
</combo_box>
<text name="Parameter:">
Parameter:
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index b5741438ae..b738b2d864 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -565,7 +565,7 @@ Verschieben Sie alle betreffenden Objekte in dieselbe Region.
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-[URL] für Informationen zum Deviseneinkauf öffnen?
+[_URL] für Informationen zum Deviseneinkauf öffnen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -796,7 +796,6 @@ Keine Gruppe ausgewählt.
<notification name="CannotDeedLandNoRegion">
Land kann nicht übertragen werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
</notification>
<notification name="CannotDeedLandMultipleSelected">
Land kann nicht übertragen werden:
@@ -842,8 +841,6 @@ Parzellen, die Ihnen gehören, werden grün dargestellt.
<notification name="CannotReleaseLandRegionNotFound">
Land kann nicht aufgegeben werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-
-Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
</notification>
<notification name="CannotReleaseLandNoTransfer">
Land kann nicht aufgegeben werden:
@@ -882,14 +879,10 @@ Land teilen?
<notification name="CannotDivideLandNoRegion">
Land kann nicht aufgeteilt werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-
-Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
</notification>
<notification name="CannotJoinLandNoRegion">
Land kann nicht zusammengelegt werden:
Kann die Region nicht finden, in der sich dieses Land befindet.
-
-Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
</notification>
<notification name="CannotJoinLandNothingSelected">
Land kann nicht zusammengelegt werden:
@@ -949,8 +942,6 @@ Grau = Öffentlich
<notification name="CannotSaveToAssetStore">
[NAME] kann nicht in Zentral-Asset-Speicher geladen werden.
Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen Minuten noch einmal an und speichern Sie es erneut.
-
-Tritt dieses Problem wiederholt auf, klicken Sie auf das Pulldown-Menü „Hilfe“ &gt; „Fehler melden“ und geben Sie Details zu Ihrem Netzwerk-Setup an.
</notification>
<notification name="YouHaveBeenLoggedOut">
Sie wurden von [SECOND_LIFE] abgemeldet:
@@ -1290,10 +1281,6 @@ In Ihren Anwendungsordner herunterladen?
Zu www.secondlife.com, um Ihr Konto zu verwalten?
<usetemplate ignoretext="Beim Starten eines Browsers, um Ihr Konto zu verwalten" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Informieren Sie sich im [SECOND_LIFE] Wiki, wie man Fehler richtig meldet.
- <usetemplate ignoretext="Beim Starten eines Browsers, um das Fehlermeldungs-Wiki anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Informieren Sie sich im [SECOND_LIFE] Wiki, wie man Sicherheitsprobleme richtig meldet.
<usetemplate ignoretext="Beim Starten eines Browsers, um das Sicherheitsfragen-Wiki anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
@@ -1974,23 +1961,10 @@ Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer di
-
Das Resultat, das sich aus dieser Meldung ergibt, betrifft nur diese Region; der Einwohnerzugang zu anderen Bereichen von [SECOND_LIFE] ist davon nicht betroffen. Nur Linden Lab kann den Zugang zu [SECOND_LIFE] beschränken.
</notification>
- <notification name="HelpReportBug">
- Verwenden Sie dieses Tool *nur*, um technische Features zu melden, die nicht wie beschrieben oder erwartet funktionieren. Bitte machen Sie so viele Angaben wie möglich. Sie können auf die automatische Antwort-E-Mail antworten, um Ihre Meldung noch zu ergänzen.
-Alle gemeldeten Fehler werden geprüft und bewertet. Sie erhalten keine persönliche Antwort auf Ihre E-Mail.
--
-Bei technischen Problemen wenden Sie sich bitte an den Support unter:
-http://secondlife.com/community/support.php
--
-Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Wählen Sie eine Missbrauchskategorie aus.
Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Wählen Sie eine Fehler-Kategorie aus.
-Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Geben Sie den Namen des Täters ein.
Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.
@@ -2003,18 +1977,10 @@ Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.
Bitte geben Sie eine Zusammenfassung des Vorfalls ein.
Eine genaue Zusammenfassung hilft uns, Fälle von Missbrauch zu ahnden.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Bitte geben Sie eine Zusammenfassung des Fehlers ein.
-Eine genaue Zusammenfassung hilft uns, Fehler schneller zu beseitigen.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Bitte geben Sie eine ausführliche Beschreibung des Vorfalls ein.
Eine möglichst genaue Beschreibung mit Namen und Einzelheiten hilft uns, Fälle von Missbrauch zu ahnden.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Bitte geben Sie eine ausführliche Fehlerbeschreibung ein.
-Eine möglichst genaue Beschreibung mit Schritten zur Reproduktion des Fehlers hilft uns, Fehler schneller zu beseitigen.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Sehr geehrte(r) Einwohner(in),
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 380046f72d..5df1570bfd 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -517,4 +517,108 @@
<string name="GraphicsQualityHigh">
Hoch
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Lindenort</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Kunst &amp; Kultur</string>
+ <string name="Business">Business</string>
+ <string name="Educational">Bildung</string>
+ <string name="Gaming">Spielen</string>
+ <string name="Hangout">Treffpunkt</string>
+ <string name="Newcomer Friendly">Anfängergerecht</string>
+ <string name="Parks&amp;Nature">Parks und Natur</string>
+ <string name="Residential">Wohngebiet</string>
+ <string name="Shopping">Shopping</string>
+ <string name="Other">Sonstige</string>
+ <string name="ringing">
+ Verbindung mit In-Welt-Voice-Chat...
+ </string>
+ <string name="connected">
+ Verbunden
+ </string>
+ <string name="unavailable">
+ Der aktuelle Standort unterstützt keine Voice-Kommunikation
+ </string>
+ <string name="hang_up">
+ Verbindung mit In-Welt-Voice-Chat getrennt
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung erteilt: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Linden-Dollar (L$) von Ihnen nehmen
+ </string>
+ <string name="ActOnControlInputs">
+ Steuerung festlegen
+ </string>
+ <string name="RemapControlInputs">
+ Steuerung neu zuweisen
+ </string>
+ <string name="AnimateYourAvatar">
+ Avatar animieren
+ </string>
+ <string name="AttachToYourAvatar">
+ An Avatar anhängen
+ </string>
+ <string name="ReleaseOwnership">
+ Eigentum aufgeben und öffentlich machen
+ </string>
+ <string name="LinkAndDelink">
+ Mit Objekten verknüpfen und davon trennen
+ </string>
+ <string name="AddAndRemoveJoints">
+ Verbindungen zu anderen Objekten hinzufügen und entfernen
+ </string>
+ <string name="ChangePermissions">
+ Berechtigungen ändern
+ </string>
+ <string name="TrackYourCamera">
+ Kameraverfolgung
+ </string>
+ <string name="ControlYourCamera">
+ Kamerasteuerung
+ </string>
+ <string name="only_user_message">
+ Sie sind der einzige Benutzer in dieser Sitzung.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] ist offline.
+ </string>
+ <string name="invite_message">
+ Klicken Sie auf [BUTTON NAME], um eine Verbindung zu diesem Voice-Chat herzustellen.
+ </string>
+ <string name="generic_request_error">
+ Fehler bei Anfrage, bitte versuchen Sie es später.
+ </string>
+ <string name="insufficient_perms_error">
+ Sie sind dazu nicht berechtigt.
+ </string>
+ <string name="session_does_not_exist_error">
+ Die Sitzung ist abgelaufen
+ </string>
+ <string name="no_ability_error">
+ Sie besitzen diese Fähigkeit nicht.
+ </string>
+ <string name="not_a_mod_error">
+ Sie sind kein Sitzungsmoderator.
+ </string>
+ <string name="muted_error">
+ Ein Gruppenmoderator hat Ihren Text-Chat deaktiviert.
+ </string>
+ <string name="add_session_event">
+ Es konnten keine Benutzer zur Chat-Sitzung mit [RECIPIENT] hinzugefügt werden.
+ </string>
+ <string name="message_session_event">
+ Ihre Nachricht konnte nicht an die Chat-Sitzung mit [RECIPIENT] gesendet werden.
+ </string>
+ <string name="removed_from_group">
+ Sie wurden von der Gruppe ausgeschlossen.
+ </string>
+ <string name="close_on_no_ability">
+ Sie haben nicht mehr die Berechtigung an der Chat-Sitzung teilzunehmen.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index c9e143bf95..dc6af79db5 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -80,6 +80,7 @@
label="Support"
name="support_panel">
<text_editor
+ allow_html="true"
follows="top|left"
font="SansSerif"
height="350"
@@ -127,7 +128,7 @@ Thank you to the following residents for helping to ensure that this is the best
It is a rare mind indeed that can render the hitherto non-existent blindingly obvious. The cry 'I could have thought of that' is a very popular and misleading one, for the fact is that they didn't, and a very significant and revealing fact it is too.
--- Douglas Adams
+ -- Douglas Adams
</text_editor>
</panel>
<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 5a285cdcb0..524495d83d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -132,9 +132,6 @@ Go to World menu &gt; About Land or select another parcel to show its details.
Description:
</text>
<text_editor
- bevel_style="in"
- border_style="line"
- border_thickness="1"
follows="left|top|right"
height="52"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 3ab5c18300..f76e4acbc9 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -55,14 +55,13 @@
width="220">
Type part of a person&apos;s name:
</text>
- <text_editor
+ <line_editor
bevel_style="none"
border_style="line"
border.border_thickness="0"
commit_on_focus_lost="false"
follows="left|top|right"
height="23"
- layout="topleft"
left_delta="0"
name="Edit"
top_pad="0"
@@ -188,8 +187,8 @@
<button
follows="right|bottom"
height="23"
- label="Ok"
- label_selected="Ok"
+ label="OK"
+ label_selected="OK"
name="Select"
top_pad="3"
left="46"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index bd0dac5ca1..62d40bc45f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -483,7 +483,8 @@ sold with objects
name="error_message"
right="435"
top="208"
- width="215">
+ width="215"
+ word_wrap="true">
Something ain&apos;t right.
</text>
<button
@@ -583,7 +584,8 @@ sold with objects
left="72"
name="land_use_reason"
right="435"
- width="215">
+ width="215"
+ word_wrap="true">
You hold 1309 m² of land.
This parcel is 512 m² of land.
</text>
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 0784b88944..c4a2654403 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -5,7 +5,7 @@
can_close="false"
center_horiz="true"
follows="top"
- height="95"
+ height="110"
layout="topleft"
name="camera_floater"
help_topic="camera_floater"
@@ -26,7 +26,7 @@
</floater.string>
<panel
border="true"
- height="64"
+ height="79"
layout="topleft"
left="0"
top="0"
@@ -46,7 +46,7 @@
scale_image="false"
sound_flags="3"
tool_tip="Orbit Camera Around Focus"
- top="0"
+ top="15"
width="64" />
<joystick_track
follows="top|left"
@@ -61,7 +61,7 @@
scale_image="false"
sound_flags="3"
tool_tip="Move Camera Up and Down, Left and Right"
- top="0"
+ top="15"
visible="false"
width="64" />
<joystick_zoom
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index be1278e8cc..a233f7f0fa 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -56,6 +56,8 @@
layout="topleft"
max_length="2147483647"
name="im_text"
+ parse_highlights="true"
+ allow_html="true"
track_bottom="true"
width="195"
word_wrap="true">
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 8b271eb41e..bdce8fa4fc 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -33,7 +33,7 @@
<text_editor
font="SansSerif"
height="64"
- hide_border="true"
+ border_visible="false"
hide_scrollbar="true"
layout="topleft"
left="77"
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 00b9f850ad..339604e658 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -55,7 +55,7 @@
top_pad="5"
width="150">
<button.commit_callback
- function="Inspect.OwnerProfilet" />
+ function="Inspect.OwnerProfile" />
</button>
<button
follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 70f9c19658..dc6a02efe1 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -81,7 +81,6 @@
left="0"
name="floater_map_east"
right="10"
- text="E"
text_color="1 1 1 0.7"
top="215">
E
@@ -95,7 +94,6 @@
left="0"
name="floater_map_west"
right="11"
- text="W"
text_color="1 1 1 0.7"
top="215">
W
@@ -109,7 +107,6 @@
left="0"
name="floater_map_south"
right="10"
- text="S"
text_color="1 1 1 0.7"
top="215">
S
@@ -123,7 +120,6 @@
left="0"
name="floater_map_southeast"
right="20"
- text="SE"
text_color="1 1 1 0.7"
top="215">
SE
@@ -137,7 +133,6 @@
left="0"
name="floater_map_northeast"
right="20"
- text="NE"
text_color="1 1 1 0.7"
top="215">
NE
@@ -151,7 +146,6 @@
left="0"
name="floater_map_southwest"
right="20"
- text="SW"
text_color="1 1 1 0.7"
top="215">
SW
@@ -165,7 +159,6 @@
left="0"
name="floater_map_northwest"
right="20"
- text="NW"
text_color="1 1 1 0.7"
top="215">
NW
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 82acea47be..65235da8d5 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -5,7 +5,7 @@
can_minimize="false"
center_horiz="true"
follows="bottom"
- height="95"
+ height="110"
layout="topleft"
name="move_floater"
help_topic="move_floater"
@@ -38,7 +38,7 @@
</string>
<panel
border="true"
- height="70"
+ height="83"
follows="left|top"
layout="topleft"
left="0"
@@ -57,7 +57,7 @@
picture_style="true"
scale_image="false"
tool_tip="Turn Left (press Left Arrow or A)"
- top="35"
+ top="45"
width="25" />
<button
follows="left|bottom"
@@ -83,7 +83,7 @@
picture_style="true"
scale_image="false"
tool_tip="Fly Up, Press &quot;E&quot;"
- top="4"
+ top="14"
width="25" />
<button
follows="left|bottom"
@@ -130,7 +130,7 @@
<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
<panel
border="true"
- height="25"
+ height="27"
layout="topleft"
left="0"
name="panel_modes"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 78f795b0e2..e851710ad8 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -39,6 +39,7 @@
height="320"
max_length="2147483647"
name="Chat History Editor"
+ parse_highlights="true"
read_only="true"
text_color="ChatHistoryTextColor"
text_readonly_color="ChatHistoryTextColor"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 1d7b7adca2..f90f2a81cf 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -74,6 +74,7 @@
left="4"
max_length="65536"
name="Notecard Editor"
+ allow_html="true"
handle_edit_keys_directly="true"
tab_group="1"
top="46"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index c7f5a1170f..abde4ba5fa 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -33,6 +33,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="10"
@@ -58,6 +59,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="10"
@@ -83,6 +85,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="10"
@@ -130,6 +133,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="48"
@@ -155,6 +159,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="48"
@@ -345,6 +350,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left_delta="0"
@@ -389,6 +395,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left="10"
@@ -413,6 +420,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left_delta="0"
@@ -437,6 +445,7 @@
length="1"
follows="left|top"
height="16"
+ font.name="SansSerif"
font.style="BOLD"
layout="topleft"
left_delta="0"
@@ -473,6 +482,7 @@
height="50"
layout="topleft"
left="10"
+ font.name="SansSerif"
font.style="BOLD"
name="incomplete_title"
top_pad="5"
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index c8b8c34f85..2085b74a55 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -16,6 +16,7 @@
layout="topleft"
max_length="10000"
name="Chat History Editor"
+ parse_highlights="true"
width="420"
word_wrap="true" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index b703b49b8b..95de27e0ea 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -88,7 +88,6 @@
</text>
<scroll_list
follows="left|top"
- font="SansSerifSmall"
height="60"
layout="topleft"
left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
index a1a271d0eb..2011f57d8b 100644
--- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- can_resize="true"
+ can_resize="false"
height="400"
layout="topleft"
name="floater_test_inspectors"
@@ -15,7 +15,6 @@
width="300">
Click to spawn an inspector:
</text>
- <!-- James Tester, 4 years old -->
<button
name="avatar_2d_btn1"
label="Avatar 2D"
@@ -25,7 +24,7 @@
width="100"
commit_callback.function="ShowAvatarInspector"
commit_callback.parameter="22df1dcb-810a-4975-aab9-0159958fe155" />
- <!-- DonkeyPuncher 2008-10-1 -->
+ <!-- InspectorA Tester -->
<button
name="avatar_2d_btn5"
label="Avatar 2D"
@@ -34,8 +33,8 @@
height="20"
width="100"
commit_callback.function="ShowAvatarInspector"
- commit_callback.parameter="d5330e4e-391a-4f00-9352-b797ed2f9a97" />
- <!-- DonkeyPuncher 2009-01-15 -->
+ commit_callback.parameter="927e68e0-e52d-4bb8-b1a9-add97a57c86a" />
+ <!-- InspectorB Tester -->
<button
name="avatar_2d_btn2"
label="Avatar 2D"
@@ -44,8 +43,8 @@
height="20"
width="100"
commit_callback.function="ShowAvatarInspector"
- commit_callback.parameter="05511655-a58a-48b6-b645-966f69fc17a7" />
- <!-- 2009-06-14 -->
+ commit_callback.parameter="9a2300ca-e251-45dd-bb61-e33139f6e4eb" />
+ <!-- InspectorC Tester -->
<button
name="avatar_2d_btn3"
label="Avatar 2D"
@@ -54,7 +53,7 @@
height="20"
width="100"
commit_callback.function="ShowAvatarInspector"
- commit_callback.parameter="6a164b3d-7c2c-43eb-880a-0ebc0687b3ec" />
+ commit_callback.parameter="8024f082-34cc-48a3-a42e-c42f345efd74" />
<!-- jarvtest Bombastic 2009-10-3 -->
<button
name="avatar_2d_btn4"
@@ -85,7 +84,9 @@
top_pad="10"
left_delta="0"
height="20"
- width="100"/>
+ width="100"
+ commit_callback.function="ShowObjectInspector"
+ commit_callback.parameter="" />
<button
name="group_btn"
label="Group"
@@ -107,5 +108,17 @@
left_delta="0"
height="20"
width="100"/>
+ <text
+ follows="left|top"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left="0"
+ max_length="65536"
+ name="slurl"
+ top_pad="4"
+ width="100">
+ secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 88c001b714..8305452c85 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -122,7 +122,6 @@
left="10"
name="floater_map_north"
right="30"
- text="N"
text_color="1 1 1 0.7"
top="370">
N
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 6ddaa63c1d..5a29c6a319 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -19,6 +19,8 @@
can_resize="true"
title="Test Floater"
height="500"
+ min_width="850"
+ min_height="500"
layout="topleft"
name="floater_test_widgets"
help_topic="floater_test_widgets"
@@ -39,6 +41,7 @@
<menu_bar
height="18"
layout="topleft"
+ follows="top|left"
tool_tip="menu"
left="2"
name="test_menu_bar"
@@ -74,7 +77,9 @@
<text
bottom="55"
layout="topleft"
- left="10">
+ follows="top|left"
+ left="10"
+ height="16">
For widget list see https://wiki.lindenlab.com/wiki/Viewer:UI/Widgets
</text>
@@ -82,6 +87,7 @@
<button
height="20"
+ follows="top|left"
label="Button"
layout="topleft"
left_delta="0"
@@ -91,7 +97,7 @@
width="100" />
<!-- "flyout_button" is a button that can spawn a menu -->
<flyout_button
- follows="right|bottom"
+ follows="top|left"
height="20"
label="Flyout"
layout="topleft"
@@ -121,6 +127,7 @@
provide input that is not a list item. -->
<combo_box
bottom_delta="35"
+ follows="top|left"
height="16"
width="150"
label="Combobox"
@@ -150,6 +157,7 @@
the text. -->
<line_editor
height="20"
+ follows="top|left"
layout="topleft"
left_delta="0"
name="test_line_editor"
@@ -161,7 +169,7 @@
<!-- "filter_editor" is a specialized line_editor that shows read-only
help text until the user clicks in the widget. -->
<filter_editor
- follows="left|top|right"
+ follows="left|top"
height="20"
label="Type here to search"
layout="topleft"
@@ -173,6 +181,7 @@
<!-- "progress_bar" percent completed gets set in C++ code -->
<progress_bar
height="16"
+ follows="top|left"
layout="topleft"
left_delta="0"
name="test_progress_bar"
@@ -227,6 +236,7 @@
<!-- "scroll_list" is a scrolling list of columnar data. -->
<scroll_list
bottom_delta="100"
+ follows="top|left"
height="80"
draw_heading="true"
tool_tip="scroll list"
@@ -239,10 +249,19 @@
dynamic_width="true"
name="second_column"
label="Column B"/>
+ <row>
+ <column column="first_column">short text</column>
+ <column column="second_column">more short text</column>
+ </row>
+ <row>
+ <column column="first_column">this is some longer text</column>
+ <column column="second_column">and here is some more long text</column>
+ </row>
</scroll_list>
<!-- "slider" is a horizontal input widget for numerical data. -->
<slider
bottom_delta="45"
+ follows="top|left"
layout="topleft"
min_val="0"
max_val="100"
@@ -255,22 +274,36 @@
change the value. -->
<spinner
bottom_delta="35"
+ follows="top|left"
label="Spinner"
layout="topleft"
name="test_spinner"
tool_tip="spinner"/>
<text
bottom_delta="50"
+ follows="top|left"
+ font.name="SansSerifSmall"
font.style = "UNDERLINE"
layout="topleft"
name="test_text"
tool_tip="text">
Text (underlined)
</text>
+ <text
+ top_pad="10"
+ follows="top|left"
+ layout="topleft"
+ width="60"
+ use_ellipses="true"
+ name="test_text"
+ tool_tip="text">
+ Truncated text here
+ </text>
<!-- "text_editor" is a multi-line text input widget, similar to
textarea in HTML. -->
<text_editor
- height="80"
+ height="40"
+ follows="top|left|bottom"
layout="topleft"
left_delta="0"
name="test_text_editor"
@@ -279,7 +312,18 @@
width="200">
Text Editor
</text_editor>
-
+ <text
+ height="40"
+ follows="top|left|bottom"
+ layout="topleft"
+ name="test_text_editor"
+ tool_tip="text box"
+ top_pad="5"
+ width="200">
+ Text box
+with
+multiple lines
+ </text>
<!-- And a third column -->
<!-- "tab_container" is a holder for multiple panels of UI widgets.
@@ -309,7 +353,6 @@
color="0.3 0.6 0.9 1"
follows="left|top"
height="90"
- border="true"
layout="topleft"
left="10"
label="Color Swatch 1"
@@ -333,7 +376,7 @@
</panel>
<!-- panels can also refer to other floaters or panels -->
<panel
- border="true"
+ border="true"
filename="floater_test_checkbox.xml"
height="225"
label="Tab 2 - Checkbox"
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 9a3d5aa183..4ed6787f53 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -17,7 +17,7 @@
left="0"
mouse_opaque="false"
name="main_panel"
- right="650"
+ right="750"
top="0">
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2042ffedbc..b44acebbcf 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -1,102 +1,142 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!--
Not can_close / no title to avoid window chrome
Single instance - only have one at a time, recycle it each spawn
-->
<floater
- background_opaque="false"
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="PanelDefaultBackgroundColor"
- can_close="false"
- can_minimize="false"
- name="inspect_avatar"
- help_topic="inspect_avatar"
- single_instance="true"
- sound_flags="0"
- title=""
- visible="true"
- width="300"
- height="200"
- left="0"
- top="200"
- >
+ bevel_style="in"
+ bg_alpha_color="PanelDefaultBackgroundColor"
+ can_close="false"
+ can_minimize="false"
+ height="190"
+ layout="topleft"
+ name="inspect_avatar"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="300">
<!-- Allowed fields include:
[BORN_ON] ("12/3/2008")
[SL_PROFILE] (Second Life profile),
- [RW_PROFILE] (real world profile),
+ [RW_PROFILE] (real world profile),
[ACCTTYPE] ("Resident"),
[PAYMENTINFO] ("Payment Info on File"),
- [AGE] ("1 year 2 months") -->
- <string name="Subtitle">
+ [AGE] ("1 year 2 months")
+ -->
+ <string
+ name="Subtitle">
[AGE]
</string>
- <string name="Details">
-[ACCTTYPE], [PAYMENTINFO]
-Profile: [SL_PROFILE]
+ <string
+ name="Details">
+[ACCTTYPE][COMMA] [PAYMENTINFO]
+ </string>
+ <string
+ name="Partner">
+ Partner: [PARTNER]
</string>
<text
- top="180" left="10" width="280" height="70" follows="left|top|right|bottom"
- use_ellipses="true" word_wrap="true"
- font="SansSerifHugeBold" text_color="white"
- mouse_opaque="true" name="user_name" >
- Test Name
- </text>
- <!-- General purpose subtitle area, not sure yet what goes here -->
- <text
- top="155" left="10" width="150" height="20" follows="left|top|right|bottom"
- font="SansSerifBig"
- text_color="white"
- mouse_opaque="true"
- name="user_subtitle" />
- <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
- <text
- top="115" left="10" width="290" height="50" follows="left|top|right|bottom"
- font="SansSerifSmall" text_color="white" word_wrap="true"
- mouse_opaque="true" name="user_details" />
- <avatar_icon
- top="185" left="230" width="60" height="60" follows="left|top|right|bottom"
- color="1 1 1 1" enabled="true" mouse_opaque="true" name="avatar_icon"
- />
- <slider
- bottom="35" left="45" width="250" height="30" follows="top|left"
- name="volume_slider"
- tool_tip="Voice Volume"
- increment="0.05" initial_value="0.75" max_val="1" min_val="0"
- show_text="false"
- />
- <button
- bottom="40" left="10" width="32" height="16" follows="left|top|right|bottom"
- name="mute_btn"
- label=""
- image_unselected="icn_speaker_dark.tga"
- image_disabled="icn_speaker_dark.tga"
- image_selected="icn_speaker-muted_dark.tga"
- image_hover_selected="icn_speaker-muted_dark.tga"
- image_disabled_selected="icn_speaker-muted_dark.tga"
- halign="center"
- toggle="true"
- />
- <button
- bottom="10" left="10" width="110" height="20" follows="top|left"
- name="add_friend_btn"
- label="Add Friend"
- font="SansSerif"
- />
- <button
- bottom="10" left="120" width="110" height="20" follows="top|left"
- name="view_profile_btn"
- label="View Profile"
- font="SansSerif"
- />
- <button
- bottom="10" left="230" width="60" height="20" follows="top|left"
- name="gear_btn"
- label=""
- image_overlay="Icon_Gear_Foreground"
- image_overlay_alignment="center"
- scale_image="true"
- />
-</floater>
+ follows="left|top|right|bottom"
+ font="SansSerifHugeBold"
+ height="70"
+ left="10"
+ name="user_name"
+ text_color="white"
+ top="20"
+ use_ellipses="true"
+ value="Test Name"
+ width="280"
+ word_wrap="true" />
+ <text
+ follows="left|top|right|bottom"
+ font="SansSerifBig"
+ height="20"
+ left="10"
+ name="user_subtitle"
+ text_color="white"
+ top="45"
+ width="150" />
+ <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
+ <text
+ follows="left|top|right|bottom"
+ height="20"
+ left="10"
+ name="user_details"
+ text_color="white"
+ top="85"
+ width="290"
+ word_wrap="true" />
+ <text
+ follows="left|top|right|bottom"
+ height="20"
+ left="10"
+ name="user_partner"
+ text_color="white"
+ top="105"
+ width="290"
+ word_wrap="true" />
+ <avatar_icon
+ follows="left|top|right|bottom"
+ height="60"
+ left="230"
+ mouse_opaque="true"
+ name="avatar_icon"
+ top="15"
+ width="60" />
+ <slider
+ follows="top|left"
+ height="30"
+ increment="0.05"
+ left="20"
+ max_val="0.95"
+ min_val="0.05"
+ name="volume_slider"
+ show_text="false"
+ tool_tip="Voice Volume"
+ top="125"
+ value="0.5"
+ width="240" />
+ <button
+ follows="left|top|right|bottom"
+ height="16"
+ image_disabled="icn_speaker_dark.tga"
+ image_disabled_selected="icn_speaker-muted_dark.tga"
+ image_hover_selected="icn_speaker-muted_dark.tga"
+ image_selected="icn_speaker-muted_dark.tga"
+ image_unselected="icn_speaker_dark.tga"
+ is_toggle="true"
+ left="265"
+ name="mute_btn"
+ picture_style="true"
+ top="132"
+ width="32" />
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="20"
+ label="Add Friend"
+ left="10"
+ name="add_friend_btn"
+ top_pad="10"
+ width="105" />
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="20"
+ label="View Profile"
+ left_delta="110"
+ name="view_profile_btn"
+ top_delta="0"
+ width="105" />
+ <menu_button
+ follows="top|left"
+ height="20"
+ image_overlay="windows\Icon_Gear_Foreground.png"
+ image_overlay_alignment="center"
+ menu_filename="menu_inspect_avatar_gear.xml"
+ name="gear_btn"
+ picture_style="true"
+ top_delta="0"
+ left_delta="110"
+ width="60"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
new file mode 100644
index 0000000000..cc56f630b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ bevel_style="in"
+ bg_opaque_color="MouseGray"
+ can_close="false"
+ can_minimize="false"
+ height="145"
+ layout="topleft"
+ name="inspect_object"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="300">
+ <string name="Creator">By [CREATOR]</string>
+ <string name="CreatorAndOwner">
+By [CREATOR]
+Owned by [OWNER]
+ </string>
+ <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" -->
+ <string name="Price">L$[AMOUNT]</string>
+ <string name="PriceFree">Free!</string>
+ <string name="Touch">Touch</string>
+ <string name="Sit">Sit</string>
+ <text
+ follows="all"
+ font="SansSerifLargeBold"
+ height="20"
+ left="8"
+ name="object_name"
+ text_color="white"
+ top="8"
+ use_ellipses="true"
+ value="Test Object Name That Is Really Long"
+ width="268" />
+ <text
+ follows="all"
+ font="SansSerif"
+ height="30"
+ left="10"
+ name="object_creator"
+ top_pad="0"
+ width="280">
+By Longavatarname Johnsonlongstonnammer
+Owned by James Linden
+ </text>
+ <text
+ follows="all"
+ height="45"
+ left="100"
+ name="object_description"
+ top_pad="4"
+ width="200"
+ word_wrap="true">
+This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+ </text>
+ <!-- *TODO: Replace this icon -->
+ <icon
+ name="price_icon"
+ image_name="Favorite_Star_Active"
+ left="5"
+ width="16"
+ height="16"
+ top="79"
+ follows="left|top"
+ />
+ <text
+ follows="all"
+ font="SansSerifSmallBold"
+ height="45"
+ left="22"
+ name="price_text"
+ text_color="white"
+ top="80"
+ font_shadow="none"
+ width="80">
+L$300,000
+ </text>
+ <!-- Overlapping buttons for all default actions. Show "Buy" if
+ for sale, "Sit" if can sit, etc. -->
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="23"
+ label="Buy"
+ left="10"
+ name="buy_btn"
+ top="116"
+ width="100" />
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="23"
+ label="Pay"
+ left_delta="0"
+ name="pay_btn"
+ top_delta="0"
+ width="100" />
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="23"
+ label="Take Copy"
+ left_delta="0"
+ name="take_free_copy_btn"
+ top_delta="0"
+ width="100" />
+ <button
+ follows="top|left"
+ font="SansSerifSmall"
+ height="23"
+ label="Touch"
+ left_delta="0"
+ name="touch_btn"
+ top_delta="0"
+ width="100" />
+ <button
+ follows="top|left"
+ font="SansSerif"
+ height="23"
+ label="Sit"
+ left_delta="0"
+ name="sit_btn"
+ top_delta="0"
+ width="100" />
+ <button
+ follows="top|left"
+ font="SansSerifSmall"
+ height="23"
+ label="Open"
+ left_delta="0"
+ name="open_btn"
+ top_delta="0"
+ width="100" />
+ <!-- non-overlapping buttons here -->
+ <menu_button
+ follows="top|left"
+ height="23"
+ image_overlay="Icon_Gear_Foreground"
+ image_overlay_alignment="center"
+ right="-8"
+ menu_filename="menu_inspect_object_gear.xml"
+ name="gear_btn"
+ picture_style="true"
+ top_delta="0"
+ width="30" />
+ <button
+ follows="top|left"
+ height="22"
+ image_overlay="TabIcon_Close_Off"
+ layout="topleft"
+ name="more_info_btn"
+ picture_style="true"
+ right="-8"
+ top="7"
+ left_delta="110"
+ tab_stop="false"
+ width="20" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..9f5b7f3813
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+ create_jump_keys="true"
+ layout="topleft"
+ mouse_opaque="false"
+ visible="false"
+ name="Gear Menu">
+ <menu_item_call
+ label="View Profile"
+ layout="topleft"
+ enabled="true"
+ name="view_profile">
+ <menu_item_call.on_click
+ function="InspectAvatar.ViewProfile"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Add Friend"
+ layout="topleft"
+ name="add_friend">
+ <menu_item_call.on_click
+ function="InspectAvatar.AddFriend"/>
+ </menu_item_call>
+ <menu_item_call
+ label="IM"
+ layout="topleft"
+ name="im">
+ <menu_item_call.on_click
+ function="InspectAvatar.IM"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Call"
+ layout="topleft"
+ enabled="true"
+ name="call">
+ </menu_item_call>
+ <menu_item_call
+ label="Teleport"
+ layout="topleft"
+ name="teleport">
+ <menu_item_call.on_click
+ function="InspectAvatar.Teleport"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Invite to Group"
+ layout="topleft"
+ name="invite_to_group">
+ <menu_item_call.on_click
+ function="InspectAvatar.InviteToGroup"/>
+ </menu_item_call>
+ <menu_item_separator layout="topleft" />
+ <menu_item_call
+ label="Block"
+ layout="topleft"
+ name="block">
+ <menu_item_call.on_click
+ function="InspectAvatar.Block"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Report"
+ layout="topleft"
+ name="report">
+ <menu_item_call.on_click
+ function="InspectAvatar.Report"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Freeze"
+ layout="topleft"
+ name="freeze">
+ <menu_item_call.on_click
+ function="InspectAvatar.Freeze"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Eject"
+ layout="topleft"
+ name="eject">
+ <menu_item_call.on_click
+ function="InspectAvatar.Eject"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Debug"
+ layout="topleft"
+ name="debug">
+ <menu_item_call.on_click
+ function="InspectAvatar.Debug"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleGodMode"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Find On Map"
+ layout="topleft"
+ name="find_on_map">
+ <menu_item_call.on_click
+ function="InspectAvatar.FindOnMap"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleFindOnMap"/>
+ </menu_item_call>
+ <menu_item_call
+ enabled="false"
+ label="Zoom In"
+ layout="topleft"
+ name="zoom_in">
+ </menu_item_call>
+ <menu_item_call
+ label="Pay"
+ layout="topleft"
+ name="pay">
+ <menu_item_call.on_click
+ function="InspectAvatar.Pay"/>
+ </menu_item_call>
+</menu> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..1bba8eb264
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+ create_jump_keys="true"
+ layout="topleft"
+ mouse_opaque="false"
+ visible="false"
+ name="Gear Menu">
+ <menu_item_call
+ label="Touch"
+ layout="topleft"
+ enabled="true"
+ name="touch">
+ <menu_item_call.on_click
+ function="InspectObject.Touch"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleTouch" />
+ </menu_item_call>
+ <menu_item_call
+ label="Sit"
+ layout="topleft"
+ name="sit">
+ <menu_item_call.on_click
+ function="InspectObject.Sit"/>
+ <menu_item_call.on_visible
+ function="Object.EnableSit" />
+ </menu_item_call>
+ <menu_item_call
+ label="Pay"
+ layout="topleft"
+ name="pay">
+ <menu_item_call.on_click
+ function="InspectObject.Pay"/>
+ <menu_item_call.on_visible
+ function="VisiblePayObject" />
+ </menu_item_call>
+ <menu_item_call
+ label="Buy"
+ layout="topleft"
+ enabled="true"
+ name="buy">
+ <menu_item_call.on_click
+ function="InspectObject.Buy"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleBuy" />
+ </menu_item_call>
+ <menu_item_call
+ label="Take"
+ layout="topleft"
+ name="take">
+ <menu_item_call.on_click
+ function="Object.Take" />
+ <menu_item_call.on_enable
+ function="Object.VisibleTake"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Take Copy"
+ layout="topleft"
+ name="take_copy">
+ <menu_item_call.on_click
+ function="InspectObject.TakeFreeCopy"/>
+ <menu_item_call.on_visible
+ function="Tools.VisibleTakeCopy"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Open"
+ layout="topleft"
+ name="open">
+ <menu_item_call.on_click
+ function="InspectObject.Open"/>
+ <menu_item_call.on_visible
+ function="Object.VisibleOpen" />
+ </menu_item_call>
+ <menu_item_call
+ label="Edit"
+ layout="topleft"
+ name="report">
+ <menu_item_call.on_click
+ function="Object.Edit" />
+ <menu_item_call.on_enable
+ function="Object.VisibleEdit"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Wear"
+ layout="topleft"
+ name="wear">
+ <menu_item_call.on_click
+ function="Object.AttachToAvatar" />
+ <menu_item_call.on_visible
+ function="Object.VisibleWear" />
+ </menu_item_call>
+ <menu_item_call
+ label="Report"
+ layout="topleft"
+ name="report">
+ <menu_item_call.on_click
+ function="Object.ReportAbuse" />
+ </menu_item_call>
+ <menu_item_call
+ label="Block"
+ layout="topleft"
+ name="block">
+ <menu_item_call.on_click
+ function="Object.Mute" />
+ <menu_item_call.on_visible
+ function="Object.VisibleMute" />
+ </menu_item_call>
+ <menu_item_call
+ enabled="false"
+ label="Zoom In"
+ layout="topleft"
+ name="zoom_in">
+ </menu_item_call>
+ <menu_item_call
+ label="Remove"
+ layout="topleft"
+ name="remove">
+ <menu_item_call.on_click
+ function="Object.Delete" />
+ <menu_item_call.on_visible
+ function="Object.VisibleDelete" />
+ </menu_item_call>
+ <menu_item_call
+ label="More Info"
+ layout="topleft"
+ name="more_info">
+ <menu_item_call.on_click
+ function="InspectObject.MoreInfo"/>
+ </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fe088b43be..829c2e02d8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -447,7 +447,7 @@ Your default permissions may not work in older regions.
icon="alertmodal.tga"
name="ClickUnimplemented"
type="alertmodal">
-This feature is yet to be implemented.
+Sorry, not implemented yet.
</notification>
<notification
@@ -761,7 +761,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
name="url"
openexternally = "1">
- http://secondlife.com/registration/
+ http://join/secondlife.com/
</url>
<usetemplate
name="okcancelbuttons"
diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml
index 5f495ef8ce..4329982209 100644
--- a/indra/newview/skins/default/xui/en/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/en/panel_audio_device.xml
@@ -80,7 +80,7 @@
bg_readonly_color="0 0 0 0"
enabled="false"
height="60"
- hide_border="true"
+ border_visible="false"
hide_scrollbar="true"
layout="topleft"
left_delta="10"
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index d5ed0c986d..c3ae2d953a 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -62,7 +62,6 @@
auto_update="true"
follows="right"
draw_border="false"
- halign="left"
height="16"
layout="topleft"
left_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 0d6d8ba97d..b13058f40a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -201,7 +201,7 @@
type="string"
follows="left|top"
font="SansSerifSmall"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
@@ -272,7 +272,7 @@
<text
follows="left|top"
font="SansSerifSmall"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
@@ -305,7 +305,7 @@
<text
follows="left|top"
font="SansSerifSmall"
- font.style="BOLD"
+ font.style="BOLD"
height="15"
layout="topleft"
left="10"
@@ -391,6 +391,7 @@
follows="left|top"
height="10"
layout="topleft"
+ font="SansSerifSmall"
font.style="BOLD"
left="12"
mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 069cf1d7bd..999aa814b1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -55,7 +55,6 @@
<scroll_list
draw_heading="true"
follows="top"
- font="SansSerifSmall"
heading_height="14"
height="100"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c96c296057..aeeb884036 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -9,7 +9,7 @@
width="800">
<panel.string
name="create_account_url">
- http://secondlife.com/registration/
+ http://join.secondlife.com/
</panel.string>
<panel.string
name="real_url">
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 4e214c4095..5d9baf4019 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -172,7 +172,7 @@
name="auto_play" radio_style="false" width="150" />
<text bottom_delta="-14" follows="top|left" height="15" left="30" width="340"
enabled="false" name="">
- Note: Parcel Owners &amp; Residents can override this setting
+ Note: Residents can override this setting
</text>
<check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 02d179d503..b4212aaa34 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -17,6 +17,10 @@
http://www.secondlife.com/account/billing.php?lang=en
</string>
<string
+ name="partner_edit_link_url">
+ http://www.secondlife.com/account/partners.php?lang=en
+ </string>
+ <string
name="my_account_link_url"
value="http://secondlife.com/account" />
<string
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 9b2461db7c..9abaf29f57 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -82,7 +82,8 @@
name="progress_text"
text_color="LoginProgressBoxTextColor"
top_pad="5"
- width="593" />
+ width="593"
+ word_wrap="true"/>
<progress_bar
bottom="115"
color_bar="1 1 1 0.96"
@@ -100,11 +101,12 @@
height="100"
layout="topleft"
left="45"
- line_spacing="2"
+ line_spacing.pixels="2"
name="message_text"
text_color="LoginProgressBoxTextColor"
top="145"
- width="550" />
+ width="550"
+ word_wrap="true"/>
</layout_panel>
<layout_panel
height="200"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index a3c714ce72..765e2ae623 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -32,8 +32,6 @@
<text_editor
type="string"
length="1"
- bevel_style="none"
- border_style="line"
bottom="393"
follows="left|top|right|bottom"
font="Monospace"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 418b88b7b5..d172154d49 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -21,7 +21,6 @@
filename="panel_sidetray_home_tab.xml"
label="home"
border="true"
- font="SansSerifBold"
/>
</sidetray_tab>
@@ -44,14 +43,12 @@
name="panel_people"
filename="panel_people.xml"
border="true"
- font="SansSerifBold"
/>
<panel
class="panel_profile_view"
name="panel_profile_view"
filename="panel_profile_view.xml"
border="true"
- font="SansSerifBold"
/>
<panel
class="panel_group_info_sidetray"
@@ -107,7 +104,6 @@
filename="panel_me_profile.xml"
label="Me"
border="true"
- font="SansSerifBold"
/>
</sidetray_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index aa76a61c15..3b1b049ff2 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -28,7 +28,8 @@
name="show_help"
top="5"
right="-8"
- width="28">
+ width="28"
+ tool_tip="Show Help">
<button.commit_callback
function="Button.ShowHelp" />
</button>
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 f6ffd2e4ee..07f0806ccb 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -58,7 +58,7 @@
<text
type="string"
length="1"
- disabled_color="TimeTextColor"
+ text_readonly_color="TimeTextColor"
follows="right|bottom"
halign="right"
height="16"
@@ -100,9 +100,8 @@
visible="false"
width="16" />
<text
- type="string"
- length="1"
- disabled_color="HealthTextColor"
+ bg_visible="false"
+ text_readonly_color="HealthTextColor"
follows="rsight|bottom"
font_shadow="hard"
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index bb37f43220..d640d3ad88 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -42,11 +42,12 @@
height="20"
layout="topleft"
left_pad="5"
+ use_ellipsis="true"
name="region"
text_color="white"
top="4"
value="Unknown"
- width="380" />
+ width="330" />
<button
follows="right"
height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
index ee355fa95c..9f08d3a817 100644
--- a/indra/newview/skins/default/xui/en/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/en/panel_world_map.xml
@@ -51,7 +51,6 @@
label="N"
layout="topleft"
name="floater_map_north"
- text="N"
text_color="1 1 1 0.7">
N
</text>
@@ -61,7 +60,6 @@
label="E"
layout="topleft"
name="floater_map_east"
- text="E"
text_color="1 1 1 0.7">
E
</text>
@@ -71,7 +69,6 @@
label="W"
layout="topleft"
name="floater_map_west"
- text="W"
text_color="1 1 1 0.7">
W
</text>
@@ -81,7 +78,6 @@
label="S"
layout="topleft"
name="floater_map_south"
- text="S"
text_color="1 1 1 0.7">
S
</text>
@@ -91,7 +87,6 @@
label="SE"
layout="topleft"
name="floater_map_southeast"
- text="SE"
text_color="1 1 1 0.7">
SE
</text>
@@ -101,7 +96,6 @@
label="NE"
layout="topleft"
name="floater_map_northeast"
- text="NE"
text_color="1 1 1 0.7">
NE
</text>
@@ -111,7 +105,6 @@
label="SW"
layout="topleft"
name="floater_map_southwest"
- text="SW"
text_color="1 1 1 0.7">
SW
</text>
@@ -121,7 +114,6 @@
label="NW"
layout="topleft"
name="floater_map_northwest"
- text="NW"
text_color="1 1 1 0.7">
NW
</text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1e85cac539..3a5347fe12 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -15,9 +15,6 @@
<string name="StartupDetectingHardware">Detecting hardware...</string>
<string name="StartupLoading">Loading</string>
<string name="Fullbright">Fullbright (Legacy)</string>
- <string name="CacheWaiting">(Loading...)</string>
- <string name="CacheNobody">(nobody)</string>
- <string name="CacheNone">(none)</string>
<!-- Login -->
<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string>
<string name="LoginInProgressNoFrozen">Logging in...</string>
@@ -40,13 +37,14 @@
<string name="LoginDownloadingClothing">Downloading clothing...</string>
<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
<string name="Quit">Quit</string>
- <string name="create_account_url">http://secondlife.com/registration/</string>
+ <string name="create_account_url">http://join.secondlife.com/</string>
<!-- Disconnection -->
<string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string>
<!-- Tooltip, lltooltipview.cpp -->
+ <!-- *TODO: Most of these are now unused, eliminate them -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -118,7 +116,10 @@
<!-- Avatar name: text shown while fetching name -->
<string name="AvatarNameWaiting">(waiting)</string>
- <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+ <!-- Avatar name: More than one avatar is selected/used here -->
+ <string name="AvatarNameMultiple">(multiple)</string>
+
+ <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
<string name="AvatarNameHippos">(hippos)</string>
<!-- Group name: text shown for LLUUID::null -->
@@ -301,1450 +302,1452 @@
<string name="choose_the_directory">Choose Directory</string>
<!-- LSL Usage Hover Tips -->
- <string name="LSLTipSleepTime">
+ <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
+ This has no effect on viewer code, but prevents Linden Lab internal localization tool from scraping these strings. -->
+ <string name="LSLTipSleepTime" translate="false">
Sleeps script for [SLEEP_TIME] seconds.
</string>
- <string name="LSLTipText_llSin">
+ <string name="LSLTipText_llSin" translate="false">
float llSin(float theta)
Returns the sine of theta (theta in radians)
</string>
- <string name="LSLTipText_llCos">
+ <string name="LSLTipText_llCos" translate="false">
float llCos(float theta)
Returns the cosine of theta (theta in radians)
</string>
- <string name="LSLTipText_llTan">
+ <string name="LSLTipText_llTan" translate="false">
float llTan(float theta)
Returns the tangent of theta (theta in radians)
</string>
- <string name="LSLTipText_llAtan2">
+ <string name="LSLTipText_llAtan2" translate="false">
float llAtan2(float y, float x)
Returns the arctangent2 of y, x
</string>
- <string name="LSLTipText_llSqrt">
+ <string name="LSLTipText_llSqrt" translate="false">
float llSqrt(float val)
Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
</string>
- <string name="LSLTipText_llPow">
+ <string name="LSLTipText_llPow" translate="false">
float llPow(float base, float exponent)
Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
</string>
- <string name="LSLTipText_llAbs">
+ <string name="LSLTipText_llAbs" translate="false">
integer llAbs(integer val)
Returns the positive version of val
</string>
- <string name="LSLTipText_llFabs">
+ <string name="LSLTipText_llFabs" translate="false">
float llFabs(float val)
Returns the positive version of val
</string>
- <string name="LSLTipText_llFrand">
+ <string name="LSLTipText_llFrand" translate="false">
float llFrand(float mag)
Returns a pseudo random number in the range [0,mag) or (mag,0]
</string>
- <string name="LSLTipText_llFloor">
+ <string name="LSLTipText_llFloor" translate="false">
integer llFloor(float val)
Returns largest integer value &lt;= val
</string>
- <string name="LSLTipText_llCeil">
+ <string name="LSLTipText_llCeil" translate="false">
integer llCeil(float val)
Returns smallest integer value &gt;= val
</string>
- <string name="LSLTipText_llRound">
+ <string name="LSLTipText_llRound" translate="false">
integer llRound(float val)
Returns val rounded to the nearest integer
</string>
- <string name="LSLTipText_llVecMag">
+ <string name="LSLTipText_llVecMag" translate="false">
float llVecMag(vector v)
Returns the magnitude of v
</string>
- <string name="LSLTipText_llVecNorm">
+ <string name="LSLTipText_llVecNorm" translate="false">
vector llVecNorm(vector v)
Returns the v normalized
</string>
- <string name="LSLTipText_llVecDist">
+ <string name="LSLTipText_llVecDist" translate="false">
float llVecDist(vector v1, vector v2)
Returns the 3D distance between v1 and v2
</string>
- <string name="LSLTipText_llRot2Euler">
+ <string name="LSLTipText_llRot2Euler" translate="false">
vector llRot2Euler(rotation q)
Returns the Euler representation (roll, pitch, yaw) of q
</string>
- <string name="LSLTipText_llEuler2Rot">
+ <string name="LSLTipText_llEuler2Rot" translate="false">
rotation llEuler2Rot(vector v)
Returns the rotation representation of Euler Angles v
</string>
- <string name="LSLTipText_llAxes2Rot">
+ <string name="LSLTipText_llAxes2Rot" translate="false">
rotation llAxes2Rot(vector fwd, vector left, vector up)
Returns the rotation defined by the coordinate axes
</string>
- <string name="LSLTipText_llRot2Fwd">
+ <string name="LSLTipText_llRot2Fwd" translate="false">
vector llRot2Fwd(rotation q)
Returns the forward vector defined by q
</string>
- <string name="LSLTipText_llRot2Left">
+ <string name="LSLTipText_llRot2Left" translate="false">
vector llRot2Left(rotation q)
Returns the left vector defined by q
</string>
- <string name="LSLTipText_llRot2Up">
+ <string name="LSLTipText_llRot2Up" translate="false">
vector llRot2Up(rotation q)
Returns the up vector defined by q
</string>
- <string name="LSLTipText_llRotBetween">
+ <string name="LSLTipText_llRotBetween" translate="false">
rotation llRotBetween(vector v1, vector v2)
Returns the rotation to rotate v1 to v2
</string>
- <string name="LSLTipText_llWhisper">
+ <string name="LSLTipText_llWhisper" translate="false">
llWhisper(integer channel, string msg)
Whispers the text of msg on channel
</string>
- <string name="LSLTipText_llSay">
+ <string name="LSLTipText_llSay" translate="false">
llSay(integer channel, string msg)
Says the text of msg on channel
</string>
- <string name="LSLTipText_llShout">
+ <string name="LSLTipText_llShout" translate="false">
llShout(integer channel, string msg)
Shouts the text of msg on channel
</string>
- <string name="LSLTipText_llListen">
+ <string name="LSLTipText_llListen" translate="false">
integer llListen(integer channel, string name, key id, string msg)
Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
</string>
- <string name="LSLTipText_llListenControl">
+ <string name="LSLTipText_llListenControl" translate="false">
llListenControl(integer number, integer active)
Makes a listen event callback active or inactive
</string>
- <string name="LSLTipText_llListenRemove">
+ <string name="LSLTipText_llListenRemove" translate="false">
llListenRemove(integer number)
Removes listen event callback number
</string>
- <string name="LSLTipText_llSensor">
+ <string name="LSLTipText_llSensor" translate="false">
llSensor(string name, key id, integer type, float range, float arc)
Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
</string>
- <string name="LSLTipText_llSensorRepeat">
+ <string name="LSLTipText_llSensorRepeat" translate="false">
llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
</string>
- <string name="LSLTipText_llSensorRemove">
+ <string name="LSLTipText_llSensorRemove" translate="false">
llSensorRemove()
Removes the sensor setup by llSensorRepeat
</string>
- <string name="LSLTipText_llDetectedName">
+ <string name="LSLTipText_llDetectedName" translate="false">
string llDetectedName(integer number)
Returns the name of detected object number (returns empty string if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedKey">
+ <string name="LSLTipText_llDetectedKey" translate="false">
key llDetectedKey(integer number)
Returns the key of detected object number (returns empty key if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedOwner">
+ <string name="LSLTipText_llDetectedOwner" translate="false">
key llDetectedOwner(integer number)
Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedType">
+ <string name="LSLTipText_llDetectedType" translate="false">
integer llDetectedType(integer number)
Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedPos">
+ <string name="LSLTipText_llDetectedPos" translate="false">
vector llDetectedPos(integer number)
Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedVel">
+ <string name="LSLTipText_llDetectedVel" translate="false">
vector llDetectedVel(integer number)
Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedGrab">
+ <string name="LSLTipText_llDetectedGrab" translate="false">
vector llDetectedGrab(integer number)
Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedRot">
+ <string name="LSLTipText_llDetectedRot" translate="false">
rotation llDetectedRot(integer number)
Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
</string>
- <string name="LSLTipText_llDetectedGroup">
+ <string name="LSLTipText_llDetectedGroup" translate="false">
integer llDetectedGroup(integer number)
Returns TRUE if detected object is part of same group as owner
</string>
- <string name="LSLTipText_llDetectedLinkNumber">
+ <string name="LSLTipText_llDetectedLinkNumber" translate="false">
integer llDetectedLinkNumber(integer number)
Returns the link position of the triggered event for touches and collisions only
</string>
- <string name="LSLTipText_llDie">
+ <string name="LSLTipText_llDie" translate="false">
llDie()
Deletes the object
</string>
- <string name="LSLTipText_llGround">
+ <string name="LSLTipText_llGround" translate="false">
float llGround(vector offset)
Returns the ground height below the object position + offset
</string>
- <string name="LSLTipText_llCloud">
+ <string name="LSLTipText_llCloud" translate="false">
float llCloud(vector offset)
Returns the cloud density at the object position + offset
</string>
- <string name="LSLTipText_llWind">
+ <string name="LSLTipText_llWind" translate="false">
vector llWind(vector offset)
Returns the wind velocity at the object position + offset
</string>
- <string name="LSLTipText_llSetStatus">
+ <string name="LSLTipText_llSetStatus" translate="false">
llSetStatus(integer status, integer value)
Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
</string>
- <string name="LSLTipText_llGetStatus">
+ <string name="LSLTipText_llGetStatus" translate="false">
integer llGetStatus(integer status)
Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
</string>
- <string name="LSLTipText_llSetScale">
+ <string name="LSLTipText_llSetScale" translate="false">
llSetScale(vector scale)
Sets the scale of the prim
</string>
- <string name="LSLTipText_llGetScale">
+ <string name="LSLTipText_llGetScale" translate="false">
vector llGetScale()
Returns the scale of the prim
</string>
- <string name="LSLTipText_llSetColor">
+ <string name="LSLTipText_llSetColor" translate="false">
llSetColor(vector color, integer face)
Sets the color on face of the prim
</string>
- <string name="LSLTipText_llGetAlpha">
+ <string name="LSLTipText_llGetAlpha" translate="false">
float llGetAlpha(integer face)
Returns the alpha of face
</string>
- <string name="LSLTipText_llSetAlpha">
+ <string name="LSLTipText_llSetAlpha" translate="false">
llSetAlpha(float alpha, integer face)
Sets the alpha on face
</string>
- <string name="LSLTipText_llGetColor">
+ <string name="LSLTipText_llGetColor" translate="false">
vector llGetColor(integer face)
Returns the color on face
</string>
- <string name="LSLTipText_llSetTexture">
+ <string name="LSLTipText_llSetTexture" translate="false">
llSetTexture(string texture, integer face)
Sets the texture of face or ALL_SIDES
</string>
- <string name="LSLTipText_llScaleTexture">
+ <string name="LSLTipText_llScaleTexture" translate="false">
llScaleTexture(float u, float v, integer face)
Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
</string>
- <string name="LSLTipText_llOffsetTexture">
+ <string name="LSLTipText_llOffsetTexture" translate="false">
llOffsetTexture(float u, float v, integer face)
Sets the texture u &amp; v offsets for the chosen face or ALL_SIDES
</string>
- <string name="LSLTipText_llRotateTexture">
+ <string name="LSLTipText_llRotateTexture" translate="false">
llRotateTexture(float rotation, integer face)
Sets the texture rotation for the chosen face
</string>
- <string name="LSLTipText_llGetTexture">
+ <string name="LSLTipText_llGetTexture" translate="false">
string llGetTexture(integer face)
Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
</string>
- <string name="LSLTipText_llSetPos">
+ <string name="LSLTipText_llSetPos" translate="false">
llSetPos(vector pos)
Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
</string>
- <string name="LSLTipText_llGetPos">
+ <string name="LSLTipText_llGetPos" translate="false">
vector llGetPos()
Returns the position of the task in region coordinates
</string>
- <string name="LSLTipText_llGetLocalPos">
+ <string name="LSLTipText_llGetLocalPos" translate="false">
vector llGetLocalPos()
Returns the position relative to the root
</string>
- <string name="LSLTipText_llSetRot">
+ <string name="LSLTipText_llSetRot" translate="false">
llSetRot(rotation rot)
Sets the rotation
</string>
- <string name="LSLTipText_llGetRot">
+ <string name="LSLTipText_llGetRot" translate="false">
rotation llGetRot()
Returns the rotation relative to the region&apos;s axes
</string>
- <string name="LSLTipText_llGetLocalRot">
+ <string name="LSLTipText_llGetLocalRot" translate="false">
rotation llGetLocalRot()
Returns the rotation local to the root
</string>
- <string name="LSLTipText_llSetForce">
+ <string name="LSLTipText_llSetForce" translate="false">
llSetForce(vector force, integer local)
Applies force to the object (if the script is physical), in local coords if local == TRUE
</string>
- <string name="LSLTipText_llGetForce">
+ <string name="LSLTipText_llGetForce" translate="false">
vector llGetForce()
Returns the force (if the script is physical)
</string>
- <string name="LSLTipText_llTarget">
+ <string name="LSLTipText_llTarget" translate="false">
integer llTarget(vector position, float range)
Sets positions within range of position as a target and return an ID for the target
</string>
- <string name="LSLTipText_llTargetRemove">
+ <string name="LSLTipText_llTargetRemove" translate="false">
llTargetRemove(integer number)
Removes positional target number registered with llTarget
</string>
- <string name="LSLTipText_llRotTarget">
+ <string name="LSLTipText_llRotTarget" translate="false">
integer llRotTarget(rotation rot, float error)
Set rotations with error of rot as a rotational target and return an ID for the rotational target
</string>
- <string name="LSLTipText_llRotTargetRemove">
+ <string name="LSLTipText_llRotTargetRemove" translate="false">
llRotTargetRemove(integer number)
Removes rotational target number registered with llRotTarget
</string>
- <string name="LSLTipText_llMoveToTarget">
+ <string name="LSLTipText_llMoveToTarget" translate="false">
llMoveToTarget(vector target, float tau)
Critically damps to target in tau seconds (if the script is physical)
</string>
- <string name="LSLTipText_llStopMoveToTarget">
+ <string name="LSLTipText_llStopMoveToTarget" translate="false">
llStopMoveToTarget()
Stops critically damped motion
</string>
- <string name="LSLTipText_llApplyImpulse">
+ <string name="LSLTipText_llApplyImpulse" translate="false">
llApplyImpulse(vector force, integer local)
Applies impulse to object (if the script is physical), in local coords if local == TRUE
</string>
- <string name="LSLTipText_llApplyRotationalImpulse">
+ <string name="LSLTipText_llApplyRotationalImpulse" translate="false">
llApplyRotationalImpulse(vector force, integer local)
Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
</string>
- <string name="LSLTipText_llSetTorque">
+ <string name="LSLTipText_llSetTorque" translate="false">
llSetTorque(vector torque, integer local)
Sets the torque of object (if the script is physical), in local coords if local == TRUE
</string>
- <string name="LSLTipText_llGetTorque">
+ <string name="LSLTipText_llGetTorque" translate="false">
vector llGetTorque()
Returns the torque (if the script is physical)
</string>
- <string name="LSLTipText_llSetForceAndTorque">
+ <string name="LSLTipText_llSetForceAndTorque" translate="false">
llSetForceAndTorque(vector force, vector torque, integer local)
Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
</string>
- <string name="LSLTipText_llGetVel">
+ <string name="LSLTipText_llGetVel" translate="false">
vector llGetVel()
Returns the velocity of the object
</string>
- <string name="LSLTipText_llGetAccel">
+ <string name="LSLTipText_llGetAccel" translate="false">
vector llGetAccel()
Returns the acceleration of the object relative to the region&apos;s axes
</string>
- <string name="LSLTipText_llGetOmega">
+ <string name="LSLTipText_llGetOmega" translate="false">
vector llGetOmega()
Returns the rotation velocity in radians per second
</string>
- <string name="LSLTipText_llGetTimeOfDay">
+ <string name="LSLTipText_llGetTimeOfDay" translate="false">
float llGetTimeOfDay()
Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
</string>
- <string name="LSLTipText_llGetWallclock">
+ <string name="LSLTipText_llGetWallclock" translate="false">
float llGetWallclock()
Returns the time in seconds since midnight California Pacific time (PST/PDT)
</string>
- <string name="LSLTipText_llGetTime">
+ <string name="LSLTipText_llGetTime" translate="false">
float llGetTime()
Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
</string>
- <string name="LSLTipText_llResetTime">
+ <string name="LSLTipText_llResetTime" translate="false">
llResetTime()
Sets the script timer to zero
</string>
- <string name="LSLTipText_llGetAndResetTime">
+ <string name="LSLTipText_llGetAndResetTime" translate="false">
float llGetAndResetTime()
Returns the script time in seconds and then resets the script timer to zero
</string>
- <string name="LSLTipText_llSound">
+ <string name="LSLTipText_llSound" translate="false">
llSound(string sound, float volume, integer queue, integer loop)
Plays sound at volume and whether it should loop or not
</string>
- <string name="LSLTipText_llPlaySound">
+ <string name="LSLTipText_llPlaySound" translate="false">
llPlaySound(string sound, float volume)
Plays attached sound once at volume (0.0 - 1.0)
</string>
- <string name="LSLTipText_llLoopSound">
+ <string name="LSLTipText_llLoopSound" translate="false">
llLoopSound(string sound, float volume)
Plays attached sound looping indefinitely at volume (0.0 - 1.0)
</string>
- <string name="LSLTipText_llLoopSoundMaster">
+ <string name="LSLTipText_llLoopSoundMaster" translate="false">
llLoopSoundMaster(string sound, float volume)
Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
</string>
- <string name="LSLTipText_llLoopSoundSlave">
+ <string name="LSLTipText_llLoopSoundSlave" translate="false">
llLoopSoundSlave(string sound, float volume)
Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
</string>
- <string name="LSLTipText_llPlaySoundSlave">
+ <string name="LSLTipText_llPlaySoundSlave" translate="false">
llPlaySoundSlave(string sound, float volume)
Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
</string>
- <string name="LSLTipText_llTriggerSound">
+ <string name="LSLTipText_llTriggerSound" translate="false">
llTriggerSound(string sound, float volume)
Plays sound at volume (0.0 - 1.0), centered at but not attached to object
</string>
- <string name="LSLTipText_llStopSound">
+ <string name="LSLTipText_llStopSound" translate="false">
llStopSound()
Stops currently attached sound
</string>
- <string name="LSLTipText_llPreloadSound">
+ <string name="LSLTipText_llPreloadSound" translate="false">
llPreloadSound(string sound)
Preloads a sound on viewers within range
</string>
- <string name="LSLTipText_llGetSubString">
+ <string name="LSLTipText_llGetSubString" translate="false">
string llGetSubString(string src, integer start, integer end)
Returns the indicated substring
</string>
- <string name="LSLTipText_llDeleteSubString">
+ <string name="LSLTipText_llDeleteSubString" translate="false">
string llDeleteSubString(string src, integer start, integer end)
Removes the indicated substring and returns the result
</string>
- <string name="LSLTipText_llInsertString">
+ <string name="LSLTipText_llInsertString" translate="false">
string llInsertString(string dst, integer position, string src)
Returns a destination string dst with the string src inserted starting at position pos
</string>
- <string name="LSLTipText_llToUpper">
+ <string name="LSLTipText_llToUpper" translate="false">
string llToUpper(string src)
Returns a string that is src with all upper-case characters
</string>
- <string name="LSLTipText_llToLower">
+ <string name="LSLTipText_llToLower" translate="false">
string llToLower(string src)
Returns a string that is src with all lower-case characters
</string>
- <string name="LSLTipText_llGiveMoney">
+ <string name="LSLTipText_llGiveMoney" translate="false">
llGiveMoney(key destination, integer amount)
Transfers amount of L$ from script owner to destination
</string>
- <string name="LSLTipText_llMakeExplosion">
+ <string name="LSLTipText_llMakeExplosion" translate="false">
llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
Makes a round explosion of particles
</string>
- <string name="LSLTipText_llMakeFountain">
+ <string name="LSLTipText_llMakeFountain" translate="false">
llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
Makes a fountain of particles
</string>
- <string name="LSLTipText_llMakeSmoke">
+ <string name="LSLTipText_llMakeSmoke" translate="false">
llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
Makes smoke like particles
</string>
- <string name="LSLTipText_llMakeFire">
+ <string name="LSLTipText_llMakeFire" translate="false">
llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
Makes fire like particles
</string>
- <string name="LSLTipText_llRezObject">
+ <string name="LSLTipText_llRezObject" translate="false">
llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
</string>
- <string name="LSLTipText_llLookAt">
+ <string name="LSLTipText_llLookAt" translate="false">
llLookAt(vector target, float strength, float damping)
Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
</string>
- <string name="LSLTipText_llStopLookAt">
+ <string name="LSLTipText_llStopLookAt" translate="false">
llStopLookAt()
Stops causing object to point at a target
</string>
- <string name="LSLTipText_llSetTimerEvent">
+ <string name="LSLTipText_llSetTimerEvent" translate="false">
llSetTimerEvent(float sec)
Causes the timer event to be triggered a maximum of once every sec seconds
</string>
- <string name="LSLTipText_llSleep">
+ <string name="LSLTipText_llSleep" translate="false">
llSleep(float sec)
Puts the script to sleep for sec seconds
</string>
- <string name="LSLTipText_llGetMass">
+ <string name="LSLTipText_llGetMass" translate="false">
float llGetMass()
Returns the mass of object that the script is attached to
</string>
- <string name="LSLTipText_llCollisionFilter">
+ <string name="LSLTipText_llCollisionFilter" translate="false">
llCollisionFilter(string name, key id, integer accept)
Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
</string>
- <string name="LSLTipText_llTakeControls">
+ <string name="LSLTipText_llTakeControls" translate="false">
llTakeControls(integer controls, integer accept, integer pass_on)
Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
</string>
- <string name="LSLTipText_llReleaseControls">
+ <string name="LSLTipText_llReleaseControls" translate="false">
llReleaseControls()
Stops taking inputs that were taken with llTakeControls
</string>
- <string name="LSLTipText_llAttachToAvatar">
+ <string name="LSLTipText_llAttachToAvatar" translate="false">
llAttachToAvatar(integer attach_point)
Attaches the object to the avatar who has granted permission to the script
</string>
- <string name="LSLTipText_llDetachFromAvatar">
+ <string name="LSLTipText_llDetachFromAvatar" translate="false">
llDetachFromAvatar()
Detaches object from avatar
</string>
- <string name="LSLTipText_llTakeCamera">
+ <string name="LSLTipText_llTakeCamera" translate="false">
llTakeCamera(key avatar)
Moves avatar&apos;s viewpoint to task
</string>
- <string name="LSLTipText_llReleaseCamera">
+ <string name="LSLTipText_llReleaseCamera" translate="false">
llReleaseCamera(key avatar)
Returns camera to agent avatar
</string>
- <string name="LSLTipText_llGetOwner">
+ <string name="LSLTipText_llGetOwner" translate="false">
key llGetOwner()
Returns the object owner&apos;s UUID
</string>
- <string name="LSLTipText_llInstantMessage">
+ <string name="LSLTipText_llInstantMessage" translate="false">
llInstantMessage(key user, string message)
Sends the specified string as an Instant Message to the user
</string>
- <string name="LSLTipText_llEmail">
+ <string name="LSLTipText_llEmail" translate="false">
llEmail(string address, string subject, string message)
Sends an email to address with the subject and message
</string>
- <string name="LSLTipText_llGetNextEmail">
+ <string name="LSLTipText_llGetNextEmail" translate="false">
llGetNextEmail(string address, string subject)
Gets the next waiting email that comes from address, with specified subject
</string>
- <string name="LSLTipText_llGetKey">
+ <string name="LSLTipText_llGetKey" translate="false">
key llGetKey()
Returns the key of the prim the script is attached to
</string>
- <string name="LSLTipText_llSetBuoyancy">
+ <string name="LSLTipText_llSetBuoyancy" translate="false">
llSetBuoyancy(float buoyancy)
Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
</string>
- <string name="LSLTipText_llSetHoverHeight">
+ <string name="LSLTipText_llSetHoverHeight" translate="false">
llSetHoverHeight(float height, integer water, float tau)
Critically damps to a height above the ground (or water) in tau seconds
</string>
- <string name="LSLTipText_llStopHover">
+ <string name="LSLTipText_llStopHover" translate="false">
llStopHover()
Stops hovering to a height
</string>
- <string name="LSLTipText_llMinEventDelay">
+ <string name="LSLTipText_llMinEventDelay" translate="false">
llMinEventDelay(float delay)
Sets the minimum time between events being handled
</string>
- <string name="LSLTipText_llSoundPreload">
+ <string name="LSLTipText_llSoundPreload" translate="false">
llSoundPreload(string sound)
Preloads a sound on viewers within range
</string>
- <string name="LSLTipText_llRotLookAt">
+ <string name="LSLTipText_llRotLookAt" translate="false">
llRotLookAt(rotation target, float strength, float damping)
Causes object name to point its forward axis towards target
</string>
- <string name="LSLTipText_llStringLength">
+ <string name="LSLTipText_llStringLength" translate="false">
integer llStringLength(string str)
Returns the length of string
</string>
- <string name="LSLTipText_llStartAnimation">
+ <string name="LSLTipText_llStartAnimation" translate="false">
llStartAnimation(string anim)
Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
</string>
- <string name="LSLTipText_llStopAnimation">
+ <string name="LSLTipText_llStopAnimation" translate="false">
llStopAnimation(string anim)
Stops animation anim for agent that granted permission
</string>
- <string name="LSLTipText_llPointAt">
+ <string name="LSLTipText_llPointAt" translate="false">
llPointAt(vector pos)
Makes agent that owns object point at pos
</string>
- <string name="LSLTipText_llStopPointAt">
+ <string name="LSLTipText_llStopPointAt" translate="false">
llStopPointAt()
Stops pointing agent that owns object
</string>
- <string name="LSLTipText_llTargetOmega">
+ <string name="LSLTipText_llTargetOmega" translate="false">
llTargetOmega(vector axis, float spinrate, float gain)
Rotates the object around axis at spinrate with strength gain
</string>
- <string name="LSLTipText_llGetStartParameter">
+ <string name="LSLTipText_llGetStartParameter" translate="false">
integer llGetStartParameter()
Returns an integer that is the script start/rez parameter
</string>
- <string name="LSLTipText_llGodLikeRezObject">
+ <string name="LSLTipText_llGodLikeRezObject" translate="false">
llGodLikeRezObject(key inventory, vector pos)
Rezzes directly off of UUID if owner is in God Mode
</string>
- <string name="LSLTipText_llRequestPermissions">
+ <string name="LSLTipText_llRequestPermissions" translate="false">
llRequestPermissions(key agent, integer perm)
Asks the agent for permission to run certain classes of functions
</string>
- <string name="LSLTipText_llGetPermissionsKey">
+ <string name="LSLTipText_llGetPermissionsKey" translate="false">
key llGetPermissionsKey()
Returns the key of the avatar that last granted permissions to the script
</string>
- <string name="LSLTipText_llGetPermissions">
+ <string name="LSLTipText_llGetPermissions" translate="false">
integer llGetPermissions()
Returns an integer bitfield with the permissions that have been granted
</string>
- <string name="LSLTipText_llGetLinkNumber">
+ <string name="LSLTipText_llGetLinkNumber" translate="false">
integer llGetLinkNumber()
Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
</string>
- <string name="LSLTipText_llSetLinkColor">
+ <string name="LSLTipText_llSetLinkColor" translate="false">
llSetLinkColor(integer linknumber, vector color, integer face)
Sets face to color if a task exists in the link chain at linknumber
</string>
- <string name="LSLTipText_llCreateLink">
+ <string name="LSLTipText_llCreateLink" translate="false">
llCreateLink(key target, integer parent)
Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
</string>
- <string name="LSLTipText_llBreakLink">
+ <string name="LSLTipText_llBreakLink" translate="false">
llBreakLink(integer linknum)
Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
</string>
- <string name="LSLTipText_llBreakAllLinks">
+ <string name="LSLTipText_llBreakAllLinks" translate="false">
llBreakAllLinks()
Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
</string>
- <string name="LSLTipText_llGetLinkKey">
+ <string name="LSLTipText_llGetLinkKey" translate="false">
key llGetLinkKey(integer linknumber)
Returns the key of the linked prim linknumber
</string>
- <string name="LSLTipText_llGetLinkName">
+ <string name="LSLTipText_llGetLinkName" translate="false">
string llGetLinkName(integer linknumber)
Returns the name of linknumber in a link set
</string>
- <string name="LSLTipText_llGetInventoryNumber">
+ <string name="LSLTipText_llGetInventoryNumber" translate="false">
integer llGetInventoryNumber(integer type)
Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
</string>
- <string name="LSLTipText_llGetInventoryName">
+ <string name="LSLTipText_llGetInventoryName" translate="false">
string llGetInventoryName(integer type, integer number)
Returns the name of the inventory item number of a given type
</string>
- <string name="LSLTipText_llSetScriptState">
+ <string name="LSLTipText_llSetScriptState" translate="false">
llSetScriptState(string name, integer run)
Sets the running state of the specified script
</string>
- <string name="LSLTipText_llGetEnergy">
+ <string name="LSLTipText_llGetEnergy" translate="false">
float llGetEnergy()
Returns how much energy is in the object as a percentage of maximum
</string>
- <string name="LSLTipText_llGiveInventory">
+ <string name="LSLTipText_llGiveInventory" translate="false">
llGiveInventory(key destination, string inventory)
Gives inventory to destination
</string>
- <string name="LSLTipText_llRemoveInventory">
+ <string name="LSLTipText_llRemoveInventory" translate="false">
llRemoveInventory(string item)
Removes the named inventory item
</string>
- <string name="LSLTipText_llSetText">
+ <string name="LSLTipText_llSetText" translate="false">
llSetText(string text, vector color, float alpha)
Displays text that hovers over the prim with specific color and translucency specified with alpha
</string>
- <string name="LSLTipText_llWater">
+ <string name="LSLTipText_llWater" translate="false">
float llWater(vector offset)
Returns the water height below the object position + offset
</string>
- <string name="LSLTipText_llPassTouches">
+ <string name="LSLTipText_llPassTouches" translate="false">
llPassTouches(integer pass)
If pass == TRUE, touches are passed from children on to parents
</string>
- <string name="LSLTipText_llRequestAgentData">
+ <string name="LSLTipText_llRequestAgentData" translate="false">
key llRequestAgentData(key id, integer data)
Requests data about agent id. When data is available the dataserver event will be raised.
</string>
- <string name="LSLTipText_llRequestInventoryData">
+ <string name="LSLTipText_llRequestInventoryData" translate="false">
key llRequestInventoryData(string name)
Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
</string>
- <string name="LSLTipText_llSetDamage">
+ <string name="LSLTipText_llSetDamage" translate="false">
llSetDamage(float damage)
Sets the amount of damage that will be done when this object hits an avatar.
</string>
- <string name="LSLTipText_llTeleportAgentHome">
+ <string name="LSLTipText_llTeleportAgentHome" translate="false">
llTeleportAgentHome(key id)
Teleports avatar on the owner&apos;s land to their home location without any warning
</string>
- <string name="LSLTipText_llModifyLand">
+ <string name="LSLTipText_llModifyLand" translate="false">
llModifyLand(integer action, integer brush)
Modifies land using the specified action on the specified brush size of land
</string>
- <string name="LSLTipText_llCollisionSound">
+ <string name="LSLTipText_llCollisionSound" translate="false">
llCollisionSound(string impact_sound, float impact_volume)
Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
</string>
- <string name="LSLTipText_llCollisionSprite">
+ <string name="LSLTipText_llCollisionSprite" translate="false">
llCollisionSprite(string impact_sprite)
Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
</string>
- <string name="LSLTipText_llGetAnimation">
+ <string name="LSLTipText_llGetAnimation" translate="false">
string llGetAnimation(key id)
Returns the name of the currently playing locomotion animation for avatar id
</string>
- <string name="LSLTipText_llResetScript">
+ <string name="LSLTipText_llResetScript" translate="false">
llResetScript()
Resets the script
</string>
- <string name="LSLTipText_llMessageLinked">
+ <string name="LSLTipText_llMessageLinked" translate="false">
llMessageLinked(integer linknum, integer num, string str, key id)
Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
</string>
- <string name="LSLTipText_llPushObject">
+ <string name="LSLTipText_llPushObject" translate="false">
llPushObject(key id, vector impulse, vector ang_impulse, integer local)
Applies impulse and ang_impulse to object id
</string>
- <string name="LSLTipText_llPassCollisions">
+ <string name="LSLTipText_llPassCollisions" translate="false">
llPassCollisions(integer pass)
If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
</string>
- <string name="LSLTipText_llGetScriptName">
+ <string name="LSLTipText_llGetScriptName" translate="false">
string llGetScriptName()
Returns the name of the script that this function is used in
</string>
- <string name="LSLTipText_llGetNumberOfSides">
+ <string name="LSLTipText_llGetNumberOfSides" translate="false">
integer llGetNumberOfSides()
Returns the number of faces (or sides) of the prim
</string>
- <string name="LSLTipText_llAxisAngle2Rot">
+ <string name="LSLTipText_llAxisAngle2Rot" translate="false">
rotation llAxisAngle2Rot(vector axis, float angle)
Returns the rotation that is a generated angle about axis
</string>
- <string name="LSLTipText_llRot2Axis">
+ <string name="LSLTipText_llRot2Axis" translate="false">
vector llRot2Axis(rotation rot)
Returns the rotation axis represented by rot
</string>
- <string name="LSLTipText_llRot2Angle">
+ <string name="LSLTipText_llRot2Angle" translate="false">
float llRot2Angle(rotation rot)
Returns the rotation angle represented by rot
</string>
- <string name="LSLTipText_llAcos">
+ <string name="LSLTipText_llAcos" translate="false">
float llAcos(float val)
Returns the arccosine in radians of val
</string>
- <string name="LSLTipText_llAsin">
+ <string name="LSLTipText_llAsin" translate="false">
float llAsin(float val)
Returns the arcsine in radians of val
</string>
- <string name="LSLTipText_llAngleBetween">
+ <string name="LSLTipText_llAngleBetween" translate="false">
float llAngleBetween(rotation a, rotation b)
Returns angle between rotation a and b
</string>
- <string name="LSLTipText_llGetInventoryKey">
+ <string name="LSLTipText_llGetInventoryKey" translate="false">
key llGetInventoryKey(string name)
Returns the key that is the UUID of the inventory name
</string>
- <string name="LSLTipText_llAllowInventoryDrop">
+ <string name="LSLTipText_llAllowInventoryDrop" translate="false">
llAllowInventoryDrop(integer add)
If add == TRUE, users without modify permissions can still drop inventory items onto a prim
</string>
- <string name="LSLTipText_llGetSunDirection">
+ <string name="LSLTipText_llGetSunDirection" translate="false">
vector llGetSunDirection()
Returns a normalized vector of the direction of the sun in the region
</string>
- <string name="LSLTipText_llGetTextureOffset">
+ <string name="LSLTipText_llGetTextureOffset" translate="false">
vector llGetTextureOffset(integer face)
Returns the texture offset of face in the x and y components of a vector
</string>
- <string name="LSLTipText_llGetTextureScale">
+ <string name="LSLTipText_llGetTextureScale" translate="false">
vector llGetTextureScale(integer side)
Returns the texture scale of side in the x and y components of a vector
</string>
- <string name="LSLTipText_llGetTextureRot">
+ <string name="LSLTipText_llGetTextureRot" translate="false">
float llGetTextureRot(integer side)
Returns the texture rotation of side
</string>
- <string name="LSLTipText_llSubStringIndex">
+ <string name="LSLTipText_llSubStringIndex" translate="false">
integer llSubStringIndex(string source, string pattern)
Returns an integer that is the index in source where pattern first appears.
(Returns -1 if not found)
</string>
- <string name="LSLTipText_llGetOwnerKey">
+ <string name="LSLTipText_llGetOwnerKey" translate="false">
key llGetOwnerKey(key id)
Returns the owner of object id
</string>
- <string name="LSLTipText_llGetCenterOfMass">
+ <string name="LSLTipText_llGetCenterOfMass" translate="false">
vector llGetCenterOfMass()
Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
</string>
- <string name="LSLTipText_llListSort">
+ <string name="LSLTipText_llListSort" translate="false">
list llListSort(list src, integer stride, integer ascending)
Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
The sort order is affected by type.
</string>
- <string name="LSLTipText_llGetListLength">
+ <string name="LSLTipText_llGetListLength" translate="false">
integer llGetListLength(list src)
Returns the number of elements in the list
</string>
- <string name="LSLTipText_llList2Integer">
+ <string name="LSLTipText_llList2Integer" translate="false">
integer llList2Integer(list src, integer index)
Copies the integer at index in the list
</string>
- <string name="LSLTipText_llList2Float">
+ <string name="LSLTipText_llList2Float" translate="false">
float llList2Float(list src, integer index)
Copies the float at index in the list
</string>
- <string name="LSLTipText_llList2String">
+ <string name="LSLTipText_llList2String" translate="false">
string llList2String(list src, integer index)
Copies the string at index in the list
</string>
- <string name="LSLTipText_llList2Key">
+ <string name="LSLTipText_llList2Key" translate="false">
key llList2Key(list src, integer index)
Copies the key at index in the list
</string>
- <string name="LSLTipText_llList2Vector">
+ <string name="LSLTipText_llList2Vector" translate="false">
vector llList2Vector(list src, integer index)
Copies the vector at index in the list
</string>
- <string name="LSLTipText_llList2Rot">
+ <string name="LSLTipText_llList2Rot" translate="false">
rotation llList2Rot(list src, integer index)
Copies the rotation at index in the list
</string>
- <string name="LSLTipText_llList2List">
+ <string name="LSLTipText_llList2List" translate="false">
list llList2List(list src, integer start, integer end)
Copies the slice of the list from start to end
</string>
- <string name="LSLTipText_llDeleteSubList">
+ <string name="LSLTipText_llDeleteSubList" translate="false">
list llDeleteSubList(list src, integer start, integer end)
Removes the slice from start to end and returns the remainder of the list
</string>
- <string name="LSLTipText_llGetListEntryType">
+ <string name="LSLTipText_llGetListEntryType" translate="false">
integer llGetListEntryType(list src, integer index)
Returns the type of the index entry in the list
(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
</string>
- <string name="LSLTipText_llList2CSV">
+ <string name="LSLTipText_llList2CSV" translate="false">
string llList2CSV(list src)
Creates a string of comma separated values from list
</string>
- <string name="LSLTipText_llCSV2List">
+ <string name="LSLTipText_llCSV2List" translate="false">
list llCSV2List(string src)
Creates a list from a string of comma separated values
</string>
- <string name="LSLTipText_llListRandomize">
+ <string name="LSLTipText_llListRandomize" translate="false">
list llListRandomize(list src, integer stride)
Returns a randomized list of blocks of size stride
</string>
- <string name="LSLTipText_llList2ListStrided">
+ <string name="LSLTipText_llList2ListStrided" translate="false">
list llList2ListStrided(list src, integer start, integer end, integer stride)
Copies the strided slice of the list from start to end
</string>
- <string name="LSLTipText_llGetRegionCorner">
+ <string name="LSLTipText_llGetRegionCorner" translate="false">
vector llGetRegionCorner()
Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
</string>
- <string name="LSLTipText_llListInsertList">
+ <string name="LSLTipText_llListInsertList" translate="false">
list llListInsertList(list dest, list src, integer start)
Returns a list that contains all the elements from dest but with the elements from src inserted at position start
</string>
- <string name="LSLTipText_llListFindList">
+ <string name="LSLTipText_llListFindList" translate="false">
integer llListFindList(list src, list test)
Returns the index of the first instance of test in src.
(Returns -1 if not found)
</string>
- <string name="LSLTipText_llGetObjectName">
+ <string name="LSLTipText_llGetObjectName" translate="false">
string llGetObjectName()
Returns the name of the prim which the script is attached to
</string>
- <string name="LSLTipText_llSetObjectName">
+ <string name="LSLTipText_llSetObjectName" translate="false">
llSetObjectName(string name)
Sets the prim&apos;s name to the name parameter
</string>
- <string name="LSLTipText_llGetDate">
+ <string name="LSLTipText_llGetDate" translate="false">
string llGetDate()
Returns the current date in the UTC time zone in the format YYYY-MM-DD
</string>
- <string name="LSLTipText_llEdgeOfWorld">
+ <string name="LSLTipText_llEdgeOfWorld" translate="false">
integer llEdgeOfWorld(vector pos, vector dir)
Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
</string>
- <string name="LSLTipText_llGetAgentInfo">
+ <string name="LSLTipText_llGetAgentInfo" translate="false">
integer llGetAgentInfo(key id)
Returns an integer bitfield containing the agent information about id.
Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
</string>
- <string name="LSLTipText_llAdjustSoundVolume">
+ <string name="LSLTipText_llAdjustSoundVolume" translate="false">
llAdjustSoundVolume(float volume)
Adjusts volume of attached sound (0.0 - 1.0)
</string>
- <string name="LSLTipText_llSetSoundQueueing">
+ <string name="LSLTipText_llSetSoundQueueing" translate="false">
llSetSoundQueueing(integer queue)
Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
</string>
- <string name="LSLTipText_llSetSoundRadius">
+ <string name="LSLTipText_llSetSoundRadius" translate="false">
llSetSoundRadius(float radius)
Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
</string>
- <string name="LSLTipText_llKey2Name">
+ <string name="LSLTipText_llKey2Name" translate="false">
string llKey2Name(key id)
Returns the name of the prim or avatar specified by id.
(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
</string>
- <string name="LSLTipText_llSetTextureAnim">
+ <string name="LSLTipText_llSetTextureAnim" translate="false">
llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
Animates the texture on the specified face/faces
</string>
- <string name="LSLTipText_llTriggerSoundLimited">
+ <string name="LSLTipText_llTriggerSoundLimited" translate="false">
llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
</string>
- <string name="LSLTipText_llEjectFromLand">
+ <string name="LSLTipText_llEjectFromLand" translate="false">
llEjectFromLand(key avatar)
Ejects avatar from the parcel
</string>
- <string name="LSLTipText_llParseString2List">
+ <string name="LSLTipText_llParseString2List" translate="false">
list llParseString2List(string src, list separators, list spacers)
Breaks src into a list, discarding separators, keeping spacers
(separators and spacers must be lists of strings, maximum of 8 each)
</string>
- <string name="LSLTipText_llOverMyLand">
+ <string name="LSLTipText_llOverMyLand" translate="false">
integer llOverMyLand(key id)
Returns TRUE if id is over land owned by the script owner, otherwise FALSE
</string>
- <string name="LSLTipText_llGetLandOwnerAt">
+ <string name="LSLTipText_llGetLandOwnerAt" translate="false">
key llGetLandOwnerAt(vector pos)
Returns the key of the land owner, returns NULL_KEY if public
</string>
- <string name="LSLTipText_llGetNotecardLine">
+ <string name="LSLTipText_llGetNotecardLine" translate="false">
key llGetNotecardLine(string name, integer line)
Returns line line of notecard name via the dataserver event
</string>
- <string name="LSLTipText_llGetAgentSize">
+ <string name="LSLTipText_llGetAgentSize" translate="false">
vector llGetAgentSize(key id)
If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
</string>
- <string name="LSLTipText_llSameGroup">
+ <string name="LSLTipText_llSameGroup" translate="false">
integer llSameGroup(key id)
Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
</string>
- <string name="LSLTipText_llUnSit">
+ <string name="LSLTipText_llUnSit" translate="false">
key llUnSit(key id)
If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
</string>
- <string name="LSLTipText_llGroundSlope">
+ <string name="LSLTipText_llGroundSlope" translate="false">
vector llGroundSlope(vector offset)
Returns the ground slope below the object position + offset
</string>
- <string name="LSLTipText_llGroundNormal">
+ <string name="LSLTipText_llGroundNormal" translate="false">
vector llGroundNormal(vector offset)
Returns the ground normal below the object position + offset
</string>
- <string name="LSLTipText_llGroundContour">
+ <string name="LSLTipText_llGroundContour" translate="false">
vector llGroundCountour(vector offset)
Returns the ground contour direction below the object position + offset
</string>
- <string name="LSLTipText_llGetAttached">
+ <string name="LSLTipText_llGetAttached" translate="false">
integer llGetAttached()
Returns the object&apos;s attachment point, or 0 if not attached
</string>
- <string name="LSLTipText_llGetFreeMemory">
+ <string name="LSLTipText_llGetFreeMemory" translate="false">
integer llGetFreeMemory()
Returns the number of free bytes of memory the script can use
</string>
- <string name="LSLTipText_llGetRegionName">
+ <string name="LSLTipText_llGetRegionName" translate="false">
string llGetRegionName()
Returns the current region name
</string>
- <string name="LSLTipText_llGetRegionTimeDilation">
+ <string name="LSLTipText_llGetRegionTimeDilation" translate="false">
float llGetRegionTimeDilation()
Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
</string>
- <string name="LSLTipText_llGetRegionFPS">
+ <string name="LSLTipText_llGetRegionFPS" translate="false">
float llGetRegionFPS()
Returns the mean region frames per second
</string>
- <string name="LSLTipText_llParticleSystem">
+ <string name="LSLTipText_llParticleSystem" translate="false">
llParticleSystem(list rules)
Creates a particle system based on rules. An empty list removes the particle system.
List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
</string>
- <string name="LSLTipText_llGroundRepel">
+ <string name="LSLTipText_llGroundRepel" translate="false">
llGroundRepel(float height, integer water, float tau)
Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
</string>
- <string name="LSLTipText_llGiveInventoryList">
+ <string name="LSLTipText_llGiveInventoryList" translate="false">
llGiveInventoryList(key target, string folder, list inventory)
Gives inventory items to target, creating a new folder to put them in
</string>
- <string name="LSLTipText_llSetVehicleType">
+ <string name="LSLTipText_llSetVehicleType" translate="false">
llSetVehicleType(integer type)
Sets the vehicle to one of the default types
</string>
- <string name="LSLTipText_llSetVehicleFloatParam">
+ <string name="LSLTipText_llSetVehicleFloatParam" translate="false">
llSetVehicleFloatParam(integer param, float value)
Sets the specified vehicle float parameter
</string>
- <string name="LSLTipText_llSetVehicleVectorParam">
+ <string name="LSLTipText_llSetVehicleVectorParam" translate="false">
llSetVehicleVectorParam(integer param, vector vec)
Sets the specified vehicle vector parameter
</string>
- <string name="LSLTipText_llSetVehicleRotationParam">
+ <string name="LSLTipText_llSetVehicleRotationParam" translate="false">
llSetVehicleVectorParam(integer param, rotation rot)
Sets the specified vehicle rotation parameter
</string>
- <string name="LSLTipText_llSetVehicleFlags">
+ <string name="LSLTipText_llSetVehicleFlags" translate="false">
llSetVehicleFlags(integer flags)
Sets the enabled bits in &apos;flags&apos;
</string>
- <string name="LSLTipText_llRemoveVehicleFlags">
+ <string name="LSLTipText_llRemoveVehicleFlags" translate="false">
llRemoveVehicleFlags(integer flags)
Removes the enabled bits in &apos;flags&apos;
</string>
- <string name="LSLTipText_llSitTarget">
+ <string name="LSLTipText_llSitTarget" translate="false">
llSitTarget(vector offset, rotation rot)
Sets the sit location for the prim. If offset == &lt;0,0,0&gt; then the sit target is removed.
</string>
- <string name="LSLTipText_llAvatarOnSitTarget">
+ <string name="LSLTipText_llAvatarOnSitTarget" translate="false">
key llAvatarOnSitTarget()
If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
</string>
- <string name="LSLTipText_llAddToLandPassList">
+ <string name="LSLTipText_llAddToLandPassList" translate="false">
llAddToLandPassList(key avatar, float hours)
Adds avatar to the land pass list for hours, or indefinitely if hours is 0
</string>
- <string name="LSLTipText_llSetTouchText">
+ <string name="LSLTipText_llSetTouchText" translate="false">
llSetTouchText(string text)
Displays text rather than the default &apos;Touch&apos; in the pie menu
</string>
- <string name="LSLTipText_llSetSitText">
+ <string name="LSLTipText_llSetSitText" translate="false">
llSetSitText(string text)
Displays text rather than the default &apos;Sit Here&apos; in the pie menu
</string>
- <string name="LSLTipText_llSetCameraEyeOffset">
+ <string name="LSLTipText_llSetCameraEyeOffset" translate="false">
llSetCameraEyeOffset(vector offset)
Sets the camera eye offset for avatars that sit on the object
</string>
- <string name="LSLTipText_llSetCameraAtOffset">
+ <string name="LSLTipText_llSetCameraAtOffset" translate="false">
llSetCameraAtOffset(vector offset)
Sets the point the camera is looking at to offset for avatars that sit on the object
</string>
- <string name="LSLTipText_llDumpList2String">
+ <string name="LSLTipText_llDumpList2String" translate="false">
string llDumpList2String(list src, string separator)
Returns the list in a single string, using separator between the entries
</string>
- <string name="LSLTipText_llScriptDanger">
+ <string name="LSLTipText_llScriptDanger" translate="false">
integer llScriptDanger(vector pos)
Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
</string>
- <string name="LSLTipText_llDialog">
+ <string name="LSLTipText_llDialog" translate="false">
llDialog(key avatar, string message, list buttons, integer chat_channel
Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
If a button is pressed, the avatar says the text of the button label on chat_channel.
</string>
- <string name="LSLTipText_llVolumeDetect">
+ <string name="LSLTipText_llVolumeDetect" translate="false">
llVolumeDetect(integer detect)
If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
Must be applied to the root prim.
</string>
- <string name="LSLTipText_llResetOtherScript">
+ <string name="LSLTipText_llResetOtherScript" translate="false">
llResetOtherScript(string name)
Resets script name
</string>
- <string name="LSLTipText_llGetScriptState">
+ <string name="LSLTipText_llGetScriptState" translate="false">
integer llGetScriptState(string name)
Returns TRUE if the script name is running
</string>
- <string name="LSLTipText_llRemoteLoadScript">
+ <string name="LSLTipText_llRemoteLoadScript" translate="false">
DEPRECATED! Please use llRemoteLoadScriptPin instead.
</string>
- <string name="LSLTipText_llSetRemoteScriptAccessPin">
+ <string name="LSLTipText_llSetRemoteScriptAccessPin" translate="false">
llSetRemoteScriptAccessPin(integer pin)
If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
</string>
- <string name="LSLTipText_llRemoteLoadScriptPin">
+ <string name="LSLTipText_llRemoteLoadScriptPin" translate="false">
llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
If running == TRUE, starts the script with start_param
</string>
- <string name="LSLTipText_llOpenRemoteDataChannel">
+ <string name="LSLTipText_llOpenRemoteDataChannel" translate="false">
llOpenRemoteDataChannel()
Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
</string>
- <string name="LSLTipText_llSendRemoteData">
+ <string name="LSLTipText_llSendRemoteData" translate="false">
key llSendRemoteData(key channel, string dest, integer idata, string sdata)
Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
Returns a key that is the message_id for the resulting remote_data events.
</string>
- <string name="LSLTipText_llRemoteDataReply">
+ <string name="LSLTipText_llRemoteDataReply" translate="false">
llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
</string>
- <string name="LSLTipText_llCloseRemoteDataChannel">
+ <string name="LSLTipText_llCloseRemoteDataChannel" translate="false">
llCloseRemoteDataChannel(key channel)
Closes XML-RPC channel
</string>
- <string name="LSLTipText_llMD5String">
+ <string name="LSLTipText_llMD5String" translate="false">
string llMD5String(string src, integer nonce)
Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
</string>
- <string name="LSLTipText_llSetPrimitiveParams">
+ <string name="LSLTipText_llSetPrimitiveParams" translate="false">
llSetPrimitiveParams(list rules)
Sets the prim&apos;s parameters according to rules
</string>
- <string name="LSLTipText_llStringToBase64">
+ <string name="LSLTipText_llStringToBase64" translate="false">
string llStringToBase64(string str)
Converts a string to the Base64 representation of the string
</string>
- <string name="LSLTipText_llBase64ToString">
+ <string name="LSLTipText_llBase64ToString" translate="false">
string llBase64ToString(string str)
Converts a Base64 string to a conventional string.
If the conversion creates any unprintable characters, they are converted to spaces.
</string>
- <string name="LSLTipText_llXorBase64Strings">
+ <string name="LSLTipText_llXorBase64Strings" translate="false">
string llXorBase64Strings(string s1, string s2)
DEPRECATED! Please use llXorBase64StringsCorrect instead.
Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string. s2 repeats if it is shorter than s1. Retained for backwards compatability.
</string>
- <string name="LSLTipText_llRemoteDataSetRegion">
+ <string name="LSLTipText_llRemoteDataSetRegion" translate="false">
llRemoteDataSetRegion()
DEPRECATED! Please use llOpenRemoteDataChannel instead.
If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
</string>
- <string name="LSLTipText_llLog10">
+ <string name="LSLTipText_llLog10" translate="false">
float llLog10(float val)
Returns the base 10 logarithm of val. Returns zero if val &lt;= 0.
</string>
- <string name="LSLTipText_llLog">
+ <string name="LSLTipText_llLog" translate="false">
float llLog(float val)
Returns the natural logarithm of val. Returns zero if val &lt;= 0.
</string>
- <string name="LSLTipText_llGetAnimationList">
+ <string name="LSLTipText_llGetAnimationList" translate="false">
list llGetAnimationList(key id)
Returns a list of keys of playing animations for avatar described by id
</string>
- <string name="LSLTipText_llSetParcelMusicURL">
+ <string name="LSLTipText_llSetParcelMusicURL" translate="false">
llSetParcelMusicURL(string url)
Sets the streaming audio URL for the parcel which the object is on
</string>
- <string name="LSLTipText_llGetRootPosition">
+ <string name="LSLTipText_llGetRootPosition" translate="false">
vector llGetRootPosition()
Returns the position (in region coordinates) of the root prim of the object which the script is attached to
</string>
- <string name="LSLTipText_llGetRootRotation">
+ <string name="LSLTipText_llGetRootRotation" translate="false">
rotation llGetRootRotation()
Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
</string>
- <string name="LSLTipText_llGetObjectDesc">
+ <string name="LSLTipText_llGetObjectDesc" translate="false">
string llGetObjectDesc()
Returns the description of the prim the script is attached to
</string>
- <string name="LSLTipText_llSetObjectDesc">
+ <string name="LSLTipText_llSetObjectDesc" translate="false">
llSetObjectDesc(string name)
Sets the prim&apos;s description
</string>
- <string name="LSLTipText_llGetCreator">
+ <string name="LSLTipText_llGetCreator" translate="false">
key llGetCreator()
Returns a key for the creator of the prim
</string>
- <string name="LSLTipText_llGetTimestamp">
+ <string name="LSLTipText_llGetTimestamp" translate="false">
string llGetTimestamp()
Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
</string>
- <string name="LSLTipText_llSetLinkAlpha">
+ <string name="LSLTipText_llSetLinkAlpha" translate="false">
llSetLinkAlpha(integer linknumber, float alpha, integer face)
If a prim exists in the link chain at linknumber, sets face to alpha
</string>
- <string name="LSLTipText_llGetNumberOfPrims">
+ <string name="LSLTipText_llGetNumberOfPrims" translate="false">
integer llGetNumberOfPrims()
Returns the number of prims in a link set the script is attached to
</string>
- <string name="LSLTipText_llGetNumberOfNotecardLines">
+ <string name="LSLTipText_llGetNumberOfNotecardLines" translate="false">
key llGetNumberOfNotecardLines(string name)
Returns number of lines in notecard name via the dataserver event (cast return value to integer)
</string>
- <string name="LSLTipText_llGetBoundingBox">
+ <string name="LSLTipText_llGetBoundingBox" translate="false">
list llGetBoundingBox(key object)
Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
</string>
- <string name="LSLTipText_llGetGeometricCenter">
+ <string name="LSLTipText_llGetGeometricCenter" translate="false">
vector llGetGeometricCenter()
Returns the geometric center of the linked set the script is attached to.
</string>
- <string name="LSLTipText_llGetPrimitiveParams">
+ <string name="LSLTipText_llGetPrimitiveParams" translate="false">
list llGetPrimitiveParams(list params)
Returns the primitive parameters specified in the params list.
</string>
- <string name="LSLTipText_llIntegerToBase64">
+ <string name="LSLTipText_llIntegerToBase64" translate="false">
string llIntegerToBase64(integer number)
Returns a string that is a Base64 big endian encode of number
</string>
- <string name="LSLTipText_llBase64ToInteger">
+ <string name="LSLTipText_llBase64ToInteger" translate="false">
integer llBase64ToInteger(string str)
Returns an integer that is the str Base64 decoded as a big endian integer
</string>
- <string name="LSLTipText_llGetGMTclock">
+ <string name="LSLTipText_llGetGMTclock" translate="false">
float llGetGMTclock()
Returns the time in seconds since midnight GMT
</string>
- <string name="LSLTipText_llGetSimulatorHostname">
+ <string name="LSLTipText_llGetSimulatorHostname" translate="false">
string llGetSimulatorHostname()
Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
</string>
- <string name="LSLTipText_llSetLocalRot">
+ <string name="LSLTipText_llSetLocalRot" translate="false">
llSetLocalRot(rotation rot)
Sets the rotation of a child prim relative to the root prim
</string>
- <string name="LSLTipText_llParseStringKeepNulls">
+ <string name="LSLTipText_llParseStringKeepNulls" translate="false">
list llParseStringKeepNulls(string src, list separators, list spacers)
Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
(separators and spacers must be lists of strings, maximum of 8 each)
</string>
- <string name="LSLTipText_llRezAtRoot">
+ <string name="LSLTipText_llRezAtRoot" translate="false">
llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
</string>
- <string name="LSLTipText_llGetObjectPermMask">
+ <string name="LSLTipText_llGetObjectPermMask" translate="false">
integer llGetObjectPermMask(integer mask)
Returns the requested permission mask for the root object the task is attached to
</string>
- <string name="LSLTipText_llSetObjectPermMask">
+ <string name="LSLTipText_llSetObjectPermMask" translate="false">
llSetObjectPermMask(integer mask, integer value)
Sets the given permission mask to the new value on the root object the task is attached to
</string>
- <string name="LSLTipText_llGetInventoryPermMask">
+ <string name="LSLTipText_llGetInventoryPermMask" translate="false">
integer llGetInventoryPermMask(string item, integer mask)
Returns the requested permission mask for the inventory item
</string>
- <string name="LSLTipText_llSetInventoryPermMask">
+ <string name="LSLTipText_llSetInventoryPermMask" translate="false">
llSetInventoryPermMask(string item, integer mask, integer value)
Sets the given permission mask to the new value on the inventory item
</string>
- <string name="LSLTipText_llGetInventoryCreator">
+ <string name="LSLTipText_llGetInventoryCreator" translate="false">
key llGetInventoryCreator(string item)
Returns a key for the creator of the inventory item
</string>
- <string name="LSLTipText_llOwnerSay">
+ <string name="LSLTipText_llOwnerSay" translate="false">
llOwnerSay(string msg)
Says msg to owner only. (Owner must be in the same region.)
</string>
- <string name="LSLTipText_llRequestSimulatorData">
+ <string name="LSLTipText_llRequestSimulatorData" translate="false">
key llRequestSimulatorData(string simulator, integer data)
Requests data about simulator. When data is available the dataserver event will be raised.
</string>
- <string name="LSLTipText_llForceMouselook">
+ <string name="LSLTipText_llForceMouselook" translate="false">
llForceMouselook(integer mouselook)
If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
</string>
- <string name="LSLTipText_llGetObjectMass">
+ <string name="LSLTipText_llGetObjectMass" translate="false">
float llGetObjectMass(key id)
Returns the mass of the avatar or object in the region
</string>
- <string name="LSLTipText_llListReplaceList">
+ <string name="LSLTipText_llListReplaceList" translate="false">
list llListReplaceList(list dest, list src, integer start, integer end)
Returns a list that is dest with start through end removed and src inserted at start
</string>
- <string name="LSLTipText_llLoadURL">
+ <string name="LSLTipText_llLoadURL" translate="false">
llLoadURL(key avatar, string message, string url)
Shows a dialog to avatar offering to load the web page at url with a message.
If user clicks yes, launches the page in their web browser.
</string>
- <string name="LSLTipText_llParcelMediaCommandList">
+ <string name="LSLTipText_llParcelMediaCommandList" translate="false">
llParcelMediaCommandList(list command)
Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
</string>
- <string name="LSLTipText_llParcelMediaQuery">
+ <string name="LSLTipText_llParcelMediaQuery" translate="false">
list llParcelMediaQuery(list query)
Returns a list containing results of the sent query
</string>
- <string name="LSLTipText_llModPow">
+ <string name="LSLTipText_llModPow" translate="false">
integer llModPow(integer a, integer b, integer c)
Returns a raised to the b power, mod c. ( (a**b)%c )
b is capped at 0xFFFF (16 bits).
</string>
- <string name="LSLTipText_llGetInventoryType">
+ <string name="LSLTipText_llGetInventoryType" translate="false">
integer llGetInventoryType(string name)
Returns the type of the inventory item name
</string>
- <string name="LSLTipText_llSetPayPrice">
+ <string name="LSLTipText_llSetPayPrice" translate="false">
llSetPayPrice(integer price, list quick_pay_buttons)
Sets the default amount on the dialog that appears when someone chooses to pay this prim
</string>
- <string name="LSLTipText_llGetCameraPos">
+ <string name="LSLTipText_llGetCameraPos" translate="false">
vector llGetCameraPos()
Returns the current camera position for the agent the task has permissions for
</string>
- <string name="LSLTipText_llGetCameraRot">
+ <string name="LSLTipText_llGetCameraRot" translate="false">
rotation llGetCameraRot()
Returns the current camera orientation for the agent the task has permissions for
</string>
- <string name="LSLTipText_llSetPrimURL">
+ <string name="LSLTipText_llSetPrimURL" translate="false">
llSetPrimURL(string url)
Updates the URL for the web page shown on the sides of the object
</string>
- <string name="LSLTipText_llRefreshPrimURL">
+ <string name="LSLTipText_llRefreshPrimURL" translate="false">
llRefreshPrimURL()
Reloads the web page shown on the sides of the object
</string>
- <string name="LSLTipText_llEscapeURL">
+ <string name="LSLTipText_llEscapeURL" translate="false">
string llEscapeURL(string url)
Returns an escaped/encoded version of url, replacing spaces with %20 etc.
</string>
- <string name="LSLTipText_llUnescapeURL">
+ <string name="LSLTipText_llUnescapeURL" translate="false">
string llUnescapeURL(string url)
Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
</string>
- <string name="LSLTipText_llMapDestination">
+ <string name="LSLTipText_llMapDestination" translate="false">
llMapDestination(string simname, vector pos, vector look_at)
Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
Only works for scripts attached to avatar, or during touch events.
</string>
- <string name="LSLTipText_llAddToLandBanList">
+ <string name="LSLTipText_llAddToLandBanList" translate="false">
llAddToLandBanList(key avatar, float hours)
Adds avatar to the land ban list for hours, or indefinitely if hours is 0
</string>
- <string name="LSLTipText_llRemoveFromLandPassList">
+ <string name="LSLTipText_llRemoveFromLandPassList" translate="false">
llRemoveFromLandPassList(key avatar)
Removes avatar from the land pass list
</string>
- <string name="LSLTipText_llRemoveFromLandBanList">
+ <string name="LSLTipText_llRemoveFromLandBanList" translate="false">
llRemoveFromLandBanList(key avatar)
Removes avatar from the land ban list
</string>
- <string name="LSLTipText_llSetCameraParams">
+ <string name="LSLTipText_llSetCameraParams" translate="false">
llSetCameraParams(list rules)
Sets multiple camera parameters at once.
List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
</string>
- <string name="LSLTipText_llClearCameraParams">
+ <string name="LSLTipText_llClearCameraParams" translate="false">
llClearCameraParams()
Resets all camera parameters to default values and turns off scripted camera control
</string>
- <string name="LSLTipText_llListStatistics">
+ <string name="LSLTipText_llListStatistics" translate="false">
float llListStatistics(integer operation, list src)
Performs statistical aggregate functions on list src using LIST_STAT_* operations
</string>
- <string name="LSLTipText_llGetUnixTime">
+ <string name="LSLTipText_llGetUnixTime" translate="false">
integer llGetUnixTime()
Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
</string>
- <string name="LSLTipText_llGetParcelFlags">
+ <string name="LSLTipText_llGetParcelFlags" translate="false">
integer llGetParcelFlags(vector pos)
Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
</string>
- <string name="LSLTipText_llGetRegionFlags">
+ <string name="LSLTipText_llGetRegionFlags" translate="false">
integer llGetRegionFlags()
Returns the region flags (REGION_FLAG_*) for the region the object is in
</string>
- <string name="LSLTipText_llXorBase64StringsCorrect">
+ <string name="LSLTipText_llXorBase64StringsCorrect" translate="false">
string llXorBase64StringsCorrect(string s1, string s2)
Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
s2 repeats if it is shorter than s1.
</string>
- <string name="LSLTipText_llHTTPRequest">
+ <string name="LSLTipText_llHTTPRequest" translate="false">
llHTTPRequest(string url, list parameters, string body)
Sends an HTTP request to the specified url with the body of the request and parameters
</string>
- <string name="LSLTipText_llResetLandBanList">
+ <string name="LSLTipText_llResetLandBanList" translate="false">
llResetLandBanList()
Removes all residents from the land ban list
</string>
- <string name="LSLTipText_llResetLandPassList">
+ <string name="LSLTipText_llResetLandPassList" translate="false">
llResetLandPassList()
Removes all residents from the land access/pass list
</string>
- <string name="LSLTipText_llGetObjectPrimCount">
+ <string name="LSLTipText_llGetObjectPrimCount" translate="false">
integer llGetObjectPrimCount(key object_id)
Returns the total number of prims for an object in the region
</string>
- <string name="LSLTipText_llGetParcelPrimOwners">
+ <string name="LSLTipText_llGetParcelPrimOwners" translate="false">
list llGetParcelPrimOwners(vector pos)
Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
Requires owner-like permissions for the parcel.
</string>
- <string name="LSLTipText_llGetParcelPrimCount">
+ <string name="LSLTipText_llGetParcelPrimCount" translate="false">
integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
Returns the number of prims on the parcel at pos of the given category.
Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
</string>
- <string name="LSLTipText_llGetParcelMaxPrims">
+ <string name="LSLTipText_llGetParcelMaxPrims" translate="false">
integer llGetParcelMaxPrims(vector pos, integer sim_wide)
Returns the maximum number of prims allowed on the parcel at pos
</string>
- <string name="LSLTipText_llGetParcelDetails">
+ <string name="LSLTipText_llGetParcelDetails" translate="false">
list llGetParcelDetails(vector pos, list params)
Returns the parcel details specified in params for the parcel at pos.
Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
</string>
- <string name="LSLTipText_llSetLinkPrimitiveParams">
+ <string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
llSetLinkPrimitiveParams(integer linknumber, list rules)
Sets primitive parameters for linknumber based on rules
</string>
- <string name="LSLTipText_llSetLinkTexture">
+ <string name="LSLTipText_llSetLinkTexture" translate="false">
llSetLinkTexture(integer linknumber, string texture, integer face)
Sets the texture of face for a task that exists in the link chain at linknumber
</string>
- <string name="LSLTipText_llStringTrim">
+ <string name="LSLTipText_llStringTrim" translate="false">
string llStringTrim(string src, integer trim_type)
Trims the leading and/or trailing white spaces from a string.
trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
</string>
- <string name="LSLTipText_llRegionSay">
+ <string name="LSLTipText_llRegionSay" translate="false">
llRegionSay(integer channel, string msg)
Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
</string>
- <string name="LSLTipText_llGetObjectDetails">
+ <string name="LSLTipText_llGetObjectDetails" translate="false">
list llGetObjectDetails(key id, list params)
Returns the object details specified in params for the object with key id.
Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
</string>
- <string name="LSLTipText_llSetClickAction">
+ <string name="LSLTipText_llSetClickAction" translate="false">
llSetClickAction(integer action)
Sets the action performed when a prim is clicked upon
</string>
- <string name="LSLTipText_llGetRegionAgentCount">
+ <string name="LSLTipText_llGetRegionAgentCount" translate="false">
integer llGetRegionAgentCount()
Returns the number of avatars in the region
</string>
- <string name="LSLTipText_llTextBox">
+ <string name="LSLTipText_llTextBox" translate="false">
llTextBox(key avatar, string message, integer chat_channel
Shows a dialog box on the avatar&apos;s screen with the message.
It contains a text box for input, and if entered that text is chatted on chat_channel.
</string>
- <string name="LSLTipText_llGetAgentLanguage">
+ <string name="LSLTipText_llGetAgentLanguage" translate="false">
string llGetAgentLanguage(key avatar)
Returns the language code of the preferred interface language of the avatar
</string>
- <string name="LSLTipText_llDetectedTouchUV">
+ <string name="LSLTipText_llDetectedTouchUV" translate="false">
vector llDetectedTouchUV(integer index)
Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
</string>
- <string name="LSLTipText_llDetectedTouchFace">
+ <string name="LSLTipText_llDetectedTouchFace" translate="false">
integer llDetectedTouchFace(integer index)
Returns the index of the face where the avatar clicked in a triggered touch event
</string>
- <string name="LSLTipText_llDetectedTouchPos">
+ <string name="LSLTipText_llDetectedTouchPos" translate="false">
vector llDetectedTouchPos(integer index)
Returns the position where the object was touched in a triggered touch event
</string>
- <string name="LSLTipText_llDetectedTouchNormal">
+ <string name="LSLTipText_llDetectedTouchNormal" translate="false">
vector llDetectedTouchNormal(integer index)
Returns the surface normal for a triggered touch event
</string>
- <string name="LSLTipText_llDetectedTouchBinormal">
+ <string name="LSLTipText_llDetectedTouchBinormal" translate="false">
vector llDetectedTouchBinormal(integer index)
Returns the surface binormal for a triggered touch event
</string>
- <string name="LSLTipText_llDetectedTouchST">
+ <string name="LSLTipText_llDetectedTouchST" translate="false">
vector llDetectedTouchST(integer index)
Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
</string>
- <string name="LSLTipText_llSHA1String">
+ <string name="LSLTipText_llSHA1String" translate="false">
string llSHA1String(string src)
Returns a string of 40 hex characters that is the SHA1 security Hash of src
</string>
- <string name="LSLTipText_llGetFreeURLs">
+ <string name="LSLTipText_llGetFreeURLs" translate="false">
integer llGetFreeURLs()
Returns the number of available URLs for the current script
</string>
- <string name="LSLTipText_llRequestURL">
+ <string name="LSLTipText_llRequestURL" translate="false">
key llRequestURL()
Requests one HTTP:// url for use by this object.
An http_request event is triggered with the results.
</string>
- <string name="LSLTipText_llRequestSecureURL">
+ <string name="LSLTipText_llRequestSecureURL" translate="false">
key llRequestSecureURL()
Requests one HTTPS:// (SSL) url for use by this object.
An http_request event is triggered with the results.
</string>
- <string name="LSLTipText_llReleaseURL">
+ <string name="LSLTipText_llReleaseURL" translate="false">
llReleaseURL(string url)
Releases the specified URL, it will no longer be usable
</string>
- <string name="LSLTipText_llHTTPResponse">
+ <string name="LSLTipText_llHTTPResponse" translate="false">
llHTTPResponse(key request_id, integer status, string body)
Responds to request_id with status and body
</string>
- <string name="LSLTipText_llGetHTTPHeader">
+ <string name="LSLTipText_llGetHTTPHeader" translate="false">
string llGetHTTPHeader(key request_id, string header)
Returns the value for header for request_id
</string>
- <string name="LSLTipText_llSetPrimMediaParams">
+ <string name="LSLTipText_llSetPrimMediaParams" translate="false">
llSetPrimMediaParams(integer face, list params)
Sets the media params for a particular face on an object. If media is not already on this object, add it.
List is a set of name/value pairs in no particular order. Params not specified are unchanged, or if new media is added then set to the default specified.
The possible names are below, along with the types of values and what they mean.
</string>
- <string name="LSLTipText_llGetPrimMediaParams">
+ <string name="LSLTipText_llGetPrimMediaParams" translate="false">
list llGetPrimMediaParams(integer face, list params)
Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
(Returns an empty list if no media exists on the face.)
</string>
- <string name="LSLTipText_llClearPrimMedia">
+ <string name="LSLTipText_llClearPrimMedia" translate="false">
llClearPrimMedia(integer face)
Clears (deletes) the media and all params from the given face.
</string>
@@ -1929,21 +1932,24 @@ this texture in your inventory
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
- <!-- Avatar age computation, see LLAvatarPropertiesProcessor::ageFromDate -->
- <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]old</string>
- <string name="WeeksOld">[AGEWEEKS]old</string>
- <string name="DaysOld">[AGEDAYS]old</string>
+ <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
+ <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string>
+ <string name="YearsOld">[AGEYEARS] old</string>
+ <string name="MonthsOld">[AGEMONTHS] old</string>
+ <string name="WeeksOld">[AGEWEEKS] old</string>
+ <string name="DaysOld">[AGEDAYS] old</string>
<string name="TodayOld">Joined today</string>
- <!-- Use value="" because of trailing spaces -->
- <string name="AgeYears" value="[YEARS] years " />
- <string name="Age1Year" value="1 year "/>
- <string name="AgeMonths" value="[MONTHS] months "/>
- <string name="Age1Month" value="1 month "/>
- <string name="AgeWeeks" value="[WEEKS] weeks "/>
- <string name="Age1Week" value="1 week "/>
- <string name="AgeDays" value="[DAYS] days "/>
- <string name="Age1Day" value="1 day "/>
+ <!-- AgeYearsA = singular, AgeYearsB = plural, see logic in
+ LLTrans::getCountString() -->
+ <string name="AgeYearsA">[COUNT] year</string>
+ <string name="AgeYearsB">[COUNT] years</string>
+ <string name="AgeMonthsA">[COUNT] month</string>
+ <string name="AgeMonthsB">[COUNT] months</string>
+ <string name="AgeWeeksA">[COUNT] week</string>
+ <string name="AgeWeeksB">[COUNT] weeks</string>
+ <string name="AgeDaysA">[COUNT] day</string>
+ <string name="AgeDaysB">[COUNT] days</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>
@@ -1993,8 +1999,8 @@ this texture in your inventory
<!-- groups -->
<string name="GroupsNone">none</string>
- <string name="Group" value=" (group)" />
- <string name="Unknown">(Unknown)</string>
+ <string name="Group" value=" (group)" />
+ <string name="Unknown">(Unknown)</string>
<string name="SummaryForTheWeek" value="Summary for this week, beginning on " />
<string name="NextStipendDay" value="The next stipend day is " />
<string name="GroupIndividualShare" value=" Group Individual Share" />
@@ -2249,9 +2255,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Belly Size">Belly Size</string>
<string name="Blonde Hair">Blonde Hair</string>
<string name="Big Eyeball">Big Eyeball</string>
- <string name="Big Hair Back">Big Hair Back</string>
- <string name="Big Hair Front">Big Hair Front</string>
- <string name="Big Hair Top">Big Hair Top</string>
+ <string name="Big Hair Back">Big Hair: Back</string>
+ <string name="Big Hair Front">Big Hair: Front</string>
+ <string name="Big Hair Top">Big Hair: Top</string>
<string name="Body Fat">Body Fat</string>
<string name="Body Thickness">Body Thickness</string>
<string name="Breast Buoyancy">Breast Buoyancy</string>
@@ -2308,7 +2314,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Hair Thickess">Hair Thickess</string>
<string name="Hair Tilted Left">Hair Tilted Left</string>
<string name="Hair Tilted Right">Hair Tilted Right</string>
- <string name="Hair Volume">Hair Volume</string>
+ <string name="Hair Volume">Hair: Volume</string>
<string name="Hand Size">Hand Size</string>
<string name="Head Length">Head Length</string>
<string name="Head Shape">Head Shape</string>
@@ -2356,10 +2362,39 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Nostril Division">Nostril Division</string>
<string name="Nostril Width">Nostril Width</string>
<string name="Open Front">Open Front</string>
+ <string name="Lipstick Color">Lipstick Color</string>
+ <string name="Lipstick">Lipstick</string>
+ <string name="Lipgloss">Lipgloss</string>
+ <string name="Blush">Blush</string>
+ <string name="Blush Color">Blush Color</string>
+ <string name="Blush Opacity">Blush Opacity</string>
+ <string name="Inner Shadow">Inner Shadow</string>
+ <string name="In Shdw Color">Inner Shadow Color</string>
+ <string name="In Shdw Opacity">Inner Shadow Opacity</string>
+ <string name="Body Definition">Body Definition</string>
+ <string name="Body Freckles">Body Freckles</string>
+ <string name="Facial Definition">Facial Definition</string>
+ <string name="Hair Front">Hair: Front</string>
+ <string name="Hair Sides">Hair: Sides</string>
+ <string name="Hair Back">Hair: Back</string>
+ <string name="Front Fringe">Front Fringe</string>
+ <string name="Side Fringe">Side Fringe</string>
+ <string name="Back Fringe">Back Fringe</string>
+ <string name="Hair Sweep">Hair Sweep</string>
+ <string name="Pigtails">Pigtails</string>
+ <string name="Ponytail">Ponytail</string>
+ <string name="Hair Tilt">Hair Tilt</string>
+ <string name="Eyebrow Size">Eyebrow Size</string>
+ <string name="Eyebrow Density">Eyebrow Density</string>
+ <!-- string name="Hair Thickess">Hair Thickess</string Need a second string for Body Parts > Hair > Facial? -->
+ <string name="Sideburns">Sideburns</string>
+ <string name="Moustache">Moustache</string>
+ <string name="Soulpatch">Soulpatch</string>
+ <string name="Chin Curtains">Chin Curtains</string>
<string name="Outer Eye Corner">Outer Eye Corner</string>
<string name="Outer Shadow">Outer Shadow</string>
- <string name="Out Shdw Opacity">Out Shdw Opacity</string>
- <string name="Out Shdw Color">Out Shdw Color</string>
+ <string name="Out Shdw Opacity">Outer Shadow Opacity</string>
+ <string name="Out Shdw Color">Outer Shadow Color</string>
<string name="Package">Package</string>
<string name="Pants Crotch">Pants Crotch</string>
<string name="Pants Fit">Pants Fit</string>
@@ -2399,10 +2434,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Slanted Forehead">Slanted Forehead</string>
<string name="Sleeve Length">Sleeve Length</string>
<string name="Sleeve Looseness">Sleeve Looseness</string>
- <string name="Slit Back">Slit Back</string>
- <string name="Slit Front">Slit Front</string>
- <string name="Slit Left">Slit Left</string>
- <string name="Slit Right">Slit Right</string>
+ <string name="Slit Back">Slit: Back</string>
+ <string name="Slit Front">Slit: Front</string>
+ <string name="Slit Left">Slit: Left</string>
+ <string name="Slit Right">Slit: Right</string>
<string name="Socks Length">Socks Length</string>
<string name="Spiked Hair">Spiked Hair</string>
<string name="Squash/Stretch Head">Squash/Stretch Head</string>
@@ -2424,12 +2459,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="White Hair">White Hair</string>
<string name="big belly skirt">big belly skirt</string>
<string name="bigbutt skirt">bigbutt skirt</string>
- <string name="bustle skirt">bustle skirt</string>
+ <string name="bustle skirt">Bustle Skirt</string>
<string name="legs skirt">legs skirt</string>
<string name="loose skirt">loose skirt</string>
<string name="poofy skirt">poofy skirt</string>
<string name="tight skirt">tight skirt</string>
- <string name="wrinkles">wrinkles</string>
+ <string name="wrinkles">Wrinkles</string>
<!-- Favorites Bar -->
<string name="location_ctrl_add_landmark">Add to My Landmarks</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index 8b4126952e..546fbd9b47 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<line_editor
- background_image="TextField_Off"
- background_image_disabled="TextField_Disabled"
- background_image_focused="TextField_Active"
+<line_editor background_image="TextField_Off"
+ background_image_disabled="TextField_Disabled"
+ background_image_focused="TextField_Active"
select_on_focus="false"
handle_edit_keys_directly="false"
commit_on_focus_lost="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 4f2261c953..8ace7b96bc 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -1,22 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<simple_text_editor
+ allow_html="false"
mouse_opaque="true"
font="SansSerifSmall"
max_length="255"
embedded_items="false"
hide_scrollbar="false"
- hide_border="true"
+ border_visible="false"
word_wrap="false"
ignore_tab="true"
+ line_spacing.pixels="1"
track_bottom="false"
cursor_color="TextCursorColor"
default_color="TextDefaultColor"
text_color="TextFgColor"
text_readonly_color="TextFgReadOnlyColor"
+ h_pad="5"
+ v_pad="3"
+ bg_visible="true"
bg_readonly_color="TextBgReadOnlyColor"
bg_writeable_color="TextBgWriteableColor"
- bg_focus_color="TextBgFocusColor"
- link_color="HTMLLinkColor">
+ bg_focus_color="TextBgFocusColor">
<simple_text_editor.border
bevel_style="in"
follows="all" />
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 3d98cd66f9..7d78a8fa20 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<text name="text_box"
+<text allow_html="true"
+ clip_to_rect="false"
+ name="text_box"
font="SansSerifSmall"
font_shadow="soft"
tab_stop="false"
halign="left"
hover_color="LabelSelectedColor"
- disabled_color="LabelDisabledColor"
- background_color="FloaterDefaultBackgroundColor"
+ h_pad="-1"
+ hide_scrollbar="true"
+ text_readonly_color="LabelDisabledColor"
+ bg_writeable_color="FloaterDefaultBackgroundColor"
border_color="DefaultHighlightLight"
use_ellipses="false"
bg_visible="false"
- border_drop_shadow_visible="false"
border_visible="false"
hover="false"
- text_color="LabelTextColor"/>
+ text_color="LabelTextColor"
+ v_pad="-1"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index deaade04f8..23ca8ea338 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Core parameters are in simple_text_editor.xml -->
<text_editor
- allow_html="false" />
+ allow_html="false"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
new file mode 100644
index 0000000000..c352abca3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<textbase clip_to_rect="true"
+ h_pad="4"
+ v_pad="4"/>
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index 1ba0b685c6..ea2571ecb8 100644
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -54,7 +54,7 @@
Factor cobrable:
</text>
<text name="land cost text">
- L$ por m2:
+ L$ por m²:
</text>
<button label="Actualizar" label_selected="Actualizar" name="Refresh"
tool_tip="Haga clic aquí para actualizar la información arriba." />
@@ -114,17 +114,17 @@
Destino:
</text>
<combo_box name="destination">
- <combo_box.item name="Selection" label="Selección" />
- <combo_box.item name="AgentRegion" label="Agente de región" />
+ <combo_box.item name="item1" label="Selección" />
+ <combo_box.item name="item2" label="Agente de región" />
</combo_box>
<text name="Request:">
Exigencia:
</text>
<combo_box name="request">
- <combo_box.item name="colliders&lt;steps&gt;" label="colisionadores &lt;pasos&gt;" />
- <combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="scripts &lt;contar&gt;,&lt;patrón opcional&gt;" />
- <combo_box.item name="objects&lt;pattern&gt;" label="objetos &lt;patrón&gt;" />
- <combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
+ <combo_box.item name="item1" label="colisionadores &lt;pasos&gt;" />
+ <combo_box.item name="item2" label="scripts &lt;contar&gt;,&lt;patrón opcional&gt;" />
+ <combo_box.item name="item3" label="objetos &lt;patrón&gt;" />
+ <combo_box.item name="item4" label="rez &lt;asset_id&gt;" />
</combo_box>
<text name="Parameter:">
Parámetro:
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
index 0ebf459cef..6a9811c058 100644
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -36,6 +36,6 @@ usted conseguirá un bono de referido.
¡Mira esto!
</string>
<string name="upload_message">
- &quot;Enviando...&quot;
+ Enviando...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 0a722ccfd2..e418de3929 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -574,7 +574,7 @@ misma región.
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-¿Ir a [URL] para informarse sobre la compra de moneda?
+¿Ir a [_URL] para informarse sobre la compra de L$?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -808,7 +808,6 @@ no ha seleccionado un grupo.
<notification name="CannotDeedLandNoRegion">
No se ha podido transferir el terreno:
Ha sido imposible encontrar en qué región está.
-Por favor, para informar de esto use Herramientas -&gt; Informar de un fallo.
</notification>
<notification name="CannotDeedLandMultipleSelected">
No se ha podido transferir el terreno:
@@ -854,8 +853,6 @@ Las parcelas de su propiedad se muestran en verde.
<notification name="CannotReleaseLandRegionNotFound">
No se ha podido abandonar el terreno:
Ha sido imposible encontrar en qué región está.
-
-Por favor, para informar de esto use Herramientas &gt; Informar de un fallo.
</notification>
<notification name="CannotReleaseLandNoTransfer">
No se ha podido abandonar el terreno:
@@ -894,14 +891,10 @@ Inténtelo seleccionando una parte.
<notification name="CannotDivideLandNoRegion">
No se ha podido dividir el terreno:
Ha sido imposible encontrar en qué región está.
-
-Por favor, para informar de esto use Herramientas -&gt; Informar de un fallo.
</notification>
<notification name="CannotJoinLandNoRegion">
No se ha podido unir el terreno:
Ha sido imposible encontrar en qué región está.
-
-Por favor, para informar de esto use Herramientas -&gt; Informar de un fallo.
</notification>
<notification name="CannotJoinLandNothingSelected">
No se ha podido unir el terreno:
@@ -960,8 +953,6 @@ Gris = Público
<notification name="CannotSaveToAssetStore">
No se ha podido guardar [NAME] en la base central de almacenamiento.
Esto es, generalmente, un fallo temporal. Por favor, reinténtelo en unos pocos minutos.
-
-Si persiste el problema, por favor, pulse en en el menú &apos;Herramientas &gt; Informar de un fallo&apos; y aporte detalles sobre la configuración de su conexión.
</notification>
<notification name="YouHaveBeenLoggedOut">
Se ha cerrado su sesión en [SECOND_LIFE]:
@@ -1311,10 +1302,6 @@ Esta actualización no es obligatoria, pero le sugerimos instalarla para mejorar
¿Ir a www.secondlife.com para administrar su cuenta?
<usetemplate ignoretext="Cuando se abra el navegador para administrar su cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Visite el wiki de [SECOND_LIFE] y aprenda cómo informar correctamente de fallos.
- <usetemplate ignoretext="Cuando se abra el navegador para ver el wiki de Informes de fallos - instrucciones" name="okcancelignore" notext="Cancelar" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Visite el wiki de [SECOND_LIFE] para más detalles sobre cómo informar de una cuestión de seguridad.
<usetemplate ignoretext="Cuando se abra el navegador para ver el wiki de cuestiones de seguridad" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -2046,26 +2033,10 @@ El propietario de la región resolverá las denuncias basándose en las reglas l
La resolución de esta denuncia se aplica exclusivamente a esta región; el acceso de los residentes a otras áreas de [SECOND_LIFE] no se verá afectado por el resultado de esta denuncia. Únicamente Linden Lab puede impedir el acceso a la totalidad de [SECOND_LIFE].
</notification>
- <notification name="HelpReportBug">
- Use esta herramienta *sólo* para informar de cuestiones técnicas que no se comportan como se describe o era esperable. Por favor, aporte todos los detalles que pueda.
-Deberá responder al correo electrónico de auto respuesta para añadir más detalles a su informe.
-
-Todos los informes de fallos serán investigados y evaluados. No se contestará por correo electrónico.
-
-Si tiene algún problema técnico, por favor, contacte con Soporte en:
-
-http://secondlife.com/community/support.php
-
-Nota: no se investigarán los informes incompletos.
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, elija una categoría para esta denuncia de infracción.
Seleccionar una categoría nos ayuda a clasificar y procesar las denuncias de infracciones.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Por favor, elija una categoría para este fallo.
-Seleccionar una categoría nos ayuda a clasificar y procesar los informes de fallos.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Por favor, escriba el nombre del infractor.
Aportar el dato preciso nos ayuda a clasificar y procesar las denuncias de infracciones.
@@ -2078,20 +2049,11 @@ Aportar el dato preciso nos ayuda a clasificar y procesar las denuncias de infra
Por favor, escriba un resumen de la infracción que ha habido.
Aportar un resumen preciso nos ayuda a clasificar y procesar las denuncias de infracciones.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Por favor, escriba un resumen del fallo.
-Aportar un resumen preciso nos ayuda a clasificar y procesar los informes de fallos.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Por favor, escriba una descripción minuciosa de la infracción que ha habido.
Sea tan específico como pueda, incluyendo los nombres y los detalles implicados en el incidente que denuncia.
Aportar una descripción precisa nos ayuda a clasificar y procesar las denuncias de infracciones.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Por favor, escriba una descripción minuciosa del fallo.
-Sea tan específico como pueda, incluyendo -si es posible- los pasos que permitan reproducir el fallo.
-Aportar una descripción precisa nos ayuda a clasificar y procesar los informes de fallos.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Estimado Residente:
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 6b7019ba95..0735bb0082 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -527,4 +527,110 @@ Si sigue recibiendo este mensaje, contacte con el [SUPPORT_SITE].
<string name="GraphicsQualityHigh">
Alto
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Localización Linden</string>
+ <string name="Adult">&apos;Adult&apos;</string>
+ <string name="Arts&amp;Culture">Arte y Cultura</string>
+ <string name="Business">Negocios</string>
+ <string name="Educational">Educativo</string>
+ <string name="Gaming">Juegos de azar</string>
+ <string name="Hangout">Entretenimiento</string>
+ <string name="Newcomer Friendly">Para recién llegados</string>
+ <string name="Parks&amp;Nature">Parques y Naturaleza</string>
+ <string name="Residential">Residencial</string>
+ <string name="Shopping">Compras</string>
+ <string name="Other">Otra</string>
+
+ <string name="ringing">
+ Conectando al chat de voz...
+ </string>
+ <string name="connected">
+ Conectado
+ </string>
+ <string name="unavailable">
+ La voz no está disponible en su localización actual
+ </string>
+ <string name="hang_up">
+ Desconectado del chat de voz
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ A &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Cogerle a usted dólares Linden (L$)
+ </string>
+ <string name="ActOnControlInputs">
+ Actuar en sus controles de entrada
+ </string>
+ <string name="RemapControlInputs">
+ Reconfigurar sus controles de entrada
+ </string>
+ <string name="AnimateYourAvatar">
+ Ejecutar animaciones en su avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Anexarse a su avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Anular la propiedad y que pase a ser público
+ </string>
+ <string name="LinkAndDelink">
+ Enlazar y desenlazar de otros objetos
+ </string>
+ <string name="AddAndRemoveJoints">
+ Añadir y quitar uniones con otros objetos
+ </string>
+ <string name="ChangePermissions">
+ Cambiar sus permisos
+ </string>
+ <string name="TrackYourCamera">
+ Seguir su cámara
+ </string>
+ <string name="ControlYourCamera">
+ Controlar su cámara
+ </string>
+
+ <string name="only_user_message">
+ Usted es el único usuario en esta sesión.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] no está conectado.
+ </string>
+ <string name="invite_message">
+ Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
+ </string>
+ <string name="generic_request_error">
+ Error al hacer lo solicitado; por favor, inténtelo más tarde.
+ </string>
+ <string name="insufficient_perms_error">
+ Usted no tiene permisos suficientes.
+ </string>
+ <string name="session_does_not_exist_error">
+ La sesión ya acabó
+ </string>
+ <string name="no_ability_error">
+ Usted no tiene esa capacidad.
+ </string>
+ <string name="not_a_mod_error">
+ Usted no es un moderador de la sesión.
+ </string>
+ <string name="muted_error">
+ Un moderador del grupo le ha desactivado el chat de texto.
+ </string>
+ <string name="add_session_event">
+ No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ No se ha podido enviar su mensaje a la sesión de chat con [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Ha sido eliminado del grupo.
+ </string>
+ <string name="close_on_no_ability">
+ Usted ya no tendrá más la capacidad de estar en la sesión de chat.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 4f43be47ea..461956ff34 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -78,17 +78,17 @@
Destination :
</text>
<combo_box name="destination">
- <combo_box.item name="Selection" label="Sélection" />
- <combo_box.item name="AgentRegion" label="Région de l&apos;avatar" />
+ <combo_box.item name="item1" label="Sélection" />
+ <combo_box.item name="item2" label="Région de l&apos;avatar" />
</combo_box>
<text name="Request:">
Requête :
</text>
<combo_box name="request">
- <combo_box.item name="colliders&lt;steps&gt;" label="Objets responsables de collisions : étapes" />
- <combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Nombre de scripts et schéma optionnel" />
- <combo_box.item name="objects&lt;pattern&gt;" label="Schéma des objets" />
- <combo_box.item name="rez&lt;asset_id&gt;" label="rezzer &lt;asset_id&gt;" />
+ <combo_box.item name="item1" label="Objets responsables de collisions : étapes" />
+ <combo_box.item name="item2" label="Nombre de scripts et schéma optionnel" />
+ <combo_box.item name="item3" label="Schéma des objets" />
+ <combo_box.item name="item4" label="rezzer &lt;asset_id&gt;" />
</combo_box>
<text name="Parameter:">
Paramètre :
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 951c199b1c..3255cdb728 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -560,7 +560,7 @@ Veuillez mettre tous les objets que vous souhaitez acquérir dans la même régi
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Aller sur [URL] pour obtenir des informations sur l&apos;achat de devises ?
+Aller sur [_URL] pour obtenir des informations sur l&apos;achat de L$ ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -788,7 +788,6 @@ aucun groupe sélectionné.
<notification name="CannotDeedLandNoRegion">
Cession du terrain impossible :
la région dans laquelle il est situé est introuvable.
-Veuillez utiliser Aide &gt; Signaler des bugs pour signaler le problème.
</notification>
<notification name="CannotDeedLandMultipleSelected">
Cession du terrain impossible :
@@ -834,8 +833,6 @@ Les parcelles qui vous appartiennent sont en vert.
<notification name="CannotReleaseLandRegionNotFound">
Impossible d&apos;abandonner le terrain :
la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
</notification>
<notification name="CannotReleaseLandNoTransfer">
Impossible d&apos;abandonner le terrain :
@@ -874,14 +871,10 @@ Diviser le terrain ?
<notification name="CannotDivideLandNoRegion">
Division du terrain impossible :
la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
</notification>
<notification name="CannotJoinLandNoRegion">
Impossible de fusionner le terrain :
la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
</notification>
<notification name="CannotJoinLandNothingSelected">
Impossible de fusionner le terrain :
@@ -940,8 +933,6 @@ Gris = public
<notification name="CannotSaveToAssetStore">
Impossible de sauvegarder le fichier [NAME] dans la base de données centrale.
Cette erreur est généralement temporaire. Veuillez éditer et sauvegarder l&apos;élément endossable à nouveau d&apos;ici quelques minutes.
-
-Si le problème persiste, veuillez cliquer sur Aide | Signaler un bug dans le menu déroulant en indiquant les détails de votre connexion.
</notification>
<notification name="YouHaveBeenLoggedOut">
Vous avez été déconnecté(e) de [SECOND_LIFE] :
@@ -1274,10 +1265,6 @@ Télécharger vers le dossier Applications ?
Aller sur www.secondlife.com pour gérer votre compte ?
<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour gérer votre compte" name="okcancelignore" notext="Annuler" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Pour apprendre à signaler correctement des bugs, consultez le Wiki de [SECOND_LIFE].
- <usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Wiki et apprendre à signaler des bugs" name="okcancelignore" notext="Annuler" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Pour apprendre à signaler un problème de sécurité, consultez le Wiki de [SECOND_LIFE].
<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur les problèmes de sécurité." name="okcancelignore" notext="Annuler" yestext="OK"/>
@@ -1966,26 +1953,10 @@ Le propriétaire de la région traitera les rapports en fonction des règles de
La résolution de ce rapport ne s&apos;applique qu&apos;à cette région ; L&apos;accès aux autres endroits de [SECOND_LIFE] ne sera pas affecté par les résultats de cette enquête. Seul Linden Lab peut interdire l&apos;accès à l&apos;ensemble de [SECOND_LIFE].
</notification>
- <notification name="HelpReportBug">
- N&apos;utilisez cet outil que pour signaler des problèmes techniques et soyez aussi précis que possible.
-Vous pouvez répondre à l&apos;e-mail automatique pour ajouter des détails à votre rapport.
-
-Tous les bugs signalés sont reproduits et évalués. Aucune réponse ne sera envoyée par e-mail.
-
-Si vous avez un problème technique, veuillez contacter le service clientèle à :
-
-http://secondlife.com/community/support.php
-
-Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une enquête.
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Veuillez choisir une catégorie pour ce rapport d&apos;infraction.
Le choix d&apos;une catégorie nous permet de traiter les rapports d&apos;infraction plus rapidement.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Veuillez choisir une catégorie pour ce bug.
-Le choix d&apos;une catégorie nous permet de traiter les bugs plus rapidement.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Veuillez saisir le nom du contrevenant.
Lorsque nous avons le nom du contrevenant, nous sommes en mesure de traiter les rapports plus rapidement.
@@ -1998,20 +1969,11 @@ Les informations précises et exactes nous permettent de traiter les rapports pl
Veuillez saisir un récapitulatif de l&apos;infraction.
Les récapitulatifs précis nous permettent de traiter les rapports plus rapidement.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Veuillez saisir un récapitulatif du bug.
-Les récapitulatifs précis nous permettent de résoudre les bugs plus rapidement.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Veuillez saisir une description détaillée de l&apos;infraction.
Soyez aussi précis que possible et essayez de fournir des noms ainsi que des détails sur l&apos;incident que vous signalez.
Les descriptions précises nous permettent de traiter les rapports plus rapidement.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Veuillez saisir une description détaillée du bug.
-Soyez aussi spécifique que possible et essayez d&apos;indiquer les étapes à suivre pour reproduire le bug.
-Les descriptions précises nous permettent de résoudre les bugs plus rapidement.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Cher résident,
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 80248a95f8..6bdee836d9 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -517,4 +517,109 @@
<string name="GraphicsQualityHigh">
Élevé
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Appartenant aux Lindens</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Art et Culture</string>
+ <string name="Business">Affaires</string>
+ <string name="Educational">Éducation</string>
+ <string name="Gaming">Jeux</string>
+ <string name="Hangout">Favoris</string>
+ <string name="Newcomer Friendly">Accueil pour les nouveaux</string>
+ <string name="Parks&amp;Nature">Parcs et Nature</string>
+ <string name="Residential">Résidentiel</string>
+ <string name="Shopping">Shopping</string>
+ <string name="Other">Autre</string>
+
+ <string name="ringing">
+ Connexion au chat vocal du Monde en cours…
+ </string>
+ <string name="connected">
+ Connecté(e)
+ </string>
+ <string name="unavailable">
+ Voix non disponible à l&apos;endroit où vous êtes
+ </string>
+ <string name="hang_up">
+ Déconnecté du chat vocal
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de : [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ &apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu le droit de : [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Débiter vos Linden dollars (L$)
+ </string>
+ <string name="ActOnControlInputs">
+ Utiliser vos touches de commandes
+ </string>
+ <string name="RemapControlInputs">
+ Reconfigurer vos touches de commandes
+ </string>
+ <string name="AnimateYourAvatar">
+ Animer votre avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Attacher à votre avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Passer l&apos;objet dans le domaine public (sans propriétaire)
+ </string>
+ <string name="LinkAndDelink">
+ Lier et délier d&apos;autres objets
+ </string>
+ <string name="AddAndRemoveJoints">
+ Créer et supprimer des liens avec d&apos;autres objets
+ </string>
+ <string name="ChangePermissions">
+ Modifier ses droits
+ </string>
+ <string name="TrackYourCamera">
+ Suivre votre caméra
+ </string>
+ <string name="ControlYourCamera">
+ Contrôler votre caméra
+ </string>
+ <text name="only_user_message">
+ Vous êtes le seul participant à cette session.
+ </text>
+ <text name="offline_message">
+ [FIRST] [LAST] est déconnecté(e).
+ </text>
+ <string name="invite_message">
+ Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
+ </string>
+ <string name="generic_request_error">
+ Erreur lors de la requête, veuillez réessayer ultérieurement.
+ </string>
+ <string name="insufficient_perms_error">
+ Vous n&apos;avez pas les droits requis.
+ </string>
+ <string name="session_does_not_exist_error">
+ La session a expiré
+ </string>
+ <string name="no_ability_error">
+ Vous n&apos;avez pas ce pouvoir.
+ </string>
+ <string name="not_a_mod_error">
+ Vous n&apos;êtes pas modérateur de session.
+ </string>
+ <string name="muted_error">
+ Un modérateur de groupe a désactivé votre chat écrit.
+ </string>
+ <string name="add_session_event">
+ Impossible d&apos;ajouter des participants à la session de chat avec [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Impossible d&apos;envoyer votre message à la session de chat avec [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Vous avez été supprimé du groupe.
+ </string>
+ <string name="close_on_no_ability">
+ Vous ne pouvez plus participer à la session de chat.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/it/floater_postcard.xml b/indra/newview/skins/default/xui/it/floater_postcard.xml
index a2522baaf4..5132771acc 100644
--- a/indra/newview/skins/default/xui/it/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/it/floater_postcard.xml
@@ -35,6 +35,6 @@
Vieni a vedere!
</string>
<string name="upload_message">
- &quot;In spedizione...&quot;
+ In spedizione...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 427247634b..d85dd7732a 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -574,7 +574,7 @@ Sposta tutti gli oggetti che vuoi acquisire su una sola regione.
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Vuoi andare su [URL] per maggiori informazioni su come acquistare denaro?
+Vuoi andare su [_URL] per maggiori informazioni su come acquistare L$?
<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -804,7 +804,6 @@ Nessun gruppo selezionato.
<notification name="CannotDeedLandNoRegion">
Impossibile cedere il terreno:
Non riesco a trovare la regione dove è situato il terreno.
-Usa Strumenti -&gt; Segnala Bug per segnalare il problema.
</notification>
<notification name="CannotDeedLandMultipleSelected">
Impossibile cedere il terreno:
@@ -850,8 +849,6 @@ I terreni di tua proprietà vengono visualizzati in verde.
<notification name="CannotReleaseLandRegionNotFound">
Impossibile abbandonare il terreno:
Non riesco a trovare la regione dove è situato il terreno.
-
-Usa Strumenti &gt; Segnala Bug segnalare questo problema.
</notification>
<notification name="CannotReleaseLandNoTransfer">
Impossibile abbandonare il terreno:
@@ -890,14 +887,10 @@ Dividi il terreno?
<notification name="CannotDivideLandNoRegion">
Impossibile dividere il terreno:
Non riesco a trovare la regione dove è situato.
-
-Usa Strumenti -&gt; Segnala Bug per segnalare il problema.
</notification>
<notification name="CannotJoinLandNoRegion">
Impossibile unire il terreno:
Non riesco a trovare la regione dove è situato.
-
-Usa Strumenti -&gt; Segnala Bug per segnalare il problema.
</notification>
<notification name="CannotJoinLandNothingSelected">
Impossibile unire il terreno:
@@ -956,8 +949,6 @@ Grigia = pubblica
<notification name="CannotSaveToAssetStore">
Impossibile salvare [NAME] nel database centrale.
Normalmente questo problema è temporaneo. Riprova a generare la parte indossabile e a salvarla fra qualche minuto.
-
-Se questo problema persiste, clicca sul menu a tendina &apos;Strumenti &gt; Segnala Bug&apos; e fornisci i dettagli sulla tua configurazione di rete.
</notification>
<notification name="YouHaveBeenLoggedOut">
Sei stato sconnesso da [SECOND_LIFE]:
@@ -1298,10 +1289,6 @@ Vuoi avviarne lo scaricamento nella tua cartella applicazioni?
Vuoi andare su www.secondlife.com per gestire il tuo account?
<usetemplate ignoretext="Quando lanci il browser web per gestire il tuo account." name="okcancelignore" notext="Annulla" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Visita la Wiki di [SECOND_LIFE] per imparare a segnalare un bug correttamente.
- <usetemplate ignoretext="Quando lanci il browser web per vedere come segnalare bug nella wiki." name="okcancelignore" notext="Annulla" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Visita la Wiki di [SECOND_LIFE] per i dettagli su come segnalare un problema di sicurezza.
<usetemplate ignoretext="Quando lanci il browser web per vedere la Wiki sui problemi di sicurezza." name="okcancelignore" notext="Annulla" yestext="OK"/>
@@ -2040,25 +2027,10 @@ Il proprietario della regione risolverà le segnalazione basandosi sulle regole
La risoluzione di questa segnalazione verrà applicata solo in questa regione; L&apos;accesso dei residenti ad altre aree di [SECOND_LIFE] non verrà influenzato dal risultato di questa segnalazione. Soltanto i Linden Lab possono restringere l&apos;accesso alla totalità di [SECOND_LIFE].
</notification>
- <notification name="HelpReportBug">
- Usa questo strumento per segnalare *soltanto* caratteristiche tecniche che non funzionano come descitto o atteso, fornisci quanti più dettagli è possibile, Puoi rispondere all&apos;email automatica aggiungendo ulteriori dettagli sulla tua segnalazione.
-
-Tutte le segnalazioni di bug sono investigate e valutate. Non vengono inviate risposte via email.
-
-Se hai difficoltà tecniche contatta il supporto:
-
-http://secondlife.com/community/support.php
-
-Nota: segnalazioni incomplete non verranno prese in considerazione
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Scegli una categoria per questa segnalazione di abuso.
Scegliere una categoria, ci aiuta a gestire ed elaborare le segnalazioni di abuso.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Scegli una categoria per questo bug.
-Scegliere una categoria, ci aiuta a gestire ed elaborare le segnalazioni di bug.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Introduci il nome di chi abusa.
Introducendo un valore accurato, ci aiuti a gestire ed elaborare le segnalazioni di abuso.
@@ -2071,20 +2043,11 @@ Introducendo un valore accurato, ci aiuti a gestire ed elaborare le segnalazioni
Inserisci un yiyolo descrittivo dell&apos;abuso che è avvenuto.
Introducendo un titolo descrittivo accurato, ci aiuti a gestire ed elaborare le segnalazioni di abuso.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Introduci una descrizione del bug.
-Introducendo una descrizione accurata ci aiuti a gestire ed elaborare le segnalazioni di bug.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Inserisci una descrizione dettagliata dell&apos;abuso che è avvenuto.
Devi essere il più specifico possibile, includendo i nomi e i dettagli dell&apos;incidente che stai segnalando.
Inserendo una descrizione accurata ci aiuti a gestire ed elaborare le segnalazioni di abuso.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Inserisci una descrizione dettagliata del bug.
-Devi essere il pià specifico possibile, includendo se possibil i passi per riprodurre il problema.
-Inserendo una descrizione accurata, ci aiuti a gestire ed elaborare le segnalazioni di bug.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Caro residente,
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 38283df469..67b946e1de 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -513,4 +513,109 @@
<string name="GraphicsQualityHigh">
Alto
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING - TAKE FROM floater_about_land."land category with adult".item1-item12 -->
+ <string name="Linden Location">Luogo dei Linden</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Arte &amp; Cultura</string>
+ <string name="Business">Affari</string>
+ <string name="Educational">Educazione</string>
+ <string name="Gaming">Gioco</string>
+ <string name="Hangout">Divertimento</string>
+ <string name="Newcomer Friendly">Accoglienza nuovi residenti</string>
+ <string name="Parks&amp;Nature">Parchi &amp; Natura</string>
+ <string name="Residential">Residenziale</string>
+ <string name="Shopping">Shopping</string>
+ <string name="Other">Altro</string>
+
+ <string name="ringing">
+ In connessione alla Voice Chat in-world...
+ </string>
+ <string name="connected">
+ Connesso
+ </string>
+ <string name="unavailable">
+ Il voice non è disponibile nel posto dove ti trovi ora
+ </string>
+ <string name="hang_up">
+ Disconnesso dalla Voice Chat in-world
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato concesso il permesso di: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Prendere dollari Linden (L$) da te
+ </string>
+ <string name="ActOnControlInputs">
+ Agire sul tuo controllo degli input
+ </string>
+ <string name="RemapControlInputs">
+ Rimappare il tuo controllo degli input
+ </string>
+ <string name="AnimateYourAvatar">
+ Animare il tuo avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Far indossare al tuo avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Rilasciare la propietà è far diventare pubblico.
+ </string>
+ <string name="LinkAndDelink">
+ Collegare e scollegare dagli altri oggetti
+ </string>
+ <string name="AddAndRemoveJoints">
+ Aggiungere e rimuovere le giunzioni insieme con gli altri oggetti
+ </string>
+ <string name="ChangePermissions">
+ Cambiare i permessi
+ </string>
+ <string name="TrackYourCamera">
+ Tracciare la fotocamera
+ </string>
+ <string name="ControlYourCamera">
+ Controllare la tua fotocamera
+ </string>
+ <string name="only_user_message">
+ Sei l&apos;unico utente di questa sessione.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] è offline.
+ </string>
+ <string name="invite_message">
+ Clicca il tasto [BUTTON NAME] per accettare/connetterti a questa voice chat.
+ </string>
+ <string name="generic_request_error">
+ Errore durante la richiesta, riprova più tardi.
+ </string>
+ <string name="insufficient_perms_error">
+ Non hai sufficienti permessi.
+ </string>
+ <string name="session_does_not_exist_error">
+ Questa sessione non esiste più
+ </string>
+ <string name="no_ability_error">
+ Non hai questa abilitazione.
+ </string>
+ <string name="not_a_mod_error">
+ Non sei un moderatore.
+ </string>
+ <string name="muted_error">
+ Un moderatore di gruppo ti ha disabilitato dalla chat di testo.
+ </string>
+ <string name="add_session_event">
+ Impossibile aggiungere utenti alla chat con [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Impossibile inviare il messaggio nella chat con [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Sei stato espulso dal gruppo.
+ </string>
+ <string name="close_on_no_ability">
+ Non hai più le abilitazioni per rimanere nella sessione chat.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index d91744c391..8fe41a823a 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -122,29 +122,17 @@
目的地:
</text>
<combo_box name="destination">
- <combo_item name="Selection">
- 選択
- </combo_item>
- <combo_item name="AgentRegion">
- エージェント地域
- </combo_item>
+ <combo_box.item name="item1" label="選択"/>
+ <combo_box.item name="item2" label="エージェント地域"/>
</combo_box>
<text name="Request:">
要求:
</text>
<combo_box name="request">
- <combo_item name="colliders&lt;steps&gt;">
- コライダー<ステップ>
- </combo_item>
- <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
- スクリプト<回数>、<オプション・パターン>
- </combo_item>
- <combo_item name="objects&lt;pattern&gt;">
- オブジェクト<パターン>
- </combo_item>
- <combo_item name="rez&lt;asset_id&gt;">
- rez <asset_id>
- </combo_item>
+ <combo_box.item name="item1" label="コライダー<ステップ>"/>
+ <combo_box.item name="item2" label="スクリプト<回数>、<オプション・パターン>"/>
+ <combo_box.item name="item3" label="オブジェクト<パターン>"/>
+ <combo_box.item name="item4" label="rez <asset_id>"/>
</combo_box>
<text name="Parameter:">
パラメーター:
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index f9d91c31fa..5c22fbf474 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -603,7 +603,7 @@ L$が不足しているのでこのグループに参加することができま
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-[URL]に移動して貨幣購入に関する情報を確認しますか?
+[_URL]に移動して貨幣購入に関する情報を確認しますか?
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -845,7 +845,6 @@ L$が不足しているのでこのグループに参加することができま
<notification name="CannotDeedLandNoRegion">
土地を譲渡できません:
この土地がある地域が見つかりません。
-「ツール」>「バグを報告する」を使って報告してください。
</notification>
<notification name="CannotDeedLandMultipleSelected">
土地を譲渡できません:
@@ -891,8 +890,6 @@ L$が不足しているのでこのグループに参加することができま
<notification name="CannotReleaseLandRegionNotFound">
土地を破棄できません:
この土地がある地域が見つかりません。
-
-「ツール」>「バグを報告する」を使って報告してください。
</notification>
<notification name="CannotReleaseLandNoTransfer">
土地を破棄できません:
@@ -933,14 +930,10 @@ L$は返金されません。
<notification name="CannotDivideLandNoRegion">
土地を分割できません:
この土地がある地域が見つかりません。
-
-「ツール」>「バグを報告する」を使って報告してください。
</notification>
<notification name="CannotJoinLandNoRegion">
土地を統合できません:
この土地がある地域が見つかりません。
-
-「ツール」>「バグを報告する」を使って報告してください。
</notification>
<notification name="CannotJoinLandNothingSelected">
土地を統合できませんでした:
@@ -1003,8 +996,6 @@ L$は返金されません。
[NAME]を中央資産格納庫に保存できません。
これは一時的な不具合です。
服飾品などをカスタマイズし、数分後にもう一度保存してください。
-
-この問題が続くようなら、「ツール」>「バグを報告する」をクリックし、お使いのネットワーク設定の詳細を報告してください。
</notification>
<notification name="YouHaveBeenLoggedOut">
あなたは[SECOND_LIFE]からログアウトされました。
@@ -1365,10 +1356,6 @@ F1キーを押してください。
www.secondlife.comに移動してアカウントを管理しますか?
<usetemplate ignoretext="アカウントを管理するため、ウェブ・ブラウザを起動するとき" name="okcancelignore" notext="取り消し" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- [SECOND_LIFE]Wikiで、バグを報告する正しい方法をご覧ください。
- <usetemplate ignoretext="バグレポート101 Wikiを閲覧するためのブラウザを開くにあたって" name="okcancelignore" notext="キャンセル" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
[SECOND_LIFE] Wikiで、
セキュリティ問題を報告する方法をご覧ください。
@@ -2180,26 +2167,10 @@ http://secondlife.com/support/incidentreport.php
Linden Lab 社だけが[SECOND_LIFE] 全域における
アクセス制限権を持っています。
</notification>
- <notification name="HelpReportBug">
- このツールは、説明どおりに動作しないなどのテクニカルなフィーチャーのレポートのみに使用してください。
-できるだけ詳しい情報を提供してください。
-自動返答メールに、より詳しい情報を付け加えて返信することもできます。
-バグレポートは全て調査され解決されます。これによってEメールで返答が送られてくることはありません。
--
-テクニカルな問題が生じた場合は、
-次のサポートに連絡してください:
-http://secondlife.com/community/support.php
--
-注意:未完成の報告は調査されません。
- </notification>
<notification name="HelpReportAbuseSelectCategory">
嫌がらせ報告のカテゴリを選択してください。
カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。
</notification>
- <notification name="HelpReportBugSelectCategory">
- バグのカテゴリを選択してください。
-カテゴリを選択することにより、バグ報告の処理や保管に大変役立ちます。
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
嫌がらせ行為をした人の名前を入力してください。
正確な情報の入力により、嫌がらせ報告の処理や保管に大変役立ちます。
@@ -2213,10 +2184,6 @@ http://secondlife.com/community/support.php
正確な概要の入力により、
嫌がらせ報告の処理や保管に大変役立ちます。
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- バグの概要を入力してください。
-正確な概要の入力により、バグ報告の処理や保管に大変役立ちます。
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
嫌がらせの詳細な説明を入力してください。
名前や嫌がらせの詳細を、できるだけ具体的に入力してください。
@@ -2224,12 +2191,6 @@ http://secondlife.com/community/support.php
正確な説明の入力により、
嫌がらせ報告の処理や保管に大変役立ちます。
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- バグの詳細な説明を入力してください。
-バグがどのような条件で再現するかなどを、できるだけ具体的に入力してください。
-
-正確な説明の入力により、バグ報告の処理や保管に大変役立ちます。
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
住人の皆様へ、
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 5d308f78d1..7b21146651 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -517,4 +517,108 @@
<string name="GraphicsQualityHigh">
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Linden所在地</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">アートとカルチャー</string>
+ <string name="Business">ビジネス</string>
+ <string name="Educational">教育的</string>
+ <string name="Gaming">ゲーム</string>
+ <string name="Hangout">たまり場</string>
+ <string name="Newcomer Friendly">新住人に好意的</string>
+ <string name="Parks&amp;Nature">公園と自然</string>
+ <string name="Residential">住宅用</string>
+ <string name="Shopping">ショッピング</string>
+ <string name="Other">その他</string>
+ <string name="ringing">
+ インワールドボイスチャットに接続中...
+ </string>
+ <string name="connected">
+ 接続しました
+ </string>
+ <string name="unavailable">
+ あなたの現在のロケーションでは、ボイスを利用できません。
+ </string>
+ <string name="hang_up">
+ インワールドボイスチャットの通話が切断されました
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ [REGIONNAME]の[REGIONPOS]という場所にある「[OWNERNAME]」所有の「[OBJECTNAME]」というオブジェクトは、次の権限を許可しました: [PERMISSIONS]
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ [REGIONNAME]の[REGIONPOS]という場所にある「[OWNERNAME]」所有の「[OBJECTNAME]」というオブジェクトは、次の権限を拒否しました: [PERMISSIONS]
+ </string>
+ <string name="ScriptTakeMoney">
+ リンデンドル(L$)を支払う
+ </string>
+ <string name="ActOnControlInputs">
+ 制御入力に基づいて行動
+ </string>
+ <string name="RemapControlInputs">
+ 制御入力のリマップ
+ </string>
+ <string name="AnimateYourAvatar">
+ アバターへのアニメーション動作
+ </string>
+ <string name="AttachToYourAvatar">
+ アバターに装着
+ </string>
+ <string name="ReleaseOwnership">
+ 所有権を解放し公のものとする
+ </string>
+ <string name="LinkAndDelink">
+ 他のオブジェクトのリンクとリンク解除
+ </string>
+ <string name="AddAndRemoveJoints">
+ 他のオブジェクトとのジョイントの追加と削除
+ </string>
+ <string name="ChangePermissions">
+ 権限の変更
+ </string>
+ <string name="TrackYourCamera">
+ カメラ追従
+ </string>
+ <string name="ControlYourCamera">
+ カメラのコントロール
+ </string>
+ <string name="only_user_message">
+ このセッションにいるユーザーはあなただけです。
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST]はオフラインです。
+ </string>
+ <string name="invite_message">
+ このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
+ </string>
+ <string name="generic_request_error">
+ 要求中にエラーが発生しました。後でもう一度試してください。
+ </string>
+ <string name="insufficient_perms_error">
+ あなたには充分な権限がありません。
+ </string>
+ <string name="session_does_not_exist_error">
+ このセッションは既に切断されています。
+ </string>
+ <string name="no_ability_error">
+ あなたにはその能力がありません。
+ </string>
+ <string name="not_a_mod_error">
+ あなたはセッション・モデレータではありません。
+ </string>
+ <string name="muted_error">
+ グループモデレータがあなたのテキストチャットを無効化しました
+ </string>
+ <string name="add_session_event">
+ [RECIPIENT] とのチャット・セッションにユーザーを追加することができません
+ </string>
+ <string name="message_session_event">
+ [RECIPIENT] とのチャット・セッションにメッセージを送ることができません
+ </string>
+ <string name="removed_from_group">
+ あなたはグループから削除されました。
+ </string>
+ <string name="close_on_no_ability">
+ このチャット・セッションを継続することはできません
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/nl/floater_postcard.xml b/indra/newview/skins/default/xui/nl/floater_postcard.xml
index 9ca6fcc026..a6d10f2244 100644
--- a/indra/newview/skins/default/xui/nl/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/nl/floater_postcard.xml
@@ -31,6 +31,6 @@
Kom dit zien!
</string>
<string name="upload_message">
- &quot;Verzenden…&quot;
+ Verzenden...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/nl/floater_telehub.xml b/indra/newview/skins/default/xui/nl/floater_telehub.xml
index 5a8abc208a..8fe8e06c03 100644
--- a/indra/newview/skins/default/xui/nl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/nl/floater_telehub.xml
@@ -17,7 +17,7 @@
<text name="spawn_points_text">
Spawnpunten (posities, niet objecten):
</text>
- <scroll_list bottom_delta="-44" draw_border="true" follows="left|top" font="SansSerifSmall"
+ <scroll_list bottom_delta="-44" draw_border="true" follows="left|top"
height="40" left="10" multi_select="false" name="spawn_points_list"
width="230" />
diff --git a/indra/newview/skins/default/xui/nl/notifications.xml b/indra/newview/skins/default/xui/nl/notifications.xml
index cbe075362a..b47e92b682 100644
--- a/indra/newview/skins/default/xui/nl/notifications.xml
+++ b/indra/newview/skins/default/xui/nl/notifications.xml
@@ -576,7 +576,7 @@ Verplaats alstublieft alle objecten die u wilt verwerven naar dezelfde regio.
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Naar [URL] gaan voor informatie over de aankoop valuta?
+Naar [_URL] gaan voor informatie over de aankoop L$?
<usetemplate name="okcancelbuttons" notext="Annuleren" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -805,7 +805,6 @@ Geen groep geselecteerd.
<notification name="CannotDeedLandNoRegion">
Kan land niet toekennen:
Kan de regio niet vinden waar dit land zich bevind.
-Gebruik alstublieft Gereedschappen -&gt; Report Bug om het te rapporteren.
</notification>
<notification name="CannotDeedLandMultipleSelected">
Kan land niet toekennen:
@@ -852,8 +851,6 @@ Percelen in uw eigendom verschijnen in groen.
<notification name="CannotReleaseLandRegionNotFound">
Kan land niet afstaan:
Kan de regio niet vinden waar dit land zich bevind.
-
-Gebruik alstublieft Gereedschappen &gt; Report Bug om het te rapporteren.
</notification>
<notification name="CannotReleaseLandNoTransfer">
Kan land niet afstaan:
@@ -892,14 +889,10 @@ Land opdelen?
<notification name="CannotDivideLandNoRegion">
Kan het land niet opdelen:
Kan de regio niet vinden waar dit land zich bevind.
-
-Gebruik alstublieft Gereedschappen &gt; Report Bug om het te rapporteren.
</notification>
<notification name="CannotJoinLandNoRegion">
Kan land niet verbinden:
Kan de regio niet vinden waar dit land zich bevind.
-
-Gebruik alstublieft Gereedschappen &gt; Report Bug om het te rapporteren.
</notification>
<notification name="CannotJoinLandNothingSelected">
Kan land niet verbinden:
@@ -959,8 +952,6 @@ Grijs = Openbaar
Kon [NAME] niet opslaan in centrale (asset) opslag.
Meestal is dit een tijdelijk probleem.
Wijzig en sla het draagbaar item over een paar minuten opnieuw op.
-
-Indien dit probleem aanhoudt, klik dan alstublieft op &apos;Gereedschap &gt; Rapporteer Bug&apos; in het menu en voeg informatie toe over uw netwerk instellingen.
</notification>
<notification name="YouHaveBeenLoggedOut">
U bent uitgelogd uit [SECOND_LIFE]:
@@ -1302,10 +1293,6 @@ Downloaden naar uw Applicatie Data map?
Naar www.secondlife.com gaan om uw account te beheren?
<usetemplate ignoretext="Bij openen van webbrowser om uw account te beheren" name="okcancelignore" notext="Annuleren" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Bezoek de [SECOND_LIFE] Wiki en leer hoe Bugs correct gerapporteerd kunnen worden.
- <usetemplate ignoretext="Bij openen webbrowser om de Bug Reporting 101 Wiki te bekijken" name="okcancelignore" notext="Annuleren" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Bezoek de [SECOND_LIFE] Wiki voor details over hoe een Veiligheids Probleem (Security Issue) te rapporteren.
<usetemplate ignoretext="Bij openen webbrowser om de Veiligheids Problemen Wiki (Security Issues Wiki) te bekijken" name="okcancelignore" notext="Annuleren" yestext="OK"/>
@@ -2044,26 +2031,11 @@ De regio eigenaar zal de rapporten afhandelen op basis van de regels geldend voo
De afhandeling van dit rapport is alleen van toepassing op deze regio.
Toegang van Inwoners tot andere gebieden van [SECOND_LIFE] zullen niet beïnvloed worden door de uitkomst van dit rapport. Alleen Linden Lab kan de toegang tot geheel [SECOND_LIFE] beperken.
</notification>
- <notification name="HelpReportBug">
- Gebruik dit gereedschap *alleen* voor het rapporteren van technische opties die niet functioneren als verwacht. Geef alstublieft zoveel mogelijk technische details als mogelijk. U kunt de automatische-antwoord email gebruiken om op te reageren om aanvullende gegevens toe te voegen aan uw rapport.
-
-Alle bug rapporten worden onderzocht en ingeschat. Er zal geen antwoord per email worden verzonden.
-
-Als u technische problemen heeft, neem dan contact op met Support op:
-http://secondlife.com/community/support.php
-
-Opmerking: Onvolledige rapporten zullen niet worden onderzocht.
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Selecteer alstublieft een categorie voor dit misbruik rapport.
Het selecteren van een categorie helpt ons met het archiveren en verwerken van misbruik rapporten.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Selecteer alstublieft een categorie voor dit bug rapport.
-
-Het selecteren van een categorie helpt ons met het archiveren en verwerken van bug rapporten.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Geef alstublieft een naam op van de misbruiker.
@@ -2079,11 +2051,6 @@ Een accurate waarde opgeven helpt ons met het archiveren en verwerken van misbru
Een accurate waarde opgeven helpt ons met het archiveren en verwerken van misbruik rapporten.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Geef alstublieft een korte samenvatting van de bug.
-
-Een accurate samenvatting opgeven helpt ons met het archiveren en verwerken van bug rapporten.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Geef alstublieft een gedetailleerde omschrijving van het misbruik dat plaats vond.
@@ -2091,13 +2058,6 @@ Wees zo specifiek als mogelijk, inclusief namen en details van het incident waar
Het opgeven van een accurate omschrijving helpt ons met het archiveren en verwerken van misbruik rapporten.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Geef alstublieft een gedetailleerde omschrijving van de bug.
-
-Wees zo specifiek als mogelijk, inclusief stappen om de bug te reproduceren, indien mogelijk.
-
-Het opgeven van een accurate omschrijving helpt ons met het archiveren en verwerken van misbruik rapporten.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Beste Inwoner,
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index 4f5f60bcfe..bb073f735d 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -516,4 +516,110 @@
<string name="GraphicsQualityHigh">
Hoog
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Linden locatie</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Kunst &amp; Cultuur</string>
+ <string name="Business">Zakelijk</string>
+ <string name="Educational">Educatief</string>
+ <string name="Gaming">Spelen</string>
+ <string name="Hangout">Ontmoetingsplaats</string>
+ <string name="Newcomer Friendly">Nieuwkomervriendelijk</string>
+ <string name="Parks&amp;Nature">Parken &amp; natuur</string>
+ <string name="Residential">Woongebied</string>
+ <string name="Shopping">Winkelen</string>
+ <string name="Other">Anders</string>
+
+ <string name="ringing">
+ Verbinden met in-wereld voice chat...
+ </string>
+ <string name="connected">
+ Verbonden
+ </string>
+ <string name="unavailable">
+ Voice is niet beschikbaar op uw huidige locatie
+ </string>
+ <string name="hang_up">
+ Verbinding met in-wereld voicechat verbroken
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming verleend om te: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ &apos;[OBJECTNAME]&apos;, een object van &apos;[OWNERNAME]&apos;, gevestigd in [REGIONNAME] op [REGIONPOS], is toestemming geweigerd om te: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Linden dollars (L$) van u wegnemen
+ </string>
+ <string name="ActOnControlInputs">
+ Acteren op uw bedieningsinvoer
+ </string>
+ <string name="RemapControlInputs">
+ Uw bedieningsinvoer herdefiniëren
+ </string>
+ <string name="AnimateYourAvatar">
+ Animeer uw avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Bevestig aan uw avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Eigendom vrijgeven en openbaar worden
+ </string>
+ <string name="LinkAndDelink">
+ Koppelen met en ontkoppelen van andere objecten
+ </string>
+ <string name="AddAndRemoveJoints">
+ Toevoegen en verwijderen koppelingen met andere objecten
+ </string>
+ <string name="ChangePermissions">
+ Wijzig zijn permissies
+ </string>
+ <string name="TrackYourCamera">
+ Volg uw camera
+ </string>
+ <string name="ControlYourCamera">
+ Bedien uw camera
+ </string>
+
+ <string name="only_user_message">
+ U bent de enige gebruiker in deze sessie.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] is offline.
+ </string>
+ <string name="invite_message">
+ Klik de [BUTTON NAME] knop om deze voicechat te accepteren/verbinden.
+ </string>
+ <string name="generic_request_error">
+ Fout tijdens het maken van het verzoek, probeer het later nog een keer.
+ </string>
+ <string name="insufficient_perms_error">
+ U heeft niet voldoende permissies.
+ </string>
+ <string name="session_does_not_exist_error">
+ De sessie bestaat niet meer
+ </string>
+ <string name="no_ability_error">
+ U beschikt niet over die mogelijkheid.
+ </string>
+ <string name="not_a_mod_error">
+ U bent geen sessie moderateur
+ </string>
+ <string name="muted_error">
+ Een groepsmoderator heeft uw textchat uitgeschakeld.
+ </string>
+ <string name="add_session_event">
+ Kan geen gebruikers toevoegen aan chatsessie met [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Kan uw bericht niet versturen naar de chatsessie met [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ U bent verwijderd uit de groep.
+ </string>
+ <string name="close_on_no_ability">
+ U heeft niet langer de mogelijkheid om in deze chatsessie te zijn.
+ </string>
</strings>
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 b146891787..83d4b717a7 100755
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -320,7 +320,7 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki.
/>
<combo_box.item name="item8" label="Przyjazne dla nowych"
/>
- <combo_box.item name="item9" label=" Park i Natura"
+ <combo_box.item name="item9" label="Park i Natura"
/>
<combo_box.item name="item10" label="Mieszkalna"
/>
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
index 762b9f0f55..df821f3b6d 100755
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -46,7 +46,7 @@
</text>
<spinner name="land cost"/>
<text name="land cost text">
- L$/m:
+ L$/m²:
</text>
<button label="Odśwież" label_selected="Odśwież" name="Refresh" />
<button label="Zastosuj" label_selected="Zastosuj" name="Apply" />
@@ -80,17 +80,17 @@
Cel:
</text>
<combo_box name="destination">
- <combo_box.item name="Selection" label="Selekcja" />
- <combo_box.item name="AgentRegion" label="Agent Regionu" />
+ <combo_box.item name="item1" label="Selekcja" />
+ <combo_box.item name="item2" label="Agent Regionu" />
</combo_box>
<text name="Request:">
Żądanie:
</text>
<combo_box name="request">
- <combo_box.item name="colliders&lt;steps&gt;" label="kolidery &lt;kroki&gt;" />
- <combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="skrypty &lt;policz&gt;,&lt;opcjonalnie powtórzenie&gt;" />
- <combo_box.item name="objects&lt;pattern&gt;" label="obiekty &lt;powtórzenia&gt;" />
- <combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
+ <combo_box.item name="item1" label="kolidery &lt;kroki&gt;" />
+ <combo_box.item name="item2" label="skrypty &lt;policz&gt;,&lt;opcjonalnie powtórzenie&gt;" />
+ <combo_box.item name="item3" label="obiekty &lt;powtórzenia&gt;" />
+ <combo_box.item name="item4" label="rez &lt;asset_id&gt;" />
</combo_box>
<text name="Parameter:">
Parameter:
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml
index b6b0dcb858..e5bdaf2ba9 100755
--- a/indra/newview/skins/default/xui/pl/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml
@@ -31,6 +31,6 @@
Sprawdź i przekonaj się sam!
</string>
<string name="upload_message">
- &quot;Wysyłanie...&quot;
+ Wysyłanie...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 15089926b2..ef5dad8786 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -562,7 +562,7 @@ Ta osoba tymczasowo nie będzie mógła się poruszać, nie będzie mógł używ
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Iść na stronę [URL] po informacje dotyczące zakupu gotówki?
+Iść na stronę [_URL] po informacje dotyczące zakupu L$?
<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -792,8 +792,6 @@ Grupa nie została wybrana.
<notification name="CannotDeedLandNoRegion">
Nie można przekazać posiadłości:
Region nie znaleziony.
-
-Zgłoś ten problem pod Pomoc &gt; Zgłoś Błędy Klienta
</notification>
<notification name="CannotDeedLandMultipleSelected">
Nie można przekazać posiadłości:
@@ -840,8 +838,6 @@ Twoje posiadłości są podkreślone na zielono.
<notification name="CannotReleaseLandRegionNotFound">
Nie można porzucić posiadłości:
Region nie znaleziony.
-
-Zgłoś ten problem pod Pomoc &gt; Zgłoś Błędy Klienta
</notification>
<notification name="CannotReleaseLandNoTransfer">
Nie możesz porzucić posiadłości:
@@ -881,14 +877,10 @@ Podzielić posiadłość?
<notification name="CannotDivideLandNoRegion">
Nie można podzielić posiadłości:
Region nie znaleziony.
-
-Zgłoś ten problem pod Pomoc &gt; Zgłoś Błędy Klienta
</notification>
<notification name="CannotJoinLandNoRegion">
Nie można połączyć posiadłości:
Region nie znaleziony.
-
-Zgłoś ten problem pod Pomoc &gt; Zgłoś Błędy Klienta
</notification>
<notification name="CannotJoinLandNothingSelected">
Nie można połączyć posiadłości:
@@ -944,9 +936,8 @@ Szary = Publiczna
Nie można zapisać &apos;[NAME]&apos; do pliku stroju. Musisz zwolnić trochę miejsca na Twoim komputerze i zapisać strój jeszcze raz.
</notification>
<notification name="CannotSaveToAssetStore">
- Nie można zapisać [NAME] w centralnym zbiorze danych. Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisać strój ponownie za kilka minut.
-
-Jeżeli wciąż masz ten problem, wybierz Pomoc &gt; Zgłoś Błędy Klienta i podaj szczegóły dotyczące konfiguracji sieci.
+ Nie można zapisać [NAME] w centralnym zbiorze danych.
+Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisać strój ponownie za kilka minut.
</notification>
<notification name="YouHaveBeenLoggedOut">
Twoja sesja [SECOND_LIFE] została zakończona:
@@ -1282,10 +1273,6 @@ Załadować do foldera Aplikacji?
Otworzyć stronę www.secondlife.com żeby zarządzać Twoim kontem?
<usetemplate ignoretext="Otwierając systemową przeglądarkę żeby zarządzać Twoim kontem" name="okcancelignore" notext="Anuluj" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Odwiedź [SECOND_LIFE] Wiki i zobacz jak zgłaszać błędy.
- <usetemplate ignoretext="Otwierając przeglądarkę żeby zobaczyć Wiki zgłaszania błędów" name="okcancelignore" notext="Anuluj" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Odwiedź [SECOND_LIFE] Wiki i zobacz jak zgłaszać problemy z bezpieczeństwem danych.
<usetemplate ignoretext="Otwierając przeglądarkę żeby zobaczyć Wiki kwestii bezpieczeństwa danych" name="okcancelignore" notext="Anuluj" yestext="OK"/>
@@ -1988,25 +1975,10 @@ Właściciel regionu będzie rozpatrywał raporty w oparciu o lokalne prawa tego
Rozwiązanie tego raportu odnosi się wyłącznie do tego regionu; konkluzja tego raportu nie będzie miała wpływu na dostęp Rezydentów do innych regionów w [SECOND_LIFE]. Wyłącznie Linden Lab może całkowicie odebrać dostęp do [SECOND_LIFE].
</notification>
- <notification name="HelpReportBug">
- Używaj tej opcji *wyłącznie* w celu zgłaszania technicznych problemów, dołączając szczegółowy opis problemu. Możesz odpowiedzieć na automatyczną email z odpowiedzią żeby dodać więcej szczegółów do Twojego raportu.
-
-Wszystkie raporty błędów są analizowane i oceniane. Kontakt przez email nie będzie nawiązany.
-
-Jeżeli masz techniczne problemy, skontaktuj się z pomocą techniczną pod:
-
-http://secondlife.com/community/support.php
-
-Uwaga: Niekompletne raporty nie będą analizowane.
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Wybierz kategorię dla tego raportu o nadużyciu.
Określenie kategorii pomoże nam w klasyfikacji i prztwarzaniu raportu.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Wybierz kategorię dla tego błędu.
-Określenie kategorii pomoże nam w klasyfikacji i prztwarzaniu raportu.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Wprowadź imię i nazwisko osoby popełniającej nadużycie.
Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
@@ -2019,19 +1991,11 @@ Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
Wprowadź opis popełnionego nadużycia.
Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Wprowadź opis błędu.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Wprowadź szczgółowy opis popełnionego nadużycia.
Podaj maksymalną ilość szczgółów oraz imiona i nazwiska osób związanych z nadużyciem które zgłaszasz.
Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Wprowadź szczgółowy opis błędu. Podaj maksymalną ilość szczgółów oraz, jeżeli to możliwe, kroki niezbędne do odtworzenia problemu.
-Dokładne dane pomogą nam w klasyfikacji i prztwarzaniu raportu.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Szanowny Rezydencie,
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 402bf0a3ed..294353ee03 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -516,4 +516,109 @@
<string name="GraphicsQualityHigh">
Wysoka
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Linden Lokacja</string>
+ <string name="Adult">&apos;Adult&apos;</string>
+ <string name="Arts&amp;Culture">Sztuka i Kultura</string>
+ <string name="Business">Biznes</string>
+ <string name="Educational">Edukacyjna</string>
+ <string name="Gaming">Gra</string>
+ <string name="Hangout">Poznawanie ludzi</string>
+ <string name="Newcomer Friendly">Przyjazne dla nowych</string>
+ <string name="Parks&amp;Nature">Park i Natura</string>
+ <string name="Residential">Mieszkalna</string>
+ <string name="Shopping">Zakupy</string>
+ <string name="Other">Inna</string>
+
+ <string name="ringing">
+ Łączenie z rozmowami głosem w świecie...
+ </string>
+ <string name="connected">
+ Połączenie uzyskane.
+ </string>
+ <string name="unavailable">
+ Niestety, rozmowy głosem są niedozwolone w tym miejscu.
+ </string>
+ <string name="hang_up">
+ Połączenie rozmowy utracone.
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, właściciel: &apos;[OWNERNAME]&apos;, położenie: [REGIONNAME] [REGIONPOS], pozwala Ci na: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ &apos;[OBJECTNAME]&apos;, właściciel: &apos;[OWNERNAME]&apos;, położenie: [REGIONNAME] [REGIONPOS], nie pozwala Ci na: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Zabiera Lindeny (L$) od Ciebie
+ </string>
+ <string name="ActOnControlInputs">
+ Używaj klawiszy sterowania
+ </string>
+ <string name="RemapControlInputs">
+ Zmień klawisze sterowania
+ </string>
+ <string name="AnimateYourAvatar">
+ Animuj Awatara
+ </string>
+ <string name="AttachToYourAvatar">
+ Dołącz do Awatara
+ </string>
+ <string name="ReleaseOwnership">
+ Usuń prawo własności (zmień na publiczne)
+ </string>
+ <string name="LinkAndDelink">
+ Łącz / odłącz z innymi obiektów
+ </string>
+ <string name="AddAndRemoveJoints">
+ Dodaj / usuń połączenia z innymi obiektami
+ </string>
+ <string name="ChangePermissions">
+ Ustaw zezwolenia
+ </string>
+ <string name="TrackYourCamera">
+ Chodź za kamerą
+ </string>
+ <string name="ControlYourCamera">
+ Kontroluj kamerę
+ </string>
+ <string name="only_user_message">
+ Jesteś jedyną osobą w tej konferencji.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] - ta osoba jest obecnie niedostępna.
+ </string>
+ <string name="invite_message">
+ Kliknij na [BUTTON NAME] przycisk by zaakceptować/dołączyć do tej rozmowy.
+ </string>
+ <string name="generic_request_error">
+ Błąd. Spróbuj ponownie za kilka minut.
+ </string>
+ <string name="insufficient_perms_error">
+ Nie posiadasz praw do kontynuacji.
+ </string>
+ <string name="session_does_not_exist_error">
+ Ta konferencja jest już zakończona.
+ </string>
+ <string name="no_ability_error">
+ Nie posiadesz tego przywileju.
+ </string>
+ <string name="not_a_mod_error">
+ Nie jesteś moderatorem konferencji.
+ </string>
+ <string name="muted_error">
+ Moderator wyciszył Cię.
+ </string>
+ <string name="add_session_event">
+ Nie można dodać nikogo do czatu z [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Nie można wysłać Twojej wiadomości do sesji czatu z [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Usunięto Cię z grupy.
+ </string>
+ <string name="close_on_no_ability">
+ Nie posiadasz praw by uczestniczyć w tej konferencji.
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 6b88db1d9c..9406658f62 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -39,7 +39,7 @@
Fator cobrança:
</text>
<text name="land cost text">
- L$ por metros quadrados
+ L$ por m²:
</text>
<button label="Atualizar" label_selected="Atualizar" name="Refresh" tool_tip="Clique aqui para atualizar a informação acima."/>
<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar qualquer mudança acima"/>
@@ -73,17 +73,17 @@
Destino:
</text>
<combo_box name="destination">
- <combo_box.item name="Selection" label="Seleção" />
- <combo_box.item name="AgentRegion" label="Região do Agente" />
+ <combo_box.item name="item1" label="Seleção" />
+ <combo_box.item name="item2" label="Região do Agente" />
</combo_box>
<text name="Request:">
Requisição:
</text>
<combo_box name="request">
- <combo_box.item name="colliders&lt;steps&gt;" label="Passos de Colisão" />
- <combo_box.item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;" label="Contagem de scripts, padrão opcional" />
- <combo_box.item name="objects&lt;pattern&gt;" label="Padrão de Objetos" />
- <combo_box.item name="rez&lt;asset_id&gt;" label="rez &lt;asset_id&gt;" />
+ <combo_box.item name="item1" label="Passos de Colisão" />
+ <combo_box.item name="item2" label="Contagem de scripts, padrão opcional" />
+ <combo_box.item name="item3" label="Padrão de Objetos" />
+ <combo_box.item name="item4" label="rez &lt;asset_id&gt;" />
</combo_box>
<text name="Parameter:">
Parametro:
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
index bd3d41e52f..62fd050ea4 100644
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -35,6 +35,6 @@
Dá uma olhada nisto!
</string>
<string name="upload_message">
- &quot;Enviando...&quot;
+ Enviando...
</string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 411f45a650..1f15feef49 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -570,7 +570,7 @@ Por favor, mova todos os objetos a serem adquiridos para uma mesma região.
<notification name="PromptGoToCurrencyPage">
[EXTRA]
-Vá para [URL] para informação sobre compra de dinheiro.
+Vá para [_URL] para informação sobre compra de L$.
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir até a página"/>
</notification>
<notification name="UnableToLinkObjects">
@@ -798,7 +798,6 @@ Nenhum grupo selecionado.
<notification name="CannotDeedLandNoRegion">
Não é possível transferir posse do terreno:
Não é possível se achar a região em que este terreno se encontra.
-Por favor, use Ferramentas &gt; Reporte de Bug para reportar isto.
</notification>
<notification name="CannotDeedLandMultipleSelected">
Impossibilitado de passar a propriedade da terra:
@@ -844,8 +843,6 @@ Os lotes que você possui estão em verde.
<notification name="CannotReleaseLandRegionNotFound">
Impossibilitado de abandonar a terra:
Não consegue achar a região em que esta terra se encontra.
-
-Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
</notification>
<notification name="CannotReleaseLandNoTransfer">
Não é possível abandonar terreno:
@@ -884,14 +881,10 @@ Quer dividir o terreno?
<notification name="CannotDivideLandNoRegion">
Impossibilitado de dividir a terra:
Não consegue achar a região em que esta terra se encontra.
-
-Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
</notification>
<notification name="CannotJoinLandNoRegion">
Impossibilitado de unir a terra:
Não consegue achar a região em que esta terra se encontra.
-
-Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
</notification>
<notification name="CannotJoinLandNothingSelected">
Não é possível unir terreno:
@@ -950,8 +943,6 @@ Grey = Pública
<notification name="CannotSaveToAssetStore">
Impossibilitado de salvar [NAME] no armazenamento central de ativos.
Isso é geralmente uma falha temporária. Por favor personalize e salve novamente a vestimenta em poucos minutos.
-
-Se o problema persistir, por favor clicar sobre &apos;Ferramentas &gt; Bug Report&apos; no menu superior e forneça detalhes sobre a configuração de sua rede.
</notification>
<notification name="YouHaveBeenLoggedOut">
Você foi deslogado do [SECOND_LIFE]:
@@ -1284,10 +1275,6 @@ Baixar para sua pasta de Aplicativos?
Ir ao www.secondlife.com para gerenciar sua conta?
<usetemplate ignoretext="Ao abrir o navegador web para gerenciar sua conta" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
- <notification name="WebLaunchBugReport101">
- Visite a Wiki [SECOND_LIFE] para aprender como reportar bugs corretamente.
- <usetemplate ignoretext="Ao abrir o web browser para visualizar o report de Bug 101 na Wiki" name="okcancelignore" notext="Cancelar" yestext="OK"/>
- </notification>
<notification name="WebLaunchSecurityIssues">
Visite a Wiki do [SECOND_LIFE] para detalhes de como Reportar um Problema de Segurança.
<usetemplate ignoretext="Ao abrir o navegador da web para visualizar a Wiki de Problemas de Segurança" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -2008,27 +1995,10 @@ O dono da região resolverá as reportagens baseado nas regras locais desta regi
A resolução desta reportagem se aplica apenas a esta região; o acesso de Residentes às outras áreas do [SECOND_LIFE] não será afetado pelas decisões desta reportagem.
Apenas a Linden Lab pode restringir acesso a todo o [SECOND_LIFE].
</notification>
- <notification name="HelpReportBug">
- Use esta ferramenta para reportar *apenas* características técnicas que não atuem como descrito ou esperado.
-Por favor, forneça tantos detalhes quanto possível.
-Você pode responder ao e-mail de resposta automática para adicionar mais detalhes à sua reportagem.
-
-Todas as reportagens de bugs são investigadas e avaliadas.
-Nenhum e-mail de resposta será enviado.
-
-Se você estiver tendo uma dificuldade técnica, por favor contate o Suporte em:
-http://secondlife.com/community/support.php
-
-Nota: reportagens incompletas não serão investigadas
- </notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, selecione uma categoria para a reportagem deste abuso.
A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de abuso.
</notification>
- <notification name="HelpReportBugSelectCategory">
- Por favor, selecione uma categoria para este bug.
-A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de bugs.
- </notification>
<notification name="HelpReportAbuseAbuserNameEmpty">
Por favor, entre com o nome do perturbador.
Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens de abuso.
@@ -2041,19 +2011,11 @@ Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens d
Por favor, digite um resumo de como ocorreu o abuso.
Fazer um resumo detalhado nos ajuda a arquivar e processar as reportagens de abuso.
</notification>
- <notification name="HelpReportBugSummaryEmpty">
- Por favor, digite um resumo do bug. Realizar um resumo detalhado nos ajuda a arquivar e processar as reportagens de abuso.
- </notification>
<notification name="HelpReportAbuseDetailsEmpty">
Por favor, digite uma descrição detalhada do abuso que ocorreu.
Seja tão específico quanto você puder, incluindo nomes e os detalhes do incidente que está denunciando.
Fazer uma descrição precisa nos ajuda a arquivar e processar as reportagens de abuso.
</notification>
- <notification name="HelpReportBugDetailsEmpty">
- Por favor, digite uma descrição detalhada do bug.
-Seja tão específico quanto você puder, incluindo as etapas para reproduzir o bug, se possível.
-Fazer uma descrição precisa nos ajuda a arquivar e processar os relatórios de bugs.
- </notification>
<notification name="HelpReportAbuseContainsCopyright">
Caro Residente,
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 36377b346b..b6788567e2 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -513,4 +513,108 @@
<string name="GraphicsQualityHigh">
Alto
</string>
+
+ <!-- PARCEL_CATEGORY_UI_STRING -->
+ <string name="Linden Location">Locação Linden</string>
+ <string name="Adult">Adult</string>
+ <string name="Arts&amp;Culture">Artes e Cultura</string>
+ <string name="Business">Negócios</string>
+ <string name="Educational">Educacional</string>
+ <string name="Gaming">Jogos</string>
+ <string name="Hangout">Moradia</string>
+ <string name="Newcomer Friendly">Amigável a Novos Usuários</string>
+ <string name="Parks&amp;Nature">Parques &amp; Natureza</string>
+ <string name="Residential">Residencial</string>
+ <string name="Shopping">Compras</string>
+ <string name="Other">Outros</string>
+ <string name="ringing">
+ Conectando à conversa de Voz no mundo
+ </string>
+ <string name="connected">
+ Conectado
+ </string>
+ <string name="unavailable">
+ Voz não disponível na sua localização atual
+ </string>
+ <string name="hang_up">
+ Desconectado da conversa de Voz no mundo
+ </string>
+ <string name="ScriptQuestionCautionChatGranted">
+ &apos;[OBJECTNAME]&apos;, um objeto de &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
+ </string>
+ <string name="ScriptQuestionCautionChatDenied">
+ &apos;[OBJECTNAME]&apos;, um objeto de &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
+ </string>
+ <string name="ScriptTakeMoney">
+ Tomar linden dólares (L$) de você
+ </string>
+ <string name="ActOnControlInputs">
+ Atue nas suas entradas de controle
+ </string>
+ <string name="RemapControlInputs">
+ Remapeie suas entradas de controle
+ </string>
+ <string name="AnimateYourAvatar">
+ Faça uma animação para o seu avatar
+ </string>
+ <string name="AttachToYourAvatar">
+ Anexe ao seu avatar
+ </string>
+ <string name="ReleaseOwnership">
+ Libere a propriedade e torne-a pública
+ </string>
+ <string name="LinkAndDelink">
+ Una e desuna de outros objetos
+ </string>
+ <string name="AddAndRemoveJoints">
+ Adicione e remova junções com outros objetos
+ </string>
+ <string name="ChangePermissions">
+ Modifique as permissões
+ </string>
+ <string name="TrackYourCamera">
+ Acompanhe sua câmera
+ </string>
+ <string name="ControlYourCamera">
+ Controle sua camera
+ </string>
+ <string name="only_user_message">
+ Você é o único usuário desta sessão.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] está offline.
+ </string>
+ <string name="invite_message">
+ Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
+ </string>
+ <string name="generic_request_error">
+ Erro na requisição, por favor, tente novamente.
+ </string>
+ <string name="insufficient_perms_error">
+ Você não tem permissões suficientes.
+ </string>
+ <string name="session_does_not_exist_error">
+ A sessão deixou de existir
+ </string>
+ <string name="no_ability_error">
+ Você não possui esta habilidade.
+ </string>
+ <string name="not_a_mod_error">
+ Você não é um moderador de sessão.
+ </string>
+ <string name="muted_error">
+ Um moderador do grupo desabilitou seu bate-papo em texto.
+ </string>
+ <string name="add_session_event">
+ Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Você foi removido do grupo.
+ </string>
+ <string name="close_on_no_ability">
+ Você não possui mais a habilidade de estar na sessão de bate-papo.
+ </string>
</strings>