Second Life viewer sources 1.18.1.2

52 files changed, 2423 insertions, 1361 deletions

diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 79e910a..1c02ce4 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -304,6 +304,7 @@
         <account_id_orange.tga value="fbe89371-1251-4e77-d2d8-8eeccffe3ca8"/>
         <account_id_green.tga value="3bf64d5a-38d3-b752-cf52-3d9f8fca353a"/>
         <status_push.tga value="07d1f523-e327-4d10-20d6-8bc22a6e8f56"/>
+        <status_voice.tga value="c49b0b3b-fe04-46ee-abab-777fa0b462b6"/>
         <ff_visible_online.tga value="d609a41f-34c0-7aae-b2c6-2fc3ab26d916"/>
         <ff_visible_map.tga value="20b52706-c1ab-414a-9dea-1cb788ad5689"/>
         <ff_edit_mine.tga value="1baee0b9-4b89-39eb-8815-866d82300ab5"/>
@@ -314,6 +315,8 @@
         <ff_edit_theirs_button.tga value="ca229f65-d7e0-133e-1bc2-674abc33f3d5"/>
         <ff_edit_mine_button.tga value="57f05b46-63d8-c3d5-66d6-8b915746b956"/>
         <ff_online_status_button.tga value="3b1b6a53-9c8c-568a-22c5-2a8f3e5286f5"/>
+        <ptt_lock_on.tga value="e0c447a5-87dd-4778-bedb-0ccab01fe078"/>
+        <ptt_lock_off.tga value="1de17e87-b392-4a7d-80d1-852e1e518ff0"/>
         <oi_hud_cen_0_0.tga value="3c650257-9caf-7cad-b26c-84c9eca560f1"/>
         <oi_hud_intro.tga value="7611fb3d-9ff2-abd3-d98f-805c1c87e757"/>
         <oi_hud_underwater.tga value="cde61aea-83c2-3001-d598-6b348f7a8e0b"/>
@@ -391,5 +394,22 @@
         <oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
         <oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
         <oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
+        <circle.tga     value="0498c309-5306-43cd-82a2-ae31d096cdef"/>
+        <mute_icon.tga value="37c8e000-6aa2-41ef-8f86-e0c2e60bfa42"/>
+        <active_speakers.tga value="c97bdfb5-b0da-4741-877c-7c1553957d30"/>
+        <active_voice_tab.tga value="33281629-74b3-4b0e-98e7-a6383eb277fa"/>
+        <music_icon.tga value="9de3ef3d-ab90-4963-be15-ae77a122a484"/>
+        <media_icon.tga value="9724ad2b-b0ec-4b8c-9558-73f36661db26"/>
+        <volume_icon.tga value="eb510e2b-3815-4434-b502-b18712db65cc"/>
+        <icn_active-speakers-dot-lvl0.tga value="73577b7b-19c3-4050-a19d-36bc2408aa79"/>
+        <icn_active-speakers-dot-lvl1.tga value="8f761ce3-5939-4d3a-8991-00064fdfacf9"/>
+        <icn_active-speakers-dot-lvl2.tga value="0e82d24e-ed45-41bc-b090-94c97c1caab2"/>
+        <icn_active-speakers-typing1.tga value="f9bbb2fe-584b-4c01-86fc-599c69534c1b"/>
+        <icn_active-speakers-typing2.tga value="e3369e02-93e1-43dc-b9c0-4533db0963d0"/>
+        <icn_active-speakers-typing3.tga value="13dd1d96-6836-461e-8a4c-36003065c59b"/>
+        <icn_voice_ptt-off.tga value="ce19b99f-bd2d-4324-88ab-975c357f9e4e"/>
+        <icn_voice_ptt-on.tga value="67f672e1-576f-42ee-973f-c796cc8eefb1"/>
+        <icn_voice_ptt-on-lvl1.tga value="24ebff50-ced7-4d52-8b74-77a5a901e701"/>
+        <icn_voice_ptt-on-lvl2.tga value="1a803501-0da7-4b80-80db-1f79a7842368"/>
+        <icn_voice_ptt-on-lvl3.tga value="3342bfc4-0bd9-4c89-8e87-e5980aee00e5"/>
 </textures>
-
diff --git a/linden/indra/newview/skins/xui/de/role_actions.xml b/linden/indra/newview/skins/xui/de/role_actions.xml
index d907591..4265342 100644
--- a/linden/indra/newview/skins/xui/de/role_actions.xml
+++ b/linden/indra/newview/skins/xui/de/role_actions.xml
@@ -5,39 +5,39 @@
              name="Membership">
                 <action description="Personen zu dieser Gruppe einladen"
                      longdescription="Laden Sie Personen zu dieser Gruppe ein. Dazu verwenden Sie die Schaltfläche &apos;Neue Person einladen...&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregister &apos;Mitglieder&apos;."
-                     name="member invite" />
+                     name="member invite" value="1" />
                 <action description="Mitglieder aus dieser Gruppe ausschließen"
                      longdescription="Schließen Sie Mitglieder mit Hilfe der Schaltfläche &apos;Aus Gruppe ausschließen&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregister &apos;Mitglieder&apos; aus dieser Gruppe aus. Ein Eigentümer kann alle anderen Benutzer außer einem anderen Eigentümer ausschließen. Sind Sie kein Eigentümer, kann ein Mitglied nur aus einer Gruppe ausgeschlossen werden, wenn es die Rolle &apos;Alle&apos; hat, aber KEINE anderen Rollen. Um Mitglieder aus Rollen zu entfernen, müssen Sie die Fähigkeit &apos;Mitglieder aus Rollen entfernen&apos; aufweisen."
-                     name="member eject" />
+                     name="member eject" value="2" />
                 <action
                      description="&apos;Offene Teilnahme&apos; ein- und ausschalten und &apos;Registrierungsgebühr&apos; ändern&apos;"
                      longdescription="Aktivieren Sie &apos;Registrierung offen&apos;, um neue Mitglieder ohne Einladung beitreten zu lassen, und ändern Sie &apos;Registrierungsgebühr&apos; im Abschnitt &apos;Gruppeneinstellungen&apos; der Registerkarte &apos;Allgemein&apos;."
-                     name="member options" />
+                     name="member options" value="3" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, Gruppenrollen hinzuzufügen, zu entfernen und zu ändern, Mitglieder in Rollen hinzuzufügen und zu entfernen und Rollen Fähigkeiten zuzuweisen."
              name="Roles">
                 <action description="Neue Rollen erstellen"
                      longdescription="Erstellen Sie neue Rollen auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregister &apos;Rollen&apos;."
-                     name="role create" />
+                     name="role create" value="4" />
                 <action description="Rollen löschen"
                      longdescription="Löschen Sie Rollen auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregister &apos;Rollen&apos;."
-                     name="role delete" />
+                     name="role delete" value="5" />
                 <action description="Rollennamen, Titel und Beschreibungen ändern"
                      longdescription="Ändern Sie Rollennamen, Titel und Beschreibungen unten auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregister &apos;Rollen&apos;, nachdem Sie eine Rolle ausgewählt haben."
-                     name="role properties" />
+                     name="role properties" value="6" />
                 <action description="Mitglieder Rollen des Zuweisenden zuweisen"
                      longdescription="Weisen Sie Mitglieder im Abschnitt &apos;Zugewiesene Rollen&apos; der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregisterkarte &apos;Mitglieder&apos; Rollen zu. Ein Mitglied mit dieser Fähigkeit kann nur Mitglieder einer Rolle zuweisen, in der sich der Zuweisende bereits befindet."
-                     name="role assign member limited" />
+                     name="role assign member limited" value="7" />
                 <action description="Mitglieder beliebiger Rolle zuweisen"
                      longdescription="Weisen Sie Mitglieder einer beliebigen Rolle im Abschnitt &apos;Zugewiesene Rollen&apos; der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregisterkarte &apos;Mitglieder&apos; zu. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und allen anderen Nichteigentümer-Mitgliedern Rollen zuweisen, die mehr Fähigkeiten haben, als sie selbst derzeit haben, so dass sie sich potenziell Eigentümer-gleiche Kräfte verleihen. Sie müssen sich dessen bewusst sein, bevor Sie diese Fähigkeit zuweisen."
-                     name="role assign member" />
+                     name="role assign member" value="8" />
                 <action description="Mitglieder aus Rollen entfernen"
                      longdescription="Entfernen Sie Mitglieder im Abschnitt &apos;Zugewiesene Rollen&apos; der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregisterkarte &apos;Mitglieder&apos; aus Rollen. Eigentümer können nicht entfernt werden."
-                     name="role remove member" />
+                     name="role remove member" value="9" />
                 <action description="Fähigkeiten in Rollen zuweisen und entfernen"
                      longdescription="Weisen Sie im Abschnitt &apos;Zugewiesene Rollen&apos; der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; Unterregisterkarte &apos;Rollen&apos; Rollen bestimmte Fähigkeiten zu bzw. entfernen Sie diese. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und allen anderen Nichteigentümer-Mitgliedern alle Fähigkeiten zuweisen, so dass sie sich potenziell Eigentümer-gleiche Kräfte verleihen. Sie müssen sich dessen bewusst sein, bevor Sie diese Fähigkeit zuweisen."
-                     name="role change actions" />
+                     name="role change actions" value="10" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, die Identität dieser Gruppe zu modifizieren, z. B. die öffentliche Visibilität, Charta und Insignien zu ändern."
@@ -52,16 +52,16 @@
              name="Parcel Management">
                 <action description="Land übertragen und für Gruppe kaufen"
                      longdescription="Land übertragen und für Gruppe kaufen. Dies erfolgt in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Allgemein&apos;."
-                     name="land deed" />
+                     name="land deed" value="12" />
                 <action description="Land an Gouverneur Linden aufgeben"
                      longdescription="Land an Gouverneur Linden aufgeben. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann Land in Gruppenbesitz auf der Registerkarte &apos;Info zu Land&apos; &gt; &apos;Allgemein&apos; aufgeben und es in Linden-Eigentum zurückführen, ohne es zu verkaufen! Sie müssen sich dessen bewusst sein, bevor Sie diese Fähigkeit zuweisen."
-                     name="land release" />
+                     name="land release" value="13" />
                 <action description="Land zu verkaufen-Info einstellen"
                      longdescription="Land zu verkaufen-Info einstellen. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann Land in Gruppenbesitz auf der Registerkarte &apos;Info zu Land&apos; &gt; &apos;Allgemein&apos; nach Wunsch verkaufen! Sie müssen sich dessen bewusst sein, bevor Sie diese Fähigkeit zuweisen."
-                     name="land set sale info" />
+                     name="land set sale info" value="14" />
                 <action description="Parzellen unterteilen und zusammenfügen"
                      longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
-                     name="land divide join" />
+                     name="land divide join" value="15" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, Parzellennamen, Veröffentlichungseinstellungen, Suchverzeichnis-Visibilität sowie Landepunkt und Teleport Routing-Optionen zu ändern."
@@ -69,119 +69,119 @@
                 <action
                      description="&apos;In „Orte suchen“ anzeigen&apos; ein- und ausschalten Kategorie festlegen"
                      longdescription="Aktivieren Sie &apos;In &quot;Orte suchen&apos; anzeigen&apos; und stellen Sie eine Parzellenkategorie in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; ein."
-                     name="land find places" />
+                     name="land find places" value="17" />
                 <action
                      description="Parzellenname, Beschreibung und Einstellungen für &apos;Im Web veröffentlichen&apos; ändern"
                      longdescription="Parzellenname, Beschreibung und Einstellungen für &apos;Im Web veröffentlichen&apos; ändern. Dies erfolgt in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos;."
-                     name="land change identity" />
+                     name="land change identity" value="18" />
                 <action description="Landepunkt und Teleport Routing einstellen"
                      longdescription="Auf einer Parzelle in Gruppenbesitz können Mitglieder in einer Rolle mit dieser Fähigkeit einen Landepunkt festlegen, um anzugeben, wo ankommende Teleports eintreffen. Sie können auch die Teleport-Route festlegen, um noch mehr Kontrolle zu haben. Dies erfolgt in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos;."
-                     name="land set landing point" />
+                     name="land set landing point" value="19" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen Möglichkeiten, die sich auf Parzellenoptionen auswirken, z. B. &apos;Objekte erstellen&apos;, &apos;Terrain bearbeiten&apos; sowie Musik- und Medieneinstellungen."
              name="Parcel Settings">
                 <action description="Musik- und Medieneinstellungen ändern"
                      longdescription="Einstellungen für Streaming-Musik und Movies ändern in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Medien&apos;."
-                     name="land change media" />
+                     name="land change media" value="20" />
                 <action description="&apos;Terrain bearbeiten&apos; ein- und ausschalten"
                      longdescription="&apos;Terrain bearbeiten&apos; ein- und ausschalten. *WARNUNG* &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; &gt; &apos;Terrain bearbeiten&apos; ermöglicht allen Benutzern, Ihr Land terrazuformen und Linden-Pflanzen zu setzen und zu bewegen. Sie müssen sich dessen bewusst sein, bevor Sie diese Fähigkeit zuweisen. Die Terrain-Bearbeitung wird in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; ein- und ausgeschaltet."
-                     name="land edit" />
+                     name="land edit" value="21" />
                 <action
                      description="Verschiedene Einstellungen für Info zu Land &gt; Optionen ein- und ausschalten"
                      longdescription="Aktivieren Sie &apos;Sicher (kein Schaden)&apos;, &apos;Fliegen&apos; und gestatten Sie Einwohnern folgendes: &apos;Objekte erstellen&apos;, &apos;Terrain bearbeiten&apos;, &apos;Landmarken erstellen&apos; und &apos;Scripts ausführen&apos; auf Land in Gruppenbesitz in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos;."
-                     name="land options" />
+                     name="land options" value="22" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen Möglichkeiten, die Mitgliedern gestatten, Beschränkungen von Parzellen in Gruppenbesitz zu umgehen."
              name="Parcel Powers">
                 <action description="&apos;Terrain bearbeiten&apos; immer zulassen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Terrain auf einer Parzelle in Gruppenbesitz bearbeiten, selbst wenn sie in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; deaktiviert ist."
-                     name="land allow edit land" />
+                     name="land allow edit land" value="23" />
                 <action description="&apos;Fliegen&apos; immer zulassen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer Parzelle in Gruppenbesitz fliegen, selbst wenn sie in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; deaktiviert ist."
-                     name="land allow fly" />
+                     name="land allow fly" value="24" />
                 <action description="&apos;Objekte erstellen&apos; immer zulassen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Objekte auf einer Parzelle in Gruppenbesitz erstellen, selbst wenn sie in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; deaktiviert ist."
-                     name="land allow create" />
+                     name="land allow create" value="25" />
                 <action description="Landmarke setzen&apos; immer zulassen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können eine Parzelle in Gruppenbesitz als landmarken verwenden, selbst wenn sie in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Optionen&apos; deaktiviert ist."
-                     name="land allow landmark" />
+                     name="land allow landmark" value="26" />
                 <action description="&apos;Zuhause auf hier einstellen&apos; auf Gruppenland zulassen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können das Menü &apos;Welt&apos; &gt; &apos;Hier als Zuhause wählen&apos; auf einer Gruppenparzelle verwenden (Land, das für diese Gruppe eingestellt ist oder ihr übertragen wurde)."
-                     name="land allow set home" />
+                     name="land allow set home" value="28" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, den Zugriff auf Parzellen in Gruppenbesitz zuzulassen oder zu beschränken, einschließlich Einfrieren und Ausschließen von Einwohnern."
              name="Parcel Access">
                 <action description="Parzellenzugangslisten verwalten"
                      longdescription="Die Parzellenzugriffslisten werden unter &apos;Info zu Land&apos; &gt; Registerkarte &apos;Zugriff&apos; verwaltet."
-                     name="land manage allowed" />
+                     name="land manage allowed" value="29" />
                 <action description="Parzellenverbannungslisten verwalten"
                      longdescription="Die Parzellenverbannungslisten werden unter &apos;Info zu Land&apos; &gt; Registerkarte &apos;Verbannen&apos; verwaltet."
-                     name="land manage banned" />
+                     name="land manage banned" value="30" />
                 <action description="Einstellungen &apos;Pässe, die...&apos; der Parzelle ändern"
                      longdescription="Einstellungen &apos;Pässe, die...&apos; der Parzelle ändern in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Zugriff&apos;."
-                     name="land manage passes" />
+                     name="land manage passes" value="31" />
                 <action description="Einwohner ausschließen und auf Parzellen einfrieren"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können mit einem nicht willkommenen Einwohner auf einer Parzelle in Gruppenbesitz durch Rechtsklicken auf den Einwohner, &apos;Mehr&apos; &gt; und Auswählen von &apos;Ausschließen...&apos; oder &apos;Einfrieren...&apos; umgehen."
-                     name="land admin" />
+                     name="land admin" value="32" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, Mitgliedern zu gestatten, Objekte zurückzugeben und Linden-Pflanzen zu platzieren und zu verschieben. Dies ist für Mitglieder nützlich, um Abfall zu entfernen und Gartenarbeiten zu verrichten, sollte aber vorsichtig eingesetzt werden, weil das Zurückgeben von Objekten nicht rückgängig gemacht werden kann."
              name="Parcel Content">
                 <action description="Objekte in Gruppenbesitz zurückgeben"
                      longdescription="Führen Sie Objekte auf Parzellen in Gruppenbesitz, die der Gruppe gehören, in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Objekte&apos; zurück."
-                     name="land return group owned" />
+                     name="land return group owned" value="48" />
                 <action description="Auf Gruppe eingestellte Objekte zurückgeben"
                      longdescription="Führen Sie Objekte auf Parzellen in Gruppenbesitz, die auf die Gruppe eingestellt sind, in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Objekte&apos; zurück."
-                     name="land return group set" />
+                     name="land return group set" value="33" />
                 <action description="Nichtgruppenobjekte zurückgeben"
                      longdescription="Führen Sie Objekte auf Parzellen in Gruppenbesitz, die nicht der Gruppe gehören, in &apos;Info zu Land&apos; &gt; Registerkarte &apos;Objekte&apos; zurück."
-                     name="land return non group" />
+                     name="land return non group" value="34" />
                 <action description="Gartenarbeiten mit Linden-Pflanzen"
                      longdescription="Gärtnereifähigkeit zum Pflanzen und versetzen von Linden-Bäumen, Pflanzen und Gräsern. Diese Objekte finden Sie in Ihrer Inventarbibliothek &gt; Ordner &apos;Objekte&apos;, oder sie können mit Hilfe der Schaltfläche &apos;Bauen&apos; erstellt werden."
-                     name="land gardening" />
+                     name="land gardening" value="35" />
         </action_set>
         <action_set
              description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
              name="Object Management">
                 <action description="Objekte an Gruppe übertragen"
                      longdescription="Übertragen Sie Objekte einer Gruppe unter &apos;Werkzeug bearbeiten&apos; &gt; Registerkarte &apos;Allgemein&apos;."
-                     name="object deed" />
+                     name="object deed" value="36" />
                 <action
                      description="Objekte in Gruppenbesitz manipulieren (verschieben, kopieren, modifizieren)"
                      longdescription="Objekte in Gruppenbesitz werden unter &apos;Werkzeug bearbeiten&apos; &gt; Registerkarte &apos;Allgemein&apos; manipuliert (Verschieben, Kopieren, Modifizieren)."
-                     name="object manipulate" />
+                     name="object manipulate" value="38" />
                 <action description="Objekte in Gruppenbesitz zum Verkauf einstellen"
                      longdescription="Stellen Sie Sie Objekte in Gruppenbesitz unter &apos;Werkzeug bearbeiten&apos; &gt; Registerkarte &apos;Allgemein&apos; zum Verkauf ein."
-                     name="object set sale" />
+                     name="object set sale" value="39" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, von Mitgliedern zu verlangen, Gruppenverpflichtungen zu bezahlen und Gruppendividenden zu erhalten, sowie den Zugriff auf den Konto-Verlauf der Gruppe zu beschränken."
              name="Accounting">
                 <action description="Gruppenverpflichtungen bezahlen und Gruppendividenden erhalten"
                      longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
-                     name="accounting accountable" />
+                     name="accounting accountable" value="40" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, Mitgliedern zu gestatten, Gruppenmitteilungen zu senden, zu empfangen und anzuzeigen."
              name="Notices">
                 <action description="Mitteilungen senden"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Mitteilungen in &apos;Gruppeninformationen&apos; &gt; Registerkarte &apos;Mitteilungen&apos; senden."
-                     name="notices send" />
+                     name="notices send" value="42" />
                 <action description="Mitteilungen erhalten und vergangene Mitteilungen anzeigen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Mitteilungen erhalten und vergangene Mitteilungen in &apos;Gruppeninformationen&apos; &gt; Registerkarte &apos;Mitteilungen&apos; anzeigen."
-                     name="notices receive" />
+                     name="notices receive" value="43" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten umfassen die Möglichkeit, Mitgliedern zu gestatten, Angebote zu erstellen, darüber abzustimmen und den Abstimmverlauf anzuzeigen."
              name="Proposals">
                 <action description="Angebote erstellen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Angebote erstellen, die in &apos;Gruppeninformationen&apos; &gt; Registerkarte &apos;Angebote&apos; zur Abstimmung kommen."
-                     name="proposal start" />
+                     name="proposal start" value="44" />
                 <action description="Über Angebote abstimmen"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können über Angebote abstimmen in &apos;Gruppeninformationen&apos; &gt; Registerkarte &apos;Angebote&apos;."
-                     name="proposal vote" />
+                     name="proposal vote" value="45" />
         </action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 319e495..d294ae8 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1087,7 +1087,7 @@ for advice and a link to the system status web page.
         </alert>
         <alert modal="true" name="CannotConnectNoReplyFromLogin">
                 <message name="message">
-                        Unable to connect.  No reply from login database.
+                        Unable to connect.  No login ack from simulator.
  
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
@@ -2594,7 +2594,7 @@ and the default for the &apos;Revert&apos; tool?
         </alert>
         <alert modal="true" name="MaxManagersOnRegion">
                 <message name="message">
-                        You can only have [MAX_MANAGER] Banned Residents.
+                        You can only have [MAX_MANAGER] Estate Managers.
                 </message>
         </alert>
         <alert modal="true" name="OwnerCanNotBeDenied">
@@ -2794,6 +2794,20 @@ also appear higher when people search for keywords.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="WebLaunchQAWiki">
+                <message name="message">
+                        Visit the [SECOND_LIFE] QA Wiki.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the QA Wiki
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="WebLaunchPublicIssue">
                 <message name="message">
                         Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
@@ -3826,6 +3840,20 @@ Default: off
 regardless of any other settings. 
                 </message>
         </alert>
+        <alert modal="true" name="HelpEstateVoiceChat" title="Allow Voice Chat">
+            <message name="message">
+                    Parcels in this estate are allowed to have their own voice
+                        channels in which residents may hear and talk with others
+                        nearby.
+
+                        Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="VoiceVersionMismatch" title="Voice Version Mismatch">
+            <message name="message">
+This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
+            </message>
+        </alert>
         <alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
                 <message name="message">
                         Setting an estate covenant enables you to sell parcels 
@@ -4082,7 +4110,7 @@ will only work if a script is added with a money() event.
                         Visit the Second Life Support Web site?
                 </message>
                 <ignore name="ignore">
-                        Ignore
+                        When visiting the Second Life Support Website.
                 </ignore>
                 <option name="Gotopage">
                         Go
@@ -4096,7 +4124,7 @@ will only work if a script is added with a money() event.
                         Are you sure you want to quit?
                 </message>
                 <ignore name="ignore">
-                        Ignore
+                        When Quitting Second Life.
                 </ignore>
                 <option name="Quit">
                         Quit
@@ -4143,9 +4171,10 @@ restrict access to the entirety of Second Life.
         </alert>
         <alert modal="true" name="HelpReportBug">
                 <message name="message">
-                        Use this tool to *only* report technical features that do not perform as 
-described or expected, please provide as much detail as possible, You 
-may reply to the auto-response email to add more details to your report.
+Use this tool to *only* report technical features that do not perform
+as described or expected, please provide as much detail as possible,
+You may reply to the auto-response email to add more details to your
+report.
 All bug reports are investigated and assessed. No email response will be sent.
 -
 If you are having a technical difficulty, please contact Support at: 
@@ -4338,25 +4367,25 @@ the contents of your Lost And Found folder?
                         When copying a SLURL to your clipboard
                 </ignore>
         </alert>
-        <alert modal="true" name="IMSessionStartError">
+        <alert modal="true" name="ChatterBoxSessionStartError">
             <message name="message">
-                    Error starting a new IM session with [RECIPIENT].
+                    Error starting a new chat session with [RECIPIENT].
                         [REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
                 </option>
         </alert>
-        <alert modal="true" name="IMSessionStartNotVerified">
+        <alert modal="true" name="ChatterBoxSessionStartNotVerified">
             <message name="message">
-                    Error starting a new IM session with [RECIPIENT].
+                    Error starting a new chat session with [RECIPIENT].
                         [REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
                 </option>
         </alert>
-        <alert modal="true" name="IMSessionEventError">
+        <alert modal="true" name="ChatterBoxSessionEventError">
             <message name="message">
                     Error [EVENT] [RECIPIENT].
                         [REASON]
@@ -4365,9 +4394,9 @@ the contents of your Lost And Found folder?
                     OK
                 </option>
         </alert>
-        <alert modal="true" name="ForceCloseIMSession">
+        <alert modal="true" name="ForceCloseChatterBoxSession">
             <message name="messsage">
-                    Your IM session with [NAME] must close.
+                    Your chat session with [NAME] must close.
             [REASON]
                 </message>
                 <option default="true" name="OK">
@@ -4383,7 +4412,7 @@ the contents of your Lost And Found folder?
         <!-- alert for more information about the debit permission -->
         <alert modal="true" name="DebitPermissionDetails" title="About Requests for the Debit Permission">
                 <message name="message">
-                        <p>Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object's owner must delete the object or reset the scripts in the object.</p>
+                        <p>Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.</p>
                 </message>
                 <option default="true" name="OK">
                         OK
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index e9bb109..20a97f6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -9,7 +9,9 @@
              text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
              word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: Gate Bates, Henri Beauchamp, zinoplatinium Burton, Celeste Eerie, Sara Flinker, skyking Heron, sakura Jannings, Arth Karas, Trevor Langdon, tamara Levitsky, Donuma Masala, Keith Mathieson, Ima Mechanique, Venus Medusa, Alice Obscure, Glenn Rotaru, Norm Schack, Singular Seoul, Rhyph Somme, Amy Sukra, Omei Turnbull, Fehan Villota
+In Memory of Jesse Malthus, you will be fondly remembered by all who heard your voice.
+
+Thank you to the following residents for helping to ensure that this is the best version yet: Aces Spade, Adrian Buckler, Adrienne LeShelle, Amanda Ascot, AnnaQuay Heart, Aquamina Khalifa, Arienne Anatine, Aston Hildyard, Ayami Kamachi, Badinage Odets, Biffy Berjis, Bigfox Pye, BigJohn Jade, BigRick Byrd, Brettus Tripsa, Brock Fitzgerald, Broker Allen, Browse by Name, Chiria Celt, Christopher Prudhomme, dale Cao, dale Lynch, Dante Tucker, DaQbet Kish, Dargon Pacer, Darius Antonelli, Deira Llanfair, DeviantBone Xi, Dore Dorado, Englishwob Etchegaray, Enya Masala, Eric Renneville, Fairfax Michinaga, FireFox Bancroft, FOXI Cortes, Frederick Earp, Geo Meek, Gotthilf Fischer, Hallo Loon, Hawk Carter, Hazel Kyrgyz, Hecter Barbosa, Hex Link, Ice Pak, Ideasu Mukerji, Itoku Kamachi, Jared Halleck, Jaykob Carter, Jennifer Drumheller, JensMartin Tomsen, JIAB Boa, Jim Gustafson, JimmyJet Fossett, Joseph Rustamova, Jt Volos, Karilyn Kidomen, Kaysha Sion, Keaton Nacon, Kevin Susenko, Khashai Steinbeck, Kira Cuddihy, Kit Massiel, Kojo Dixon, KUieTSToRm Lightcloud, Kwai Kyong, Kyrtis Daehlie, LazyGunGuy Bartlett, Lewcas Zapedzki, Lioc Cioc, LLIB Utu, Lou Liebknecht, Luca Draken, Maci Homewood, Major Sewell, Mari Todriya, MarieElize Noel, matt27 Churchill, Maverick Miasma, maydaysos Young, Mediaho Ball, Mikayla Gillespie, Mike Faulkland, Modfire Milland, MollyBrown Foxley, Mosley Jewell, Nuahs Zapedzki, Nyx Divine, Panther Farber, Paul Bumi, PrincessNina Prefect, Prio Serpentine, Rainbow Drake, Randall Rall, Randy Kazan, Reinhart Mokeev, Rhyph Somme, Rico Roizman, Ruge Dryke, Ryan Orbit, Safira Rosher, Samantha Bainbridge, Sammy Foxley, Sash Furst, Saturn Ariantho, Sienna Summers, Skye Enoch, Sofie Kanno, Solar Legion, Sonic Oki, Sunra Saenz, Taina Heart, Taryn Sprawl, tenerife Wei, TomDragon Nilsson, Trebla Reve, Trouble Carnell, user1cat Orbit, Vance Merlin, Veritas Variscan, Web Page, Wi3g3ht3s Ihnen, WinDrftr DeFarge, Yuu Nakamichi, Zac Delec, Zed Fairweather, Zimmo Hallard.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 Cg Copyright (C) 2002, NVIDIA Corporationa.
@@ -32,6 +34,7 @@ All rights reserved.  See licenses.txt for details.
 
 
 Viva la Liberación!</text_editor>
+
         <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
              max_length="65536" mouse_opaque="true" name="support_editor"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 9366154..681b2fd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -652,60 +652,92 @@
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" hidden="false" label="Media" left="1" mouse_opaque="true"
                      name="land_media_panel" width="458">
-                        <check_box bottom="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" hidden="false" initial_value="false"
-                             label="Restrict spatialized sound to this parcel" left="76"
-                             mouse_opaque="true" name="check sound local" radio_style="false"
-                             width="292" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-48" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-                             left="4" mouse_opaque="true" name="Music URL:" v_pad="0" width="364">
-                                Music URL:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-48"
-                             enabled="true" follows="left|top|right" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" hidden="false" left="76"
-                             max_length="255" mouse_opaque="true" name="music_url"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-76" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left="4" mouse_opaque="true" name="Media texture:" v_pad="0" width="364">
                                 Media
 texture:
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-76" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left="76" mouse_opaque="true" name="Replace this texture:" v_pad="0"
                              width="292">
                                 Replace this texture:
                         </text>
-                        <texture_picker allow_no_texture="true" bottom="-144" can_apply_immediately="false"
+                        <texture_picker allow_no_texture="true" bottom_delta="-68" can_apply_immediately="false"
                              default_image_name="Default" enabled="true" follows="left|top" height="64"
                              hidden="false" label="" left="76" mouse_opaque="true" name="media texture"
                              tool_tip="Click to choose a picture" width="64" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-154" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom_delta="-10" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
                              left="76" mouse_opaque="true" name="with content from this URL:" v_pad="0"
                              width="292">
                                 with content from this URL:
                         </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-172"
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
                              enabled="true" follows="left|top|right" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" hidden="false" left="76"
                              max_length="255" mouse_opaque="true" name="media_url"
                              select_all_on_focus_received="true" select_on_focus="true"
                              text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
-                        <check_box bottom="-208" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" hidden="false" initial_value="false"
                              label="Auto scale content (slower and reduced visual quality)" left="76"
                              mouse_opaque="true" name="media_auto_scale" radio_style="false"
                              tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
                              width="308" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+                             left="8" mouse_opaque="true" name="Media texture:" v_pad="0" width="364">
+                                Sound
+Settings:
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+                             left="76" mouse_opaque="true" name="Music URL:" v_pad="0" width="364">
+                                Music URL:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
+                             enabled="true" follows="left|right|top" font="SansSerifSmall"
+                             handle_edit_keys_directly="false" height="16" hidden="false" left="76"
+                             max_length="255" mouse_opaque="true" name="music_url"
+                             select_all_on_focus_received="true" select_on_focus="true"
+                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370" />
+
+                        <check_box bottom_delta="-26" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" hidden="false" initial_value="false"
+                             label="Restrict spatialized sound to this parcel" left="76"
+                             mouse_opaque="true" name="check sound local" radio_style="false"
+                             width="292" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-268" enabled="true" follows="left|top" font="SansSerifSmall"
+                             h_pad="0" halign="left" height="16" hidden="false" left="8"
+                             mouse_opaque="false" name="Voice settings:" tab_stop="false" v_pad="0"
+                             width="364">
+                                Voice
+Settings:
+                        </text>
+                        <radio_group bottom="-306" draw_border="true" enabled="true" follows="left|top" height="54"
+                             hidden="false" left="76" mouse_opaque="true" name="parcel_voice_channel"
+                             tab_stop="true" width="219">
+                                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                                     left="3" mouse_opaque="true" name="Estate" width="463">
+                                        Use the Estate spatial channel
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                                     left="3" mouse_opaque="true" name="Private" width="463">
+                                        Use a private spatial channel
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
+                                     left="3" mouse_opaque="true" name="Disabled" width="463">
+                                        Disable spatial audio on this parcel
+                                </radio_item>
+                        </radio_group>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" hidden="false" label="Access" left="1" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
new file mode 100644
index 0000000..bf7734e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater

+        name="active_speakers"

+        title="Active Speakers"

+        width="250"

+        height="300"

+        rect_control="FloaterActiveSpeakersRect"

+        can_resize="true"

+        can_minimize="true"

+        can_close="true"

+        can_drag_on_left="false"

+        min_width="220"

+        min_height="200"

+        >

+        <panel name="active_speakers_panel" left="0" bottom="0" right="250" top="300" follows="left|top|right|bottom" mouse_opaque="false">

+                <scroll_list

+                name="speakers_list"

+                        left="10"

+                        right="-10"

+                        top="-20"

+                        bottom="60"

+                        column_padding="0"

+                        can_resize="true"

+                        follows="left|top|bottom|right"

+                        draw_heading="true"

+                        draw_stripes="false"

+                        multi_select="false"

+                        search_column="1"

+                >

+                        <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

+                        <column name="speaker_name" label="Name" dynamicwidth="true" />

+                        <column name="speaking_status" label="" width="0" />

+                </scroll_list>

+                <panel 

+                        name="volume_container"

+                        left="10"

+                        right="-10"     

+                        height="30"

+                        bottom="20"     

+                        border="true"

+                        mouse_opaque="true"

+                        bevel_style="in"

+                        background_visible="false"

+                        background_opaque="false"

+                        follows="left|right|bottom"

+                        bg_opaque_color="0,0,0,0.3"

+                        bg_alpha_color="0,0,0,0"

+                        can_resize="false"

+                        >

+                        <volume_slider

+                                name="speaker_volume"

+                                left_delta="10"

+                                width="110"

+                                bottom="5"

+                                height="15"

+                                follows="left|bottom"

+                                min_val="0.0"

+                                max_val="1.0"

+                                increment="0.05"

+                                initial_val="0.5"

+                        />

+                        <button

+                                name="mute_btn"

+                                left_delta="115"

+                                bottom_delta="-2"

+                                width="70"

+                                height="25"

+                                label="Mute"

+                                />

+                </panel>                

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
new file mode 100644
index 0000000..dc31951
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="40" left="40" height="225" width="180" 
+         rect_control="FloaterAudioVolumeRect"
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         name="Volume" title="Volume">
+        <panel border="true" bottom="-210" enabled="true" follows="left|top|right|bottom"
+               hidden="false" label="Volume" left="10" height="180" width="205"
+               mouse_opaque="true" name="Volume Panel"
+               filename="panel_audio.xml">
+        </panel>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
index 9a37e07..09233ce 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
@@ -14,7 +14,7 @@
              follows="left|top|right|bottom" height="148" left="15" mouse_opaque="true"
              multi_select="false" name="item_list" width="281">
                 <column name="icon" width="16" />
-                <column name="text" width="300" />
+                <column name="text" relwidth="1.0" />
         </scroll_list>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-28" drop_shadow_visible="true" follows="left|right|bottom"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index c37074a..a57326c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -1,30 +1,112 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" can_tear_off="true" enabled="true" height="235"
-     hidden="false" left="15" min_height="100" min_width="440"
+     can_resize="true" can_tear_off="true" enabled="true" height="270"
+     hidden="false" left="15" min_height="150" min_width="425"
      mouse_opaque="true" name="chat floater" rect_control="FloaterChatRect"
-     title="Chat History" width="440" default_tab_group="1">
-        <button bottom="-42" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Chat" left="6" mouse_opaque="true"
-             name="Chat" scale_image="true" width="55" />
-        <button bottom="-42" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Mute" left="63"
-             mouse_opaque="true" name="Mute resident" scale_image="true" width="55" />
-        <combo_box allow_text_entry="false" bottom="-42" enabled="true" follows="left|top"
-             height="20" hidden="false" left="122" max_chars="20" mouse_opaque="true"
-             name="chatter combobox" width="200" />
-        <check_box bottom="-42" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="20" hidden="false" initial_value="false" label="Show Muted Text"
-             left="328" mouse_opaque="true" name="show mutes" radio_style="false"
-             width="116" />
-        <text_editor type="string" length="1" bottom="-229" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="181"
-             hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
-             name="Chat History Editor" tab_group="1" text_color="1 1 1 1"
-             text_readonly_color="1 1 1 1" width="428" word_wrap="true" />
-        <text_editor type="string" length="1" bottom="-229" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="181"
-             hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
-             name="Chat History Editor with mute" tab_group="1" text_color="1 1 1 1"
-             text_readonly_color="1 1 1 1" width="428" word_wrap="true" />
+     title="Residents Near Me (Chat History)" short_title="Near Me" width="435">
+
+        <string name="ringing">Connecting to in-world Voice Chat...</string>
+        <string name="connected">Connected</string>
+        <string name="hang_up">Disconnected from in-world Voice Chat</string>
+     
+    <layout_stack border="false" left="2" bottom="2" width="430" height="250" follows="left|top|right|bottom" orientation="horizontal">
+        <layout_panel border="false" name="im_contents_panel" min_width="275" left="0" bottom="0" width="305" height="130" default_tab_group="1">
+                 
+                <combo_box left="4"
+                                height="20" 
+                                width="120"
+                                label="Gestures" 
+                                follows="left|top" 
+                                name="Gesture">
+                                <combo_item name="Gestures">
+                                        Gestures
+                                </combo_item>
+                        </combo_box>
+
+                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+                                        height="20" initial_value="false" label="Show Muted Text"
+                                        left_delta="125" name="show mutes" radio_style="false"
+                                        width="116" />
+
+                <button left="270" right="303" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>
+
+                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
+                                follows="left|top|right|bottom" font="SansSerif" height="70"
+                                hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
+                                name="Chat History Editor" text_color="1 1 1 1"
+                                text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
+                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
+                                follows="left|top|right|bottom" font="SansSerif" height="70"
+                                hidden="false" left="6" max_length="2147483647" mouse_opaque="true"
+                                name="Chat History Editor with mute" text_color="1 1 1 1"
+                                text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
+                
+                        <panel name="chat_panel" bottom="3" left="5" right="-5" top="25" tab_group="1" follows="left|right|bottom">
+                                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
+                                        enabled="true" follows="left|right|bottom" font="SansSerif"
+                                        handle_edit_keys_directly="false" height="20" hidden="false"
+                                        label="Click here to chat." left="0" right="-120" max_length="254"
+                                        mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"
+                                        select_on_focus="false" tab_group="1"/>
+                                <button bottom="0" follows="bottom|right" font="SansSerif"
+                                        halign="center" height="20" label="Say" left="-115"
+                                        mouse_opaque="true" name="Say" scale_image="true" width="50" />
+                                <button bottom="0" follows="bottom|right" font="SansSerif"
+                                        halign="center" height="20" label="Shout" left="-60"
+                                        mouse_opaque="true" name="Shout" scale_image="true" width="50" />
+                        </panel>
+                
+        </layout_panel>
+
+                <layout_panel name="active_speakers_panel" auto_resize="false" left="0" bottom="0" right="140" height="120" min_width="140" visible="false">
+                        <scroll_list name="speakers_list" left="0" right="140" top="120" bottom="78" column_padding="0" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">
+                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 
+                                <column name="speaker_name" label="Name" dynamicwidth="true"/>
+                                <column name="speaking_status" label="" width="0"/>
+                        </scroll_list>
+                        <panel name="volume_container" left="0" right="140" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77" follows="left|bottom|right">
+                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>
+                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top" width="140" font="SansSerif">Rumplstiltskin Califragilistic</text>
+                                <volume_slider
+                                        name="speaker_volume"
+                                        left="5"
+                                        width="85"
+                                        bottom_delta="-29"
+                                        height="15"
+                                        follows="left|top"
+                                        min_val="0.0"
+                                        max_val="1.0"
+                                        increment="0.05"
+                                        initial_val="0.5"
+                                />
+                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                        drop_shadow_visible="true" enabled="true" follows="left|top"
+                                        font="SansSerifSmall" height="16" hidden="false"
+                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">
+                                        Mute:
+                                </text>
+                                <check_box
+                                        name="mute_text_btn"
+                                        width="50"
+                                        bottom_delta="0"
+                                        left_delta="32"
+                                        follows="left|top"
+                                        height="25"
+                                        enabled="false"
+                                        label="Text"
+                                />
+                                <check_box
+                                        name="mute_btn"
+                                        follows="left|top"
+                                        width="50"
+                                        bottom_delta="0"
+                                        left_delta="45"
+                                        height="25"
+                                        enabled="false"
+                                        label="Voice"
+                                />
+                        </panel>
+                </layout_panel>
+        </layout_stack>
+
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
new file mode 100644
index 0000000..807d833
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
@@ -0,0 +1,6 @@
+<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"

+     height="390" min_height="340" min_width="400" name="floater_chatterbox"

+     title="Communicate" width="392" rect_control="ChatterboxRect">

+        <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"

+             name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />

+</multi_floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
new file mode 100644
index 0000000..3c95030
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
@@ -0,0 +1,4 @@
+<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings"

+     title="Voice Chat Device Settings" width="405">

+        <panel bottom="0" name="device_settings" filename="panel_audio_device.xml" left="2" top="-20" right="-5"/>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
index d80452c..49b1d14 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
@@ -1,165 +1,64 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
-        name="friends"
-        title="Friends"
-        can_resize="true"
-        can_minimize="true"
-        can_close="true"
-        can_drag_on_left="false"
-        rect_control="FloaterFriendsRect"
-        min_width="293"
-        min_height="300"
-        >
-        <!-- <text
-                name="help_label"
-                bottom="-30"
-                left="15"
-                font="SansSerifSmall"
-                follows="top|left"
-                >
-        </text> -->
-
-        <scroll_list
-           name="friend_list"
-                left="10"
-                right="-10"
-                top="-20"
-                bottom="130"
-                column_padding="0"
-                can_resize="true"
-                follows="left|top|bottom|right"
-                draw_heading="true"
-                multi_select="true"
-                search_column="1"
-                tool_tip="Hold shift or control while clicking to select multiple friends"
-           >
-                <column name="icon_online_status" image="ff_online_status_button.tga" width="20"/>      
-                <column name="friend_name" label="Name" dynamicwidth="true" />
-                <column name="icon_visible_online" image="ff_visible_online_button.tga" width="20"/>    
-                <column name="icon_visible_map" image="ff_visible_map_button.tga" width="20"/>
-                <column name="icon_edit_mine" image="ff_edit_mine_button.tga" width="20"/>
-                <column name="icon_edit_theirs" image="ff_edit_theirs_button.tga" width="20"/>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     min_height="300" min_width="350" name="friends"
+     rect_control="FloaterFriendsRect" title="Friends">
+        <scroll_list bottom="90" can_resize="true" column_padding="0" draw_heading="true"
+             follows="left|top|bottom|right" left="10" multi_select="true"
+             name="friend_list" right="-100" search_column="1"
+             tool_tip="Hold shift or control while clicking to select multiple friends"
+             top="-20">
+                <column image="ff_online_status_button.tga" name="icon_online_status" width="20" />
+                <column dynamicwidth="true" label="Name" name="friend_name" />
+                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" />
+                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" />
+                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" />
+                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" />
         </scroll_list>
-<panel 
-        name="rights_container"
-        left="10"
-        right="-10"     
-        height="70"
-        bottom="50"     
-        border="true"
-        mouse_opaque="true"
-        bevel_style="in"
-        background_visible="true"
-        background_opaque="true"
-        follows="left|right|bottom"
-        bg_opaque_color="0,0,0,0.3"
-        bg_alpha_color="blue"
-        can_resize="false"
-        >
-        <text
-                name="friend_name_label"
-                bottom_delta="-11"
-                left="10"
-                font="SansSerifSmall"
-                follows="top|left"
-                >
-                Select friend(s) to change rights...
-        </text>
-        <check_box height="16" label="Can see my online status" 
-                           left="10" bottom_delta="-21" name="online_status_cb" 
-                           width="200" follows="bottom|left"
-                           hidden="false" mouse_opaque="true" font="SansSerifSmall"
-                           initial_value="false" enabled="false" radio_style="false" 
-                           tool_tip="Set whether this friend see my online status in their friends list or calling cards" />
-        <check_box height="16" label="Can see me on the map" 
-                           left="25" bottom_delta="-18" name="map_status_cb" 
-                           width="200" follows="bottom|left"
-                           hidden="false" mouse_opaque="true" font="SansSerifSmall"
-                           initial_value="false" enabled="false" radio_style="false" 
-                           tool_tip="Set whether this friend see my location on their map" />
-        <check_box height="16" label="Can modify my objects" 
-                           left="10"  bottom_delta="-18" name="modify_status_cb"
-                           width="200" follows="bottom|left"
-                           hidden="false" mouse_opaque="true" font="SansSerifSmall"
-                           initial_value="false" enabled="false" radio_style="false"
-                           tool_tip="Set whether this friend can modify my objects" />                     
-        <text
-                name="process_rights_label"
-                bottom_delta="25"
-                left="10"
-                font="SansSerif"
-                follows="top|left"
-                >
-                Processing rights change...
-        </text>
-
-</panel>                
-        <button
-                name="im_btn"
-                label="IM"
-                tool_tip="Open Instant Message session"
-                left="10"
-                bottom_delta="-22"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />      
-
-        <button
-                name="offer_teleport_btn"
-                label="Teleport..."
-                tool_tip="Offer this friend a teleport to your current location"
-                left="85"
-                bottom_delta="0"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />
-        
-        <button
-                name="add_btn"
-                label="Add..."
-                tool_tip="Offer friendship to a resident"
-                left="165"
-                bottom_delta="0"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />
-        <button
-                name="profile_btn"
-                label="Profile"
-                tool_tip="Show picture, groups, and other information"
-                left="10"
-                bottom_delta="-20"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />              
-        <button
-                name="pay_btn"
-                label="Pay..."
-                tool_tip="Give Linden dollars (L$) to this friend"
-                left="85"
-                bottom_delta="0"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />
-        <button
-                name="remove_btn"
-                label="Remove..."
-                tool_tip="Remove this person from your friends list"
-                left="165"
-                bottom_delta="0"
-                width="70"
-                height="20"
-                font="SansSerifSmall"
-                follows="bottom|left"
-                />      
+        <panel background_opaque="true" background_visible="true" bevel_style="in"
+             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true" bottom="10"
+             can_resize="false" follows="left|right|bottom" height="70" left="10"
+             mouse_opaque="true" name="rights_container" right="-100">
+                <text bottom_delta="-11" follows="top|left" font="SansSerifSmall" left="10"
+                     name="friend_name_label">
+                        Select friend(s) to change rights...
+                </text>
+                <check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"
+                     height="16" hidden="false" initial_value="false"
+                     label="Can see my online status" left="10" mouse_opaque="true"
+                     name="online_status_cb" radio_style="false"
+                     tool_tip="Set whether this friend see my online status in their friends list or calling cards"
+                     width="200" />
+                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
+                     height="16" hidden="false" initial_value="false"
+                     label="Can see me on the map" left="25" mouse_opaque="true"
+                     name="map_status_cb" radio_style="false"
+                     tool_tip="Set whether this friend see my location on their map" width="200" />
+                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
+                     height="16" hidden="false" initial_value="false"
+                     label="Can modify my objects" left="10" mouse_opaque="true"
+                     name="modify_status_cb" radio_style="false"
+                     tool_tip="Set whether this friend can modify my objects" width="200" />
+                <text bottom_delta="25" follows="top|left" font="SansSerif" left="10"
+                     name="process_rights_label">
+                        Processing rights change...
+                </text>
+        </panel>
+        <pad bottom="-17" height="0" left="-90" width="1" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Profile" left_delta="0" name="profile_btn"
+             tool_tip="Show picture, groups, and other information" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="IM/Call" left_delta="0" name="im_btn"
+             tool_tip="Open Instant Message session" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Teleport..." left_delta="0" name="offer_teleport_btn"
+             tool_tip="Offer this friend a teleport to your current location" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Pay..." left_delta="0" name="pay_btn"
+             tool_tip="Give Linden dollars (L$) to this friend" width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="Remove..." left_delta="0" name="remove_btn"
+             tool_tip="Remove this person from your friends list" width="80" />
+        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
+             label="Add..." left_delta="0" name="add_btn"
+             tool_tip="Offer friendship to a resident" width="80" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_groups.xml b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
index 7b12684..1e08fb2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
@@ -1,57 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-371" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="false" enabled="true" follows="left|top"
-     height="300" hidden="false" left="280" min_height="200" min_width="275"
-     mouse_opaque="true" name="groups" title="Groups" width="280">
+     height="300" hidden="false" left="280" min_height="250" min_width="350"
+     mouse_opaque="true" name="groups" title="Groups" width="350">
+        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
+             draw_heading="false" draw_stripes="true" enabled="true"
+             follows="left|top|right|bottom" hidden="false" left="10"
+             mouse_opaque="true" multi_select="false" name="group list" tab_stop="true"
+             top="-20" width="240">
+                <column label="" name="name" width="248" />
+        </scroll_list>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-36" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="false" name="groupdesc" tab_stop="false" v_pad="0"
+             left="12" mouse_opaque="false" name="groupdesc" v_pad="0"
              width="248">
                 Your currently active group is displayed in bold.
         </text>
-        <scroll_list background_visible="true" bottom="-228" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" height="190" hidden="false" left="12"
-             mouse_opaque="true" multi_select="false" name="group list" tab_stop="true"
-             width="248">
-                <column label="" name="name" width="248" />
-        </scroll_list>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-246" drop_shadow_visible="true" enabled="true"
-             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-             height="16" hidden="false" left="12" mouse_opaque="false" name="groupcount"
-             tab_stop="false" v_pad="0" width="248">
+             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+             left="12" mouse_opaque="false" name="groupcount" v_pad="0"
+             width="248">
                 You belong to [COUNT] groups (of [MAX] maximum).
         </text>
-        <button border_height="16" border_width="16" bottom="-268" enabled="false"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Activate"
-             label_selected="Activate" left="12" mouse_opaque="true" name="Activate"
-             scale_image="true" tab_stop="true" width="80" />
-        <button border_height="16" border_width="16" bottom="-268" enabled="true"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Info"
-             label_selected="Info" left="100" mouse_opaque="true" name="Info"
-             scale_image="true" tab_stop="true" width="80" />
-        <button border_height="16" border_width="16" bottom="-268" enabled="true"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Leave"
-             label_selected="Leave" left="188" mouse_opaque="true" name="Leave"
-             scale_image="true" tab_stop="true" width="80" />
-        <button border_height="16" border_width="16" bottom="-292" enabled="true"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Create"
-             label_selected="Create" left="12" mouse_opaque="true" name="Create"
-             scale_image="true" tab_stop="true" width="80" />
-        <button border_height="16" border_width="16" bottom="-292" enabled="true"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Search..."
-             label_selected="Search..." left="100" mouse_opaque="true" name="Search..."
-             scale_image="true" tab_stop="true" width="80" />
-        <button border_height="16" border_width="16" bottom="-292" enabled="true"
-             follows="left|bottom" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Close"
-             label_selected="Close" left="188" mouse_opaque="true" name="Close"
-             scale_image="true" tab_stop="true" width="80" />
+        <pad bottom="-17" height="0" left="-90" width="1" />
+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+             font="SansSerif" height="22" hidden="false" label="Info" name="Info"
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+             label="IM/Call" left_delta="0" name="IM"
+             tool_tip="Open Instant Message session" width="80" />
+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+             font="SansSerif" height="22" hidden="false" label="Activate"
+             name="Activate" width="80" />
+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+             font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"
+             width="80" />
+        <button border_height="16" border_width="16" bottom_delta="-35" follows="top|right"
+             font="SansSerif" height="22" hidden="false" label="Create..." name="Create"
+             width="80" />
+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+             font="SansSerif" height="22" hidden="false" label="Search..."
+             name="Search..." width="80" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_im.xml b/linden/indra/newview/skins/xui/en-us/floater_im.xml
index 89595a9..fee153a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_im.xml
@@ -7,31 +7,34 @@
         <tab_container border="false" bottom="-422" enabled="true" follows="left|top|right|bottom"
              height="406" hidden="false" left="1" mouse_opaque="false"
              name="Preview Tabs" tab_position="bottom" width="417" />
-        <text follows="left|bottom" hidden="true" name="only_user_message">
+        <string name="only_user_message">
                 You are the only user in this session.
-        </text>
-        <text follows="left|bottom" hidden="true" name="offline_message">
+        </string>
+        <string name="offline_message">
                 [FIRST] [LAST] is offline.
-        </text>
-        <text hidden="true" name="generic_request_error">
+        </string>
+        <string name="generic_request_error">
             Error making request, please try again later.
-        </text>
-        <text hidden="true" name="insufficient_perms_error">
+        </string>
+        <string name="insufficient_perms_error">
             You do not have sufficient permissions.
-        </text>
-        <text hidden="true" name="user_no_help">
+        </string>
+        <string name="user_no_help">
             The requested user is no longer in the help session.
-        </text>
-        <text hidden="true" name="add_session_event">
+        </string>
+        <string name="add_session_event">
             adding agents to chat session with
-        </text>
-        <text hidden="true" name="message_session_event">
+        </string>
+        <string name="message_session_event">
             messaging chat session with
-        </text>
-        <text hidden="true" name="teleport_session_event">
+        </string>
+        <string name="teleport_session_event">
             teleporting to creator of
-        </text>
-        <text hidden="true" name="removed_from_group">
+        </string>
+        <string name="removed_from_group">
             You have been removed from the group.
-        </text>
+        </string>
+        <string name="invite_message">
+                Click the [BUTTON NAME] button to accept/connect to this voice chat.
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index f5b11d6..637c8ba 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -4,7 +4,7 @@
      bottom="-298"
      can_close="true"
      can_drag_on_left="false"
-     can_minimize="false"
+     can_minimize="true"
      can_resize="true"
      enabled="true"
      follows="left|top|right|bottom"
@@ -12,33 +12,60 @@
      hidden="false"
      label="(unknown)"
      left="1"
-     min_height="130"
-     min_width="200"
+     min_height="155"
+     min_width="345"
      mouse_opaque="true"
      name="im_floater"
      rect_control=""
      title="(unknown)"
      width="501"
      default_tab_group="1">
+        <string name="ringing">Calling...</string>
+        <string name="connected">Connected, click End Call to hang up</string>
+        <string name="hang_up">Call ended</string>
+     
+    <button left="4" bottom="-40" height="20" width="70" label="Profile..." follows="left|top" name="profile_callee_btn"/>
+    <button left_delta="75" bottom="-40" height="20" width="70" label="Call" follows="left|top" name="start_call_btn"/>
+    <button left_delta="0" bottom="-40" height="20" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>
+    <panel left_delta="72" bottom="-40" height="20" width="344" border="false" name="speaker_controls" follows="left|top|right">
+                <volume_slider
+                                name="speaker_volume"
+                                enabled="false"
+                                left="0"
+                                width="80"
+                                bottom="0"
+                                height="15"
+                                follows="left|bottom"
+                                min_val="0.0"
+                                max_val="1.0"
+                                increment="0.05"
+                                initial_val="0.5"
+                        />
+                <check_box
+                        name="mute_btn"
+                        enabled="false"
+                        left_delta="85"
+                        bottom_delta="0"
+                        width="70"
+                        height="25"
+                        label="Mute voice chat"
+                        />
+    </panel>
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-             bottom="-275" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="257"
+             bottom="28" embedded_items="false" enabled="false"
+             follows="left|top|right|bottom" font="SansSerif" height="225"
              hidden="false" left="4" max_length="2147483647" mouse_opaque="true"
              name="im_history" text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-295"
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5"
              enabled="true" follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="20" hidden="false" left="4"
+             handle_edit_keys_directly="false" height="20" hidden="false" left="6"
              max_length="1022" mouse_opaque="true" name="chat_editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             width="345" label="Click here to instant message" />
-        <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Profile..."
-             label_selected="Profile..." left="355" mouse_opaque="true"
-             name="profile_btn" scale_image="true" width="70" />
-        <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Close"
-             label_selected="Close" left="430" mouse_opaque="true" name="close_btn"
+             width="421" label="Click here to instant message" />
+        <button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Send"
+             left="432" mouse_opaque="true" name="send_btn"
              scale_image="true" width="60" />
         <text hidden="true" name="live_help_dialog" wordwrap="false">
                 *** Welcome to Help Request *** 
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
new file mode 100644
index 0000000..f58273e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -0,0 +1,119 @@
+<!-- This is the _embedded_ instant message panel, not the floater that

+     contains all the instant messages.  See floater_im.xml.  JC -->

+<floater border="true"

+     bottom="-298"

+     can_close="true"

+     can_drag_on_left="false"

+     can_minimize="false"

+     can_resize="true"

+     enabled="true"

+     follows="left|top|right|bottom"

+     height="297"

+     hidden="false"

+     label="(unknown)"

+     left="1"

+     min_height="225"

+     min_width="265"

+     mouse_opaque="true"

+     name="im_floater"

+     rect_control=""

+     title="(unknown)"

+     width="501"

+     default_tab_group="1">

+

+        <string name="ringing">Joining Voice Chat...</string>

+        <string name="connected">Connected, click End Call to hang up</string>

+        <string name="hang_up">Left Voice Chat</string>

+

+        <layout_stack border="false" left="2" bottom="1" width="495" height="277" follows="left|top|right|bottom" orientation="horizontal" tab_group="1">

+        <layout_panel border="false" name="im_contents_panel" min_width="115" left="0" bottom="0" width="495" height="295" follows="left|top|bottom|right" default_tab_group="1">

+                        <button left="4" bottom="-24" height="20" width="70" label="Call" enabled="false" follows="left|top" name="start_call_btn"/>

+                        <button left_delta="0" bottom_delta="0" height="20" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>

+                <button left="460" right="493" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>

+                        

+                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"

+                                bottom="-268" embedded_items="false" enabled="false"

+                                follows="left|top|right|bottom" font="SansSerif" height="240"

+                                hidden="false" left="4" max_length="2147483647" mouse_opaque="true"

+                                name="im_history" text_color="ChatHistoryTextColor"

+                                text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"

+                                enabled="true" follows="left|right|bottom" font="SansSerif"

+                                handle_edit_keys_directly="false" height="20" hidden="false" left="4"

+                                max_length="1022" mouse_opaque="true" name="chat_editor"

+                                select_all_on_focus_received="false" select_on_focus="false" tab_group="1"

+                                width="425" label="Click here to instant message" />

+                        <button bottom_delta="-1" enabled="true" follows="right|bottom" font="SansSerif"

+                                halign="center" height="20" hidden="false" label="Send"

+                                left="433" mouse_opaque="true" name="send_btn"

+                                scale_image="true" width="60" />

+                </layout_panel>

+                             

+             

+        <layout_panel auto_resize="false" can_resize="true" min_width="145" name="active_speakers_panel" top_delta="0" left="0" bottom="0" width="145" height="120" visible="false">

+                        <scroll_list name="speakers_list" left="0" right="145" top="120" bottom="78" column_padding="0" can_resize="false" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">

+                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

+                                <column name="speaker_name" label="Name" dynamicwidth="true"/>

+                                <column name="speaking_status" label="" width="0"/>

+                        </scroll_list>

+                        <panel name="volume_container" follows="left|bottom|right" left="0" right="145" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77">

+                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>

+                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="110" font="SansSerif">Rumplstiltskin Califragilistic</text>

+                                <volume_slider

+                                        name="speaker_volume"

+                                        left="5"

+                                        width="85"

+                                        bottom_delta="-29"

+                                        height="15"

+                                        follows="left|top"

+                                        min_val="0.0"

+                                        max_val="1.0"

+                                        increment="0.05"

+                                        initial_val="0.5"

+                                />

+                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                                        drop_shadow_visible="true" enabled="true" follows="left|top"

+                                        font="SansSerifSmall" height="16" hidden="false"

+                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">

+                                        Mute:

+                                </text>

+                                <check_box

+                                        name="mute_text_btn"

+                                        width="50"

+                                        bottom_delta="0"

+                                        left_delta="32"

+                                        follows="left|top"

+                                        height="25"

+                                        enabled="false"

+                                        label="Text"

+                                />

+                                <check_box

+                                        name="mute_btn"

+                                        follows="left|top"

+                                        width="50"

+                                        bottom_delta="0"

+                                        left_delta="45"

+                                        height="25"

+                                        enabled="false"

+                                        label="Voice"

+                                />

+                                

+                        </panel>                

+                </layout_panel>

+        </layout_stack>

+        <text hidden="true" name="live_help_dialog" wordwrap="false">

+                *** Welcome to Help Request *** 

+Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 

+If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

+-=-=- Response times will vary, especially during peak times -=-=-

+        </text>

+        <text hidden="true" name="title_string">

+                Instant Message with [NAME]

+        </text>

+        <text hidden="true" name="typing_start_string">

+                [NAME] is typing...

+        </text>

+        <text hidden="true" name="session_start_string">

+            Starting session with [NAME] please wait.

+        </text>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
new file mode 100644
index 0000000..1b7dd4e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -0,0 +1,160 @@
+<!-- This is the _embedded_ instant message panel, not the floater that

+     contains all the instant messages.  See floater_im.xml.  JC -->

+<floater border="true"

+                 bottom="-297" 

+                 can_close="true" 

+                 can_drag_on_left="false" 

+                 can_minimize="false" 

+                 can_resize="true" 

+                 enabled="true" 

+                 follows="left|top|right|bottom" 

+                 height="296" 

+                 hidden="false" 

+                 label="(unknown)" 

+                 left="1" 

+                 min_height="200"

+                 min_width="340"

+                 mouse_opaque="true"

+                 name="im_floater"

+                 rect_control="" 

+                 title="(unknown)" 

+                 width="501" 

+                 default_tab_group="1">

+

+        <string name="ringing">Joining Voice Chat...</string>

+        <string name="connected">Connected, click End Call to hang up</string>

+        <string name="hang_up">Left Voice Chat</string>

+        

+    <layout_stack border="false" left="2" bottom="1" width="495" height="276" follows="left|top|right|bottom" orientation="horizontal" tab_group="1">

+        <layout_panel border="false" name="im_contents_panel" min_width="185" left="0" bottom="0" width="175" height="130" follows="left|top|bottom|right" default_tab_group="1">

+                 

+                <button left="4"

+                                height="20" 

+                                width="70"

+                                tab_group="0"

+                                label="Group Info..." 

+                                follows="left|top" 

+                                name="group_info_btn"/>

+                

+                <button left_delta="75"

+                                bottom_delta="0"

+                                height="20" 

+                                width="70" 

+                                label="Join Call" 

+                                enabled="false" 

+                                follows="left|top" 

+                                name="start_call_btn"/>

+                

+                <button bottom_delta="0" height="20" left_delta="0" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>

+                <button left="140" right="173" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>

+                

+                <text_editor type="string"

+                                         length="1" 

+                                         bg_readonly_color="ChatHistoryBgColor" 

+                                         bg_writeable_color="ChatHistoryBgColor" 

+                                         bottom="27"

+                                         top="102"

+                                         embedded_items="false" 

+                                         enabled="false" 

+                                         follows="left|top|right|bottom" 

+                                         font="SansSerif" 

+                                         hidden="false" 

+                                         left="4" 

+                                         max_length="2147483647" 

+                                         mouse_opaque="true" 

+                                         name="im_history" 

+                                         text_color="ChatHistoryTextColor" 

+                                         text_readonly_color="ChatHistoryTextColor" 

+                                         width="170" 

+                                         word_wrap="true"/>

+                

+                <line_editor bevel_style="in" 

+                                         border_style="line" 

+                                         border_thickness="1" 

+                                         bottom="4" enabled="true"

+                                         follows="left|right|bottom" 

+                                         font="SansSerif" 

+                                         handle_edit_keys_directly="false" 

+                                         height="20" 

+                                         hidden="false" 

+                                         left="4" 

+                                         max_length="1022" 

+                                         mouse_opaque="true" 

+                                         name="chat_editor"

+                                         select_all_on_focus_received="false" 

+                                         select_on_focus="false" 

+                                         tab_group="1" 

+                                         width="105"

+                                         label="Click here to instant message"/>

+                

+                <button bottom="3" enabled="true" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Send" left="113" mouse_opaque="true" name="send_btn" scale_image="true" width="60"/>

+                <text hidden="true" name="live_help_dialog" wordwrap="false">

+                        *** Welcome to Help Request *** 

+                        Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 

+                        If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

+                        -=-=- Response times will vary, especially during peak times -=-=-

+                </text>

+                <text hidden="true" name="title_string">

+                        Instant Message with [NAME]

+                </text>

+                <text hidden="true" name="typing_start_string">

+                        [NAME] is typing...

+                </text>

+                <text hidden="true" name="session_start_string">

+                        Starting session with [NAME] please wait.

+                </text>

+        </layout_panel>

+        

+        <layout_panel auto_resize="false" can_resize="true" min_width="145" name="active_speakers_panel" top_delta="0" left="0" bottom="0" width="145" height="120" visible="false">

+                        <scroll_list name="speakers_list" left="0" right="145" top="120" bottom="78" column_padding="0" can_resize="false" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">

+                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

+                                <column name="speaker_name" label="Name" dynamicwidth="true"/>

+                                <column name="speaking_status" label="" width="0"/>

+                        </scroll_list>

+                        <panel name="volume_container" follows="left|bottom|right" auto_resize="false" left="0" right="145" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77">

+                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>

+                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="110" font="SansSerif">Rumplstiltskin Califragilistic</text>

+                                <volume_slider

+                                        name="speaker_volume"

+                                        left="5"

+                                        width="85"

+                                        bottom_delta="-29"

+                                        height="15"

+                                        follows="left|top"

+                                        min_val="0.0"

+                                        max_val="1.0"

+                                        increment="0.05"

+                                        initial_val="0.5"

+                                />

+                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                                        drop_shadow_visible="true" enabled="true" follows="left|top"

+                                        font="SansSerifSmall" height="16" hidden="false"

+                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">

+                                        Mute:

+                                </text>

+                                <check_box

+                                        name="mute_text_btn"

+                                        width="50"

+                                        bottom_delta="0"

+                                        left_delta="32"

+                                        follows="left|top"

+                                        height="25"

+                                        enabled="false"

+                                        label="Text"

+                                />

+                                <check_box

+                                        name="mute_btn"

+                                        follows="left|top"

+                                        width="50"

+                                        bottom_delta="0"

+                                        left_delta="45"

+                                        height="25"

+                                        enabled="false"

+                                        label="Voice"

+                                />

+                                

+                        </panel>                

+                </layout_panel>

+                

+        </layout_stack>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
index d3bc3fa..040406e 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
@@ -34,7 +34,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-81" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-             mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="88">
+             mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="200">
                 Nicole Linden
         </text>
         <button bottom="-81" follows="top|right" font="SansSerifSmall" halign="center"
@@ -49,7 +49,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-101" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-             mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="88">
+             mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="200">
                 Thrax Linden
         </text>
         <button bottom="-101" follows="top|right" font="SansSerifSmall" halign="center"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
new file mode 100644
index 0000000..50c69c6
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="365" name="floater_my_friends"

+     title="Contacts" 

+     width="395">

+        <tab_container bottom="10" height="360" tab_width="80" follows="left|right|top|bottom" left="0" name="friends_and_groups" tab_position="left" width="388">

+                <panel label="Friends" filename="panel_friends.xml" bottom="0" left="0" width="370" name="friends_panel"/>

+                <panel label="Groups" filename="panel_groups.xml" bottom="0" left="0" width="370" name="groups_panel"/>

+        </tab_container>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
index bafb11c..916ee85 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
@@ -71,7 +71,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-160" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="category_label" v_pad="0" width="50">
+             mouse_opaque="true" name="category_label" v_pad="0" width="60">
                 Category:
         </text>
         <combo_box bottom_delta="-20" follows="left|top" height="20" left="16" mouse_opaque="true"
@@ -136,7 +136,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="sum_title" v_pad="0" width="50">
+             mouse_opaque="true" name="sum_title" v_pad="0" width="60">
                 Summary:
         </text>
         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_select_key.xml b/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
new file mode 100644
index 0000000..7c2221f
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
+     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
+     height="100" hidden="false" left="415" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title=" " width="240">
+        <button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
+             hidden="false" label="Cancel" label_selected="Cancel" left="138"
+             mouse_opaque="true" name="Cancel" scale_image="true" width="82" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="20" mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
+                Press a key to select
+        </text>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
index 994aa70..43c6aa0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
@@ -3,8 +3,8 @@
      title="Debug Settings" width="350">
         <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
              height="20" left="15" max_chars="255" name="settings_combo" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" name="comment_text"
-             word_wrap="true" />
+        <text_editor bottom_delta="-75" enabled="false" height="60" hide_scrollbar="true"
+             name="comment_text" word_wrap="true" />
         <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
              left="15" name="boolean_combo" visible="false">
                 <combo_item name="TRUE" value="true">
@@ -25,5 +25,6 @@
              max_val="10000000" name="val_spinner_3" visible="false" width="120" />
         <spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
              max_val="10000000" name="val_spinner_4" visible="false" width="120" />
-        <button bottom="5" left="15" height="20" width="150" name="default_btn" label="Reset to default"/>
+        <button bottom="5" height="20" label="Reset to default" left="15" name="default_btn"
+             width="150" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_test.xml b/linden/indra/newview/skins/xui/en-us/floater_test.xml
new file mode 100644
index 0000000..354cc73
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_test.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="40" left="40" height="225" width="180" 
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         name="Test" title="Test">
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
new file mode 100644
index 0000000..d17cb56
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
@@ -0,0 +1,17 @@
+<floater bottom="0" can_resize="false" can_minimize="true" height="300" left="0" name="floater_voice_wizard"

+     title="Voice Setup" width="420">

+     <tab_container name="wizard_tabs" hide_tabs="true" bottom="30" left="4" top="-20" right="-2" tab_position="bottom">

+        <panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0"/>

+        <panel bottom="0" filename="panel_voice_options.xml" left="0" right="0"/>

+        <panel bottom="0" name="device_settings" filename="panel_audio_device.xml" left="0" right="0"/>

+        </tab_container>

+        <panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"

+             name="content_panel" width="404">

+                <!--<button bottom="0" height="20" label="Help" left="0" name="help_btn" width="70" />-->

+                <button bottom="0" height="20" label="Previous" left="105" name="back_btn" width="70" />

+                <button bottom="0" height="20" label="Next" left_delta="75" name="next_btn" width="70" />

+                <button bottom="0" height="20" label="Finish" left_delta="80" name="ok_btn" width="70" />

+                <button bottom="0" height="20" label="Cancel" left_delta="75" name="cancel_btn"

+                     width="70" />

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index bd955e3..a57a8b6 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -160,6 +160,10 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
         </menu_item_call>
         <menu_item_separator name="Folder Wearables Separator" />
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Take Off Items" left="0"
+             mouse_opaque="true" name="Take Off Items" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
+        </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Add To Outfit" left="0"
              mouse_opaque="true" name="Add To Outfit" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="addtooutfit" />
@@ -168,10 +172,6 @@
              mouse_opaque="true" name="Replace Outfit" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />
         </menu_item_call>
-        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Take Off Items" left="0"
-             mouse_opaque="true" name="Take Off Items" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
-        </menu_item_call>
         <menu_item_separator name="Calling Card Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false"
              label="Start Conference Chat" left="0" mouse_opaque="true"
@@ -235,14 +235,14 @@
              mouse_opaque="true" name="Attach To HUD" opaque="true" tear_off="false"
              width="128" />
         <menu_item_separator name="Wearable Separator" />
-        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Wear" left="0"
-             mouse_opaque="true" name="Wearable Wear" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
-        </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Edit" left="0"
              mouse_opaque="true" name="Wearable Edit" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
         </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Wear" left="0"
+             mouse_opaque="true" name="Wearable Wear" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
+        </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Take Off" left="0"
              mouse_opaque="true" name="Take Off" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="take_off" />
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index c14ba4b..4d30c05 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -62,7 +62,7 @@
                 </menu_item_call>
                 <menu_item_call bottom="-186" enabled="true" height="19" hidden="false"
                      label="Snapshot to Disk" left="0" mouse_opaque="true"
-                     name="Snapshot to Disk" shortcut="control|`" width="243">
+                     name="Snapshot to Disk" shortcut="control|`" useMacCtrl="true" width="243">
                         <on_click function="File.TakeSnapshotToDisk" userdata="" />
                 </menu_item_call>
                 <menu_item_separator bottom="-194" enabled="true" height="8" hidden="false" label="-----------"
@@ -318,6 +318,11 @@
                      width="211">
                         <on_click function="ShowFloater" userdata="inventory" />
                 </menu_item_call>
+                <menu_item_check bottom="-189" enabled="true" height="19" hidden="false" label="Active Speakers"
+                     left="0" mouse_opaque="true" name="Active Speakers" width="211">
+                        <on_click function="ShowFloater" userdata="active speakers" />
+                        <on_check function="FloaterVisible" userdata="active speakers" />
+                </menu_item_check>
                 <menu_item_check bottom="-189" enabled="true" height="19" hidden="false" label="Mute List"
                      left="0" mouse_opaque="true" name="Mute List" width="211">
                         <on_click function="ShowFloater" userdata="mute list" />
@@ -396,10 +401,10 @@
                         </menu_item_check>
                 </menu>
                 <menu_item_check bottom="-384" enabled="true" height="19" hidden="false"
-                     label="Alt Shows Physical" left="0" mouse_opaque="true"
-                     name="Alt Shows Physical" width="211">
-                        <on_click function="ToggleControl" userdata="AltShowsPhysical" />
-                        <on_check control="AltShowsPhysical" />
+                     label="Beacons Always On" left="0" mouse_opaque="true"
+                     name="Beacons Always On" width="211" shortcut="control|N">
+                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
+                        <on_check control="BeaconAlwaysOn" />
                 </menu_item_check>
                 <menu_item_check bottom="-403" enabled="true" height="19" hidden="false"
                      label="Highlight Transparent" left="0" mouse_opaque="true"
@@ -410,32 +415,49 @@
                 <menu bottom="-554" color="0 0 0 1" drop_shadow="true" enabled="true" height="117"
                      hidden="false" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
                      opaque="true" tear_off="true" create_jump_keys="true" width="129">
-                        <menu_item_check bottom="-29" enabled="true" height="19" hidden="false" label="Scripted Objects"
+                    <menu_item_check bottom="-29" enabled="true" height="19" hidden="false" label="Scripted Objects with Touch Only"
+                             left="0" mouse_opaque="true" name="Scripted Objects With Touch Only" width="129">
+                                <on_click function="View.ToggleBeacon" userdata="scripttouchbeacon" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="scripttouchbeacon" />
+                        </menu_item_check>
+                        <menu_item_check bottom="-48" enabled="true" height="19" hidden="false" label="Scripted Objects"
                              left="0" mouse_opaque="true" name="Scripted Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="scripts" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="scripts" />
+                                <on_click function="View.ToggleBeacon" userdata="scriptsbeacon" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="scriptsbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-48" enabled="true" height="19" hidden="false" label="Physical Objects"
+                        <menu_item_check bottom="-67" enabled="true" height="19" hidden="false" label="Physical Objects"
                              left="0" mouse_opaque="true" name="Physical Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="physical" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="physical" />
+                                <on_click function="View.ToggleBeacon" userdata="physicalbeacon" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="physicalbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-67" enabled="true" height="19" hidden="false" label="Sound Sources"
+                        <menu_item_check bottom="-86" enabled="true" height="19" hidden="false" label="Sound Sources"
                              left="0" mouse_opaque="true" name="Sound Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="sounds" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="sounds" />
+                                <on_click function="View.ToggleBeacon" userdata="soundsbeacon" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="soundsbeacon" />
                         </menu_item_check>
-                        <menu_item_check bottom="-86" enabled="true" height="19" hidden="false" label="Particle Sources"
+                        <menu_item_check bottom="-105" enabled="true" height="19" hidden="false" label="Particle Sources"
                              left="0" mouse_opaque="true" name="Particle Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="particles" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="particles" />
+                                <on_click function="View.ToggleBeacon" userdata="particlesbeacon" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="particlesbeacon" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-94" enabled="true" height="8" hidden="false" label="-----------"
+                        <menu_item_separator bottom="-113" enabled="true" height="8" hidden="false" label="-----------"
                              left="0" mouse_opaque="true" name="separator" width="129" />
-                        <menu_item_check bottom="-113" enabled="true" height="19" hidden="false" label="Hide Particles"
+                        <menu_item_check bottom="-121" enabled="true" height="19" hidden="false" label="Render Highlights"
+                             left="0" mouse_opaque="true" name="Render Highlights" width="129">
+                                <on_click function="View.ToggleBeacon" userdata="renderhighlights" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="renderhighlights" />
+                        </menu_item_check>
+                        <menu_item_check bottom="-140" enabled="true" height="19" hidden="false" label="Render Beacons"
+                             left="0" mouse_opaque="true" name="Render Beacons" width="129">
+                                <on_click function="View.ToggleBeacon" userdata="renderbeacons" />
+                                <on_check function="View.CheckBeaconEnabled" userdata="renderbeacons" />
+                        </menu_item_check>
+                        <menu_item_separator bottom="-159" enabled="true" height="8" hidden="false" label="-----------"
+                             left="0" mouse_opaque="true" name="separator" width="129" />
+                        <menu_item_check bottom="-167" enabled="true" height="19" hidden="false" label="Hide Particles"
                              left="0" mouse_opaque="true" name="Hide Particles" width="129">
-                                <on_click function="View.ToggleRenderType" userdata="particles" />
-                                <on_check function="View.CheckRenderType" userdata="particles" />
+                                <on_click function="View.ToggleRenderType" userdata="hideparticles" />
+                                <on_check function="View.CheckRenderType" userdata="hideparticles" />
                         </menu_item_check>
                 </menu>
                 <menu_item_check bottom="-441" enabled="true" height="19" hidden="false"
@@ -806,6 +828,12 @@
                         <on_click function="PromptShowURL"
                              userdata="WebLaunchSecurityIssues,https://wiki.secondlife.com/wiki/Security_issues" />
                         </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="QA Wiki..." left="0" mouse_opaque="true"
+                     name="QA Wiki..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchQAWiki,https://wiki.secondlife.com/wiki/QA_Portal" />
+                        </menu_item_call>
                         <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
                         left="0" mouse_opaque="true" name="separator7" width="250" />
                         <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 8e51bcb..b21325e 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -360,25 +360,30 @@ Non-transferable objects that are deeded to the group have been deleted.
                         The objects on the selected parcel that are NOT owned by you have been returned to their owners.
                 </message>
         </notify>
-        <notify name="NotSafe" tip="false">
+        <notify name="NotSafe" tip="false" unique="true">
                 <message name="message">
                         This land has damage enabled (&apos;not safe&apos;).
 You can be hurt here. If you die, you will be teleported to your home location.
                 </message>
         </notify>
-        <notify name="NoFly" tip="false">
+        <notify name="NoFly" tip="false" unique="true">
                 <message name="message">
                         This land has flying disabled (&apos;no fly&apos;).
 You cannot fly here.
                 </message>
         </notify>
-        <notify name="PushRestricted" tip="false">
+        <notify name="PushRestricted" tip="false" unique="true">
                 <message name="message">
                         This land is &apos;llPushObject Restricted&apos;.
 You cannot push others here unless you own the land.
                 </message>
         </notify>
-        <notify name="NoBuild" tip="false">
+        <notify name="VoiceAvailablity" tip="false" unique="true">
+                <message name="message">
+                        This land has voice enabled.
+                </message>
+        </notify>
+        <notify name="NoBuild" tip="false" unique="true">
                 <message name="message">
                         This land has building disabled (&apos;no build&apos;).
 You cannot create objects here.
@@ -868,4 +873,84 @@ You can find example sculpted textures in the system library.
 from this list.
                 </message>
         </notify>
+        <notify name="VoiceInviteP2P" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a Voice Chat call. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="VoiceInviteGroup" tip="false" unique="true">
+                <message name="message">
+                        [NAME] has joined a Voice Chat call with the group [GROUP]. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="VoiceInviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a Voice Chat conference call. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="VoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
+                </message>
+        </notify>
+        <notify name="ProximalVoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        We're sorry.  This area has has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnected" tip="true" unique="true">
+                <message name="message">
+                        You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnectedP2P" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="P2PCallDeclined" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="P2PCallNoAnswer" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="VoiceLoginRetry" tip="true" unique="true" duration="10">
+                <message name="message">
+                        We are creating a voice channel for you. This may take up to one minute.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
new file mode 100644
index 0000000..203f70e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel border="true" enabled="true" follows="left|top|right|bottom"
+     height="180" hidden="false" label="Audio &amp; Video"
+     mouse_opaque="true" name="Media panel" width="160">
+        <check_box bottom="-25" control_name="MuteAudio" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             label="Mute" left="10" mouse_opaque="true" name="disable audio"
+             radio_style="false" width="134" />
+
+        <slider bottom_delta="-20" control_name="AudioLevelMaster" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="System Volume" width="120"
+             label="Master" show_text="false" label_width="50" volume="true" />
+        <slider bottom_delta="-20" control_name="AudioLevelMusic" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="Music Volume" width="120"
+             label="Music" show_text="false" label_width="50" volume="true" />
+        <slider bottom_delta="-20" control_name="AudioLevelMedia" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="Media Volume" width="120"
+             label="Media" show_text="false" label_width="50" volume="true" />
+        <slider bottom_delta="-20" control_name="AudioLevelVoice" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="Voice Volume" width="120"
+             label="Voice" show_text="false" label_width="50" volume="true" />
+
+        <slider bottom_delta="-20" control_name="AudioLevelSFX" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="SFX Volume" width="120"
+             label="Sounds" show_text="false" label_width="50" volume="true" />
+        <slider bottom_delta="-20" control_name="AudioLevelAmbient" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="Wind Volume" width="120"
+             label="Ambient" show_text="false" label_width="50" volume="true" />
+        <slider bottom_delta="-20" control_name="AudioLevelUI" enabled="true" follows="left|top"
+             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
+             max_val="1" min_val="0" mouse_opaque="true" name="UI Volume" width="120"
+             label="UI" show_text="false" label_width="50" volume="true" />
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
new file mode 100644
index 0000000..e895085
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
@@ -0,0 +1,77 @@
+        <panel 

+                border="false" 

+                enabled="true" 

+                hidden="false" 

+                left="8" 

+                bottom="0"

+                mouse_opaque="true" 

+                name="device_settings" 

+                width="404"

+                height="240">

+

+                <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                         drop_shadow_visible="true" enabled="true" follows="left|top"

+                         font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+                         left="6" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">

+                        Audio Devices

+                </text>

+

+                <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                         bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"

+                         font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+                         left="20" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">

+                        Input device (microphone):

+                </text>

+                <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"

+                         height="18" hidden="false" left_delta="0" max_chars="128" mouse_opaque="true"

+                         name="voice_input_device" width="225" />

+

+                <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                         bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"

+                         font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+                         left_delta="0" mouse_opaque="true" name="Output device (speakers):" v_pad="0" width="200">

+                        Output device (speakers):

+                </text>

+                <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top"

+                         height="18" hidden="false" left_delta="0" max_chars="128" mouse_opaque="true"

+                         name="voice_output_device" width="225" />

+

+                <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                         bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"

+                         font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+                         left="6" mouse_opaque="true" name="Input device (microphone):" v_pad="0" width="200">

+                        Input Level

+                </text>

+

+                <text_editor 

+                        name="voice_intro_text1" 

+                        type="string" 

+                        enabled="false" 

+                        bg_readonly_color="0 0 0 0" 

+                        font="SansSerifSmall" 

+                        left_delta="10" 

+                        width="380" 

+                        height="60" 

+                        length="1" 

+                        max_length="65535"

+                        hidden="false" 

+                        hide_border="true"

+                        hide_scrollbar="true" 

+                        embedded_items="false" 

+                        allow_html="false" 

+                        mouse_opaque="true" 

+                        tab_stop="false"

+                        word_wrap="true">Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.</text_editor>

+

+        <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17" hidden="false"

+             increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0"

+             mouse_opaque="true" name="mic_volume_slider" width="60"

+             tool_tip="Change the volume using this slider" />

+

+        <text name="wait_text" left_delta="70" bottom_delta="-4" width="200" height="20" follows="left|top">

+                Please wait

+        </text>

+        <!--<icon name="voice_volume" left_delta="70" bottom_delta="1" width="16" height="16" image_name="icn_voice_ptt-off.tga"  follows="left|top"/>-->

+

+

+        </panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
new file mode 100644
index 0000000..eb14d4b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -0,0 +1,62 @@
+<panel name="friends" border="true">

+        <scroll_list bottom="90" can_resize="true" column_padding="0" draw_heading="true"

+             follows="left|top|bottom|right" left="10" multi_select="true"

+             name="friend_list" right="-100" search_column="1"

+             tool_tip="Hold shift or control while clicking to select multiple friends"

+             top="-10">

+                <column image="ff_online_status_button.tga" name="icon_online_status" width="20" />

+                <column dynamicwidth="true" label="Name" name="friend_name" />

+                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" />

+                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" />

+                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" />

+                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" />

+        </scroll_list>

+        <panel background_opaque="true" background_visible="true" bevel_style="in"

+             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true" bottom="10"

+             can_resize="false" follows="left|right|bottom" height="70" left="10"

+             mouse_opaque="true" name="rights_container" right="-100">

+                <text bottom_delta="-11" follows="top|left" font="SansSerifSmall" left="10"

+                     name="friend_name_label" width="200">

+                        Select friend(s) to change rights...

+                </text>

+                <check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"

+                     height="16" hidden="false" initial_value="false"

+                     label="Can see my online status" left="10" mouse_opaque="true"

+                     name="online_status_cb" radio_style="false"

+                     tool_tip="Set whether this friend see my online status in their friends list or calling cards"

+                     width="200" />

+                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"

+                     height="16" hidden="false" initial_value="false"

+                     label="Can see me on the map" left="25" mouse_opaque="true"

+                     name="map_status_cb" radio_style="false"

+                     tool_tip="Set whether this friend see my location on their map" width="200" />

+                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"

+                     height="16" hidden="false" initial_value="false"

+                     label="Can modify my objects" left="10" mouse_opaque="true"

+                     name="modify_status_cb" radio_style="false"

+                     tool_tip="Set whether this friend can modify my objects" width="200" />

+                <text bottom_delta="25" follows="top|left" font="SansSerif" left="10"

+                     name="process_rights_label">

+                        Processing rights change...

+                </text>

+        </panel>

+        <pad bottom="-7" height="0" left="-90" width="1" />

+        <button bottom_delta="-25" follows="top|right" height="22"

+             label="IM/Call" left_delta="0" name="im_btn"

+             tool_tip="Open Instant Message session" width="80" />

+        <button bottom_delta="-25" follows="top|right" height="22"

+             label="Profile" left_delta="0" name="profile_btn"

+             tool_tip="Show picture, groups, and other information" width="80" />

+        <button bottom_delta="-25" follows="top|right" height="22"

+             label="Teleport..." left_delta="0" name="offer_teleport_btn"

+             tool_tip="Offer this friend a teleport to your current location" width="80" />

+        <button bottom_delta="-25" follows="top|right" height="22"

+             label="Pay..." left_delta="0" name="pay_btn"

+             tool_tip="Give Linden dollars (L$) to this friend" width="80" />

+        <button bottom_delta="-25" follows="top|right" height="22"

+             label="Remove..." left_delta="0" name="remove_btn"

+             tool_tip="Remove this person from your friends list" width="80" />

+        <button bottom_delta="-35" follows="top|right" height="22"

+             label="Add..." left_delta="0" name="add_btn"

+             tool_tip="Offer friendship to a resident" width="80" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
index 3f6acf8..202d505 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
@@ -153,6 +153,7 @@ including the Everyone and Owner Roles.
                              fg_disable_color="grey" fg_selected_color="black"
                              fg_unselected_color="black" follows="left|top" height="134" left="6"
                              mouse_opaque="true" multi_select="true" name="action_list"
+                             search_column="1"
                              tool_tip="Select an Ability to view more details." width="392">
                                 <column label="" name="icon" width="18" />
                                 <column label="" name="action" width="356" />
@@ -248,6 +249,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                 <scroll_list bottom_delta="0" draw_border="true" draw_heading="false" height="125"
                      left="150" multi_select="false" name="role_allowed_actions"
                      tool_tip="For Details of each Allowed Ability see the Abilities tab."
+                     search_column="2"
                      width="254">
                         <column label="" name="icon" width="2" />
                         <column label="" name="checkbox" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
new file mode 100644
index 0000000..9dd0461
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
@@ -0,0 +1,43 @@
+<panel bottom="-371" height="300" hidden="false" left="280"

+     mouse_opaque="true" name="groups" width="350" border="true">

+        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"

+             draw_heading="false" draw_stripes="true" enabled="true"

+             follows="left|top|right|bottom" hidden="false" left="10"

+             mouse_opaque="true" multi_select="false" name="group list" tab_stop="true"

+             top="-10" width="240">

+                <column label="" name="name" width="248" />

+        </scroll_list>

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+             left="12" mouse_opaque="false" name="groupdesc" v_pad="0"

+             width="248">

+                Your currently active group is displayed in bold.

+        </text>

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"

+             left="12" mouse_opaque="false" name="groupcount" v_pad="0"

+             width="248">

+                You belong to [COUNT] groups (of [MAX] maximum).

+        </text>

+        <pad bottom="-7" height="0" left="-90" width="1" />

+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

+             label="IM/Call" left_delta="0" name="IM"

+             tool_tip="Open Instant Message session" width="80" />

+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+             font="SansSerif" height="22" hidden="false" label="Info" name="Info"

+             width="80" />

+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+             font="SansSerif" height="22" hidden="false" label="Activate"

+             name="Activate" width="80" />

+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+             font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"

+             width="80" />

+        <button border_height="16" border_width="16" bottom_delta="-35" follows="top|right"

+             font="SansSerif" height="22" hidden="false" label="Create..." name="Create"

+             width="80" />

+        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+             font="SansSerif" height="22" hidden="false" label="Search..."

+             name="Search..." width="80" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
new file mode 100644
index 0000000..ac1a46f
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
@@ -0,0 +1,13 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
+     enabled="true" follows="left|top" hidden="false"
+     mouse_opaque="true" name="music_remote">
+<!--    <button bottom="-22" height="22" label="Volume" left="2" name="volume" -->
+<!--         tool_tip="Master Volume Control, click for volume settings" width="55" /> -->
+        <button bottom="-22" height="22" label="" image_overlay="volume_icon.tga" left="2" name="volume"
+             tool_tip="Master Volume Control, click for volume settings" width="28" />
+        <volume_slider control_name="AudioLevelMaster"
+             bottom="-20" enabled="true" follows="left|top" height="17" hidden="false"
+             increment="0.05" initial_val="0.5" left_delta="25" max_val="1" min_val="0"
+             mouse_opaque="true" name="volume_slider" width="40"
+             tool_tip="Change the volume using this slider" />
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
index 71e74b6..f14ec61 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
@@ -1,26 +1,23 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" height="20" hidden="false" left="571"
-     mouse_opaque="true" name="music_remote" width="110">
-        <text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="2" mouse_opaque="true" name="text" v_pad="0" width="77">
-                Movies
-        </text>
-        <volume_slider bottom="-20" enabled="true" follows="left|top" height="17" hidden="false"
-             increment="0.05" initial_val="0.125" left="33" max_val="1" min_val="0"
-             mouse_opaque="true" name="volume_slider"
-             tool_tip="Change the volume using this slider" width="42" />
+     enabled="true" follows="left|top" hidden="false" left="571"
+     mouse_opaque="true" name="music_remote" >
+<!--    <text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" -->
+<!--         bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top" -->
+<!--         font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" -->
+<!--         left="2" mouse_opaque="true" name="text" v_pad="0" width="77"> -->
+<!--            Movies -->
+<!--    </text> -->
+        <icon name="media_icon" left="5" bottom="-19" width="16" height="16" image_name="media_icon.tga"/>
         <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
              halign="center" height="17" hidden="false"
              image_selected="button_anim_stop_selected.tga"
              image_unselected="button_anim_stop.tga" label="" label_selected=""
-             left="76" mouse_opaque="true" name="stop_btn" scale_image="true"
+             left_delta="25" mouse_opaque="true" name="media_stop" scale_image="true"
              tool_tip="Stop media" width="17" />
         <button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
              height="17" hidden="false" image_selected="button_anim_play_selected.tga"
              image_unselected="button_anim_play.tga" label="" label_selected=""
-             left="92" mouse_opaque="true" name="play_btn" scale_image="true"
+             left_delta="15" mouse_opaque="true" name="media_play" scale_image="true"
              tool_tip="Play media stream" width="17" />
         <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
              halign="center" height="17" hidden="false"
@@ -28,6 +25,6 @@
              image_disabled_selected="button_disabled_32x128.tga"
              image_selected="button_anim_pause_selected.tga"
              image_unselected="button_anim_pause.tga" label="" label_selected=""
-             left="92" mouse_opaque="true" name="pause_btn" scale_image="true"
+             left_delta="0" mouse_opaque="true" name="media_pause" scale_image="true"
              tool_tip="Pause media stream" width="17" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
index e0c9bb1..a99333e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
@@ -1,26 +1,23 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" height="20" hidden="false" left="571"
-     mouse_opaque="true" name="music_remote" width="110">
-        <text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="2" mouse_opaque="true" name="text" v_pad="0" width="77">
-                Music
-        </text>
-        <volume_slider bottom="-20" enabled="true" follows="left|top" height="17" hidden="false"
-             increment="0.05" initial_val="0.125" left="33" max_val="1" min_val="0"
-             mouse_opaque="true" name="volume_slider"
-             tool_tip="Change the volume using this slider" width="42" />
+     enabled="true" follows="left|top" hidden="false"
+     mouse_opaque="true" name="music_remote">
+<!--    <text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" -->
+<!--         bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top" -->
+<!--         font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" -->
+<!--         left="2" mouse_opaque="true" name="text" v_pad="0" width="77"> -->
+<!--            Music -->
+<!--    </text> -->
+        <icon name="music_icon" left="5" bottom="-19" width="16" height="16" image_name="music_icon.tga"/>
         <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
              halign="center" height="17" hidden="false"
              image_selected="button_anim_stop_selected.tga"
              image_unselected="button_anim_stop.tga" label="" label_selected=""
-             left="76" mouse_opaque="true" name="stop_btn" scale_image="true"
+             left_delta="25" mouse_opaque="true" name="music_stop" scale_image="true"
              tool_tip="Stop media" width="17" />
         <button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
              height="17" hidden="false" image_selected="button_anim_play_selected.tga"
              image_unselected="button_anim_play.tga" label="" label_selected=""
-             left="92" mouse_opaque="true" name="play_btn" scale_image="true"
+             left_delta="17" mouse_opaque="true" name="music_play" scale_image="true"
              tool_tip="Play media stream" width="17" />
         <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
              halign="center" height="17" hidden="false"
@@ -28,6 +25,6 @@
              image_disabled_selected="button_disabled_32x128.tga"
              image_selected="button_anim_pause_selected.tga"
              image_unselected="button_anim_pause.tga" label="" label_selected=""
-             left="92" mouse_opaque="true" name="pause_btn" scale_image="true"
+             left_delta="0" mouse_opaque="true" name="music_pause" scale_image="true"
              tool_tip="Pause media stream" width="17" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
index d24cb43..acb453b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="51" enabled="true" follows="left|right|bottom" height="42"
-     hidden="false" left="-1" mouse_opaque="false" name="overlay" width="1682">
+     hidden="false" left="-1" mouse_opaque="false" name="overlay" width="800">
         <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
              height="20" hidden="false" label="IM Received" label_selected="IM Received"
              left="0" mouse_opaque="true" name="IM Received" scale_image="true"
@@ -28,9 +28,16 @@
              left="457" mouse_opaque="true" name="Stand Up" scale_image="true"
              tool_tip="Click here to stand up." width="102" />
         <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="left|top" height="20" hidden="false" left="571"
-             mouse_opaque="true" name="music_remote" width="110" />
+             follows="right|top" height="20" hidden="false" left="400"
+             mouse_opaque="true" name="media_remote" width="75" />
         <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="left|top" height="20" hidden="false" left="700"
-             mouse_opaque="true" name="media_remote" width="110" />
+             follows="right|top" height="20" hidden="false" left="500"
+             mouse_opaque="true" name="music_remote" width="75" />
+        <panel background_visible="false" border="false" bottom="-41" enabled="true"
+             follows="right|top" height="20" hidden="false" left="600"
+             mouse_opaque="true" name="voice_remote" width="108" />
+        <panel background_visible="false" border="false" bottom="-41" enabled="true"
+             follows="right|top" height="20" hidden="false" left="700"
+             mouse_opaque="true" name="master_volume" width="75" />
+
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
index db387f1..cb65ba9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
@@ -6,125 +6,82 @@
              bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="muting_text" v_pad="0" width="128">
-                Muting:
+                Volume:
+        </text>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             left="10" mouse_opaque="true" name="doppler_effect_text" v_pad="0"
+             width="128">
+                Streaming Preferences:
         </text>
-        <check_box bottom="-26" control_name="MuteAudio" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Mute Audio" left="142" mouse_opaque="true" name="disable audio"
-             radio_style="false" width="134" />
-        <check_box bottom="-46" control_name="MuteWhenMinimized" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-             label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
-             name="mute_when_minimized" radio_style="false" width="215" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="streaming_text" v_pad="0" width="128">
-                Streaming:
+             left="10" mouse_opaque="true" name="doppler_effect_text" v_pad="0"
+             width="128">
+                Audio Preferences:
+        </text>
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-385" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             left="10" mouse_opaque="true" name="default_upload_bitrate_text" v_pad="0"
+             width="150">
+                Default Upload Bitrate:
         </text>
-        <check_box bottom="-66" control_name="AudioStreamingMusic" enabled="true"
+
+        <panel border="true" bottom="-195" enabled="true" follows="left|top|right|bottom"
+               hidden="false" label="Volume" left="148" height="180" width="205"
+               mouse_opaque="true" name="Volume Panel"
+               filename="panel_audio.xml">
+        </panel>
+
+        <check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="true"
              label="Play Streaming Music When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
-        <check_box bottom="-86" control_name="AudioStreamingVideo" enabled="true"
+        <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="true"
              label="Play Streaming Video When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
              width="338" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-102" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="system_volume_text" v_pad="0"
-             width="128">
-                Sound Effects:
-        </text>
-        <slider_bar bottom="-102" control_name="AudioLevelMaster" enabled="true" follows="left|top"
-             height="12" hidden="false" increment="0.01" initial_val="1" left="148"
-             max_val="1" min_val="0" mouse_opaque="true" name="System Volume"
-             width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-126" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="wind_volume_text" v_pad="0" width="128">
-                Wind Volume:
-        </text>
-        <slider_bar bottom="-126" control_name="AudioLevelWind" enabled="true" follows="left|top"
-             height="12" hidden="false" increment="0.01" initial_val="0.5" left="148"
-             max_val="1" min_val="0" mouse_opaque="true" name="Wind Volume" width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-142" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="footsteps_volume_text" v_pad="0"
-             width="128">
-                Footsteps Volume:
-        </text>
-        <slider_bar bottom="-142" control_name="AudioLevelFootsteps" enabled="true"
-             follows="left|top" height="12" hidden="false" increment="0.01"
-             initial_val="0.5" left="148" max_val="1" min_val="0" mouse_opaque="true"
-             name="Footsteps Volume" width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-158" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="ui_volume_text" v_pad="0" width="128">
-                UI Volume:
-        </text>
-        <slider_bar bottom="-158" control_name="AudioLevelUI" enabled="true" follows="left|top"
-             height="12" hidden="false" increment="0.01" initial_val="0.5" left="148"
-             max_val="1" min_val="0" mouse_opaque="true" name="UI Volume" width="128" />
-        <spinner bottom="-178" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+
+
+        <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+             label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
+             name="mute_when_minimized" radio_style="false" width="215" />
+        <slider bottom_delta="-20" control_name="AudioLevelDoppler" enabled="true"
+             follows="left|top" height="15" hidden="false" increment="0.1"
+             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
+             name="Doppler Effect" width="250"
+             label="Doppler Effect" show_text="true" edit_text="true" label_width="100"  />
+        <slider bottom_delta="-20" control_name="AudioLevelDistance" enabled="true"
+             follows="left|top" height="15" hidden="false" increment="0.1"
+             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
+             name="Distance Factor" width="250"
+             label="Distance Factor" show_text="true" edit_text="true" label_width="100"  />
+        <slider bottom_delta="-20" control_name="AudioLevelRolloff" enabled="true"
+             follows="left|top" height="15" hidden="false" increment="0.1"
+             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
+             name="Rolloff Factor" width="250"
+             label="Rolloff Factor" show_text="true" edit_text="true" label_width="100"  />
+
+        <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
              enabled="true" follows="left|top" height="16" hidden="false" increment="10"
-             initial_val="10" label="L$ Change Threshold" label_width="128" left="20"
+             initial_val="10" label="L$ Change Threshold" label_width="128" left="148"
              max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
              width="192" />
-        <spinner bottom="-194" control_name="UISndHealthReductionThreshold" decimal_digits="0"
+        <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0"
              enabled="true" follows="left|top" height="16" hidden="false" increment="10"
              initial_val="20" label="Health Change Threshold" label_width="128"
-             left="20" max_val="10000" min_val="0" mouse_opaque="true"
+             left="148" max_val="10000" min_val="0" mouse_opaque="true"
              name="Health Change Threshold" width="192" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-214" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="doppler_effect_text" v_pad="0"
-             width="128">
-                Doppler Effect:
-        </text>
-        <slider_bar bottom="-214" control_name="AudioLevelDoppler" enabled="true"
-             follows="left|top" height="12" hidden="false" increment="0.01"
-             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-             name="Doppler Effect" width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-230" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="distance_factor_text" v_pad="0"
-             width="128">
-                Distance Factor:
-        </text>
-        <slider_bar bottom="-230" control_name="AudioLevelDistance" enabled="true"
-             follows="left|top" height="12" hidden="false" increment="0.01"
-             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-             name="Distance Factor" width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-246" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="rolloff_factor_text" v_pad="0"
-             width="128">
-                Rolloff Factor:
-        </text>
-        <slider_bar bottom="-246" control_name="AudioLevelRolloff" enabled="true"
-             follows="left|top" height="12" hidden="false" increment="0.01"
-             initial_val="1" left="148" max_val="2" min_val="0" mouse_opaque="true"
-             name="Rolloff Factor" width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-266" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="default_upload_bitrate_text" v_pad="0"
-             width="128">
-                Default Upload Bitrate:
-        </text>
-        <radio_group bottom="-272" control_name="AudioDefaultBitrate" draw_border="true"
+
+        <radio_group bottom_delta="-25" control_name="AudioDefaultBitrate" draw_border="true"
              enabled="true" follows="left|top" height="18" hidden="false" left="148"
              mouse_opaque="true" name="bitrate" width="320">
                 <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 20ccfe9..d24a8e9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Chat" left="102" mouse_opaque="true"
+     height="408" hidden="false" label="Text Chat" left="102" mouse_opaque="true"
      name="chat" width="517">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
index fd48f34..83cc3bc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
@@ -106,7 +106,7 @@
         </text>
         <spinner bottom="-264" control_name="DebugBeaconLineWidth" decimal_digits="0"
              enabled="true" follows="left|top" height="16" hidden="false"
-             increment="1" initial_val="1" label="Debug Beacon Line Width:"
+             increment="1" initial_val="8" label="Debug Beacon Line Width:"
              label_width="138" left="10" max_val="127" min_val="1" mouse_opaque="true"
              name="debug beacon line width" width="202" />
         <check_box bottom="-304" control_name="ProbeHardwareOnStartup" enabled="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
new file mode 100644
index 0000000..137616c
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -0,0 +1,89 @@
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" hidden="false" label="Voice Chat" left="102"
+     mouse_opaque="true" name="chat" width="517">
+        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="20" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="8" max_length="65535"
+             mouse_opaque="true" name="voice_unavailable" width="450" tab_stop="false"
+             word_wrap="true">
+                Voice Chat Is Not Available
+        </text_editor>
+        <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Enable voice chat" left="8"
+             mouse_opaque="true" name="enable_voice_check" radio_style="false"
+             width="200" />
+        <radio_group bottom_delta="-40" draw_border="false"

+             follows="left|top" height="40" left_delta="20" name="ear_location" width="364">

+                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">

+                        Hear Voice Chat from camera position.

+                </radio_item>

+                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">

+                        Hear Voice Chat from avatar position.

+                </radio_item>

+        </radio_group>

+
+        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+             embedded_items="false" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
+             name="push_to_talk_heading" width="445" word_wrap="true">
+                Push To Talk
+        </text>
+        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="65" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="20" max_length="65535"
+             mouse_opaque="true" name="voice_chat_description" width="450" tab_stop="false"
+             word_wrap="true">Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.</text_editor>
+        <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Start Viewer in Push-to-Talk mode" left_delta="0"
+             mouse_opaque="true" name="push_to_talk_check" radio_style="false"
+             width="200" />
+        <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Use Push-to-Talk in toggle mode" left_delta="0"
+             mouse_opaque="true" name="push_to_talk_toggle_check" radio_style="false"
+             width="200" />
+        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+             embedded_items="false" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="4" max_length="65535" mouse_opaque="true"
+             name="push_to_talk_label" width="445" word_wrap="true">
+                Push-to-Talk trigger:
+        </text>
+
+        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
+             drop_shadow_visible="true" enabled="false" follows="top|left"
+             font="SansSerifSmall" halign="right" height="19" left_delta="0"
+             max_length="254" mouse_opaque="false" name="modifier_combo" control_name="PushToTalkButton" width="255" />
+
+        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+             height="20" label="Set Key" left_delta="0"
+             mouse_opaque="true" name="set_voice_hotkey_button" width="90" />
+        <button bottom_delta="0" follows="left" font="SansSerif" halign="center"
+             height="20" label="Middle Mouse Button" left_delta="95"
+             mouse_opaque="true" name="set_voice_middlemouse_button" width="160" />
+
+        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
+             embedded_items="false" enabled="true" follows="left|top"
+             height="16" hidden="false"
+             left_delta="-120" 
+             name="privacy_heading" width="445">
+                Privacy Options
+        </text>
+        <check_box bottom_delta="-20" enabled="true" control_name="VoiceCallsFriendsOnly"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Only accept voice calls from people on My Friends list" left_delta="20"
+             mouse_opaque="true" name="voice_call_friends_only_check" radio_style="false"
+             width="200" />
+
+        <button bottom_delta="-30" follows="left|top" font="SansSerif"
+             height="20" label="Device Settings..." left_delta="-20"
+             mouse_opaque="true" name="device_settings_btn" width="120" />
+        <button bottom_delta="-30" follows="left|top" font="SansSerif"
+             height="20" label="Run Voice Setup Wizard..." left_delta="0"
+             mouse_opaque="true" name="launch_voice_wizard_button" width="170" />
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index b15b0bf..176164c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -51,6 +51,11 @@
              left="15" name="externally_visible_check" width="200" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="185" name="externally_visible_help" width="18" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Voice Chat"
+             left="15" name="voice_chat_check" width="200" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="185" name="voice_chat_help" width="18" />
+
 <!--
 <check_box name="mainland_visible_check"
                 label="Mainland Visible From Here"
@@ -70,7 +75,7 @@
                 font="SansSerifSmall"
         />
 -->
-        <check_box bottom_delta="-40" follows="left|top" height="20" label="Allow Direct Teleport"
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport"
              left="15" name="allow_direct_teleport" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="185" name="allow_direct_teleport_help" width="18" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index b584151..51338f1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -94,13 +94,19 @@
              image_unselected="status_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
              tool_tip="Restrict llPushObject" width="24" />
+        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
+             halign="center" height="24" hidden="false" image_disabled="status_voice.tga"
+             image_disabled_selected="status_voice.tga" image_selected="status_voice.tga"
+             image_unselected="status_voice.tga" label="" label_selected="" left="545"
+             mouse_opaque="true" name="status_voice" scale_image="false"
+             tool_tip="Voice Enabled" width="24" />
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" hidden="false"
              image_disabled="status_buy_land.tga"
              image_disabled_selected="status_buy_land_pressed.tga"
              image_selected="status_buy_land_pressed.tga"
              image_unselected="status_buy_land.tga" label="" label_selected=""
-             left="545" mouse_opaque="true" name="buyland" scale_image="true"
+             left="569" mouse_opaque="true" name="buyland" scale_image="true"
              tool_tip="Buy this parcel" width="16" />
         <text hidden="true" name="packet_loss_tooltip">
                 Packet Loss
diff --git a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
index 655d869..2a2affe 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -2,13 +2,10 @@
 <panel background_opaque="true" background_visible="true" can_close="true"
      can_minimize="false" can_resize="false" follows="left|right|bottom"
      height="26" name="panel_toolbar" width="1024">
-        <button bottom="0" font="SansSerif" height="24" label="IM" left="0" name="im_btn"
-             tool_tip="Instant Message your friends." width="50" />
+        <button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn"
+             tool_tip="Communicate with your Friends and Groups." width="50" />
         <button bottom="0" font="SansSerif" height="24" label="Chat" left="0" name="chat_btn"
              tool_tip="Talk to people nearby. (Enter)" width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Friends" left="0"
-             name="friends_btn" tool_tip="Find and communicate with your buddies."
-             width="50" />
         <button bottom="0" font="SansSerif" height="24" label="Fly"
              label_selected="Stop Flying" left="0" name="fly_btn"
              tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
new file mode 100644
index 0000000..3a25ccc
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
@@ -0,0 +1,98 @@
+        <panel 

+                border="false" 

+                enabled="true" 

+                left="8" 

+                bottom="4"

+                mouse_opaque="true" 

+                name="content_panel" 

+                width="404"

+                height="240">

+

+                <text_editor 

+                        name="voice_intro_text1" 

+                        type="string" 

+                        enabled="false" 

+                        bg_readonly_color="0 0 0 0" 

+                        font="SansSerifSmall" 

+                        left_delta="0" 

+                        width="400" 

+                        height="65" 

+                        length="1" 

+                        max_length="65535"

+                        hide_border="true"

+                        hide_scrollbar="true" 

+                        embedded_items="false" 

+                        allow_html="false" 

+                        mouse_opaque="true" 

+                        tab_stop="false"

+                        word_wrap="true">Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Note that Voice Chat requires a stereo headset with a microphone; click the Help button for more information. </text_editor>

+

+                <text_editor 

+                        name="voice_intro_text2" 

+                        type="string" 

+                        enabled="false" 

+                        bg_readonly_color="0 0 0 0" 

+                        font="SansSerifSmall" 

+                        left_delta="0" 

+                        width="400" 

+                        height="30" 

+                        length="1" 

+                        max_length="65535"

+                        hide_border="true"

+                        hide_scrollbar="true" 

+                        embedded_items="false" 

+                        allow_html="false" 

+                        mouse_opaque="true" 

+                        tab_stop="false"

+                        word_wrap="true">Do you want to enable Voice Chat now?</text_editor>

+

+                <radio_group draw_border="false" enabled="true"

+                        follows="left|top" height="40" left="10"

+                        mouse_opaque="true" name="voice_enable" width="364">

+                        <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" 

+                                left="3" name="1" width="315">

+                                Yes, enable Voice Chat.

+                        </radio_item>

+                        <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" 

+                                left="3" name="0" width="315">

+                                No, do not enable Voice Chat at this time.

+                        </radio_item>

+                </radio_group>

+

+                <text_editor 

+                        name="voice_intro_text3" 

+                        enabled="false" 

+                        bottom_delta="-50"

+                        bg_readonly_color="0 0 0 0" 

+                        font="SansSerifSmall" 

+                        left="0" 

+                        width="400" 

+                        height="40" 

+                        length="1" 

+                        max_length="65535"

+                        hide_border="true"

+                        hide_scrollbar="true" 

+                        embedded_items="false" 

+                        allow_html="false" 

+                        tab_stop="false"

+                        word_wrap="true">You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.</text_editor>

+

+                <text_editor 

+                        name="voice_intro_text4" 

+                        enabled="false" 

+                        bg_readonly_color="0 0 0 0" 

+                        bottom_delta="0"

+                        font="SansSerifSmall" 

+                        left="0" 

+                        width="400" 

+                        height="40" 

+                        length="1" 

+                        max_length="65535"

+                        hide_border="true"

+                        hide_scrollbar="true" 

+                        embedded_items="false" 

+                        allow_html="false" 

+                        tab_stop="false"

+                        word_wrap="true">Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.</text_editor>

+

+        </panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
new file mode 100644
index 0000000..040782b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
@@ -0,0 +1,46 @@
+<panel border="false" bottom="36" height="240" left="8" name="content_panel"

+     width="404">

+        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"

+             enabled="false" font="SansSerifSmall" height="30" hide_border="true"

+             hide_scrollbar="true" left_delta="0" max_length="65535"

+             name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">

+                Use the options below to configure your Voice Chat experience.

+        </text_editor>

+        <radio_group bottom_delta="-40" draw_border="false"

+             follows="left|top" height="40" left="10" name="ear_location" width="364">

+                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">

+                        Hear Voice Chat from camera position.

+                </radio_item>

+                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">

+                        Hear Voice Chat from avatar position.

+                </radio_item>

+        </radio_group>

+        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Only allow Friends to initiate Voice Calls with me" left="20"

+             left_delta="2" name="push_to_talk_check" width="200" />

+        <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Start Viewer in Push-to-Talk mode" left_delta="0"

+             name="push_to_talk_check" width="200" />

+        <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Use Push-to-Talk in toggle mode" left_delta="0"

+             name="push_to_talk_toggle_check" width="200" />

+        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"

+             embedded_items="false" follows="left|top" font="SansSerifSmall" height="16"

+             hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535"

+             name="push_to_talk_label" width="445" word_wrap="true">

+                Push-to-Talk trigger:

+        </text>

+        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"

+             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"

+             follows="top|left" font="SansSerifSmall" halign="right" height="19"

+             left_delta="0" max_length="254" name="modifier_combo" width="255" />

+        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"

+             height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"

+             width="90" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="20" label="Middle Mouse Button" left_delta="95"

+             name="set_voice_middlemouse_button" width="160" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
new file mode 100644
index 0000000..28cead3
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
@@ -0,0 +1,12 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="-34"

+     enabled="true" follows="left|top" hidden="false"

+     mouse_opaque="true" name="music_remote" >

+        <button bottom="-22" height="22" label="" image_overlay="active_speakers.tga" left="2" name="speakers_btn"

+             tool_tip="Show list of residents using voice chat around you" width="38" />

+        <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk"

+             tab_stop="false" tool_tip="Hold the button to talk" width="64" />

+        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"

+             image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"

+             scale_image="true" tool_tip="Click lock to switch to talk mode" width="16" />

+        <icon name="voice_volume" left_delta="40" bottom="-19" width="16" height="16" image_name="icn_voice_ptt-off.tga"/>

+</panel>

diff --git a/linden/indra/newview/skins/xui/es/role_actions.xml b/linden/indra/newview/skins/xui/es/role_actions.xml
index 0632b23..1e10ccf 100644
--- a/linden/indra/newview/skins/xui/es/role_actions.xml
+++ b/linden/indra/newview/skins/xui/es/role_actions.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<role_actions>

-        <action_set

-             description="Estas habilidades incluyen poderes de adicionar o remover miembros del grupo y permitir que nuevos miembros se junten sin una invitación."

-             name="Membership">

-                <action description="Invitar personas para este grupo"

-                     longdescription="Invite personas para este grupo usando el botón &apos;Invitar nueva persona...&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros."

-                     name="member invite" />

-                <action description="Expulsar a miembros de este grupo"

-                     longdescription="Expulse a miembros de este grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro puede a expulsarlo del grupo si, y solamente si, él apenas tiene la función de todos y no otras funciones. Para remover miembros de funciones, necesita tener la habilidad &apos;Remover miembros de funciones&apos;."

-                     name="member eject" />

-                <action

-                     description="Activar/desactivar &apos;Abrir registro&apos; y cambiar &apos;Tasa de suscripción&apos;"

-                     longdescription="Active/desactive &apos;Abrir registro&apos; para permitir que nuevos miembros se unan sin una invitación, y cambie &apos;Tasa de registro&apos; en la sección Preferencia de grupo de la pestaña General."

-                     name="member options" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes de adicionar, remover y cambiar funciones del grupo; adicionar y remover miembros en funciones y designar habilidades a funciones."

-             name="Roles">

-                <action description="Crear nuevas funciones"

-                     longdescription="Cree nuevas funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."

-                     name="role create" />

-                <action description="Borrar funciones"

-                     longdescription="Borra funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."

-                     name="role delete" />

-                <action description="Cambiar nombres de funciones, títulos y descripciones"

-                     longdescription="Cambie el nombre de funciones, títulos y descripciones en la parte inferior de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones después de seleccionar una función."

-                     name="role properties" />

-                <action description="Designar miembros para la función&apos;s del asignador"

-                     longdescription="Designe miembros para funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un miembro con este poder puede solamente adicionar miembros para la función que el asignador ya posee."

-                     name="role assign member limited" />

-                <action description="Designar miembros para cualquier función"

-                     longdescription="Designe miembros para cualquier función en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--para funciones que tienen más poderes que las actuales, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."

-                     name="role assign member" />

-                <action description="Remover miembros de las funciones"

-                     longdescription="Remueva miembros de funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Propietarios no pueden&apos; ser removidos."

-                     name="role remove member" />

-                <action description="Determinar y remover habilidades en función"

-                     longdescription="Designe y remueva habilidades en funciones en la sección habilidades permitidas de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--todas las habilidades, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."

-                     name="role change actions" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes para modificar esta identidad de grupo, como cambiar la visibilidad pública, presentación y insignia."

-             name="Group Identity">

-                <action

-                     description="Cambiar presentación, insignia, &apos;Publicar en la web&apos;, y cuales miembros están públicamente visibles en Informaciones del Grupo."

-                     longdescription="Cambie la presentación, insignia, &apos;Publicar en la web&apos; y cuales miembros están públicamente visibles en  Informaciones del grupo. Es hecho en la pestaña General."

-                     name="group change identity" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vaya para la ventana Sobre el terreno, haga clic con el botón derecho en el terreno y seleccione &apos;Sobre el terreno...&apos; o haga clic en la información de la parcela en la barra del menú."

-             name="Parcel Management">

-                <action description="Transferir  y comprar terreno para el grupo"

-                     longdescription="Transfiere y compre terreno para el grupo. Es hecho en Sobre el terreno &gt; pestaña General."

-                     name="land deed" />

-                <action description="Abandonar al terreno para Gobernador Linden"

-                     longdescription="Abandone al terreno para Gobernador Linden. *AVISO* Cualquier miembro en una función con esta habilidad puede  abandonar al terreno perteneciente al grupo en Sobre el terreno &gt; pestaña General, revirtiendo a la posesión Linden sin una venta! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."

-                     name="land release" />

-                <action description="Definir terreno para información de venta"

-                     longdescription="Defina informaciones de venta para terreno. *AVISO* Cualquier miembro en una función con esta habilidad puede vender terrenos pertenecientes al grupo en Sobre el terreno &gt; pestaña General ¡cómo quiera! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."

-                     name="land set sale info" />

-                <action description="Subdividir y unir parcelas"

-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "

-                     name="land divide join" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes para cambiar el nombre de las parcelas y configuraciones de publicación, visibilidad de la búsqueda de directorio y punto de aterrizaje &amp; opciones de ruta de TP."

-             name="Parcel Identity">

-                <action

-                     description="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y definir categoría"

-                     longdescription="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y configurar una categoría de parcela en Sobre el terreno &gt; pestaña Opciones."

-                     name="land find places" />

-                <action

-                     description="Cambiar nombre de la parcela, descripción, y configuraciones &apos;Publicar en la web&apos;"

-                     longdescription="Cambie el nombre de la parcela, descripción y configuraciones de &apos;Publicar en la web&apos;. Es hecho en Sobre el terreno &gt; pestaña Opciones."

-                     name="land change identity" />

-                <action description="Definir punto de aterrizaje y ruta de teletransporte"

-                     longdescription="En una parcela perteneciente al grupo, miembros en una función con esta habilidad pueden definir un punto de aterrizaje para especificar donde los teletransportes llegan y también definir la ruta del teletransporte para un mayor control. Es hecho en Sobre el terreno &gt; pestaña Opciones."

-                     name="land set landing point" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes que afectan opciones de parcela, como &apos;Crear objetos&apos;, &apos;Editar terreno&apos; y música &amp; configuraciones de multimedia."

-             name="Parcel Settings">

-                <action description="Cambiar música &amp; configuraciones de multimedia"

-                     longdescription="Cambie streaming de música y configuraciones de vídeo en Sobre el terreno &gt; pestaña Multimedia."

-                     name="land change media" />

-                <action description="Activar/desactivar &apos;Editar terreno&apos;"

-                     longdescription="Active/desactive &apos;Editar terreno&apos;. *AVISO* Sobre el terreno &gt; pestaña Opciones &gt; Editar terreno permite a cualquiera alterar las formas de su terreno&apos;, sustituir y mover plantas Linden. Asegúrese de saber lo que está haciendo antes de designar esta habilidad. La edición de terreno es activada/desactivada en Sobre el terreno &gt; pestaña Opciones."

-                     name="land edit" />

-                <action

-                     description="Activar/desactivar variados Sobre el Terreno &gt; Opciones de configuraciones"

-                     longdescription="Active/desactive &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permita a otros residentes: &apos;Crear objetos&apos;, &apos;Editar terreno&apos;, &apos;Crear puntos de referencia&apos;, y &apos;Ejecutar scripts&apos; en un terreno perteneciente al grupo en Sobre el terreno &gt; pestaña Opciones."

-                     name="land options" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes que permiten a miembros rebasar restricciones en parcelas pertenecientes al grupo."

-             name="Parcel Powers">

-                <action description="Siempre permitir &apos;Editar terreno&apos;"

-                     longdescription="Miembros en una función con esta habilidad pueden editar terreno en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."

-                     name="land allow edit land" />

-                <action description="Siempre permitir &apos;Volar&apos;"

-                     longdescription="Miembros en una función con esta habilidad pueden volar sobre una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."

-                     name="land allow fly" />

-                <action description="Siempre permitir &apos;Crear objetos&apos;"

-                     longdescription="Miembros en una función con esta habilidad pueden crear objetos en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."

-                     name="land allow create" />

-                <action description="Siempre permitir &apos;Crear punto de referencia&apos;"

-                     longdescription="Miembros en una función con esta habilidad pueden poner un punto de referencia en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."

-                     name="land allow landmark" />

-                <action description="Permitir &apos;Colocar casa aquí&apos; en el terreno del grupo"

-                     longdescription="Miembros en una función con esta habilidad pueden usar el menú Mundo &gt; Definir hogar aquí en una parcela del grupo (definir terreno o transferir para este grupo)."

-                     name="land allow set home" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes de permitir o restringir acceso a parcelas pertenecientes al grupo, incluyendo congelar y expulsar a residentes."

-             name="Parcel Access">

-                <action description="Administrar listas de acceso a la parcela"

-                     longdescription="Administre la lista de acceso a la parcela en Sobre el terreno &gt; pestaña Acceso."

-                     name="land manage allowed" />

-                <action description="Administrar lista de desterrados de la parcela"

-                     longdescription="Administre la lista de desterrados de la parcela en Sobre el terreno &gt; pestaña Desterrado."

-                     name="land manage banned" />

-                <action description="Cambiar configuraciones de parcela &apos;Vender pases...&apos;"

-                     longdescription="Cambie configuraciones de &apos;Vender pases...&apos; en Sobre el terreno &gt; pestaña Acceso."

-                     name="land manage passes" />

-                <action description="Expulsar y congelar residentes en las parcelas"

-                     longdescription="Miembros en una función con esta habilidad pueden lidiar con un residente indeseado en una parcela perteneciente al grupo haciendo clic con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."

-                     name="land admin" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes de permitir a miembros devolver objetos y poner y mover plantas Linden. Útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, debido a no ser posible deshacer la mudanza de los objetos."

-             name="Parcel Content">

-                <action description="Devolver objetos que pertenecen al grupo"

-                     longdescription="Devuelva objetos en parcelas pertenecientes al grupo que pertenecen al grupo en Sobre el terreno &gt; pestaña Objetos."

-                     name="land return group owned" />

-                <action description="Devolver objetos definidos para el grupo"

-                     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Sobre el terreno &gt; pestaña Objetos."

-                     name="land return group set" />

-                <action description="Devolver objetos que no pertenecen al grupo"

-                     longdescription="Devuelva objetos en las parcelas pertenecientes a un grupo que está sin grupo en el Sobre el terreno &gt; pestaña Objetos."

-                     name="land return non group" />

-                <action description="Enjardinar usando plantas Linden"

-                     longdescription="La habilidad de enjardinar permite poner y mover árboles Linden, plantas y céspedes. Estos ítems pueden ser encontrados en la&apos;s Biblioteca de su inventario &gt; carpeta Objetos o pueden ser criados a través del botón Construir."

-                     name="land gardening" />

-        </action_set>

-        <action_set

-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "

-             name="Object Management">

-                <action description="Transferir objetos para el grupo"

-                     longdescription="Transfiere objetos para el grupo en Editar herramientas &gt; pestaña General."

-                     name="object deed" />

-                <action description="Manipular (mover, copiar, modificar) objetos del grupo"

-                     longdescription="Manipule (mover,copiar, modificar) objetos pertenecientes al grupo en Editar Herramientas &gt; pestaña General."

-                     name="object manipulate" />

-                <action description="Definir objetos pertenecientes al grupo para venta"

-                     longdescription="Defina objetos pertenecientes al grupo para venta en Editar Herramientas &gt; pestaña General."

-                     name="object set sale" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes que requieren que miembros paguen deudas y reciban dividendos del grupo, y  restringen acceso al historial de cuenta del grupo."

-             name="Accounting">

-                <action description="Pagar débitos y reciber dividendos del grupo"

-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "

-                     name="accounting accountable" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes de permitir enviar, recibir y ver avisos de grupo."

-             name="Notices">

-                <action description="Enviar aviso"

-                     longdescription="Miembros en una función con esta habilidad pueden enviar avisos en Informaciones de grupo &gt; pestaña Avisos."

-                     name="notices send" />

-                <action description="Reciber nuevos avisos y ver los anteriores"

-                     longdescription="Miembros en una función con esta habilidad pueden recibir los nuevos avisos y ver los anteriores en Informaciones de grupo &gt; pestaña Avisos."

-                     name="notices receive" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluyen poderes de permitir a miembros definir y votar en propuestas y ver historial de votación."

-             name="Proposals">

-                <action description="Crear propuesta"

-                     longdescription="Miembros en una función con esta habilidad pueden crear propuestas para que sean votadas en Informaciones de grupo &gt; pestaña Propuestas."

-                     name="proposal start" />

-                <action description="Votar en propuestas"

-                     longdescription="Miembros en una función con esta habilidad pueden votar en propuestas en Informaciones de grupo &gt; pestaña Propuestas."

-                     name="proposal vote" />

-        </action_set>

-</role_actions>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+        <action_set
+             description="Estas habilidades incluyen poderes de adicionar o remover miembros del grupo y permitir que nuevos miembros se junten sin una invitación."
+             name="Membership">
+                <action description="Invitar personas para este grupo"
+                     longdescription="Invite personas para este grupo usando el botón &apos;Invitar nueva persona...&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros."
+                     name="member invite" value="1" />
+                <action description="Expulsar a miembros de este grupo"
+                     longdescription="Expulse a miembros de este grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si usted no es un propietario, un miembro puede a expulsarlo del grupo si, y solamente si, él apenas tiene la función de todos y no otras funciones. Para remover miembros de funciones, necesita tener la habilidad &apos;Remover miembros de funciones&apos;."
+                     name="member eject"  value="2" />
+                <action
+                     description="Activar/desactivar &apos;Abrir registro&apos; y cambiar &apos;Tasa de suscripción&apos;"
+                     longdescription="Active/desactive &apos;Abrir registro&apos; para permitir que nuevos miembros se unan sin una invitación, y cambie &apos;Tasa de registro&apos; en la sección Preferencia de grupo de la pestaña General."
+                     name="member options"  value="3" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes de adicionar, remover y cambiar funciones del grupo; adicionar y remover miembros en funciones y designar habilidades a funciones."
+             name="Roles">
+                <action description="Crear nuevas funciones"
+                     longdescription="Cree nuevas funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+                     name="role create" value="4" />
+                <action description="Borrar funciones"
+                     longdescription="Borra funciones en Miembros &amp; pestaña Funciones &gt; subpestaña Funciones."
+                     name="role delete" value="5" />
+                <action description="Cambiar nombres de funciones, títulos y descripciones"
+                     longdescription="Cambie el nombre de funciones, títulos y descripciones en la parte inferior de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones después de seleccionar una función."
+                     name="role properties" value="6" />
+                <action description="Designar miembros para la función&apos;s del asignador"
+                     longdescription="Designe miembros para funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Un miembro con este poder puede solamente adicionar miembros para la función que el asignador ya posee."
+                     name="role assign member limited" value="7" />
+                <action description="Designar miembros para cualquier función"
+                     longdescription="Designe miembros para cualquier función en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--para funciones que tienen más poderes que las actuales, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+                     name="role assign member" value="8" />
+                <action description="Remover miembros de las funciones"
+                     longdescription="Remueva miembros de funciones en la sección de funciones designadas de Miembros &amp; pestaña Funciones &gt; subpestaña Miembros. Propietarios no pueden&apos; ser removidos."
+                     name="role remove member" value="9" />
+                <action description="Determinar y remover habilidades en función"
+                     longdescription="Designe y remueva habilidades en funciones en la sección habilidades permitidas de Miembros &amp; pestaña Funciones &gt; subpestaña Funciones. *AVISO* Cualesquiera miembros en una función con esta habilidad pueden designar a sí propios--y cualesquiera otros miembros no propietarios--todas las habilidades, promocionándolos a poderes próximos al del propietario. Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+                     name="role change actions" value="10" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes para modificar esta identidad de grupo, como cambiar la visibilidad pública, presentación y insignia."
+             name="Group Identity">
+                <action
+                     description="Cambiar presentación, insignia, &apos;Publicar en la web&apos;, y cuales miembros están públicamente visibles en Informaciones del Grupo."
+                     longdescription="Cambie la presentación, insignia, &apos;Publicar en la web&apos; y cuales miembros están públicamente visibles en  Informaciones del grupo. Es hecho en la pestaña General."
+                     name="group change identity" value="11" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Vaya para la ventana Sobre el terreno, haga clic con el botón derecho en el terreno y seleccione &apos;Sobre el terreno...&apos; o haga clic en la información de la parcela en la barra del menú."
+             name="Parcel Management">
+                <action description="Transferir  y comprar terreno para el grupo"
+                     longdescription="Transfiere y compre terreno para el grupo. Es hecho en Sobre el terreno &gt; pestaña General."
+                     name="land deed" value="12" />
+                <action description="Abandonar al terreno para Gobernador Linden"
+                     longdescription="Abandone al terreno para Gobernador Linden. *AVISO* Cualquier miembro en una función con esta habilidad puede  abandonar al terreno perteneciente al grupo en Sobre el terreno &gt; pestaña General, revirtiendo a la posesión Linden sin una venta! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+                     name="land release" value="13" />
+                <action description="Definir terreno para información de venta"
+                     longdescription="Defina informaciones de venta para terreno. *AVISO* Cualquier miembro en una función con esta habilidad puede vender terrenos pertenecientes al grupo en Sobre el terreno &gt; pestaña General ¡cómo quiera! Asegúrese de saber lo que está haciendo antes de designar esta habilidad."
+                     name="land set sale info" value="14" />
+                <action description="Subdividir y unir parcelas"
+                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                     name="land divide join" value="15" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes para cambiar el nombre de las parcelas y configuraciones de publicación, visibilidad de la búsqueda de directorio y punto de aterrizaje &amp; opciones de ruta de TP."
+             name="Parcel Identity">
+                <action
+                     description="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y definir categoría"
+                     longdescription="Activar/desactivar &apos;Exhibir en locales de encuentro&apos; y configurar una categoría de parcela en Sobre el terreno &gt; pestaña Opciones."
+                     name="land find places" value="17" />
+                <action
+                     description="Cambiar nombre de la parcela, descripción, y configuraciones &apos;Publicar en la web&apos;"
+                     longdescription="Cambie el nombre de la parcela, descripción y configuraciones de &apos;Publicar en la web&apos;. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+                     name="land change identity" value="18" />
+                <action description="Definir punto de aterrizaje y ruta de teletransporte"
+                     longdescription="En una parcela perteneciente al grupo, miembros en una función con esta habilidad pueden definir un punto de aterrizaje para especificar donde los teletransportes llegan y también definir la ruta del teletransporte para un mayor control. Es hecho en Sobre el terreno &gt; pestaña Opciones."
+                     name="land set landing point" value="19" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes que afectan opciones de parcela, como &apos;Crear objetos&apos;, &apos;Editar terreno&apos; y música &amp; configuraciones de multimedia."
+             name="Parcel Settings">
+                <action description="Cambiar música &amp; configuraciones de multimedia"
+                     longdescription="Cambie streaming de música y configuraciones de vídeo en Sobre el terreno &gt; pestaña Multimedia."
+                     name="land change media" value="20" />
+                <action description="Activar/desactivar &apos;Editar terreno&apos;"
+                     longdescription="Active/desactive &apos;Editar terreno&apos;. *AVISO* Sobre el terreno &gt; pestaña Opciones &gt; Editar terreno permite a cualquiera alterar las formas de su terreno&apos;, sustituir y mover plantas Linden. Asegúrese de saber lo que está haciendo antes de designar esta habilidad. La edición de terreno es activada/desactivada en Sobre el terreno &gt; pestaña Opciones."
+                     name="land edit" value="21" />
+                <action
+                     description="Activar/desactivar variados Sobre el Terreno &gt; Opciones de configuraciones"
+                     longdescription="Active/desactive &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permita a otros residentes: &apos;Crear objetos&apos;, &apos;Editar terreno&apos;, &apos;Crear puntos de referencia&apos;, y &apos;Ejecutar scripts&apos; en un terreno perteneciente al grupo en Sobre el terreno &gt; pestaña Opciones."
+                     name="land options" value="22" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes que permiten a miembros rebasar restricciones en parcelas pertenecientes al grupo."
+             name="Parcel Powers">
+                <action description="Siempre permitir &apos;Editar terreno&apos;"
+                     longdescription="Miembros en una función con esta habilidad pueden editar terreno en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+                     name="land allow edit land" value="23" />
+                <action description="Siempre permitir &apos;Volar&apos;"
+                     longdescription="Miembros en una función con esta habilidad pueden volar sobre una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+                     name="land allow fly" value="24" />
+                <action description="Siempre permitir &apos;Crear objetos&apos;"
+                     longdescription="Miembros en una función con esta habilidad pueden crear objetos en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+                     name="land allow create" value="25" />
+                <action description="Siempre permitir &apos;Crear punto de referencia&apos;"
+                     longdescription="Miembros en una función con esta habilidad pueden poner un punto de referencia en una parcela perteneciente al grupo, mismo si está desactivada en Sobre el terreno &gt; pestaña Opciones."
+                     name="land allow landmark" value="26" />
+                <action description="Permitir &apos;Colocar casa aquí&apos; en el terreno del grupo"
+                     longdescription="Miembros en una función con esta habilidad pueden usar el menú Mundo &gt; Definir hogar aquí en una parcela del grupo (definir terreno o transferir para este grupo)."
+                     name="land allow set home" value="28" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes de permitir o restringir acceso a parcelas pertenecientes al grupo, incluyendo congelar y expulsar a residentes."
+             name="Parcel Access">
+                <action description="Administrar listas de acceso a la parcela"
+                     longdescription="Administre la lista de acceso a la parcela en Sobre el terreno &gt; pestaña Acceso."
+                     name="land manage allowed" value="29" />
+                <action description="Administrar lista de desterrados de la parcela"
+                     longdescription="Administre la lista de desterrados de la parcela en Sobre el terreno &gt; pestaña Desterrado."
+                     name="land manage banned" value="30" />
+                <action description="Cambiar configuraciones de parcela &apos;Vender pases...&apos;"
+                     longdescription="Cambie configuraciones de &apos;Vender pases...&apos; en Sobre el terreno &gt; pestaña Acceso."
+                     name="land manage passes" value="31" />
+                <action description="Expulsar y congelar residentes en las parcelas"
+                     longdescription="Miembros en una función con esta habilidad pueden lidiar con un residente indeseado en una parcela perteneciente al grupo haciendo clic con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
+                     name="land admin" value="32" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes de permitir a miembros devolver objetos y poner y mover plantas Linden. Útil para que miembros organicen el paisaje, pero debe ser usado con cuidado, debido a no ser posible deshacer la mudanza de los objetos."
+             name="Parcel Content">
+                <action description="Devolver objetos que pertenecen al grupo"
+                     longdescription="Devuelva objetos en parcelas pertenecientes al grupo que pertenecen al grupo en Sobre el terreno &gt; pestaña Objetos."
+                     name="land return group owned" value="48" />
+                <action description="Devolver objetos definidos para el grupo"
+                     longdescription="Devuelva objetos en parcelas pertenecientes al grupo en Sobre el terreno &gt; pestaña Objetos."
+                     name="land return group set" value="33" />
+                <action description="Devolver objetos que no pertenecen al grupo"
+                     longdescription="Devuelva objetos en las parcelas pertenecientes a un grupo que está sin grupo en el Sobre el terreno &gt; pestaña Objetos."
+                     name="land return non group" value="34" />
+                <action description="Enjardinar usando plantas Linden"
+                     longdescription="La habilidad de enjardinar permite poner y mover árboles Linden, plantas y céspedes. Estos ítems pueden ser encontrados en la&apos;s Biblioteca de su inventario &gt; carpeta Objetos o pueden ser criados a través del botón Construir."
+                     name="land gardening" value="35" />
+        </action_set>
+        <action_set
+             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             name="Object Management">
+                <action description="Transferir objetos para el grupo"
+                     longdescription="Transfiere objetos para el grupo en Editar herramientas &gt; pestaña General."
+                     name="object deed" value="36" />
+                <action description="Manipular (mover, copiar, modificar) objetos del grupo"
+                     longdescription="Manipule (mover,copiar, modificar) objetos pertenecientes al grupo en Editar Herramientas &gt; pestaña General."
+                     name="object manipulate" value="38" />
+                <action description="Definir objetos pertenecientes al grupo para venta"
+                     longdescription="Defina objetos pertenecientes al grupo para venta en Editar Herramientas &gt; pestaña General."
+                     name="object set sale" value="39" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes que requieren que miembros paguen deudas y reciban dividendos del grupo, y  restringen acceso al historial de cuenta del grupo."
+             name="Accounting">
+                <action description="Pagar débitos y reciber dividendos del grupo"
+                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                     name="accounting accountable" value="40" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes de permitir enviar, recibir y ver avisos de grupo."
+             name="Notices">
+                <action description="Enviar aviso"
+                     longdescription="Miembros en una función con esta habilidad pueden enviar avisos en Informaciones de grupo &gt; pestaña Avisos."
+                     name="notices send" value="42" />
+                <action description="Reciber nuevos avisos y ver los anteriores"
+                     longdescription="Miembros en una función con esta habilidad pueden recibir los nuevos avisos y ver los anteriores en Informaciones de grupo &gt; pestaña Avisos."
+                     name="notices receive" value="43" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluyen poderes de permitir a miembros definir y votar en propuestas y ver historial de votación."
+             name="Proposals">
+                <action description="Crear propuesta"
+                     longdescription="Miembros en una función con esta habilidad pueden crear propuestas para que sean votadas en Informaciones de grupo &gt; pestaña Propuestas."
+                     name="proposal start" value="44" />
+                <action description="Votar en propuestas"
+                     longdescription="Miembros en una función con esta habilidad pueden votar en propuestas en Informaciones de grupo &gt; pestaña Propuestas."
+                     name="proposal vote" value="45" />
+        </action_set>
+</role_actions>
diff --git a/linden/indra/newview/skins/xui/fr/role_actions.xml b/linden/indra/newview/skins/xui/fr/role_actions.xml
index 12c8cc6..c3d6ffe 100644
--- a/linden/indra/newview/skins/xui/fr/role_actions.xml
+++ b/linden/indra/newview/skins/xui/fr/role_actions.xml
@@ -1,189 +1,189 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<role_actions>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;ajouter et supprimer des Membres du groupe, et d&apos;autoriser de nouveaux Membres à s&apos;inscrire sans invitation."

-             name="Membership">

-                <action description="Inviter quelqu&apos;un dans ce groupe"

-                     longdescription="Invitez des personnes dans ce Groupe à l&apos;aide du bouton &apos;Inviter&apos; dans l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres."

-                     name="member invite" />

-                <action description="Ejecter des Membres du Groupe"

-                     longdescription="Ejectez des Membres de ce groupe à l&apos;aide du bouton &apos;Ejecter du groupe&apos; dans l&apos;onglet Membres &amp; Rôles &gt; Membres. Un propriétaire peut éjecter tout le monde, sauf un autre propriétaire. Si vous n&apos;êtes pas propriétaire, vous pouvez éjecter un Membre si et seulement si il est dans le Rôle &apos;Tout le monde&apos; et AUCUN autre.Pour destituer des Membres d&apos;un Rôle, vous devez disposer de la Faculté &apos;Destituer Membres d&apos;un Rôle&apos;."

-                     name="member eject" />

-                <action

-                     description="Basculer &apos;Inscription libre&apos; et modifier &apos;Frais d&apos;inscription&apos;"

-                     longdescription="Basculez &apos;Inscription libre&apos; pour permettre à de nouveaux Membres de s&apos;inscrire sans invitation, et modifiez &apos;Frais d&apos;inscription&apos; dans les Préférences du Groupe, onglet Général."

-                     name="member options" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;ajouter, supprimer et modifier les Rôles dans le groupe, d&apos;ajouter et supprimer des Membres affectés à des Rôles, et d&apos;attribuer des Facultés aux Rôles."

-             name="Roles">

-                <action description="Créer de nouveaux rôles"

-                     longdescription="Créez de nouveaux Rôles dans l&apos;onglet &apos;Membres et Rôles&apos; &gt; sous-onglet Rôles."

-                     name="role create" />

-                <action description="Supprimer des Rôles"

-                     longdescription="Supprimez des Rôles dans l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Rôles."

-                     name="role delete" />

-                <action description="Modifier les noms, titres et descriptions des Rôles"

-                     longdescription="Modifiez les noms, titres et descriptions des Rôles dans l&apos;onglet Membres et Rôles &gt; sous-onglet Rôles après avoir sélectionné un Rôle."

-                     name="role properties" />

-                <action description="Affecter des Membres à des rôles d&apos;attribution"

-                     longdescription="Affectez des Membres à des Rôles dans la section &apos;Rôles Attribués&apos; de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. Un Membre disposant de ce pouvoir ne peut affecter de nouveaux membres qu&apos;à un rôle auquel il est lui-même affecté."

-                     name="role assign member limited" />

-                <action description="Affecter des Membres à tous types de Rôles"

-                     longdescription="Affectez des Membres à tous types de rôles dans la section &apos;Rôles Attribués&apos; de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. *AVERTISSEMENT* Tout membre disposant de cette faculté peut s&apos;affecter lui-même --ainsi que tout autre Membre non-propriétaire du groupe-- à des Rôles disposant de pouvoirs plus grands, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."

-                     name="role assign member" />

-                <action description="Destituer des Membres de leurs Rôles"

-                     longdescription="Retirez des Membres de Rôles dans la section Rôles Attribués de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. Les Propriétaires ne peuvent être retirés."

-                     name="role remove member" />

-                <action description="Attribuer et retirer des Facultés d&apos;un Rôle"

-                     longdescription="Attribuez et retirez des Facultés de Rôles dans la section Facultés Attribuées de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Rôles. *AVERTISSEMENT* Tout membre disposant de cette faculté peut s&apos;affecter lui-même --ainsi que tout autre Membre non-propriétaire du groupe-- à des Rôles disposant de pouvoirs plus grands, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."

-                     name="role change actions" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir de modifier l&apos;identité du Groupe, c&apos;est-à-dire sa visibilité publique, sa charte et son insigne."

-             name="Group Identity">

-                <action

-                     description="Modifier la Charte, l&apos;Insigne, &apos;Publier sur le web&apos;, et quels Membres apparaissent dans les Informations du Groupe"

-                     longdescription="Modifiez la Charte, l&apos;Insigne, &apos;Publier sur le web&apos; et la visibilité publique des Membres dans les Informations du Groupe. Ces opérations s&apos;effectuent dans l&apos;onglet Général."

-                     name="group change identity" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir de transférer, modifier, et vendre du terrain appartenant au patrimoine du Groupe. Pour accéder au menu du terrain, cliquez-droit sur le sol et sélectionnez &apos;A propos du terrain...&apos;, ou cliquez sur l&apos;info de parcelle dans la barre de menus."

-             name="Parcel Management">

-                <action description="Transférer du terrain et acheter du terrain pour le groupe"

-                     longdescription="Transférez du terrain et achetez du terrain pour le compte d&apos;un groupe. Ces opérations s&apos;effectuent dans &apos;A propos du terrain&apos; &gt; onglet Général."

-                     name="land deed" />

-                <action description="Céder terrain au Gouverneur Linden"

-                     longdescription="Céder terrain au Gouverneur Linden. *AVERTISSEMENT* Tout Membre disposant de cette Faculté peut céder du terrain dans &apos;A propos du terrain&apos; &gt; onglet Général, et rétrocéder la propriété aux Linden sans effectuer de vente ! Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."

-                     name="land release" />

-                <action description="Définir des infos de vente de terrain"

-                     longdescription="Définissez les informations de vente du terrain. *AVERTISSEMENT* Tout Membre dans un Rôle avec cette Faculté peut vendre du terrain appartenant au groupe dans &apos;A propos du Terrain&apos; &gt; onglet General quand il le souhaite ! Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."

-                     name="land set sale info" />

-                <action description="Subdiviser et fusionner des parcelles"

-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "

-                     name="land divide join" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir de modifier le nom de la parcelle et les réglages de confidentialité, la visibilité dans l&apos;annuaire, le point d&apos;atterrissage et les options de routage de téléportation."

-             name="Parcel Identity">

-                <action

-                     description="Basculer &apos;Afficher dans Rechercher un lieu&apos; et définir une catégorie"

-                     longdescription="Basculez &apos;Afficher dans Rechercher un Lieu&apos; et définissez une catégorie pour la parcelle dans &apos;A propos du Terrain&apos; &gt; onglet Options."

-                     name="land find places" />

-                <action

-                     description="Modifier le nom et la description de la parcelle, et les réglages de &apos;Publier sur le web&apos;"

-                     longdescription="Modifiez le nom de la parcelle, sa description et les réglages de &apos;Publier sur le web&apos;. Ces modifications s&apos;effectuent dans &apos;A propos du terrain&apos;, onglet Options."

-                     name="land change identity" />

-                <action

-                     description="Définir le point d&apos;atterrissage et le routage de téléportation"

-                     longdescription="Sur une parcelle appartenant au groupe, les Membres dans un Rôle avec cette Faculté peuvent définir un point d&apos;atterrissage pour les téléportations entrantes, et définir le routage de téléportation pour plus de contrôle. Ceci s&apos;effectue dans A propos du Terrain &gt; onglet Options."

-                     name="land set landing point" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent des pouvoirs sur les options de la parcelle, comme &apos;Créer objets&apos;, &apos;Modifier Relief&apos;, ainsi que les réglages audio et vidéo."

-             name="Parcel Settings">

-                <action description="Modifier les réglages de la musique et des media"

-                     longdescription="Modifiez les réglages des flux audio et vidéo dans &apos;A propos du terrain&apos; &gt; onglet Media."

-                     name="land change media" />

-                <action description="Basculer &apos;Modifier relief&apos;"

-                     longdescription="Basculez &apos;Modifier Relief&apos;. *AVERTISSEMENT* A propos du Terrain &gt; onglet Options &gt; Modifier Relief permet à tout le monde de terraformer votre terrain, disposer et déplacer des plantes Linden. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté. Modifier Terrain s&apos;effectue dans A propos du terrain &gt; onglet Options."

-                     name="land edit" />

-                <action description="Basculer divers réglages de A propos du Terrain &gt; Options"

-                     longdescription="Basculez &apos;Sans danger (pas de dégâts)&apos;, &apos;Voler&apos;, et autorisez d&apos;autres résidents à : &apos;Créer des objets&apos;, &apos;Modifier le Relief&apos;, &apos;Créer un repère&apos;, et &apos;Exécuter des Scripts&apos; sur un terrain appartenant au Groupe dans &apos;A propos du Terrain&apos; &gt; onglet Options."

-                     name="land options" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent des pouvoirs qui permettent aux Membres de contourner les restrictions sur des parcelles appartenant à un groupe."

-             name="Parcel Powers">

-                <action description="Toujours autoriser &apos;Modifier relief&apos;"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent modifier le relief d&apos;une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."

-                     name="land allow edit land" />

-                <action description="Toujours autoriser le vol"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent voler sur une parcelle de groupe, même si le vol est désactivé dans A Propos du Terrain &gt; onglet Options."

-                     name="land allow fly" />

-                <action description="Toujours autoriser &apos;Créer objets&apos;"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer des objets sur une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."

-                     name="land allow create" />

-                <action description="Toujours autoriser &apos;Créer repère&apos;"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer un repère sur une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."

-                     name="land allow landmark" />

-                <action

-                     description="Autoriser &apos;Définir son domicile ici&apos; sur le terrain du groupe"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent utiliser le menu Monde &gt; Définir Domicile Ici sur une parcelle de groupe (terrain attribué ou transféré au groupe)."

-                     name="land allow set home" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;autoriser ou restreindre l&apos;accès à des parcelles appartenant au Groupe, y compris de bloquer ou éjecter des résidents."

-             name="Parcel Access">

-                <action description="Gérer les listes d&apos;accès à cette parcelle"

-                     longdescription="Gérez les listes d&apos;accès à la parcelle dans &apos;A propos du terrain&apos; &gt; Accès."

-                     name="land manage allowed" />

-                <action description="Gérer les listes noires de cette parcelle"

-                     longdescription="Gérez les listes de bannissement de la parcelle dans &apos;A propos du terrain&apos; &gt; Bannir."

-                     name="land manage banned" />

-                <action

-                     description="Modifier réglages de &apos;Vendre des laissez-passer...&apos; sur cette parcelle"

-                     longdescription="Modifiez les réglages de &apos;Vendre des laissez-passer&apos; de la parcelle dans &apos;A propos du terrain&apos; &gt; onglet &apos;Accès&apos;."

-                     name="land manage passes" />

-                <action description="Ejecter et bloquer des Résidents sur les parcelles"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent intervenir auprès d&apos;un Résident indésirable sur une parcelle de groupe en cliquant-droit sur eux, Plus &gt;, et &apos;Ejecter...&apos; ou &apos;Bloquer...&apos;."

-                     name="land admin" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à renvoyer des objets, placer et déplacer des plantes Linden. Ceci permet aux Membres de traiter les déchets et d&apos;aménager le paysage. A utiliser avec précaution, car les objets renvoyés le sont définitivement."

-             name="Parcel Content">

-                <action description="Renvoyer des objets appartenant au groupe."

-                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe dans A propos du Terrain &gt; onglet Objets."

-                     name="land return group owned" />

-                <action description="Renvoyer des objets attribués au groupe"

-                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe et attribuées au groupe dans A propos du Terrain &gt; onglet Objets."

-                     name="land return group set" />

-                <action description="Renvoyer des objets n&apos;appartenant pas au groupe."

-                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe et non attribuées au groupe dans A propos du Terrain &gt; onglet Objets."

-                     name="land return non group" />

-                <action description="Aménager le paysage avec des plantes Linden"

-                     longdescription="Faculté de placer et déplacer des arbres, plantes et pelouses Linden. Ces eléments sont disponibles dans le dossier Objets de la Bibliothèque de votre Inventaire ou peuvent être créés à l&apos;aide du bouton Construire."

-                     name="land gardening" />

-        </action_set>

-        <action_set

-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "

-             name="Object Management">

-                <action description="Transférer des objets au groupe"

-                     longdescription="Transférez des objets à un groupe dans Outils d&apos;Edition &gt; onglet Général."

-                     name="object deed" />

-                <action

-                     description="Manipuler (déplacer, copier, modifier) des objets appartenant au groupe"

-                     longdescription="Manipulez (déplacez, copiez, modifiez) les objets appartenant au groupe dans Outils d&apos;Edition &gt; onglet Général."

-                     name="object manipulate" />

-                <action description="Mettre en vente des objets appartenant au groupe"

-                     longdescription="Définissez les objets à vendre du groupe dans Outils d&apos;Edition &gt; onglet Général."

-                     name="object set sale" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent des pouvoirs qui requièrent que les Membres paient les en-cours et reçoivent des dividendes du Groupe, ainsi que le pouvoir de restreindre l&apos;accès à l&apos;historique comptable du Groupe."

-             name="Accounting">

-                <action description="Payer le passif du groupe et recevoir les dividendes du groupe"

-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "

-                     name="accounting accountable" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à envoyer, recevoir, et voir les Notifications de groupe."

-             name="Notices">

-                <action description="Envoyer des Notifications"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent envoyer des Notifications dans Informations du Groupe &gt; onglet Notifications."

-                     name="notices send" />

-                <action description="Recevoir Notifications et voir Notifications passées"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent recevoir les Notifications et afficher les Notifications passées dans Informations du Groupe &gt; onglet Notifications."

-                     name="notices receive" />

-        </action_set>

-        <action_set

-             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à soumettre des Propositions, les voter, et voir l&apos;historique des votes."

-             name="Proposals">

-                <action description="Créer des propositions"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer des propositions à voter dans Informations du Groupe &gt; onglet Propositions."

-                     name="proposal start" />

-                <action description="Voter les propositions"

-                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent voter les propositions dans Informations du Groupe &gt; onglet Propositions."

-                     name="proposal vote" />

-        </action_set>

-</role_actions>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;ajouter et supprimer des Membres du groupe, et d&apos;autoriser de nouveaux Membres à s&apos;inscrire sans invitation."
+             name="Membership">
+                <action description="Inviter quelqu&apos;un dans ce groupe"
+                     longdescription="Invitez des personnes dans ce Groupe à l&apos;aide du bouton &apos;Inviter&apos; dans l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres."
+                     name="member invite" value="1" />
+                <action description="Ejecter des Membres du Groupe"
+                     longdescription="Ejectez des Membres de ce groupe à l&apos;aide du bouton &apos;Ejecter du groupe&apos; dans l&apos;onglet Membres &amp; Rôles &gt; Membres. Un propriétaire peut éjecter tout le monde, sauf un autre propriétaire. Si vous n&apos;êtes pas propriétaire, vous pouvez éjecter un Membre si et seulement si il est dans le Rôle &apos;Tout le monde&apos; et AUCUN autre.Pour destituer des Membres d&apos;un Rôle, vous devez disposer de la Faculté &apos;Destituer Membres d&apos;un Rôle&apos;."
+                     name="member eject" value="2" />
+                <action
+                     description="Basculer &apos;Inscription libre&apos; et modifier &apos;Frais d&apos;inscription&apos;"
+                     longdescription="Basculez &apos;Inscription libre&apos; pour permettre à de nouveaux Membres de s&apos;inscrire sans invitation, et modifiez &apos;Frais d&apos;inscription&apos; dans les Préférences du Groupe, onglet Général."
+                     name="member options" value="3" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;ajouter, supprimer et modifier les Rôles dans le groupe, d&apos;ajouter et supprimer des Membres affectés à des Rôles, et d&apos;attribuer des Facultés aux Rôles."
+             name="Roles">
+                <action description="Créer de nouveaux rôles"
+                     longdescription="Créez de nouveaux Rôles dans l&apos;onglet &apos;Membres et Rôles&apos; &gt; sous-onglet Rôles."
+                     name="role create" value="4" />
+                <action description="Supprimer des Rôles"
+                     longdescription="Supprimez des Rôles dans l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Rôles."
+                     name="role delete" value="5" />
+                <action description="Modifier les noms, titres et descriptions des Rôles"
+                     longdescription="Modifiez les noms, titres et descriptions des Rôles dans l&apos;onglet Membres et Rôles &gt; sous-onglet Rôles après avoir sélectionné un Rôle."
+                     name="role properties" value="6" />
+                <action description="Affecter des Membres à des rôles d&apos;attribution"
+                     longdescription="Affectez des Membres à des Rôles dans la section &apos;Rôles Attribués&apos; de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. Un Membre disposant de ce pouvoir ne peut affecter de nouveaux membres qu&apos;à un rôle auquel il est lui-même affecté."
+                     name="role assign member limited" value="7" />
+                <action description="Affecter des Membres à tous types de Rôles"
+                     longdescription="Affectez des Membres à tous types de rôles dans la section &apos;Rôles Attribués&apos; de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. *AVERTISSEMENT* Tout membre disposant de cette faculté peut s&apos;affecter lui-même --ainsi que tout autre Membre non-propriétaire du groupe-- à des Rôles disposant de pouvoirs plus grands, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."
+                     name="role assign member" value="8" />
+                <action description="Destituer des Membres de leurs Rôles"
+                     longdescription="Retirez des Membres de Rôles dans la section Rôles Attribués de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Membres. Les Propriétaires ne peuvent être retirés."
+                     name="role remove member" value="9" />
+                <action description="Attribuer et retirer des Facultés d&apos;un Rôle"
+                     longdescription="Attribuez et retirez des Facultés de Rôles dans la section Facultés Attribuées de l&apos;onglet Membres &amp; Rôles &gt; sous-onglet Rôles. *AVERTISSEMENT* Tout membre disposant de cette faculté peut s&apos;affecter lui-même --ainsi que tout autre Membre non-propriétaire du groupe-- à des Rôles disposant de pouvoirs plus grands, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."
+                     name="role change actions" value="10" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir de modifier l&apos;identité du Groupe, c&apos;est-à-dire sa visibilité publique, sa charte et son insigne."
+             name="Group Identity">
+                <action
+                     description="Modifier la Charte, l&apos;Insigne, &apos;Publier sur le web&apos;, et quels Membres apparaissent dans les Informations du Groupe"
+                     longdescription="Modifiez la Charte, l&apos;Insigne, &apos;Publier sur le web&apos; et la visibilité publique des Membres dans les Informations du Groupe. Ces opérations s&apos;effectuent dans l&apos;onglet Général."
+                     name="group change identity" value="11" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir de transférer, modifier, et vendre du terrain appartenant au patrimoine du Groupe. Pour accéder au menu du terrain, cliquez-droit sur le sol et sélectionnez &apos;A propos du terrain...&apos;, ou cliquez sur l&apos;info de parcelle dans la barre de menus."
+             name="Parcel Management">
+                <action description="Transférer du terrain et acheter du terrain pour le groupe"
+                     longdescription="Transférez du terrain et achetez du terrain pour le compte d&apos;un groupe. Ces opérations s&apos;effectuent dans &apos;A propos du terrain&apos; &gt; onglet Général."
+                     name="land deed" value="12" />
+                <action description="Céder terrain au Gouverneur Linden"
+                     longdescription="Céder terrain au Gouverneur Linden. *AVERTISSEMENT* Tout Membre disposant de cette Faculté peut céder du terrain dans &apos;A propos du terrain&apos; &gt; onglet Général, et rétrocéder la propriété aux Linden sans effectuer de vente ! Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."
+                     name="land release" value="13" />
+                <action description="Définir des infos de vente de terrain"
+                     longdescription="Définissez les informations de vente du terrain. *AVERTISSEMENT* Tout Membre dans un Rôle avec cette Faculté peut vendre du terrain appartenant au groupe dans &apos;A propos du Terrain&apos; &gt; onglet General quand il le souhaite ! Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté."
+                     name="land set sale info" value="14" />
+                <action description="Subdiviser et fusionner des parcelles"
+                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                     name="land divide join" value="15" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir de modifier le nom de la parcelle et les réglages de confidentialité, la visibilité dans l&apos;annuaire, le point d&apos;atterrissage et les options de routage de téléportation."
+             name="Parcel Identity">
+                <action
+                     description="Basculer &apos;Afficher dans Rechercher un lieu&apos; et définir une catégorie"
+                     longdescription="Basculez &apos;Afficher dans Rechercher un Lieu&apos; et définissez une catégorie pour la parcelle dans &apos;A propos du Terrain&apos; &gt; onglet Options."
+                     name="land find places" value="17" />
+                <action
+                     description="Modifier le nom et la description de la parcelle, et les réglages de &apos;Publier sur le web&apos;"
+                     longdescription="Modifiez le nom de la parcelle, sa description et les réglages de &apos;Publier sur le web&apos;. Ces modifications s&apos;effectuent dans &apos;A propos du terrain&apos;, onglet Options."
+                     name="land change identity" value="18" />
+                <action
+                     description="Définir le point d&apos;atterrissage et le routage de téléportation"
+                     longdescription="Sur une parcelle appartenant au groupe, les Membres dans un Rôle avec cette Faculté peuvent définir un point d&apos;atterrissage pour les téléportations entrantes, et définir le routage de téléportation pour plus de contrôle. Ceci s&apos;effectue dans A propos du Terrain &gt; onglet Options."
+                     name="land set landing point" value="19" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent des pouvoirs sur les options de la parcelle, comme &apos;Créer objets&apos;, &apos;Modifier Relief&apos;, ainsi que les réglages audio et vidéo."
+             name="Parcel Settings">
+                <action description="Modifier les réglages de la musique et des media"
+                     longdescription="Modifiez les réglages des flux audio et vidéo dans &apos;A propos du terrain&apos; &gt; onglet Media."
+                     name="land change media" value="20" />
+                <action description="Basculer &apos;Modifier relief&apos;"
+                     longdescription="Basculez &apos;Modifier Relief&apos;. *AVERTISSEMENT* A propos du Terrain &gt; onglet Options &gt; Modifier Relief permet à tout le monde de terraformer votre terrain, disposer et déplacer des plantes Linden. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté. Modifier Terrain s&apos;effectue dans A propos du terrain &gt; onglet Options."
+                     name="land edit" value="21" />
+                <action description="Basculer divers réglages de A propos du Terrain &gt; Options"
+                     longdescription="Basculez &apos;Sans danger (pas de dégâts)&apos;, &apos;Voler&apos;, et autorisez d&apos;autres résidents à : &apos;Créer des objets&apos;, &apos;Modifier le Relief&apos;, &apos;Créer un repère&apos;, et &apos;Exécuter des Scripts&apos; sur un terrain appartenant au Groupe dans &apos;A propos du Terrain&apos; &gt; onglet Options."
+                     name="land options" value="22" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent des pouvoirs qui permettent aux Membres de contourner les restrictions sur des parcelles appartenant à un groupe."
+             name="Parcel Powers">
+                <action description="Toujours autoriser &apos;Modifier relief&apos;"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent modifier le relief d&apos;une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."
+                     name="land allow edit land" value="23" />
+                <action description="Toujours autoriser le vol"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent voler sur une parcelle de groupe, même si le vol est désactivé dans A Propos du Terrain &gt; onglet Options."
+                     name="land allow fly" value="24" />
+                <action description="Toujours autoriser &apos;Créer objets&apos;"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer des objets sur une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."
+                     name="land allow create" value="25" />
+                <action description="Toujours autoriser &apos;Créer repère&apos;"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer un repère sur une parcelle de groupe, même si l&apos;option est désactivée dans A Propos du Terrain &gt; onglet Options."
+                     name="land allow landmark" value="26" />
+                <action
+                     description="Autoriser &apos;Définir son domicile ici&apos; sur le terrain du groupe"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent utiliser le menu Monde &gt; Définir Domicile Ici sur une parcelle de groupe (terrain attribué ou transféré au groupe)."
+                     name="land allow set home" value="28" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;autoriser ou restreindre l&apos;accès à des parcelles appartenant au Groupe, y compris de bloquer ou éjecter des résidents."
+             name="Parcel Access">
+                <action description="Gérer les listes d&apos;accès à cette parcelle"
+                     longdescription="Gérez les listes d&apos;accès à la parcelle dans &apos;A propos du terrain&apos; &gt; Accès."
+                     name="land manage allowed" value="29" />
+                <action description="Gérer les listes noires de cette parcelle"
+                     longdescription="Gérez les listes de bannissement de la parcelle dans &apos;A propos du terrain&apos; &gt; Bannir."
+                     name="land manage banned" value="30" />
+                <action
+                     description="Modifier réglages de &apos;Vendre des laissez-passer...&apos; sur cette parcelle"
+                     longdescription="Modifiez les réglages de &apos;Vendre des laissez-passer&apos; de la parcelle dans &apos;A propos du terrain&apos; &gt; onglet &apos;Accès&apos;."
+                     name="land manage passes" value="31" />
+                <action description="Ejecter et bloquer des Résidents sur les parcelles"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent intervenir auprès d&apos;un Résident indésirable sur une parcelle de groupe en cliquant-droit sur eux, Plus &gt;, et &apos;Ejecter...&apos; ou &apos;Bloquer...&apos;."
+                     name="land admin" value="32" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à renvoyer des objets, placer et déplacer des plantes Linden. Ceci permet aux Membres de traiter les déchets et d&apos;aménager le paysage. A utiliser avec précaution, car les objets renvoyés le sont définitivement."
+             name="Parcel Content">
+                <action description="Renvoyer des objets appartenant au groupe."
+                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe dans A propos du Terrain &gt; onglet Objets."
+                     name="land return group owned" value="48" />
+                <action description="Renvoyer des objets attribués au groupe"
+                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe et attribuées au groupe dans A propos du Terrain &gt; onglet Objets."
+                     name="land return group set" value="33" />
+                <action description="Renvoyer des objets n&apos;appartenant pas au groupe."
+                     longdescription="Renvoyez des objets sur des parcelles appartenant au groupe et non attribuées au groupe dans A propos du Terrain &gt; onglet Objets."
+                     name="land return non group" value="34" />
+                <action description="Aménager le paysage avec des plantes Linden"
+                     longdescription="Faculté de placer et déplacer des arbres, plantes et pelouses Linden. Ces eléments sont disponibles dans le dossier Objets de la Bibliothèque de votre Inventaire ou peuvent être créés à l&apos;aide du bouton Construire."
+                     name="land gardening" value="35" />
+        </action_set>
+        <action_set
+             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             name="Object Management">
+                <action description="Transférer des objets au groupe"
+                     longdescription="Transférez des objets à un groupe dans Outils d&apos;Edition &gt; onglet Général."
+                     name="object deed" value="36" />
+                <action
+                     description="Manipuler (déplacer, copier, modifier) des objets appartenant au groupe"
+                     longdescription="Manipulez (déplacez, copiez, modifiez) les objets appartenant au groupe dans Outils d&apos;Edition &gt; onglet Général."
+                     name="object manipulate" value="38" />
+                <action description="Mettre en vente des objets appartenant au groupe"
+                     longdescription="Définissez les objets à vendre du groupe dans Outils d&apos;Edition &gt; onglet Général."
+                     name="object set sale" value="39" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent des pouvoirs qui requièrent que les Membres paient les en-cours et reçoivent des dividendes du Groupe, ainsi que le pouvoir de restreindre l&apos;accès à l&apos;historique comptable du Groupe."
+             name="Accounting">
+                <action description="Payer le passif du groupe et recevoir les dividendes du groupe"
+                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                     name="accounting accountable" value="40" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à envoyer, recevoir, et voir les Notifications de groupe."
+             name="Notices">
+                <action description="Envoyer des Notifications"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent envoyer des Notifications dans Informations du Groupe &gt; onglet Notifications."
+                     name="notices send" value="42" />
+                <action description="Recevoir Notifications et voir Notifications passées"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent recevoir les Notifications et afficher les Notifications passées dans Informations du Groupe &gt; onglet Notifications."
+                     name="notices receive" value="43" />
+        </action_set>
+        <action_set
+             description="Ces Facultés confèrent le pouvoir d&apos;autoriser les Membres à soumettre des Propositions, les voter, et voir l&apos;historique des votes."
+             name="Proposals">
+                <action description="Créer des propositions"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent créer des propositions à voter dans Informations du Groupe &gt; onglet Propositions."
+                     name="proposal start" value="44" />
+                <action description="Voter les propositions"
+                     longdescription="Les Membres dans un Rôle avec cette Faculté peuvent voter les propositions dans Informations du Groupe &gt; onglet Propositions."
+                     name="proposal vote" value="45" />
+        </action_set>
+</role_actions>
diff --git a/linden/indra/newview/skins/xui/ja/role_actions.xml b/linden/indra/newview/skins/xui/ja/role_actions.xml
index dc3010d..c0c98b3 100644
--- a/linden/indra/newview/skins/xui/ja/role_actions.xml
+++ b/linden/indra/newview/skins/xui/ja/role_actions.xml
@@ -5,38 +5,38 @@
              name="Membership">
                 <action description="このグループに人を招待"
                      longdescription="グループに人を招待するには、[メンバーと役割]タブ＞[メンバー]サブタブの[新しい人を招待...]ボタンを使います。"
-                     name="member invite" />
+                     name="member invite"  value="1" />
                 <action description="メンバーをこのグループから追放"
                      longdescription="メンバーをこのグループから追放するには、[メンバーと役割]タブ &gt; [役割]サブタブの[グループから追放]を使います。 オーナーは、他のオーナー以外の任意のメンバーを追放できます。 オーナーでないユーザーがグループからメンバーを追放できるのは、そのメンバーが「全員」の役割にのみ所属しており、他の役割に所属していない場合だけです。 役割からメンバーを除外するには、「役割からメンバーを除外」能力を有している必要があります。"
-                     name="member eject" />
+                     name="member eject"  value="2" />
                 <action description="[会員募集]に切り替え、[入会費]を変更。"
                      longdescription="招待状なしに新メンバーが加入できるように[会員募集]に切り替え、[一般]タブの[グループ環境設定]セクションから[入会費]を変更します。"
-                     name="member options" />
+                     name="member options"  value="3" />
         </action_set>
         <action_set
              description="これらの能力には、グループ内の役割を追加、削除、変更し、役割にメンバーを追加、削除し、さらに役割へ能力を割り当てる権限が含まれます。"
              name="Roles">
                 <action description="新しい役割を作成"
                      longdescription="[メンバーと役割]タブ &gt; [役割]サブタブで新しい役割を作成"
-                     name="role create" />
+                     name="role create" value="4" />
                 <action description="役割を削除"
                      longdescription="役割を削除するには、メンバーと役割タブ &gt; 役割サブタブを使います。"
-                     name="role delete" />
+                     name="role delete" value="5" />
                 <action description="役割名、タイトル、説明を変更"
                      longdescription="役割名、タイトル、説明を変更するには、役割を選択した後、[メンバーと役割]タブ &gt; [役割]サブタブの下部分を使います。"
-                     name="role properties" />
+                     name="role properties" value="6" />
                 <action description="メンバーを割り当て人の役割に割り当てる"
                      longdescription="メンバーを割り当て人の役割に割り当てるには、[メンバーと役割]タブ＞[役割]サブタブの割り当てられた役割セクションを使います。 この能力を持つメンバーは、割り当て人が現在所属している役割に対してのみメンバーを追加できます。"
-                     name="role assign member limited" />
+                     name="role assign member limited" value="7" />
                 <action description="メンバーを任意の役割に割り当てる"
                      longdescription="メンバーを任意の役割に割り当てるには、[メンバーと役割]タブ＞[役割]サブタブの割り当てられた役割セクションを使います。 *警告* この能力を持つ役割のメンバーは、自分自身や他のメンバーを現在の役割よりも強力な役割に割り当てることができます。このため、オーナー以外のメンバーに対して、オーナーに近いパワーを与えることも可能です。 この能力の割り当ては、そのことを理解した上で行ってください。"
-                     name="role assign member" />
+                     name="role assign member" value="8" />
                 <action description="役割からメンバーを解除"
                      longdescription="メンバーを役割から解除するには、[メンバーと役割]タブ＞[メンバー]サブタブの[割り当てられた役割]セクションを使います。 オーナーは解除できません。"
-                     name="role remove member" />
+                     name="role remove member" value="9" />
                 <action description="役割の能力の割り当てと解除"
                      longdescription="役割の能力の割り当てと解除は、[メンバーと役割]タブ＞[役割]サブタブの許可された能力セクションで行います。 *警告* この能力を持つ役割のメンバーは、すべての能力を自分自身や他のメンバーに割り当てることができます。このため、オーナー以外のメンバーに対して、オーナーに近いパワーを持たせることも可能です。 この能力の割り当ては、そのことを理解した上で行ってください。"
-                     name="role change actions" />
+                     name="role change actions" value="10" />
         </action_set>
         <action_set
              description="これらの能力には、グループの公開性や憲章、記章の変更といった、グループのアイデンティティを修正する権限が含まれます。"
@@ -44,141 +44,141 @@
                 <action
                      description="特権、記章、「Web上で公開」、およびグループ情報内で可視のメンバーを変更。"
                      longdescription="特権、記章、「Web上で公開」、およびグループ情報内で可視のメンバーを変更します。 この操作には、一般タブを使用します。"
-                     name="group change identity" />
+                     name="group change identity" value="11" />
         </action_set>
         <action_set
              description="これらの能力には、グループ所有の土地を譲渡、修正、販売する権限が含まれます。 [土地情報]のウィンドウを開くには、地面を右クリックして[土地情報]を選択するか、メニューバーの[区画情報]をクリックします。"
              name="Parcel Management">
                 <action description="グループ用の土地の譲渡と購入"
                      longdescription="グループ用の土地の譲渡と購入を行います。 この操作には、土地情報画面 &gt; 一般タブを使います。"
-                     name="land deed" />
+                     name="land deed" value="12" />
                 <action description="Linden総督に土地を明け渡す"
                      longdescription="Linden総督に土地を明け渡します。 *警告* この能力を持つ役割のメンバーは、[土地情報]＞[一般]でグループ所有の土地を放棄して、売り上げなしでLinden総督に明け渡すことができます。 この能力の割り当ては、そのことを理解した上で行ってください。"
-                     name="land release" />
+                     name="land release" value="13" />
                 <action description="売り地情報の設定"
                      longdescription="売り地情報を設定します。 *警告* この能力を持つ役割のメンバーは、[土地情報]＞[一般]タブでグループ所有の土地を自分の思いどおりに販売することができます。 この能力の割り当ては、そのことを理解した上で行ってください。"
-                     name="land set sale info" />
+                     name="land set sale info" value="14" />
                 <action description="区画の再分割と統合"
                      longdescription="区画を再分割および統合します。 この操作を実行するには、地面を右クリックして［地形を編集］を選択し、土地の上でマウスをドラッグして範囲を選択します。 再分割するには、分割対象を選択した後、［再分割...］をクリックします。 統合するには、複数の隣接する区画を選択した後、［統合...］をクリックします。"
-                     name="land divide join" />
+                     name="land divide join" value="15" />
         </action_set>
         <action_set
              description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびにTPルートのオプションを変更する権限が含まれます。"
              name="Parcel Identity">
                 <action description="[場所検索に表示]に切り替え、カテゴリーを設定"
                      longdescription="[場所検索に表示]に切り替え、[土地情報]＞[オプション]タブでカテゴリーを設定"
-                     name="land find places" />
+                     name="land find places" value="17" />
                 <action description="区画名、説明、「Web上で公開」の設定を変更"
                      longdescription="区画名、説明、「Web上で公開」の設定を変更。 この操作には、[土地情報] &gt; [オプション]タブを使います。"
-                     name="land change identity" />
+                     name="land change identity" value="18" />
                 <action description="着地点およびテレポート・ルートを設定"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポート・ルートを設定して細かく制御することができます。 この操作は、[土地情報]＞[オプション]タブで行います。"
-                     name="land set landing point" />
+                     name="land set landing point" value="19" />
         </action_set>
         <action_set
              description="これらの能力には、[オブジェクトを作成]、[地形を編集]、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。"
              name="Parcel Settings">
                 <action description="音楽とメディアの設定を変更"
                      longdescription="ストリーミング・ミュージックと動画の設定を変更するには、[土地情報] &gt; [メディア]タブを使います。"
-                     name="land change media" />
+                     name="land change media" value="20" />
                 <action description="[地形を編集]に切り替え"
                      longdescription="[地形を編集]に切り替えます。 *警告* [土地情報]＞[オプション]＞[地形を編集]の順で進むと、誰でもあなたの土地の形の整備や、リンデンプラントの設置、移動ができます。  この能力を割り振る前に、このことをよく理解しておいてください。 [土地情報]＞[オプション]タブから[地形を編集]に切り替えられます。"
-                     name="land edit" />
+                     name="land edit" value="21" />
                 <action
                      description="[土地情報]＞[オプション]タブ内のさまざまな設定を切り替え"
                      longdescription="[安全（ダメージなし）]、[飛ぶ]に切り替え、[土地情報]＞[オプション]タブから、 他の住人がグループ所有の土地で[オブジェクトを作成]、[地形を編集]、[ランドマークを作成]、[スクリプトを実行]できるようにします。"
-                     name="land options" />
+                     name="land options" value="22" />
         </action_set>
         <action_set
              description="これらの能力には、グループ所有の区画に関する規制を迂回することを、メンバーに許可する権限が含まれます。"
              name="Parcel Powers">
                 <action description="常に「地形を編集」を許可"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で地形を編集することができます。その区画が[土地情報]＞[オプション]タブでオフになっていても、地形の編集が可能です。"
-                     name="land allow edit land" />
+                     name="land allow edit land" value="23" />
                 <action description="常に「飛行」を許可"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上を飛行することができます。その区画が[土地情報]＞[オプション]タブでオフになっていても、飛行が可能です。"
-                     name="land allow fly" />
+                     name="land allow fly" value="24" />
                 <action description="常に「オブジェクト作成」を許可"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が[土地情報]＞[オプション]タブでオフになっていても、オブジェクトの作成が可能です。"
-                     name="land allow create" />
+                     name="land allow create" value="25" />
                 <action description="常に「ランドマークを作成」を許可"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にランドマークを作成することができます。その区画が[土地情報]＞[オプション]タブでオフになっていても、ランドマークの作成が可能です。"
-                     name="land allow landmark" />
+                     name="land allow landmark" value="26" />
                 <action description="グループの土地への「ホーム設定」を許可"
                      longdescription="この能力を持つ役割のメンバーは、[ワールド]メニュー＞[ホームをここに設定]を使用して、このグループに譲渡された区画をホームに設定することができます。"
-                     name="land allow set home" />
+                     name="land allow set home" value="28" />
         </action_set>
         <action_set
              description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。"
              name="Parcel Access">
                 <action description="区画アクセス・リストの管理"
                      longdescription="区画アクセス・リストの管理は、[土地情報]＞[アクセス]タブで行います。"
-                     name="land manage allowed" />
+                     name="land manage allowed" value="29" />
                 <action description="区画禁止リストの管理"
                      longdescription="区画禁止リストの管理は、[土地情報]＞[禁止]タブで行います。"
-                     name="land manage banned" />
+                     name="land manage banned" value="30" />
                 <action description="区画の「パス販売」の設定を変更"
                      longdescription="区画の「パス販売」の設定を変更するには、[土地情報] &gt; [アクセス]タブを使います。"
-                     name="land manage passes" />
+                     name="land manage passes" value="31" />
                 <action description="区画上の住人の追放と凍結"
                      longdescription="この能力を持つ役割のメンバーは、グループ所有の区画に問題のある住人がいる場合に、右クリック・メニューから[詳細＞]を選択し、[追放...]または[フリーズ...]を選択することにより、その住人を処理することができます。"
-                     name="land admin" />
+                     name="land admin" value="32" />
         </action_set>
         <action_set
              description="これらの能力には、オブジェクトの返却、リンデンプラントの設置や移動を、メンバーに許可する権限が含まれます。 これはメンバーがゴミ処理や景観作成をする際に便利ですが、返却したオブジェクトは元に戻せないので、注意して行いましょう。"
              name="Parcel Content">
                 <action description="グループ所有オブジェクトの返却"
                      longdescription="グループ所有の区画上のオブジェクトのうち、グループ所有のオブジェクトを返却するには、[土地情報]＞[オブジェクト]タブを使います。"
-                     name="land return group owned" />
+                     name="land return group owned" value="48" />
                 <action description="グループに設定されているオブジェクトを返却"
                      longdescription="グループ所有の区画上のオブジェクトのうち、グループに設定されているオブジェクトを返却するには、[土地情報]＞[オブジェクト]タブを使います。"
-                     name="land return group set" />
+                     name="land return group set" value="33" />
                 <action description="非グループ・オブジェクトの返却"
                      longdescription="グループ所有の区画上のオブジェクトのうち、グループ以外のオブジェクトを返却するには、[土地情報]＞[オブジェクト]タブを使います。"
-                     name="land return non group" />
+                     name="land return non group" value="34" />
                 <action description="Linden製の植物を使用して景観作成"
                      longdescription="景観作成能力により、リンデン製の樹木、植物、草を配置および移動することができます。 これらのアイテムは、自分の持ち物のライブラリ＞オブジェクト・フォルダから検索できるほか、「作成」ボタンで作成することもできます。"
-                     name="land gardening" />
+                     name="land gardening" value="35" />
         </action_set>
         <action_set
              description="これらの能力には、グループ所有のオブジェクトを譲渡、修正、販売する権限が含まれます。 こうした変更は、［編集ツール］&gt;［一般］タブで行われます。 オブジェクトを右クリックして［編集］を開くと、設定内容を表示できます。"
              name="Object Management">
                 <action description="グループにオブジェクトを譲渡"
                      longdescription="グループにオブジェクトを譲渡するには、編集ツール＞一般タブを使います。"
-                     name="object deed" />
+                     name="object deed" value="36" />
                 <action
                      description="グループ所有オブジェクトの操作（移動、コピー、修正）"
                      longdescription="グループ所有オブジェクトの操作（移動、コピー、修正）は、[編集ツール]＞[一般]タブで行います。"
-                     name="object manipulate" />
+                     name="object manipulate" value="38" />
                 <action description="グループ所有オブジェクトを販売可能に設定"
                      longdescription="グループ所有オブジェクトを販売可能に設定にするには、[編集ツール]＞[一般]タブを使います。"
-                     name="object set sale" />
+                     name="object set sale" value="39" />
         </action_set>
         <action_set
              description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。"
              name="Accounting">
                 <action description="グループ負債の返済とグループ配当の受領"
                      longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。 つまり、これらのメンバーは、毎日配当されるグループ所有の土地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。"
-                     name="accounting accountable" />
+                     name="accounting accountable" value="40" />
         </action_set>
         <action_set
              description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。"
              name="Notices">
                 <action description="通知を送信"
                      longdescription="この能力を持つ役割のメンバーは、[グループ情報]＞[通知]タブで通知を送信することができます。"
-                     name="notices send" />
+                     name="notices send" value="42" />
                 <action description="通知の受信と過去の通知の閲覧"
                      longdescription="この能力を持つ役割のメンバーは、通知を受け取ることができ、[グループ情報]＞[通知]タブで過去の通知を閲覧することができます。"
-                     name="notices receive" />
+                     name="notices receive" value="43" />
         </action_set>
         <action_set
              description="これらの能力には、提案の作成と投票、投票履歴の表示をメンバーに許可する権限が含まれます。"
              name="Proposals">
                 <action description="提案を作成"
                      longdescription="この能力を持つ役割のメンバーは、投票の対象となる問題提起を[グループ情報]＞[問題提起]タブ上で作成することができます。"
-                     name="proposal start" />
+                     name="proposal start" value="44" />
                 <action description="問題提起に投票する"
                      longdescription="この能力を持つ役割のメンバーは、グループ情報＞提案タブで提案に投票することができます。"
-                     name="proposal vote" />
+                     name="proposal vote" value="45" />
         </action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/xui/ko/role_actions.xml b/linden/indra/newview/skins/xui/ko/role_actions.xml
index 848393e..9e06970 100644
--- a/linden/indra/newview/skins/xui/ko/role_actions.xml
+++ b/linden/indra/newview/skins/xui/ko/role_actions.xml
@@ -5,39 +5,39 @@
              name="Membership">
                 <action description="이 그룹에 사람들 초대"
                      longdescription="회원 및 역할 탭 &gt; 회원 하위 탭에 있는 &apos;새로운 사람 초대’ 버튼을 사용하여 이 그룹에 사람들을 초대합니다."
-                     name="member invite" />
+                     name="member invite" value="1" />
                 <action description="이 그룹에서 회원 강퇴"
                      longdescription="회원 및 역할 탭 &gt; 회원 하위 탭에서 &apos;그룹에서 강퇴&apos; 버튼을 사용하여 이 그룹에서 회원 강퇴를 수행합니다. 소유주는 다른 소유주를 제외한 모든 사람을 추방할 수 있습니다. 소유주가 아닌 회원인 경우에는 모든 사람 역할에 속한 경우에만 그룹에서 강퇴되며 다른 역할인 경우에는 추방되지 않습니다. 회원을 역할에서 제거하려면 &apos;역할에서 회원 삭제&apos; 권한이 있어야 합니다."
-                     name="member eject" />
+                     name="member eject" value="2" />
                 <action
                      description="&apos;자유 가입&apos; 토글 및 &apos;가입 수수료&apos; 변경"
                      longdescription="초대 없이 새 회원을 가입시키려면 &apos;자유 가입&apos;을 토글하고 일반 탭의 그룹 환경 설정 섹션에서 &apos;가입 수수료&apos;를 변경합니다."
-                     name="member options" />
+                     name="member options" value="3" />
         </action_set>
         <action_set
              description="이러한 권한에는 그룹 역할을 추가, 삭제 및 변경, 특정 역할에 회원을 추가 및 삭제하며 특정 역할에 다른 권한을 할당하는 것을 포함합니다."
              name="Roles">
                 <action description="새 역할 생성"
                      longdescription="회원 및 역할 탭 &gt; 역할 하위 탭에서 새 역할을 생성합니다."
-                     name="role create" />
+                     name="role create" value="4" />
                 <action description="역할 삭제"
                      longdescription="회원 및 역할 탭 &gt; 역할 하위 탭에서 역할을 삭제합니다."
-                     name="role delete" />
+                     name="role delete" value="5" />
                 <action description="역할 이름, 타이틀 및 설명 변경"
                      longdescription="역할을 선택한 후 회원 및 역할 탭 &gt; 역할 하위 탭 맨 아래에서 역할 이름, 타이틀 및 설명을 변경합니다."
-                     name="role properties" />
+                     name="role properties" value="6" />
                 <action description="회원에게 할당자의 역할 할당"
                      longdescription="회원 및 역할 탭 &gt; 회원 하위 탭의 할당된 역할 섹션에서 회원에게 역할을 할당합니다. 이 권한을 가진 회원은 할당자가 이미 속해 있는 역할에만 회원을 추가할 수 있습니다."
-                     name="role assign member limited" />
+                     name="role assign member limited" value="7" />
                 <action description="회원에게 모든 역할 할당"
                      longdescription="회원 및 역할 탭 &gt; 회원 하위 탭의 할당된 역할 섹션에서 회원에게 모든 역할 할당을 수행합니다. *경고* 이 권한을 가진 역할 회원은 소유자가 아닌 다른 회원 및 자기 자신에게 현재 보유한 권한 이상의 역할을 할당하여 소유자에 필적하는 권한을 가지도록 할 수 있습니다. 이 권한을 할당하기 전에 현재 상태에 대해 이해 해야 합니다."
-                     name="role assign member" />
+                     name="role assign member" value="8" />
                 <action description="역할에서 회원 삭제"
                      longdescription="회원 및 역할 탭 &gt; 회원 하위 탭의 할당된 역할에서 회원들로부터 역할 제거. 소유자들은 제거될 수 없음."
-                     name="role remove member" />
+                     name="role remove member" value="9" />
                 <action description="역할의 권한을 할당 및 삭제"
                      longdescription="회원 및 역할 탭 &gt; 역할 하위 탭의 허용된 권한 섹션에서 역할의 권한을 할당 및 삭제합니다. *경고* 이 권한을 가진 역할 회원은 소유자가 아닌 다른 회원 및 자기 자신에게 모든 권한을 할당하여 소유자에 필적하는 권한을 가지도록 할 수 있습니다. 이 권한을 할당하기 전에 현재 상태에 대해 이해 해야 합니다."
-                     name="role change actions" />
+                     name="role change actions" value="10" />
         </action_set>
         <action_set
              description="이러한 권한에는 공공 가시성, 설립 조항, 휘장 변경과 같은 그룹의 신분을 수정할 권한이 포함됩니다."
@@ -45,139 +45,139 @@
                 <action
                      description="설립 조항, 로고, &apos;웹에 게시&apos;, 그룹 정보에 표시되는 회원 등을 변경합니다."
                      longdescription="설립 조항, 로고, &apos;웹에 게시&apos;, 그룹 정보에 표시되는 회원 등을 변경합니다. 일반 탭에서 수행합니다."
-                     name="group change identity" />
+                     name="group change identity" value="11" />
         </action_set>
         <action_set
              description="이러한 권한에는 이 그룹 소유 토지를 양도, 수정 및 판매하는 권한이 포함됩니다. 토지 소개 창에 가려면 토지의 일부를 마우스 오른쪽 클릭하고 &apos;토지 소개...&apos;를 선택하거나 메뉴 바에서 구획 정보를 클릭합니다."
              name="Parcel Management">
                 <action description="토지 양도 및 그룹을 위한 토지 구매"
                      longdescription="토지를 양도하고 그룹을 위한 토지를 구매합니다. 토지 소개 &gt; 일반 탭에서 수행합니다."
-                     name="land deed" />
+                     name="land deed" value="12" />
                 <action description="린든에게 토지 버리기"
                      longdescription="린든에게 토지를 버립니다. *경고* 이 권한을 가진 역할 회원은 토지 소개 &gt; 일반 탭에서 그룹 소유의 토지를 판매하지 않고 버려 린든 소유로 되돌릴 수 있습니다. 이 권한을 할당하기 전에 현재 상태에 대해 이해해야 합니다."
-                     name="land release" />
+                     name="land release" value="13" />
                 <action description="토지 판매 정보 설정"
                      longdescription="토지 판매 정보 설정 *경고* 역할에 이 권한이 있는 회원은 토지 소개 &gt; 일반 탭을 사용하여 원하는 대로 그룹 소유 토지를 판매할 수 있습니다! 이 권한을 할당하기 전에 현재 상태에 대해 이해해야 합니다."
-                     name="land set sale info" />
+                     name="land set sale info" value="14" />
                 <action description="구획 분할 및 결합"
                      longdescription="구획 분할 및 결합. 이렇게 하려면 토지, &apos;지형 편집&apos;을 마우스 오른쪽 버튼으로 클릭하고 선택할 토지로 마우스를 드래그하십시오. 구획을 분할하려면 분할할 구획을 선택하고 &apos;세분…&apos;을 클릭합니다. 구획을 결합하려면 2개 이상의 인접한 구획을 선택하고 &apos;결합…&apos;을 클릭합니다. "
-                     name="land divide join" />
+                     name="land divide join" value="15" />
         </action_set>
         <action_set
              description="이러한 권한에는 구획 이름 및 게시 설정, 연락처 찾기, 착륙 지점 및 텔리포트 경로 옵션 등을 변경할 수 있는 권한이 포함됩니다."
              name="Parcel Identity">
                 <action description="&apos;장소 찾기&apos;를 토글 및 카테고리 설정"
                      longdescription="토지 소개 &gt; 옵션 탭에서 &apos;장소 찾기&apos;를 토글하고 구획의 카테고리를 설정합니다."
-                     name="land find places" />
+                     name="land find places" value="17" />
                 <action description="구획 이름, 설명, &apos;웹에 게시&apos; 설정 변경"
                      longdescription="구획 이름, 설명 및 &apos;웹에 게시&apos;에 대한 설정을 변경합니다. 토지 소개 &gt; 옵션 탭에서 수행합니다."
-                     name="land change identity" />
+                     name="land change identity" value="18" />
                 <action description="텔레포트 도착지 및 텔레포트 경로 설정"
                      longdescription="그룹 소유 구획에서, 역할에 이 권한이 있는 회원은 수신 텔레포트의 도착지를 설정하고, 향후 제어할 수 있는 텔레포트 착신 전환도 설정할 수 있습니다. 이는 토지 소개 &gt; 옵션 탭에서 이루어 집니다."
-                     name="land set landing point" />
+                     name="land set landing point" value="19" />
         </action_set>
         <action_set
              description="이러한 기능에는 &apos;오브젝트 만들기’, &apos;지형 편집&apos;, 음악과 미디어 설정과 같은 구획 옵션에 영향을 주는 권한이 포함됩니다."
              name="Parcel Settings">
                 <action description="음악 및 미디어 설정 변경"
                      longdescription="토지 소개 &gt; 미디어 탭에서 스트리밍 음악 및 동영상 설정을 변경합니다."
-                     name="land change media" />
+                     name="land change media" value="20" />
                 <action description="&apos;지형 편집&apos; 토글"
                      longdescription="&apos;지형 편집&apos; 토글. *경고* 토지 소개 &gt; 옵션 탭 &gt; 지형 편집 기능을 사용하면 다른 모든 사람들이 귀하의 토지 모습을 변형하여 린든 시설에 배치 및 이동할 수 있습니다. 이 권한을 할당하기 전에 현재 상태에 대해 이해해야 합니다. 지형 편집 기능은 토지 소개 &gt; 옵션 탭에서 전환할 수 있습니다."
-                     name="land edit" />
+                     name="land edit" value="21" />
                 <action description="토지 소개 &gt; 옵션 설정 토글"
                      longdescription="안전(데미지 없음)&apos;, &apos;비행&apos;을 토글하면 다른 주민들이 토지 소개 &gt; 옵션 탭에서 그룹이 소유한 토지에 대해 &apos;오브젝트 만들기&apos;, &apos;지형 편집&apos; 및 &apos;스크립트 실행&apos; 기능을 사용할 수 있습니다."
-                     name="land options" />
+                     name="land options" value="22" />
         </action_set>
         <action_set
              description="이러한 권한에는 회원이 그룹 소유의 구획에서 제약을 우회할 수 있는 권한이 포함됩니다."
              name="Parcel Powers">
                 <action description="&apos;지형 편집&apos; 항상 허용"
                      longdescription="역할에 이 권한이 있는 회원은 토지 소개 &gt; 옵션 탭에서 꺼져 있어도 그룹 소유 구획에서 오브젝트를 편집할 수 있습니다."
-                     name="land allow edit land" />
+                     name="land allow edit land" value="23" />
                 <action description="&apos;비행&apos; 항상 허용"
                      longdescription="역할에 이 권한이 있는 회원은 토지 소개 &gt; 옵션 탭에서 꺼져 있어도 그룹 소유 구획에서 비행할 수 있습니다."
-                     name="land allow fly" />
+                     name="land allow fly" value="24" />
                 <action description="&apos;오브젝트 만들기&apos; 항상 허용"
                      longdescription="역할에 이 권한이 있는 회원은 토지 소개 &gt; 옵션 탭에서 꺼져 있어도 그룹 소유 구획에서 오브젝트를 만들 수 있습니다."
-                     name="land allow create" />
+                     name="land allow create" value="25" />
                 <action description="&apos;랜드마크 만들기&apos; 항상 허용"
                      longdescription="역할에 이 권한이 있는 회원은 토지 소개 &gt; 옵션 탭에서 꺼져 있어도 그룹 소유 구획에서 랜드마크 할 수 있습니다."
-                     name="land allow landmark" />
+                     name="land allow landmark" value="26" />
                 <action description="그룹 토지에 &apos;이곳을 홈으로 설정&apos; 허용"
                      longdescription="역할에 이 권한이 있는 회원은 이 그룹에 양도된 구획에서 월드 메뉴 &gt; 이곳을 홈으로 설정을 이용할 수 있습니다."
-                     name="land allow set home" />
+                     name="land allow set home" value="28" />
         </action_set>
         <action_set
              description="이러한 권한에는 주민 동결 및 강퇴를 포함하여 그룹 소유 구획에 대한 접근을 허용 또는 제한하는 것이 포함됩니다."
              name="Parcel Access">
                 <action description="구획 사용 권한 목록 관리"
                      longdescription="토지 소개 &gt; 사용 권한 탭의 구획 사용 권한 목록 관리"
-                     name="land manage allowed" />
+                     name="land manage allowed" value="29" />
                 <action description="구획 차단 목록 관리"
                      longdescription="토지 소개 &gt; 차단 탭에 있는 구획 차단 목록을 관리합니다."
-                     name="land manage banned" />
+                     name="land manage banned" value="30" />
                 <action description="구획 &apos;임시 통행권 판매&apos; 설정 변경"
                      longdescription="토지 소개 &gt; 사용 권한 탭에서 구획 &apos;임시 통행권 판매&apos; 설정을 변경합니다."
-                     name="land manage passes" />
+                     name="land manage passes" value="31" />
                 <action description="구획의 주민 강퇴 및 정지"
                      longdescription="역할에 이 권한이 있는 회원은 그룹 소유 구획에서 환영하지 않는 주민을 마우스 오른쪽 클릭, 더 보기&gt;, ‘추방’, 또는 ‘동결’을 선택하여 해당 주민을 처리할 수 있습니다."
-                     name="land admin" />
+                     name="land admin" value="32" />
         </action_set>
         <action_set
              description="이러한 권한에는 회원이 오브젝트와 장소를 반환하고 린든 시설들을 삭제할 수 있는 기능이 포함됩니다. 회원이 쓰레기를 청소하고 조경할 때 유용하지만 반환 오브젝트에 대해 취소를 할 수 없으므로 주의해서 사용해야 합니다."
              name="Parcel Content">
                 <action description="Return objects owned by group"
                      longdescription="토지 소개 &gt; 오브젝트 탭에 있는 그룹 소유의 오브젝트를 그룹 소유 구획에 반환합니다."
-                     name="land return group owned" />
+                     name="land return group owned" value="48" />
                 <action description="그룹에 설정된 오브젝트 반환"
                      longdescription="토지 소개 &gt; 오브젝트 탭에서 그룹에 설정된 오브젝트를 그룹 소유 구획에 반환합니다."
-                     name="land return group set" />
+                     name="land return group set" value="33" />
                 <action description="비그룹 오브젝트 반환"
                      longdescription="토지 소개 &gt; 오브젝트 탭에 있는 비그룹의 오브젝트를 그룹 소유 구획에 반환합니다."
-                     name="land return non group" />
+                     name="land return non group" value="34" />
                 <action description="린든 식물을 사용한 조경"
                      longdescription="린든 나무, 식물, 잔디의 조경 권한. 이러한 아이템은 인벤토리의 라이브러리 &gt; 오브젝트 폴더에 있거나 직접 만들 수 있습니다."
-                     name="land gardening" />
+                     name="land gardening" value="35" />
         </action_set>
         <action_set
              description="이러한 권한에는 그룹 소유 오브젝트를 양도, 수정, 판매하는 권한이 포함됩니다. 이러한 변경은 '편집 도구 &gt; 일반 탭'에서 수행됩니다. 오브젝트를 마우스 오른쪽 클릭하고 '편집'을 선택해 설정을 봅니다."
              name="Object Management">
                 <action description="그룹에게 오브젝트 양도"
                      longdescription="편집 도구 &gt; 일반 탭에서 오브젝트를 그룹에 양도합니다."
-                     name="object deed" />
+                     name="object deed" value="36" />
                 <action description="그룹 소유 오브젝트 조작(이동, 복사, 수정)"
                      longdescription="도구 편집 일반 탭에 있는 그룹 소유 오브젝트를 조작합니다(이동, 복사, 수정)."
-                     name="object manipulate" />
+                     name="object manipulate" value="38" />
                 <action description="그룹 소유 오브젝트를 판매로 설정"
                      longdescription="편집 도구 &gt; 일반 탭에서 그룹 소유 오브젝트를 판매 오브젝트로 설정하십시오."
-                     name="object set sale" />
+                     name="object set sale" value="39" />
         </action_set>
         <action_set
              description="이러한 권한에는 회원이 그룹 부채를 지불하고 그룹 배당금을 수령해야 하며 그룹 계정 기록에 대한 접근을 제한하는 권한이 포함됩니다."
              name="Accounting">
                 <action description="그룹 부채 지불과 그룹 배당금 수령"
                      longdescription="역할에 이 권한이 있는 회원은 그룹 부채를 자동 지불하고 그룹 배당금을 수령합니다. 이는 회원이 그룹 소유 토지 판매에서 매일 분배되는 일정 부분을 수령하고 구획 게재 비용 등을 기부함을 의미합니다. "
-                     name="accounting accountable" />
+                     name="accounting accountable" value="40" />
         </action_set>
         <action_set
              description="이러한 권한에는 회원이 그룹 통지를 전송, 수령 및 볼 수 있게 하는 것이 포함됩니다."
              name="Notices">
                 <action description="공지 전송"
                      longdescription="역할에 이 권한이 있는 회원은  그룹 정보 &gt; 공지 탭에서 공지를 발송할 수 있습니다."
-                     name="notices send" />
+                     name="notices send" value="42" />
                 <action description="공지 수령 및 과거 공지 보기"
                      longdescription="역할에 이 권한이 있는 회원은 공지를 수령하고 그룹 정보 &gt; 공지 탭에서 지난 공지 사항을 볼 수 있습니다."
-                     name="notices receive" />
+                     name="notices receive" value="43" />
         </action_set>
         <action_set
              description="이러한 권한에는 회원이 제안을 설정하고 제안에 투표하며 투표 기록을 볼 수 있게 하는 것이 포함됩니다."
              name="Proposals">
                 <action description="제안 만들기"
                      longdescription="역할에 이 권한이 있는 회원은 그룹 정보 &gt; 제안 탭에서 투표 가능한 제안을 만들 수 있습니다."
-                     name="proposal start" />
+                     name="proposal start" value="44" />
                 <action description="제안에 투표"
                      longdescription="역할에 이 권한이 있는 회원은 그룹 정보 &gt; 제안 탭에서 제안에 관한 투표를 할 수 있습니다."
-                     name="proposal vote" />
+                     name="proposal vote" value="45" />
         </action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/xui/pt/role_actions.xml b/linden/indra/newview/skins/xui/pt/role_actions.xml
index 91ca2a4..7267e60 100644
--- a/linden/indra/newview/skins/xui/pt/role_actions.xml
+++ b/linden/indra/newview/skins/xui/pt/role_actions.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<role_actions>

-        <action_set

-             description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite."

-             name="Membership">

-                <action description="Convidar pessoas para este grupo"

-                     longdescription="Convide pessoas para este grupo usando o botão &apos;Convidar nova pessoa...&apos; em Membros &amp; aba Funções &gt; sub-aba Membros."

-                     name="member invite" />

-                <action description="Expulsar membros deste grupo"

-                     longdescription="Expulse membros deste grupo usando o botão &apos;Expulsar do grupo&apos; em Membros &amp; aba Funções &gt; sub-aba Membros. Um proprietário pode expulsar qualquer um, exceto outro proprietário. Se você não é um proprietário, um membro pode expulsá-lo do grupo se, e somente se, ele apenas tiver a função de todos e não outras funções. Para remover membros de funções, você precisa ter a habilidade &apos;Remover membros de funções&apos;."

-                     name="member eject" />

-                <action

-                     description="Ativar/desativar &apos;Abrir registro&apos; e mudar &apos;Taxa de assinatura&apos;"

-                     longdescription="Ative/desative &apos;Abrir registro&apos; para permitir que novos membros se unam sem um convite, e mude a &apos;Taxa de registro&apos; na seção Preferência de grupo da aba Geral."

-                     name="member options" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções."

-             name="Roles">

-                <action description="Criar novas funções"

-                     longdescription="Crie novas funções em Membros &amp; aba Funções &gt; sub-aba Funções."

-                     name="role create" />

-                <action description="Apagar funções"

-                     longdescription="Apague funções em Membros &amp; aba Funções &gt; sub-aba Funções."

-                     name="role delete" />

-                <action description="Mudar nomes de função, títulos e descrições"

-                     longdescription="Mude o nome de funções, títulos e descrições na parte inferior de Membros &amp; aba Funções &gt; sub-aba Funções após selecionar uma função."

-                     name="role properties" />

-                <action description="Designar membros para a função do designador"

-                     longdescription="Designe membros a funções na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. Um membro com este poder pode somente adicionar membros para a função que o designador já possui."

-                     name="role assign member limited" />

-                <action description="Designar membros para qualquer função"

-                     longdescription="Designe membros a qualquer função na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. *AVISO* Quaisquer membros em uma função com esta habilidade podem designar a si próprios--e quaisquer outros membros não proprietários--para funções que têm mais poderes do que as atuais, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."

-                     name="role assign member" />

-                <action description="Remover membros das funções"

-                     longdescription="Remova membros de funções na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. Proprietários não podem ser removidos."

-                     name="role remove member" />

-                <action description="Determinar e remover habilidades em funções"

-                     longdescription="Designe e remova habilidades em funções na seção habilidades pertmitidas de Membros &amp; aba Funções &gt; sub-aba Funções. *AVISO* Quaisquer membros em uma função com esta habilidade podem desginar a si próprios--e quaisquer outros membros não proprietários--todas as habilidades, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."

-                     name="role change actions" />

-        </action_set>

-        <action_set

-             description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insígnia."

-             name="Group Identity">

-                <action

-                     description="Mudar apresentação, insígnia, &apos;Publicar na web&apos;, e quais membros estão publicamente visíveis em Informações do Grupo."

-                     longdescription="Mude a apresentação, insígnia, &apos;Publicar na web&apos; e quais membros estão publicamente visíveis em Informações do grupo. É feito na aba Geral."

-                     name="group change identity" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes para transferir, modificar e vender terrenos do grupo. Vá pra a janela Sobre o terreno, clique com o botão direito no terreno e selecione &apos;Sobre o terreno...&apos; ou clique na informação da parcela na barra do menu."

-             name="Parcel Management">

-                <action description="Transferir  e comprar terreno para o grupo"

-                     longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno &gt; aba Geral."

-                     name="land deed" />

-                <action description="Abandonar terreno para Governador Linden"

-                     longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno &gt; aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade."

-                     name="land release" />

-                <action description="Definir terreno para informação de venda"

-                     longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno &gt; aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade."

-                     name="land set sale info" />

-                <action description="Subdividir e unir parcelas"

-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "

-                     name="land divide join" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem &amp; opções de rota de TP."

-             name="Parcel Identity">

-                <action

-                     description="Ativar/desativar &apos;Exibir em locais de encontro&apos; e definir categoria"

-                     longdescription="Ativar/desativar &apos;Exibir em locais de encontro&apos; e configurar uma categoria de parcela em Sobre o terreno &gt; aba Opções."

-                     name="land find places" />

-                <action

-                     description="Mudar nome da parcela, descrição, e configurações &apos;Publicar na web&apos;"

-                     longdescription="Mude o nome da parcela, descrição e configurações de &apos;Publicar na web&apos;. É feito em Sobre o terreno &gt; aba Opções."

-                     name="land change identity" />

-                <action description="Definir ponto de aterrissagem e rota de teletransporte"

-                     longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno &gt; aba Opções."

-                     name="land set landing point" />

-        </action_set>

-        <action_set

-             description="Estas habilidade incluem poderes que afetam opções de parcela, como &apos;Criar objetos&apos;, &apos;Editar terreno&apos; e música &amp; configurações de mídia."

-             name="Parcel Settings">

-                <action description="Mudar música &amp; configurações de mídia"

-                     longdescription="Mude streaming de música e configurações de vídeo em Sobre o terreno &gt; aba Mídia."

-                     name="land change media" />

-                <action description="Ativar/desativar &apos;Editar terreno&apos;"

-                     longdescription="Ative/desative &apos;Editar terreno&apos;. *AVISO* Sobre o terreno &gt; aba Opções &gt; Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno &gt; aba Opções."

-                     name="land edit" />

-                <action

-                     description="Ativar/desativar variados Sobre o Terreno &gt; Opções de configuração"

-                     longdescription="Ative/desative &apos;Seguro (sem dano)&apos;, &apos;Voar&apos;, e permita a outros residentes: &apos;Criar objetos&apos;, &apos;Editar terreno&apos;, &apos;Criar pontos de referência&apos;, e &apos;Executar scripts&apos; em um terreno pertencente ao grupo em Sobre o terreno &gt; aba Opções."

-                     name="land options" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo."

-             name="Parcel Powers">

-                <action description="Sempre permitir &apos;Editar terreno&apos;"

-                     longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."

-                     name="land allow edit land" />

-                <action description="Sempre permitir &apos;Voar&apos;"

-                     longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."

-                     name="land allow fly" />

-                <action description="Sempre permitir &apos;Criar objetos&apos;"

-                     longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."

-                     name="land allow create" />

-                <action description="Sempre permitir &apos;Criar ponto de referência&apos;"

-                     longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."

-                     name="land allow landmark" />

-                <action description="Permitir &apos;Colocar casa aqui&apos; no terreno do grupo"

-                     longdescription="Membros em uma função com esta habilidade podem usar o menu Mundo &gt; Definir lar aqui em uma parcela do grupo (definir terreno ou transferir para este grupo)."

-                     name="land allow set home" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes."

-             name="Parcel Access">

-                <action description="Gerenciar listas de acesso à parcela"

-                     longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno &gt; aba Acesso."

-                     name="land manage allowed" />

-                <action description="Gerenciar lista de banidos da parcela"

-                     longdescription="Gerencie a lista de banidos da parcela em Sobre o terreno &gt; aba Banido."

-                     name="land manage banned" />

-                <action description="Mudar configurações de parcela &apos;Vender passes...&apos;"

-                     longdescription="Mude configurações de &apos;Vender passes...&apos; em Sobre o terreno &gt; aba Acesso."

-                     name="land manage passes" />

-                <action description="Expulsar e congelar residentes nas parcelas"

-                     longdescription="Membros em uma função com esta habilidade podem lidar com um residente indesejado em uma parcela pertencente ao grupo clicando com o botão direitos sobre ele, Mais &gt; e selecionado &apos;Expulsar...&apos; ou &apos;Congelar...&apos;."

-                     name="land admin" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possível desfazer a mudança dos objetos."

-             name="Parcel Content">

-                <action description="Retornar objetos que pertencem ao grupo"

-                     longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno &gt; aba Objetos."

-                     name="land return group owned" />

-                <action description="Retornar objetos definidos para o grupo"

-                     longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno &gt; aba Objetos."

-                     name="land return group set" />

-                <action description="Retornar objetos que não pertencem ao grupo"

-                     longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno &gt; aba Objetos."

-                     name="land return non group" />

-                <action description="Ajardinar usando plantas Linden"

-                     longdescription="A habilidade de ajardinar permite colocar e mover árvores Linden, plantas e gramas. Estes itens podem ser encontrando na Biblioteca de seu inventário &gt; pasta Objetos ou podem ser criados através do botão Construir."

-                     name="land gardening" />

-        </action_set>

-        <action_set

-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "

-             name="Object Management">

-                <action description="Transferir objetos para o grupo"

-                     longdescription="Transfere objetos para o grupo em Editar ferramentas &gt; aba Geral."

-                     name="object deed" />

-                <action description="Manipular (mover, copiar, modificar) objetos do grupo"

-                     longdescription="Manipule (mover,copiar, modificar) objetos pertencentes ao grupo em Editar Ferramentas &gt; aba Geral."

-                     name="object manipulate" />

-                <action description="Definir objetos pertencentes ao grupo para venda"

-                     longdescription="Defina objetos pertencentes ao grupo para venda em Editar Ferramentas &gt; aba Geral."

-                     name="object set sale" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes que requerem que membros paguem dívidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo."

-             name="Accounting">

-                <action description="Pagar débitos e receber dividendos do grupo"

-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "

-                     name="accounting accountable" />

-        </action_set>

-        <action_set

-             description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo."

-             name="Notices">

-                <action description="Enviar aviso"

-                     longdescription="Membros em uma função com esta habiliade podem enviar avisos em Informações de grupo &gt; aba Avisos."

-                     name="notices send" />

-                <action description="Receber novos avisos e ver os anteriores"

-                     longdescription="Membros em uma função com esta habilidade podem receber os novos avisos e ver os anteriores em Informações de grupo &gt; aba Avisos."

-                     name="notices receive" />

-        </action_set>

-        <action_set

-             description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação."

-             name="Proposals">

-                <action description="Criar proposta"

-                     longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo &gt; aba Propostas."

-                     name="proposal start" />

-                <action description="Votar em propostas"

-                     longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo &gt; aba Propostas."

-                     name="proposal vote" />

-        </action_set>

-</role_actions>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+        <action_set
+             description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite."
+             name="Membership">
+                <action description="Convidar pessoas para este grupo"
+                     longdescription="Convide pessoas para este grupo usando o botão &apos;Convidar nova pessoa...&apos; em Membros &amp; aba Funções &gt; sub-aba Membros."
+                     name="member invite" value="1" />
+                <action description="Expulsar membros deste grupo"
+                     longdescription="Expulse membros deste grupo usando o botão &apos;Expulsar do grupo&apos; em Membros &amp; aba Funções &gt; sub-aba Membros. Um proprietário pode expulsar qualquer um, exceto outro proprietário. Se você não é um proprietário, um membro pode expulsá-lo do grupo se, e somente se, ele apenas tiver a função de todos e não outras funções. Para remover membros de funções, você precisa ter a habilidade &apos;Remover membros de funções&apos;."
+                     name="member eject" value="2" />
+                <action
+                     description="Ativar/desativar &apos;Abrir registro&apos; e mudar &apos;Taxa de assinatura&apos;"
+                     longdescription="Ative/desative &apos;Abrir registro&apos; para permitir que novos membros se unam sem um convite, e mude a &apos;Taxa de registro&apos; na seção Preferência de grupo da aba Geral."
+                     name="member options" value="3" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções."
+             name="Roles">
+                <action description="Criar novas funções"
+                     longdescription="Crie novas funções em Membros &amp; aba Funções &gt; sub-aba Funções."
+                     name="role create" value="4" />
+                <action description="Apagar funções"
+                     longdescription="Apague funções em Membros &amp; aba Funções &gt; sub-aba Funções."
+                     name="role delete" value="5" />
+                <action description="Mudar nomes de função, títulos e descrições"
+                     longdescription="Mude o nome de funções, títulos e descrições na parte inferior de Membros &amp; aba Funções &gt; sub-aba Funções após selecionar uma função."
+                     name="role properties" value="6" />
+                <action description="Designar membros para a função do designador"
+                     longdescription="Designe membros a funções na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. Um membro com este poder pode somente adicionar membros para a função que o designador já possui."
+                     name="role assign member limited" value="7" />
+                <action description="Designar membros para qualquer função"
+                     longdescription="Designe membros a qualquer função na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. *AVISO* Quaisquer membros em uma função com esta habilidade podem designar a si próprios--e quaisquer outros membros não proprietários--para funções que têm mais poderes do que as atuais, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+                     name="role assign member" value="8" />
+                <action description="Remover membros das funções"
+                     longdescription="Remova membros de funções na seção de funções designadas de Membros &amp; aba Funções &gt; sub-aba Membros. Proprietários não podem ser removidos."
+                     name="role remove member" value="9" />
+                <action description="Determinar e remover habilidades em funções"
+                     longdescription="Designe e remova habilidades em funções na seção habilidades pertmitidas de Membros &amp; aba Funções &gt; sub-aba Funções. *AVISO* Quaisquer membros em uma função com esta habilidade podem desginar a si próprios--e quaisquer outros membros não proprietários--todas as habilidades, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+                     name="role change actions" value="10" />
+        </action_set>
+        <action_set
+             description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insígnia."
+             name="Group Identity">
+                <action
+                     description="Mudar apresentação, insígnia, &apos;Publicar na web&apos;, e quais membros estão publicamente visíveis em Informações do Grupo."
+                     longdescription="Mude a apresentação, insígnia, &apos;Publicar na web&apos; e quais membros estão publicamente visíveis em Informações do grupo. É feito na aba Geral."
+                     name="group change identity" value="11" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes para transferir, modificar e vender terrenos do grupo. Vá pra a janela Sobre o terreno, clique com o botão direito no terreno e selecione &apos;Sobre o terreno...&apos; ou clique na informação da parcela na barra do menu."
+             name="Parcel Management">
+                <action description="Transferir  e comprar terreno para o grupo"
+                     longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno &gt; aba Geral."
+                     name="land deed" value="12" />
+                <action description="Abandonar terreno para Governador Linden"
+                     longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno &gt; aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+                     name="land release" value="13" />
+                <action description="Definir terreno para informação de venda"
+                     longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno &gt; aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade."
+                     name="land set sale info" value="14" />
+                <action description="Subdividir e unir parcelas"
+                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                     name="land divide join" value="15" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem &amp; opções de rota de TP."
+             name="Parcel Identity">
+                <action
+                     description="Ativar/desativar &apos;Exibir em locais de encontro&apos; e definir categoria"
+                     longdescription="Ativar/desativar &apos;Exibir em locais de encontro&apos; e configurar uma categoria de parcela em Sobre o terreno &gt; aba Opções."
+                     name="land find places" value="17" />
+                <action
+                     description="Mudar nome da parcela, descrição, e configurações &apos;Publicar na web&apos;"
+                     longdescription="Mude o nome da parcela, descrição e configurações de &apos;Publicar na web&apos;. É feito em Sobre o terreno &gt; aba Opções."
+                     name="land change identity" value="18" />
+                <action description="Definir ponto de aterrissagem e rota de teletransporte"
+                     longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno &gt; aba Opções."
+                     name="land set landing point" value="19" />
+        </action_set>
+        <action_set
+             description="Estas habilidade incluem poderes que afetam opções de parcela, como &apos;Criar objetos&apos;, &apos;Editar terreno&apos; e música &amp; configurações de mídia."
+             name="Parcel Settings">
+                <action description="Mudar música &amp; configurações de mídia"
+                     longdescription="Mude streaming de música e configurações de vídeo em Sobre o terreno &gt; aba Mídia."
+                     name="land change media" value="20" />
+                <action description="Ativar/desativar &apos;Editar terreno&apos;"
+                     longdescription="Ative/desative &apos;Editar terreno&apos;. *AVISO* Sobre o terreno &gt; aba Opções &gt; Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno &gt; aba Opções."
+                     name="land edit" value="21" />
+                <action
+                     description="Ativar/desativar variados Sobre o Terreno &gt; Opções de configuração"
+                     longdescription="Ative/desative &apos;Seguro (sem dano)&apos;, &apos;Voar&apos;, e permita a outros residentes: &apos;Criar objetos&apos;, &apos;Editar terreno&apos;, &apos;Criar pontos de referência&apos;, e &apos;Executar scripts&apos; em um terreno pertencente ao grupo em Sobre o terreno &gt; aba Opções."
+                     name="land options" value="22" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo."
+             name="Parcel Powers">
+                <action description="Sempre permitir &apos;Editar terreno&apos;"
+                     longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."
+                     name="land allow edit land" value="23" />
+                <action description="Sempre permitir &apos;Voar&apos;"
+                     longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."
+                     name="land allow fly" value="24" />
+                <action description="Sempre permitir &apos;Criar objetos&apos;"
+                     longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."
+                     name="land allow create" value="25" />
+                <action description="Sempre permitir &apos;Criar ponto de referência&apos;"
+                     longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno &gt; aba Opções."
+                     name="land allow landmark" value="26" />
+                <action description="Permitir &apos;Colocar casa aqui&apos; no terreno do grupo"
+                     longdescription="Membros em uma função com esta habilidade podem usar o menu Mundo &gt; Definir lar aqui em uma parcela do grupo (definir terreno ou transferir para este grupo)."
+                     name="land allow set home" value="28" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes."
+             name="Parcel Access">
+                <action description="Gerenciar listas de acesso à parcela"
+                     longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno &gt; aba Acesso."
+                     name="land manage allowed" value="29" />
+                <action description="Gerenciar lista de banidos da parcela"
+                     longdescription="Gerencie a lista de banidos da parcela em Sobre o terreno &gt; aba Banido."
+                     name="land manage banned" value="30" />
+                <action description="Mudar configurações de parcela &apos;Vender passes...&apos;"
+                     longdescription="Mude configurações de &apos;Vender passes...&apos; em Sobre o terreno &gt; aba Acesso."
+                     name="land manage passes" value="31" />
+                <action description="Expulsar e congelar residentes nas parcelas"
+                     longdescription="Membros em uma função com esta habilidade podem lidar com um residente indesejado em uma parcela pertencente ao grupo clicando com o botão direitos sobre ele, Mais &gt; e selecionado &apos;Expulsar...&apos; ou &apos;Congelar...&apos;."
+                     name="land admin" value="32" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possível desfazer a mudança dos objetos."
+             name="Parcel Content">
+                <action description="Retornar objetos que pertencem ao grupo"
+                     longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno &gt; aba Objetos."
+                     name="land return group owned" value="48" />
+                <action description="Retornar objetos definidos para o grupo"
+                     longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno &gt; aba Objetos."
+                     name="land return group set" value="33" />
+                <action description="Retornar objetos que não pertencem ao grupo"
+                     longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno &gt; aba Objetos."
+                     name="land return non group" value="34" />
+                <action description="Ajardinar usando plantas Linden"
+                     longdescription="A habilidade de ajardinar permite colocar e mover árvores Linden, plantas e gramas. Estes itens podem ser encontrando na Biblioteca de seu inventário &gt; pasta Objetos ou podem ser criados através do botão Construir."
+                     name="land gardening" value="35" />
+        </action_set>
+        <action_set
+             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             name="Object Management">
+                <action description="Transferir objetos para o grupo"
+                     longdescription="Transfere objetos para o grupo em Editar ferramentas &gt; aba Geral."
+                     name="object deed" value="36" />
+                <action description="Manipular (mover, copiar, modificar) objetos do grupo"
+                     longdescription="Manipule (mover,copiar, modificar) objetos pertencentes ao grupo em Editar Ferramentas &gt; aba Geral."
+                     name="object manipulate" value="38" />
+                <action description="Definir objetos pertencentes ao grupo para venda"
+                     longdescription="Defina objetos pertencentes ao grupo para venda em Editar Ferramentas &gt; aba Geral."
+                     name="object set sale" value="39" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes que requerem que membros paguem dívidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo."
+             name="Accounting">
+                <action description="Pagar débitos e receber dividendos do grupo"
+                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                     name="accounting accountable" value="40" />
+        </action_set>
+        <action_set
+             description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo."
+             name="Notices">
+                <action description="Enviar aviso"
+                     longdescription="Membros em uma função com esta habiliade podem enviar avisos em Informações de grupo &gt; aba Avisos."
+                     name="notices send" value="42" />
+                <action description="Receber novos avisos e ver os anteriores"
+                     longdescription="Membros em uma função com esta habilidade podem receber os novos avisos e ver os anteriores em Informações de grupo &gt; aba Avisos."
+                     name="notices receive" value="43" />
+        </action_set>
+        <action_set
+             description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação."
+             name="Proposals">
+                <action description="Criar proposta"
+                     longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo &gt; aba Propostas."
+                     name="proposal start" value="44" />
+                <action description="Votar em propostas"
+                     longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo &gt; aba Propostas."
+                     name="proposal vote" value="45" />
+        </action_set>
+</role_actions>
diff --git a/linden/indra/newview/skins/xui/zh/role_actions.xml b/linden/indra/newview/skins/xui/zh/role_actions.xml
index ec59576..9f6f957 100644
--- a/linden/indra/newview/skins/xui/zh/role_actions.xml
+++ b/linden/indra/newview/skins/xui/zh/role_actions.xml
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<role_actions>

-        <action_set

-             description="这些能力包括添加或移除社团成员的权利，并且有权利接纳没有邀请函的成员"

-             name="Membership">

-                <action description="邀请朋友加入社团"

-                     longdescription="Invite People to this Group using the &apos;Invite New Person...&apos; button in the Members &amp; Roles tab &gt; Members sub-tab."

-                     name="member invite" />

-                <action description="从社团驱逐会员"

-                     longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."

-                     name="member eject" />

-                <action description="绑定 &apos;打开登记&apos;并更改&apos;登记费用&apos;"

-                     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."

-                     name="member options" />

-        </action_set>

-        <action_set

-             description="这些能力包括添加，移除或改变社团角色的权利，从角色中添加或移除组员的权利，以及为角色分配能力的权利"

-             name="Roles">

-                <action description="创建新角色"

-                     longdescription="Create new Roles in the Members &amp; Roles tab &gt; Roles sub-tab."

-                     name="role create" />

-                <action description="删除角色"

-                     longdescription="Delete Roles in the Members &amp; Roles tab &gt; Roles sub-tab."

-                     name="role delete" />

-                <action description="改变角色的名字, 头衔和其他描述"

-                     longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."

-                     name="role properties" />

-                <action description="给会员分配分配者的角色"

-                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A member with this power can only add members to a role the assigner is already in."

-                     name="role assign member limited" />

-                <action description="给会员分配任何角色"

-                     longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."

-                     name="role assign member" />

-                <action description="禁止会员继续扮演该项角色"

-                     longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. Owners can&apos;t be removed."

-                     name="role remove member" />

-                <action description="分配或移除角色的能力"

-                     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."

-                     name="role change actions" />

-        </action_set>

-        <action_set

-             description="这些能力包括修改社团身份的权利，例如更改公众可见度，宪章和徽章"

-             name="Group Identity">

-                <action

-                     description="改变宪章,徽章, &apos;在网络上发布&apos;,公开会员在社团中的信息"

-                     longdescription="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information. This is done in the General tab."

-                     name="group change identity" />

-        </action_set>

-        <action_set

-             description="这些能力包括转让，修改，并出售社团所拥有的部分土地的权利。转到“关于土地“窗口，点击右键并选择“关于土地...“，或者点击在菜单条上的土地信息。"

-             name="Parcel Management">

-                <action description="转让土地或购买土地给社团"

-                     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."

-                     name="land deed" />

-                <action description="把土地放弃还给林登长官"

-                     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."

-                     name="land release" />

-                <action description="设置待售土地的信息"

-                     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."

-                     name="land set sale info" />

-                <action description="划分并加入土地"

-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "

-                     name="land divide join" />

-        </action_set>

-        <action_set

-             description="这些能力包括改变土地名称和发布设置，查找目的地可见度，选择着陆点和闪电传运点的路线的权利。"

-             name="Parcel Identity">

-                <action description="绑定&apos;在查找地点中显示&apos;并设定分类"

-                     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."

-                     name="land find places" />

-                <action

-                     description="改变土地名称, 描述和 &apos;在网络上发布&apos;的设置"

-                     longdescription="Change parcel name, description, and &apos;Publish on the Web&apos; settings. This is done in About Land &gt; Options tab."

-                     name="land change identity" />

-                <action description="设置着陆点，并设置闪电传送路径"

-                     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."

-                     name="land set landing point" />

-        </action_set>

-        <action_set

-             description="这些能力包括影响影响土地选项的权利，例如“创建东东”，“编辑地形”，音乐和媒体设置等。"

-             name="Parcel Settings">

-                <action description="改变音乐和多媒体设置"

-                     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."

-                     name="land change media" />

-                <action description="绑定&apos;编辑地形&apos;"

-                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."

-                     name="land edit" />

-                <action description="绑定各项步骤：关于土地&gt;选择设定"

-                     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."

-                     name="land options" />

-        </action_set>

-        <action_set

-             description="这些能力包括允许组员绕过社团拥有土地的限制的权利"

-             name="Parcel Powers">

-                <action description="永远允许 &apos;编辑地形&apos;"

-                     longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."

-                     name="land allow edit land" />

-                <action description="永远允许 &apos;起飞&apos;"

-                     longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."

-                     name="land allow fly" />

-                <action description="永远允许&apos;创建东东&apos;"

-                     longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."

-                     name="land allow create" />

-                <action description="永远允许 &apos;创建地标&apos;"

-                     longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."

-                     name="land allow landmark" />

-                <action description="允许在社团土地上&apos;把家建在这里&apos;"

-                     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a group parcel (either land set or deeded to this group)."

-                     name="land allow set home" />

-        </action_set>

-        <action_set

-             description="这些能力包括允许或限制通往社团拥有的土地的权利，包括冻结和驱逐组员权利。"

-             name="Parcel Access">

-                <action description="管理可进入土地名单"

-                     longdescription="Manage parcel Access lists in About Land &gt; Access tab."

-                     name="land manage allowed" />

-                <action description="管理不可进入土地名单"

-                     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."

-                     name="land manage banned" />

-                <action description="改变土地上 &apos;出售通行证...&apos;的设置"

-                     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."

-                     name="land manage passes" />

-                <action description="从土地上驱逐或冻结居民"

-                     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."

-                     name="land admin" />

-        </action_set>

-        <action_set

-             description="这些能力包括允许组员归还东东，定位或移动林登设备的权利。这对组员清理垃圾和美化景观时很有用，当这项能力在使用时应该注意，因为一旦选择归还东东后则无法撤销。"

-             name="Parcel Content">

-                <action description="归还社团拥有的东东"

-                     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."

-                     name="land return group owned" />

-                <action description="归还放置在社团处的东东"

-                     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."

-                     name="land return group set" />

-                <action description="归还非社团所有的东东"

-                     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."

-                     name="land return non group" />

-                <action description="使用林登植物美化土地"

-                     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."

-                     name="land gardening" />

-        </action_set>

-        <action_set

-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "

-             name="Object Management">

-                <action description="转让东东给社团"

-                     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."

-                     name="object deed" />

-                <action description="处理(移动，复制，修改)社团所有的东东"

-                     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."

-                     name="object manipulate" />

-                <action description="把社团拥有的东东舍维待售"

-                     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."

-                     name="object set sale" />

-        </action_set>

-        <action_set

-             description="这些能力包括要求组员偿还社团贷款和获得社团红利，以及限制进入社团帐号历史纪录的权利。"

-             name="Accounting">

-                <action description="偿还社团债务/获得社团红利"

-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "

-                     name="accounting accountable" />

-        </action_set>

-        <action_set

-             description="这些能力包括允许组员发送，接受和浏览社团通知的权利"

-             name="Notices">

-                <action description="发送通知"

-                     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."

-                     name="notices send" />

-                <action description="接受通知/回顾原来的通知"

-                     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."

-                     name="notices receive" />

-        </action_set>

-        <action_set

-             description="这些能力包括允许组员提出议案，为议案投票，和浏览投票历史纪录的权利"

-             name="Proposals">

-                <action description="创建提议本"

-                     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."

-                     name="proposal start" />

-                <action description="为议案投票"

-                     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."

-                     name="proposal vote" />

-        </action_set>

-</role_actions>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+        <action_set
+             description="这些能力包括添加或移除社团成员的权利，并且有权利接纳没有邀请函的成员"
+             name="Membership">
+                <action description="邀请朋友加入社团"
+                     longdescription="Invite People to this Group using the &apos;Invite New Person...&apos; button in the Members &amp; Roles tab &gt; Members sub-tab."
+                     name="member invite" value="1" />
+                <action description="从社团驱逐会员"
+                     longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
+                     name="member eject" value="2" />
+                <action description="绑定 &apos;打开登记&apos;并更改&apos;登记费用&apos;"
+                     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."
+                     name="member options" value="3" />
+        </action_set>
+        <action_set
+             description="这些能力包括添加，移除或改变社团角色的权利，从角色中添加或移除组员的权利，以及为角色分配能力的权利"
+             name="Roles">
+                <action description="创建新角色"
+                     longdescription="Create new Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
+                     name="role create" value="4" />
+                <action description="删除角色"
+                     longdescription="Delete Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
+                     name="role delete" value="5" />
+                <action description="改变角色的名字, 头衔和其他描述"
+                     longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."
+                     name="role properties" value="6" />
+                <action description="给会员分配分配者的角色"
+                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A member with this power can only add members to a role the assigner is already in."
+                     name="role assign member limited" value="7" />
+                <action description="给会员分配任何角色"
+                     longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
+                     name="role assign member" value="8" />
+                <action description="禁止会员继续扮演该项角色"
+                     longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. Owners can&apos;t be removed."
+                     name="role remove member" value="9" />
+                <action description="分配或移除角色的能力"
+                     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
+                     name="role change actions" value="10" />
+        </action_set>
+        <action_set
+             description="这些能力包括修改社团身份的权利，例如更改公众可见度，宪章和徽章"
+             name="Group Identity">
+                <action
+                     description="改变宪章,徽章, &apos;在网络上发布&apos;,公开会员在社团中的信息"
+                     longdescription="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information. This is done in the General tab."
+                     name="group change identity" value="11" />
+        </action_set>
+        <action_set
+             description="这些能力包括转让，修改，并出售社团所拥有的部分土地的权利。转到“关于土地“窗口，点击右键并选择“关于土地...“，或者点击在菜单条上的土地信息。"
+             name="Parcel Management">
+                <action description="转让土地或购买土地给社团"
+                     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
+                     name="land deed" value="12" />
+                <action description="把土地放弃还给林登长官"
+                     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
+                     name="land release" value="13" />
+                <action description="设置待售土地的信息"
+                     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
+                     name="land set sale info" value="14" />
+                <action description="划分并加入土地"
+                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                     name="land divide join" value="15" />
+        </action_set>
+        <action_set
+             description="这些能力包括改变土地名称和发布设置，查找目的地可见度，选择着陆点和闪电传运点的路线的权利。"
+             name="Parcel Identity">
+                <action description="绑定&apos;在查找地点中显示&apos;并设定分类"
+                     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
+                     name="land find places" value="17" />
+                <action
+                     description="改变土地名称, 描述和 &apos;在网络上发布&apos;的设置"
+                     longdescription="Change parcel name, description, and &apos;Publish on the Web&apos; settings. This is done in About Land &gt; Options tab."
+                     name="land change identity" value="18" />
+                <action description="设置着陆点，并设置闪电传送路径"
+                     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
+                     name="land set landing point" value="19" />
+        </action_set>
+        <action_set
+             description="这些能力包括影响影响土地选项的权利，例如“创建东东”，“编辑地形”，音乐和媒体设置等。"
+             name="Parcel Settings">
+                <action description="改变音乐和多媒体设置"
+                     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
+                     name="land change media" value="20" />
+                <action description="绑定&apos;编辑地形&apos;"
+                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
+                     name="land edit" value="21" />
+                <action description="绑定各项步骤：关于土地&gt;选择设定"
+                     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
+                     name="land options" value="22" />
+        </action_set>
+        <action_set
+             description="这些能力包括允许组员绕过社团拥有土地的限制的权利"
+             name="Parcel Powers">
+                <action description="永远允许 &apos;编辑地形&apos;"
+                     longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     name="land allow edit land" value="23" />
+                <action description="永远允许 &apos;起飞&apos;"
+                     longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     name="land allow fly" value="24" />
+                <action description="永远允许&apos;创建东东&apos;"
+                     longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     name="land allow create" value="25" />
+                <action description="永远允许 &apos;创建地标&apos;"
+                     longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     name="land allow landmark" value="26" />
+                <action description="允许在社团土地上&apos;把家建在这里&apos;"
+                     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a group parcel (either land set or deeded to this group)."
+                     name="land allow set home" value="28" />
+        </action_set>
+        <action_set
+             description="这些能力包括允许或限制通往社团拥有的土地的权利，包括冻结和驱逐组员权利。"
+             name="Parcel Access">
+                <action description="管理可进入土地名单"
+                     longdescription="Manage parcel Access lists in About Land &gt; Access tab."
+                     name="land manage allowed" value="29" />
+                <action description="管理不可进入土地名单"
+                     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
+                     name="land manage banned" value="30" />
+                <action description="改变土地上 &apos;出售通行证...&apos;的设置"
+                     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
+                     name="land manage passes" value="31" />
+                <action description="从土地上驱逐或冻结居民"
+                     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
+                     name="land admin" value="32" />
+        </action_set>
+        <action_set
+             description="这些能力包括允许组员归还东东，定位或移动林登设备的权利。这对组员清理垃圾和美化景观时很有用，当这项能力在使用时应该注意，因为一旦选择归还东东后则无法撤销。"
+             name="Parcel Content">
+                <action description="归还社团拥有的东东"
+                     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
+                     name="land return group owned" value="48" />
+                <action description="归还放置在社团处的东东"
+                     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."
+                     name="land return group set" value="33" />
+                <action description="归还非社团所有的东东"
+                     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
+                     name="land return non group" value="34" />
+                <action description="使用林登植物美化土地"
+                     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
+                     name="land gardening" value="35" />
+        </action_set>
+        <action_set
+             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             name="Object Management">
+                <action description="转让东东给社团"
+                     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
+                     name="object deed" value="36" />
+                <action description="处理(移动，复制，修改)社团所有的东东"
+                     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
+                     name="object manipulate" value="38" />
+                <action description="把社团拥有的东东舍维待售"
+                     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
+                     name="object set sale" value="39" />
+        </action_set>
+        <action_set
+             description="这些能力包括要求组员偿还社团贷款和获得社团红利，以及限制进入社团帐号历史纪录的权利。"
+             name="Accounting">
+                <action description="偿还社团债务/获得社团红利"
+                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                     name="accounting accountable" value="40" />
+        </action_set>
+        <action_set
+             description="这些能力包括允许组员发送，接受和浏览社团通知的权利"
+             name="Notices">
+                <action description="发送通知"
+                     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
+                     name="notices send" value="42" />
+                <action description="接受通知/回顾原来的通知"
+                     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
+                     name="notices receive" value="43" />
+        </action_set>
+        <action_set
+             description="这些能力包括允许组员提出议案，为议案投票，和浏览投票历史纪录的权利"
+             name="Proposals">
+                <action description="创建提议本"
+                     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."
+                     name="proposal start" value="44" />
+                <action description="为议案投票"
+                     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
+                     name="proposal vote" value="45" />
+        </action_set>
+</role_actions>