Second Life viewer sources 1.19.0.0

181 files changed, 3371 insertions, 12056 deletions

diff --git a/linden/indra/newview/skins/xui/de/alerts.xml b/linden/indra/newview/skins/xui/de/alerts.xml
index b98dd58..f09d0f6 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/xui/de/alerts.xml
@@ -150,6 +150,20 @@ Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?
                         Nein
                 </option>
         </alert>
+        <alert name="GrantModifyRightsMultiple">
+                <message name="message">
+                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen, 
+JEDES BELIEBIGE Objekt zu ändern, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen 
+dieser Erlaubnis.
+Möchten Sie den ausgewählten Einwohnern Änderungsrechte gewähren?
+                </message>
+                <option name="Yes">
+                        Ja
+                </option>
+                <option name="No">
+                        Nein
+                </option>
+        </alert>
         <alert name="RevokeModifyRights">
                 <message name="message">
                         Möchten Sie [FIRST_NAME] [LAST_NAME] die Änderungsrechte entziehen?
@@ -161,6 +175,17 @@ Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?
                         Nein
                 </option>
         </alert>
+        <alert name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        Möchten Sie den ausgewählten Einwohnern die Änderungsrechte entziehen?
+                </message>
+                <option name="Yes">
+                        Ja
+                </option>
+                <option name="No">
+                        Nein
+                </option>
+        </alert>
         <alert name="RemoveFriend">
                 <message name="message">
                         Möchten Sie [FIRST] [LAST] aus Ihrer Freundesliste entfernen?
@@ -470,6 +495,20 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
                         Abbrechen
                 </option>
         </alert>
+        <alert name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+                        ACHTUNG: Wenn Sie auf &apos;An jeden verkaufen&apos; klicken, kann jeder in Second Life Ihr Land kaufen, auch Einwohner in anderen Regionen.
+
+Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.
+Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
+                </message>
+                <option name="Continue">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
                         Möchten Sie alle Ihre Objekte auf dieser Parzelle,
@@ -688,9 +727,20 @@ Möchten Sie auf www.secondlife.com ein Konto anlegen?
                         Abbrechen
                 </option>
         </alert>
+        <alert name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        QuickTime wurde deaktiviert, weil Sie eine alte Version verwenden
+                </ignore>
+                <message name="message">
+                        Streaming-Video wurde deaktiviert, weil die QuickTime-Version 
+auf Ihrem Computer nicht mehr aktuell ist. 
+
+Laden Sie ein Update von http://www.apple.com/quicktime/ herunter.
+                </message>
+        </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        Anzeigen erscheinen für eine Woche auf der Registerkarte &apos;Anzeigen&apos;
+                        Anzeigen erscheinen für eine Woche unter &apos;Anzeigen&apos;
 im Suchverzeichnis.
 Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum
 Verzeichnis hinzuzufügen.
@@ -1365,7 +1415,7 @@ Region.
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
-                        Mindestens ein Objekt ist gesperrt oder gehört nicht Ihnen.
+                        Mindestens ein Objekt ist gesperrt oder gehört Ihnen nicht.
 Wenn Ihnen ein Objekt nicht gehört und Sie es nehmen, 
 werden die Rechte für den nächsten Eigentümer angewandt und Sie
 können es möglicherweise nicht bearbeiten oder kopieren.
@@ -2499,11 +2549,9 @@ Bitte überprüfen Sie Ihre Netzwerkverbindung.
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        Verbindung nicht möglich.  Anmeldeserver hat das Anmeldepaket
-nie erhalten.
+                        Die Verbindung kann nicht hergestellt werden. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder den Second Life-Servern.
 
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf &apos;Hilfe&apos;, um zu unserer Supportseite zu gelangen, oder klicken Sie auf &apos;Teleportieren&apos;, um nach Hause zu teleportieren.
                 </message>
                 <option name="OK">
                         OK
@@ -2511,6 +2559,9 @@ für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe
                 <option name="Help">
                         Hilfe
                 </option>
+                <option name="Teleport">
+                        Teleportieren
+                </option>
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
@@ -3129,7 +3180,8 @@ Inhalten wird das Objekt beschädigt. Möchten Sie dieses Element löschen?
                         Beschäftigt-Modus aktiviert.
 Chat und Instant Messages werden ausgeblendet. Instant
 Messages erhalten Ihre Beschäftigt-Antwort. Alle Teleport-
-und Inventarangebote werden abgelehnt.
+Angebote werden ausgeschlagen. Alle Inventar-Angebote werden in den
+Papierkorb verschoben.
                 </message>
                 <ignore name="ignore">
                         Beim Aktivieren des Beschäftigt-Modus
@@ -3665,10 +3717,24 @@ Wenn der Wert unter 45 liegt, öffnen Sie den Bereich &apos;Time&apos; (Zeit) ga
         </alert>
         <alert name="HelpRegionDisableCollisions" title="Kollisionen deaktivieren">
                 <message name="message">
-                        Schlechte Sim-Performance ist oftmals auf physische Objekte zurückzuführen. Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für &apos;Simulator Physics FPS&apos; (Simulator Physik-FPS) an.  Wenn der Wert unter 45 liegt, öffnen Sie den Bereich &apos;Time&apos; (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für &apos;Sim Time (Physics) &apos; [Sim Time (Physik)] 20 ms oder höher ist, klicken Sie auf &apos;Top-Kollisionsobjekte&apos;. Der Name und die Position der physikalischen Objekte, die für die schlechte Performance verantwortlich sind, werden angezeigt.
- Wenn Sie das Kontrollkästchen &apos;Kollisionen deaktivieren&apos; aktivieren und auf
-&apos;Übernehmen&apos; klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten &apos;Top-Kollisionsobjekts&apos; reisen können. Sobald Sie dort angekommen sind, sollten Sie das Objekt untersuchen – kollidiert es ständig mit anderen Objekten? Möglicherweise müssen Sie sich an den Objekt-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um Kollisionen in der Region wieder zu aktivieren, deaktivieren Sie &apos;Kollisionen deaktivieren&apos; und klicken Sie auf &apos;Übernehmen&apos;.
- Standard: aus
+                        Schlechte Sim-Performance ist oftmals auf physische Objekte zurückzuführen. 
+Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert &apos;Simulator 
+Physics FPS&apos; an. Liegt dieser unter 45, öffnen Sie unten in der 
+Statistikleiste den &apos;Time&apos;-Bereich. Liegt die &apos;Sim Time (Physics)&apos; 
+bei 20 ms oder darüber, klicken Sie auf &apos;Top-Kollisionsobjekte&apos;. 
+Der Name und der Standort der physischen Objekte, die das  
+Problem verursachen, werden angezeigt.
+ 
+Wenn Sie das Kontrollkästchen &apos;Kollisionen deaktivieren&apos; aktivieren und auf
+&apos;Übernehmen&apos; klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt 
+ist eventuell notwendig, damit Sie an die Position des gemeldeten 
+&apos;Top-Kollisionsobjekts&apos; reisen können. Überprüfen Sie das Objekt an der angegebenen Position. 
+Kollidiert es ständig mit anderen Objekten? Wenden Sie sich 
+eventuell an den Eigentümer des Objekts, löschen Sie es oder geben Sie es zurück. 
+Deaktivieren Sie die Option &apos;Kollisionen deaktivieren&apos; und klicken Sie auf &apos;Übernehmen&apos;, 
+um Kollisionen in dieser Region wieder zu aktivieren.
+ 
+Standard: aus
                 </message>
         </alert>
         <alert name="HelpRegionDisablePhysics" title="Physik deaktivieren">
@@ -4101,13 +4167,17 @@ funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt w
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        Verwenden Sie dieses Tool, um Verletzungen der Servicebedingungen und Community-Standards zu melden. Siehe:
+                        Verwenden Sie dieses Tool, um Verletzungen der Servicebedingungen 
+und Community-Standards zu melden. Siehe:
 
 http://secondlife.com/corporate/tos.php 
 http://secondlife.com/corporate/cs.php
 
 Alle gemeldeten Verletzungen der Servicebedingungen und Community-Standards 
-werden geprüft und geklärt. Sie werden per E-Mail über die Klärung informiert. Sie können den Prozess auch im Police Blotter verfolgen: http://secondlife.com/community/blotter.php
+werden geprüft und geklärt. Sie können den Prozess im 
+Police Blotter verfolgen:
+
+http://secondlife.com/community/blotter.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
@@ -4299,10 +4369,10 @@ wirklich permanent löschen?
         <alert name="CopySLURL">
                 <message name="message">
                         Die folgende SLURL wurde in die Zwischenablage kopiert:
-                         [SLURL] 
+ [SLURL] 
 
-                        Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort
-                        zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.
+Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort
+zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.
                 </message>
                 <ignore name="ignore">
                         Beim Kopieren einer SLURL in die Zwischenablage
@@ -4347,7 +4417,7 @@ wirklich permanent löschen?
         <alert name="ChatterBoxSessionStartError">
                 <message name="message">
                         Fehler beim Starten einer neuen Chat-Sitzung mit [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4356,7 +4426,7 @@ wirklich permanent löschen?
         <alert name="ChatterBoxSessionStartNotVerified">
                 <message name="message">
                         Fehler beim Starten einer neuen Chat-Sitzung mit [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4365,7 +4435,7 @@ wirklich permanent löschen?
         <alert name="ChatterBoxSessionEventError">
                 <message name="message">
                         Fehler [EVENT] [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4376,6 +4446,10 @@ wirklich permanent löschen?
                         Ihre Chat-Sitzung mit [NAME] muss beendet werden.
             [REASON]
                 </message>
+                <message name="message">
+                        Ihre Chat-Sitzung mit [NAME] muss beendet werden.
+[REASON]
+                </message>
                 <option name="OK">
                         OK
                 </option>
diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml
index a8834bc..ff86898 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -313,6 +313,8 @@
                         <button label="Name" label_selected="Name" name="Name" tool_tip="Nach Name sortieren" />
                         <button label="Zählen" label_selected="Zählen" name="Count"
                              tool_tip="Nach Anzahl sortieren" />
+                        <name_list label="Zählen" name="owner list" />
+                        /&gt;
                 </panel>
                 <panel label="Optionen" name="land_options_panel">
                         <text type="string" length="1" name="allow_label">
@@ -480,11 +482,13 @@ Einstellungen:
                         </text>
                         <check_box label="Freien Zugang erlauben" name="public_access" />
                         <text name="Only Allow">
-                                Zugang beschränken auf:
+                                Zugang verweigern für:
                         </text>
-                        <check_box label="Einwohner, die Zahlungsinformationen bei Linden Lab hinterlegt haben"
+                        <check_box
+                             label="Einwohner, die keine Zahlungsinformationen bei Linden Lab hinterlegt haben"
                              name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen." />
-                        <check_box label="Altersgeprüfte Erwachsene" name="limit_age_verified"
+                        <check_box label="Einwohner, die keine altersgeprüften Erwachsenen sind"
+                             name="limit_age_verified"
                              tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com." />
                         <string name="estate_override">
                                 Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
diff --git a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
index ed21f5e..88c3e15 100644
--- a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
@@ -4,9 +4,10 @@
                 <scroll_list name="speakers_list">

                         <column label="Name" name="speaker_name" />

                 </scroll_list>

-                <panel name="volume_container" >

+                <panel name="volume_container">

                         <volume_slider name="speaker_volume" width="90" />

-                        <button label="Stummschalten" name="mute_btn" width="120" left_delta="95"/>

+                        <button label="Stummschalten" left_delta="95" name="mute_btn"

+                             tool_tip="Voice für diesen Einwohner stummschalten" width="120" />

                 </panel>

         </panel>

 </floater>

diff --git a/linden/indra/newview/skins/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
index 9493e23..73c0bb8 100644
--- a/linden/indra/newview/skins/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
@@ -9,7 +9,13 @@
         <string name="connected">
                 Verbunden
         </string>
+        <string name="unavailable">
+                Der aktuelle Standort unterstützt keine Voice-Kommunikation
+        </string>
         <string name="hang_up">
                 Verbindung mit In-Welt-Voice-Chat getrennt
         </string>
+        <string name="voice_icon">
+                icn_voice-localchat.tga
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_directory.xml b/linden/indra/newview/skins/xui/de/floater_directory.xml
index 1ca7015..cf6a0ea 100644
--- a/linden/indra/newview/skins/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/de/floater_directory.xml
@@ -24,6 +24,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="Alle" name="find_all_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="Zurück" name="back_btn" />
                         <button label="Weiter" name="forward_btn" />
                         <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen" />
@@ -63,6 +69,12 @@
                         </text>
                 </panel>
                 <panel label="Anzeigen" name="classified_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <text left_delta="38" name="find">
@@ -118,6 +130,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="Events" name="events_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
                                         Stattfindend und anstehend
@@ -195,6 +213,12 @@
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                 </panel>
                 <panel label="Beliebte Orte" name="popular_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <check_box label="Nur Orte mit Bildern anzeigen" name="incpictures" />
@@ -214,6 +238,12 @@ die Benutzer dort verbringen.
                         </scroll_list>
                 </panel>
                 <panel label="Landverkauf" name="land_sales_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <combo_box name="type">
@@ -262,6 +292,12 @@ Land in der Titelleiste auf den Namen.
                         </scroll_list>
                 </panel>
                 <panel label="Orte" name="places_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <text left_delta="38" name="find">
@@ -319,6 +355,12 @@ Land in der Titelleiste auf den Namen.
                         </scroll_list>
                 </panel>
                 <panel label="Leute" name="people_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <text left_delta="38" name="find">
@@ -333,6 +375,12 @@ Land in der Titelleiste auf den Namen.
                         </scroll_list>
                 </panel>
                 <panel label="Gruppen" name="groups_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <text left_delta="38" name="find">
@@ -350,6 +398,12 @@ Land in der Titelleiste auf den Namen.
                         </scroll_list>
                 </panel>
                 <panel label="Alle (alt)" name="find_all_old_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
                         <button label="&lt; Vorherige/s" label_selected="&lt; Vorherige/s" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <text left_delta="38" name="find">
diff --git a/linden/indra/newview/skins/xui/de/floater_html.xml b/linden/indra/newview/skins/xui/de/floater_html.xml
index 45636ec..22b8e60 100644
--- a/linden/indra/newview/skins/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/xui/de/floater_html.xml
@@ -6,7 +6,7 @@
         <button label="Weiterleiten" name="forward_btn" />
         <button label="Los" name="go_btn" />
         <text name="home_page_url">
-                http://www.google.de
+                http://www.secondlife.com
         </text>
         <text name="in-world_help_title">
                 In-Welt-Hilfe
diff --git a/linden/indra/newview/skins/xui/de/floater_html_help.xml b/linden/indra/newview/skins/xui/de/floater_html_help.xml
deleted file mode 100644
index 008e2b8..0000000
--- a/linden/indra/newview/skins/xui/de/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlhelp" title="Hilfe zu Second Life">
-        <button label="Zurück" name="back_btn" />
-        <button label="Zuhause" name="home_btn" />
-        <button label="Weiterleiten" name="forward_btn" />
-        <button label="Schließen" name="close_btn" />
-        <text name="status_text">
-                Bereit
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_im.xml b/linden/indra/newview/skins/xui/de/floater_im.xml
index 7ea68b5..db5c580 100644
--- a/linden/indra/newview/skins/xui/de/floater_im.xml
+++ b/linden/indra/newview/skins/xui/de/floater_im.xml
@@ -15,6 +15,18 @@
         <text name="user_no_help">
                 Der angeforderte Benutzer hat die Hilfe-Sitzung verlassen.
         </text>
+        <string name="session_does_not_exist_error">
+                Die Sitzung ist abgelaufen
+        </string>
+        <string name="no_ability_error">
+                Sie besitzen diese Fähigkeit nicht.
+        </string>
+        <string name="not_a_mod_error">
+                Sie sind kein Sitzungsmoderator.
+        </string>
+        <string name="muted_error">
+                Sie wurden stummgeschaltet.
+        </string>
         <text name="add_session_event">
                 Füge Avatare zur Chat-Sitzung hinzu mit
         </text>
@@ -24,10 +36,16 @@
         <text name="teleport_session_event">
                 teleportiert zum Ersteller von
         </text>
+        <string name="mute_agent_event">
+                Agent wird stummgeschaltet in
+        </string>
         <text name="removed_from_group">
                 Sie wurden von der Gruppe ausgeschlossen.
         </text>
         <string name="invite_message">
                 Klicken Sie auf [BUTTON NAME], um eine Verbindung zu diesem Voice-Chat herzustellen.
         </string>
+        <string name="close_on_no_ability">
+                Die Chat-Sitzung kann nicht fortgesetzt werden
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/xui/de/floater_instant_message.xml
index 1537cc9..eb29ed4 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message.xml
@@ -3,17 +3,23 @@
         <string name="ringing">
                 Anruf...
         </string>
+        <string name="answering">
+                Wird verbunden...
+        </string>
         <string name="connected">
-                Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen
+                Verbunden. Klicken Sie auf &apos;Anruf beenden&apos;, um die Verbindung zu trennen
         </string>
         <string name="hang_up">
                 Anruf beendet
         </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
         <button label="Profil..." name="profile_callee_btn" />
         <button label="Anrufen" name="start_call_btn" />
         <button label="Anruf beenden" name="end_call_btn" />
         <panel name="speaker_controls">
-                <check_box label="Voice-Chat stummschalten" name="mute_btn" />
+                <check_box label="Voice-Chat stummschalten" name="mute_btn" tool_tip="Voice stummschalten" />
         </panel>
         <line_editor label="Für Instant Message hier klicken" name="chat_editor" />
         <button label="Profil..." label_selected="Profil..." name="profile_btn" />
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
index 2418741..8dc0fdd 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
@@ -34,6 +34,9 @@
         <string name="hang_up">

                 Voice-Chat verlassen

         </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

         <text name="live_help_dialog">

                 *** Willkommen bei Help Request ***  

 Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 

diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
index 6c4e0cd..8379644 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
@@ -45,9 +45,36 @@
                 Voice-Chat wird beigetreten...

         </string>

         <string name="connected">

-                Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen

+                Verbunden. Klicken Sie auf &apos;Anruf beenden&apos;, um die Verbindung zu trennen

         </string>

         <string name="hang_up">

                 Voice-Chat verlassen

         </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

+        <string name="live_help_dialog">

+                *** Willkommen bei Help Request *** 

+        Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. Drücken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf. 

+        Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis die verfügbaren Helfer antworten.

+        -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-

+        </string>

+        <string name="title_string">

+                Instant Message an [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] tippt...

+        </string>

+        <string name="session_start_string">

+                Beginne Sitzung mit [NAME], bitte warten.

+        </string>

+        <string name="moderated_chat_label">

+                (Moderiert)

+        </string>

+        <string name="default_text_label">

+                Für Instant Message hier klicken.

+        </string>

+        <string name="muted_text_label">

+                Text-Chat wurde von einem Gruppenmoderator deaktiviert.

+        </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/de/floater_mute_object.xml b/linden/indra/newview/skins/xui/de/floater_mute_object.xml
new file mode 100644
index 0000000..c6351cc
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/floater_mute_object.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="mute by name" title="Objekt nach Name stummschalten">

+        <text name="message">

+                Stummschalten nach Name betrifft nur Chat und IM, keine Sounds.

+Sie müssen den Objektnamen exakt angeben.

+        </text>

+        <line_editor name="object_name">

+                Objektname

+        </line_editor>

+        <button label="OK" name="OK" />

+        <button label="Abbrechen" name="Cancel" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml
index fb10816..9ad4fde 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml
@@ -49,4 +49,10 @@ ein.
         <text name="none_text">
                 – Keine –
         </text>
+        <text name="stop_txt">
+                Stopp
+        </text>
+        <text name="preview_txt">
+                Vorschau
+        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_region_info.xml b/linden/indra/newview/skins/xui/de/floater_region_info.xml
new file mode 100644
index 0000000..153cdc7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="regioninfo" />

diff --git a/linden/indra/newview/skins/xui/de/menu_login.xml b/linden/indra/newview/skins/xui/de/menu_login.xml
index 9d960f9..8662963 100644
--- a/linden/indra/newview/skins/xui/de/menu_login.xml
+++ b/linden/indra/newview/skins/xui/de/menu_login.xml
@@ -7,6 +7,7 @@
                 <menu_item_call label="Einstellungen..." name="Preferences..." />

         </menu>

         <menu label="Hilfe" name="Help">

+                <menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />

                 <menu_item_call label="Über Second Life..." name="About Second Life..." />

         </menu>

 </menu_bar>

diff --git a/linden/indra/newview/skins/xui/de/need_to_translate.xml b/linden/indra/newview/skins/xui/de/need_to_translate.xml
index f3e3cd7..af07d4c 100644
--- a/linden/indra/newview/skins/xui/de/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/de/need_to_translate.xml
@@ -1,300 +1,225 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/message</b_path>

-<c_attribute></c_attribute>

+<string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        You need to be age-verified in order to access this parcel.

-Would you like to visit the Second Life website to verify your age?

-

-[_URL]

-                </e_new>

+<e_new>Type</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Um Zugang zu dieser Parzelle zu erhalten, müssen Sie sich einer Altersprüfung unterziehen.

-Möchten Sie auf der Second Life Website eine Altersüberprüfung durchführen?

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/ignore</b_path>

-<c_attribute></c_attribute>

+<f_translation>Typ</f_translation>

+</string><string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Warn about lack of age verification

-                </e_new>

+<e_new>Name</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Auf fehlende Altersprüfung aufmerksam machen

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/Yes</b_path>

-<c_attribute></c_attribute>

+<f_translation>Name</f_translation>

+</string><string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

+<e_new>Count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Ja

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/No</b_path>

-<c_attribute></c_attribute>

+<f_translation>Zählen</f_translation>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        No

-                </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Nein

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/message</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_chatterbox.xml</a_file>

+<b_path>/floater_chatterbox</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>

-                        This parcel requires that you have payment information on file before you can access it.

-Would you like to visit the Second Life website to set this up?

-

-[_URL]

-                </e_new>

+<e_new>Communicate</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Um Zugang zu dieser Parzelle zu erhalten, müssen Sie Zahlungsinformationen hinterlegt haben.

-Möchten Sie die Second Life Website öffnen, um diese Angaben zu hinterlegen?

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/ignore</b_path>

-<c_attribute></c_attribute>

+<f_translation>Unterhalten</f_translation>

+</string><string><a_file>floater_device_settings.xml</a_file>

+<b_path>/floater_device_settings</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Warn about lack of payment info

-                </e_new>

+<e_new>Voice Chat Device Settings</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Auf fehlende Zahlungsinformationen aufmerksam machen

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/Yes</b_path>

+<f_translation>Zubehör-Einstellungen für Voice-Chat</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Ja

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/No</b_path>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        Nein

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/public_access</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Allow Public Access</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Freien Zugang erlauben</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Only Allow</b_path>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                Restrict Access To:

-                        </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                Zugang beschränken auf:

-                        </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Residents who have given payment info to Linden Lab</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Einwohner, die Zahlungsinformationen bei Linden Lab hinterlegt haben</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Nicht identifizierte Einwohner verbannen.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Age-verified adults</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Altersgeprüfte Erwachsene</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/estate_override</b_path>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>One ore more of these options is set at the estate level</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Eine oder mehrere dieser Optionen gelten auf Grundstücksebene</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Set group in the General tab.</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Gruppe im Register 'Allgemein' festlegen.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Allows temporary access to this parcel</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Ermöglicht befristeten Zugang zu dieser Parzelle</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Anyone</b_path>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Anyone

-                                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        Jeder

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Group</b_path>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Group

-                                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        Gruppe

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED] angezeigt, max. [MAX])</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Hinzufügen...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Hinzufügen...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Entfernen</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Entfernen</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/BannedList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED] angezeigt, max. [MAX])</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Hinzufügen...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Hinzufügen...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_old_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Entfernen</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_old_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Entfernen</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

 <e_new></e_new>

 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/no_ability_error</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Communicate</e_new>

+<e_new>

+            You do not have that ability.

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Unterhalten</f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>

+            Sie besitzen diese Fähigkeit nicht.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/not_a_mod_error</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

+<e_new>

+            You are not a session moderator.

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zubehör-Einstellungen für Voice-Chat</f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_panel/redirect_404_url</b_path>

+<f_translation>

+            Sie sind kein Sitzungsmoderator.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_error</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>http://secondlife.com/app/search/notfound.html</e_new>

+<e_new>

+            You have been muted.

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>http://secondlife.com/app/search/notfound.html</f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>

+            Sie wurden stummgeschaltet.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/mute_agent_event</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>

+            muting agent in

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

+<f_translation>

+            Agent wird stummgeschaltet in

+        </f_translation>

 </string><string><a_file>floater_preview_classified.xml</a_file>

 <b_path>/classified_preview</b_path>

 <c_attribute>title</c_attribute>

@@ -316,6 +241,13 @@ Möchten Sie die Second Life Website öffnen, um diese Angaben zu hinterlegen?
 <e_new>Place Information</e_new>

 <f_old_trans></f_old_trans>

 <f_translation>Ortsinformationen</f_translation>

+</string><string><a_file>floater_region_info.xml</a_file>

+<b_path>/regioninfo</b_path>

+<c_attribute>title</c_attribute>

+<d_old></d_old>

+<e_new>Region/Estate</e_new>

+<f_old_trans></f_old_trans>

+<f_translation>Region/Länderei</f_translation>

 </string><string><a_file>floater_select_key.xml</a_file>

 <b_path>/modal container</b_path>

 <c_attribute>title</c_attribute>

@@ -323,110 +255,55 @@ Möchten Sie die Second Life Website öffnen, um diese Angaben zu hinterlegen?
 <e_new> </e_new>

 <f_old_trans></f_old_trans>

 <f_translation> </f_translation>

-</string><string><a_file>floater_texture_ctrl.xml</a_file>

-<b_path>/texture picker/choose_picture</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>&quot;Click to choose a picture&quot;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&quot;Zum Auswählen eines Bildes hier klicken&quot;</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File</b_path>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>File</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Datei</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File/Quit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Quit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Beenden</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_media</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Edit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Bearbeiten</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit/Preferences...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_voice</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Preferences...</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Einstellungen...</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_sfx</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Help</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Hilfe</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help/About Second Life...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_wind</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>About Second Life...</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Über Second Life...</f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not a group member/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not a member of the appropriate group.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        Zugang zur Parzelle verweigert, Sie gehören keiner berechtigten Gruppe an.

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: banned/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you have been banned.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        Zugang zur Parzelle verweigert. Sie wurden verbannt.

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not on access list/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not on the access list.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        Zugang zur Parzelle verweigert. Sie stehen nicht auf der Zugangsliste.

-                </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/AgeVerified</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                                , Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                , altersgeprüft

-                        </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/NotAgeVerified</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_ui</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                                , Not Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                , nicht altersgeprüft

-                        </f_translation>

+<f_translation></f_translation>

 </string><string><a_file>panel_groups.xml</a_file>

 <b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

@@ -435,54 +312,54 @@ Möchten Sie die Second Life Website öffnen, um diese Angaben zu hinterlegen?
 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

 </string><string><a_file>panel_login.xml</a_file>

-<b_path>/panel_login/forgot_password_url</b_path>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                http://secondlife.com/account/request.php

+                Forgot your password?

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                http://secondlife.com/account/request.php

+                Kennwort vergessen?

         </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/Only Allow</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_url</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-              Restrict Access To:

-            </e_new>

+                http://secondlife.com/account/request.php

+        </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-              Zugang beschränken auf:

-            </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

+                http://secondlife.com/account/request.php

+        </f_translation>

+</string><string><a_file>panel_master_volume.xml</a_file>

+<b_path>/master_volume/mute_master</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Residents with payment info on file</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Einwohner mit hinterlegten Zahlungsinformationen</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_bg</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Nicht identifizierte Einwohner verbannen.</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_icon</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Age-verified adults</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Altersgeprüfte Erwachsene</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/channel_label</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com.</f_translation>

+<f_translation></f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/de/need_to_update.xml b/linden/indra/newview/skins/xui/de/need_to_update.xml
index 260fd2a..162c36c 100644
--- a/linden/indra/newview/skins/xui/de/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/de/need_to_update.xml
@@ -1,1694 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//ConnectTimeout/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Möglicherweise handelt es sich um einen Systemausfall.

-

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Möglicherweise handelt es sich um einen Systemausfall.

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CharacterSnapshotSaved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A snapshot of your character has been saved.

- 

-Visit the Webpage Studio exhibit to see it.

-                </d_old>

-<e_new>

-                        A snapshot of your character has been saved.

-Visit the Webpage Studio exhibit to see it.

-                </e_new>

-<f_translation>

-                        Ein Foto Ihres Avatars wurde gespeichert.

-Sie finden es in der Webpage Studio-Ausstellung.

-                </f_translation>

-<f_old_trans>

-                        Ein Foto Ihres Avatars wurde gespeichert.

- 

-Sie finden es in der Webpage Studio-Ausstellung.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CreateGroupCanAfford/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Creating a group costs L$[COST].

- 

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </d_old>

-<e_new>

-                        Creating a group costs L$[COST].

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </e_new>

-<f_translation>

-                        Das Erstellen einer Gruppe kostet [COST] L$.

-Damit die Gruppe länger als drei Tage bestehen bleibt,

-muss sie aus mindestens zwei Mitgliedern bestehen.

- 

-Gruppe gründen?

-                </f_translation>

-<f_old_trans>

-                        Das Erstellen einer Gruppe kostet [COST] L$.

- 

-Damit die Gruppe länger als drei Tage bestehen bleibt,

-muss sie aus mindestens zwei Mitgliedern bestehen.

- 

-Gruppe gründen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered inappropriate for a minor

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        &quot;Im Web veröffentlichen&quot; veröffentlicht den Namen

-die Insignien, die Charta, die Titel und den Gründer der Gruppe auf der

-[SECOND_LIFE] Website. Falls die oben angeführten Inhalte

-gemäß der

-Community-Standards nicht jugendfrei sind, sind Sie sind verpflichtet, dies anzugeben.

-                </f_translation>

-<f_old_trans>

-                        Im Web veröffentlichen

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpPostcard/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered inappropriate for a minor 

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        &quot;Im Web veröffentlichen&quot; veröffentlicht den Namen

-des Fotografen, eine Betreffzeile, eine Positionsangabe, eine Nachricht und

-ein Foto auf der [SECOND_LIFE] Website. Sie sind verpflichtet, für jedes Foto anzugeben,

-ob die oben angeführten Inhalte gemäß der 

-Community-Standards nicht jugendfrei sind.

-                </f_translation>

-<f_old_trans>

-                        Im Web veröffentlichen

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmLandSaleChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

- 

-                </d_old>

-<e_new>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

-                </e_new>

-<f_translation>

-                        Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.

-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.

-                </f_translation>

-<f_old_trans>

-                        Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.

-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MustHaveAccountToLogIn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You must have an account to connect to [SECOND_LIFE].

- 

-Go to www.secondlife.com to create an account?

-                </d_old>

-<e_new>

-                        You must have an account to connect to [SECOND_LIFE].

-Go to www.secondlife.com to create an account?

-                </e_new>

-<f_translation>

-                        Sie benötigen ein Konto, um sich in [SECOND_LIFE] anmelden zu können.

-Möchten Sie auf www.secondlife.com ein Konto anlegen?

-                </f_translation>

-<f_old_trans>

-                        Sie benötigen ein Konto, um sich in [SECOND_LIFE] anmelden zu können.

- 

-Möchten Sie auf www.secondlife.com ein Konto anlegen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

- 

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

- 

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </d_old>

-<e_new>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </e_new>

-<f_translation>

-                        Anzeigen erscheinen für eine Woche auf der Registerkarte &apos;Anzeigen&apos;

-im Suchverzeichnis und auf www.secondlife.com.

-Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum

-Verzeichnis hinzuzufügen.

-Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.

-Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,

-erscheint Ihre Anzeige weiter oben in der Liste.

-                </f_translation>

-<f_old_trans>

-                        Anzeigen erscheinen eine Woche lang auf der Registerkarte &apos;Anzeigen&apos;

-im Suchverzeichnis.

- 

-Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum

-Verzeichnis hinzuzufügen.

- 

-Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.

-Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,

-erscheint Ihre Anzeige weiter oben in der Liste.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DisplayChangeRestart/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

- 

-Apply those changes and quit

-                </d_old>

-<e_new>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

-

-Apply those changes and quit?

-                </e_new>

-<f_translation>

-                        Einige Änderungen der Bildschirmeinstellungen erfordern einen

-sofortigen Neustart von [SECOND_LIFE], wodurch

-alle laufenden Arbeiten verloren gehen.

-

-Die Änderungen übernehmen und das Programm beenden?

-                </f_translation>

-<f_old_trans>

-                        Einige Änderungen an der Anzeige erfordern einen

-sofortigen Neustart von [SECOND_LIFE], wodurch 

-alle laufenden Arbeiten verloren gehen.

- 

-Übernehmen Sie die Änderungen und beenden Sie das Programm

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotFindDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Der Server-Domänenname konnte nicht gefunden werden.

-Mögliche Ursachen sind der Verlust der Netzwerkverbindung

-oder ein Serverproblem.

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Der Server-Domänenname konnte nicht gefunden werden.

-Mögliche Ursachen sind der Verlust der Netzwerkverbindung

-oder ein Serverproblem.

- 

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectDNSError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-DNS konnte den Hostnamen nicht auflösen.

-

-Prüfen Sie, ob Sie die Website www.secondlife.com öffnen

-können.  Bitte melden Sie das Problem auf www.secondlife.com/support,

-falls der Fehler wiederholt auftritt.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-DNS konnte den Hostnamen nicht auflösen.

-Prüfen Sie, ob Sie die Website www.secondlife.com öffnen

-können.  Bitte melden Sie das Problem auf www.secondlife.com/support,

-falls der Fehler wiederholt auftritt.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectSecurityError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-Please ensure the time and date are set correctly.

- 

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-

-Please ensure the time and date are set correctly.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        Es konnte keine sichere Verbindung zum Anmeldeserver hergestellt werden.

-Die Ursache hierfür ist oft eine falsch eingestellte Uhrzeit auf Ihrem Computer.

-

-Bitte vergewissern Sie sich, dass Datum und Uhrzeit korrekt eingestellt sind.

-Bitte melden Sie das Problem unter

-www.secondlife.com/support,

-sollte der Fehler wiederholt auftreten.

-                </f_translation>

-<f_old_trans>

-                        Es konnte keine sichere Verbindung zum Anmeldeserver hergestellt werden.

-Die Ursache hierfür ist oft eine falsch eingestellte Uhrzeit auf Ihrem Computer.

-Bitte vergewissern Sie sich, dass Datum und Uhrzeit korrekt eingestellt sind.

- 

-Bitte melden Sie das Problem unter

-www.secondlife.com/support,

-sollte der Fehler wiederholt auftreten.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectVerificationError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Der Anmeldeserver konnte sich nicht per SSL verifizieren.

-

-Bitte melden Sie das Problem unter

-www.secondlife.com/support,

-sollte der Fehler wiederholt auftreten.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Der Anmeldeserver konnte sich nicht per SSL verifizieren.

-Bitte melden Sie das Problem unter

-www.secondlife.com/support,

-sollte der Fehler häufiger auftreten.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.

-

-Bitte melden Sie das Problem auf

-www.secondlife.com/support und fügen Sie dem Bericht die Datei SecondLife.log

-an, die Sie hier finden: C:\Dokumente und Einstellungen\(Name)\Anwendungsdaten\SecondLife\logs

-Vielen Dank.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.

-Bitte melden Sie das Problem auf

-www.secondlife.com/support und fügen Sie dem Bericht die Datei SecondLife.log

-an, die Sie hier finden: C:\Dokumente und Einstellungen\(Name)\Anwendungsdaten\SecondLife\logs

-Vielen Dank.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorDarwin/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.

-

-Bitte melden Sie das Problem auf

-www.secondlife.com/support  und fügen Sie dem Bericht die Datei SecondLife.log

-an, die Sie hier finden: ~/Library/Application Support/SecondLife/logs

-Vielen Dank.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.

-Bitte melden Sie das Problem auf

-www.secondlife.com/support und fügen Sie dem Bericht die Datei SecondLife.log

-an, die Sie hier finden: ~/Library/Application Support/SecondLife/logs

-Vielen Dank.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveLoginToken/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        There was a problem resolving your login

-authentication token. Please try logging in

-again. If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        There was a problem resolving your login

-authentication token. Please try logging in again. 

-

-If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        Bei der Prüfung Ihres Authentifizierungs-

-Token ist ein Problem aufgetreten. Bitte melden Sie sich erneut an. 

-

-Wenden Sie sich an www.secondlife.com/support,

-sollte dieser Fehler wiederholt auftreten.

-                </f_translation>

-<f_old_trans>

-                        Bei der Prüfung Ihres Authentifizierungs-

-Token ist ein Problem aufgetreten. Bitte melden Sie sich

-erneut an. Wenden Sie sich an www.secondlife.com/support,

-sollte dieser Fehler wiederholt auftreten.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectNoMessage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unknown problem trying to connect.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unknown problem trying to connect.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Unbekanntes Verbindungsproblem.

-

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Unbekanntes Verbindungsproblem.

- 

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRunDialog/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        Die Installation von [SECOND_LIFE] ist abgeschlossen.

-

-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,

-bevor Sie sich anmelden können.

-Möchten Sie auf www.secondlife.com ein Konto erstellen?

-                </f_translation>

-<f_old_trans>

-                        Die Installation von [SECOND_LIFE] ist abgeschlossen.

- 

-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,

-bevor Sie sich anmelden können.

- 

-Möchten Sie auf www.secondlife.com ein Konto erstellen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        Verbindung zum Server nicht möglich.

-Folgende Domäne konnte nicht aufgelöst werden: [DOMAIN]

-

-Bitte überprüfen Sie Ihre Netzwerkverbindung.

-                </f_translation>

-<f_old_trans>

-                        Verbindung zum Server nicht möglich.

-Folgende Domäne konnte nicht aufgelöst werden: [DOMAIN]

-Bitte überprüfen Sie Ihre Netzwerkverbindung.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLife/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar. 

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]! 

-

-Use arrow keys to walk.

-Please choose the male or female avatar. 

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        Willkommen bei [SECOND_LIFE]! 

-

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

-Bitte wählen Sie einen männlichen oder weiblichen Avatar. 

-Sie können sich später noch umentscheiden.

-                </f_translation>

-<f_old_trans>

-                        Willkommen bei [SECOND_LIFE]! 

- 

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

- 

-Bitte wählen Sie einen männlichen oder weiblichen Avatar. 

-Sie können sich später noch umentscheiden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLifeSimple/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]!

-

-Use arrow keys to walk.

-Please choose the male or female avatar.

-                </e_new>

-<f_translation>

-                        Willkommen bei [SECOND_LIFE]!

-

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

-Bitte wählen Sie einen männlichen oder weiblichen Avatar.

-                </f_translation>

-<f_old_trans>

-                        Willkommen bei [SECOND_LIFE]! 

- 

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

- 

-Bitte wählen Sie einen männlichen oder weiblichen Avatar.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PromptGoToCurrencyPage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [EXTRA]

- 

- 

-Go to [URL] for information on purchasing currency?

-                </d_old>

-<e_new>

-                        [EXTRA]

-

-Go to [URL] for information on purchasing currency?

-                </e_new>

-<f_translation>

-                        [EXTRA]

-

-[URL] für Informationen zum Deviseneinkauf öffnen?

-                </f_translation>

-<f_old_trans>

-                        [EXTRA]

- 

- 

-[URL] für Informationen zum Deviseneinkauf öffnen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkModify/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  Make sure none are locked, and that

-you own all of them.

-                </d_old>

-<e_new>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  

-

-Please make sure none are locked, and that you own all of them.

-                </e_new>

-<f_translation>

-                        Verknüpfung nicht möglich, da Sie nicht alle Objekte bearbeiten

-dürfen.  

-

-Stellen Sie sicher, dass kein Objekt gesperrt ist und alle Objekte Ihnen gehören.

-                </f_translation>

-<f_old_trans>

-                        Verknüpfung nicht möglich, da Sie nicht alle Objekte bearbeiten

-dürfen.  Stellen Sie sicher, dass kein Objekt gesperrt ist

-und alle Objekte Ihnen gehören.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkDifferentOwners/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because not all of the objects have the

-same owner. Make sure you own all of the selected objects.

-                </d_old>

-<e_new>

-                        Unable to link because not all of the objects have the

-same owner. 

-

-Please make sure you own all of the selected objects.

-                </e_new>

-<f_translation>

-                        Verknüpfung nicht möglich, da nicht alle Objekte denselben

-Eigentümer haben. 

-

-Stellen Sie sicher, dass alle ausgewählten Objekte Ihnen gehören.

-                </f_translation>

-<f_old_trans>

-                        Verknüpfung nicht möglich, da nicht alle Objekte denselben

-Eigentümer haben. Stellen Sie sicher, dass alle ausgewählten Objekte Ihnen gehören.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NoFileExtension/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        No file extension for the file: &apos;[FILE]&apos;

-Please make sure the file has a correct file extension

-                </d_old>

-<e_new>

-                        No file extension for the file: &apos;[FILE]&apos;

-

-Please make sure the file has a correct file extension.

-                </e_new>

-<f_translation>

-                        Kein Dateityp für Datei: &apos;[FILE]&apos;

-

-Vergewissern Sie sich, dass die Datei den richtigen Dateityp hat.

-                </f_translation>

-<f_old_trans>

-                        Keine Datei-Erweiterung für Datei: &apos;[FILE]&apos;

-Vergewissern Sie sich, dass die Datei die richtige Datei-Erweiterung hat

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotRecompileSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;recompilation&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;recompilation&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;Rekompilieren&apos; nicht möglich.

-

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_translation>

-<f_old_trans>

-                        &apos;Rekompilieren&apos; nicht möglich.

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        &apos;Zurücksetzen&apos; nicht möglich.

-

-Wählen Sie Objekte mit Skripts.

-                </f_translation>

-<f_old_trans>

-                        &apos;Zurücksetzen&apos; nicht möglich.

-Wählen Sie Objekte mit Skripts.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;Zurücksetzen&apos; nicht möglich.

-

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_translation>

-<f_old_trans>

-                        &apos;Zurücksetzen&apos; nicht möglich.

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        &apos;Ausführen&apos; von Skripts nicht möglich.

-

-Wählen Sie Objekte mit Skripts.

-                </f_translation>

-<f_old_trans>

-                        &apos;Ausführen&apos; von Skripts nicht möglich.

-Wählen Sie Objekte mit Skripts.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;Ausführen&apos; von Skripts nicht möglich.

-

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_translation>

-<f_old_trans>

-                        &apos;Ausführen&apos; von Skripts nicht möglich.

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.

-

-Wählen Sie Objekte mit Skripts.

-                </f_translation>

-<f_old_trans>

-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.

-Wählen Sie Objekte mit Skripts.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.

-

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_translation>

-<f_old_trans>

-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.

-Wählen Sie Objekte mit Skripts, die

-Sie bearbeiten dürfen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        Landkauf nicht möglich, da die Auswahl mehrere Regionen umfasst.

-

-Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.

-                </f_translation>

-<f_old_trans>

-                        Landkauf nicht möglich, da die Auswahl mehrere Regionen umfasst.

-Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        Land kann nicht gekauft werden:

-Mehrere Parzellen ausgewählt.

-

-Wählen Sie eine einzelne Parzelle.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht gekauft werden:

-Mehrere Parzellen ausgewählt.

-Wählen Sie eine einzelne Parzelle.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        Land kann nicht übertragen werden:

-Mehrere Parzellen ausgewählt.

-

-Wählen Sie eine einzelne Parzelle.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht übertragen werden:

-Mehrere Parzellen ausgewählt.

-Wählen Sie eine einzelne Parzelle.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMusic/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming music. 

- 

-Music requires a 768 kbps or faster

-Internet connection.

- 

-Play music when available?

-                </d_old>

-<e_new>

-                        This location can play streaming music. 

-Music requires a 768 kbps or faster

-Internet connection.

-

-Play music when available?

-                </e_new>

-<f_translation>

-                        Dieser Ort kann Streaming-Musik abspielen. 

-Musik erfordert eine Internetverbindung

-mit mindestens 768 kbit/s.

-

-Musik abspielen, wenn verfügbar?

-                </f_translation>

-<f_old_trans>

-                        Dieser Ort kann Streaming-Musik wiedergeben. 

- 

-Musik erfordert eine Internetverbindung

-mit mindestens 768 kbit/s.

- 

-Musik wiedergeben, wenn verfügbar?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming video. 

- 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

- 

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        Dieser Ort kann Streaming-Video abspielen. 

-Streaming-Video erfordert eine Internetverbindung 

-mit mindestens 768 kbit/s.

- 

-Streaming-Video abspielen, wenn verfügbar?

-(Sie können diese Option später unter 

-&apos;Einstellungen&apos; &gt; &apos;Audio &amp; Video&apos; ändern.)

-                </f_translation>

-<f_old_trans>

-                        Dieser Ort kann Streaming-Video wiedergeben. 

- 

-Streaming-Video erfordert eine Internetverbindung 

-mit mindestens 768 kbit/s.

- 

-Streaming-Video wiedergeben, wenn verfügbar?

- 

-(Sie können diese Option später unter 

-&apos;Einstellungen&apos; &gt; &apos;Audio &amp; Video&apos; ändern.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Waiting for server to report cost.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Waiting for server to report cost.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        Land kann nicht gekauft werden:

-Warte auf Server für Preisinformationen.

-

-Bitte versuchen Sie es erneut.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht gekauft werden:

-Warte auf Server für Preisinformationen.

-Bitte versuchen Sie es erneut.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Waiting for server to report ownership.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Waiting for server to report ownership.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        Land kann nicht übertragen werden:

-Warte auf Server für Eigentümerinformationen.

-

-Bitte versuchen Sie es erneut.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht übertragen werden:

-Warte auf Server für Eigentümerinformationen.

-Bitte versuchen Sie es erneut.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotButLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        Land kann nicht gekauft werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht gekauft werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandForGroupNotOfficer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-Please activate another group using Edit -&gt; Groups...

-                </d_old>

-<e_new>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-

-Please activate another group using Edit -&gt; Groups...

-                </e_new>

-<f_translation>

-                        Landkauf für Gruppe nicht möglich:

-Sie sind kein Officer in Ihrer aktuellen Gruppe.

-

-Wählen Sie über &apos;Bearbeiten&apos; -&gt; &apos;Gruppen...&apos; eine andere Gruppe aus.

-                </f_translation>

-<f_old_trans>

-                        Landkauf für Gruppe nicht möglich:

-Sie sind kein Officer in Ihrer aktuellen Gruppe.

-Wählen Sie über &apos;Bearbeiten&apos; -&gt; &apos;Gruppen...&apos; eine andere Gruppe aus.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandWatingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-Try again in a few seconds.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-

-Try again in a few seconds.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgegeben werden:

-Server muss Parzelleninformation aktualisieren.

-

-Versuchen Sie es in einigen Sekunden erneut.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgegeben werden:

-Server muss Parzelleninformation aktualisieren.

-Versuchen Sie es in einigen Sekunden erneut.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-Please select a single parcel.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-

-Please select a single parcel.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgegeben werden:

-Die ausgewählten Parzellen gehören Ihnen nicht.

-

-Wählen Sie eine einzelne Parzelle.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgegeben werden:

-Die ausgewählten Parzellen gehören Ihnen nicht.

-Wählen Sie eine einzelne Parzelle.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgegeben werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgegeben werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-Select an entire parcel, or divide your parcel first.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-

-Select an entire parcel, or divide your parcel first.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgegeben werden:

-Zum Freigeben müssen Sie eine ganze Parzelle auswählen.

-

-Wählen Sie eine ganze Parzelle oder teilen Sie Ihre Parzelle.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgegeben werden:

-Zum Freigeben müssen Sie eine ganze Parzelle auswählen.

-Wählen Sie eine ganze Parzelle oder teilen Sie Ihre Parzelle.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReleaseLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

- 

-Release this land?

-                </d_old>

-<e_new>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

-

-Release this land?

-                </e_new>

-<f_translation>

-                        Sie sind im Begriff, [AREA] qm Land aufzugeben.

-Wenn Sie diese Parzelle aufgeben, wird sie ohne

-L$-Erstattung von Ihrem Landbesitz entfernt.

-

-Dieses Land aufgeben?

-                </f_translation>

-<f_old_trans>

-                        Sie sind im Begriff, [AREA] qm Land aufzugeben.

-Wenn Sie diese Parzelle aufgeben, wird sie ohne

-L$-Erstattung von Ihrem Landbesitz entfernt.

- 

-Dieses Land aufgeben?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNothingSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-No parcels selected.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-No parcels selected.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgeteilt werden:

-

-Keine Parzellen ausgewählt.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgeteilt werden:

-Keine Parzellen ausgewählt.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgeteilt werden:

-

-Sie haben eine ganze Parzelle ausgewählt.

-Wählen Sie einen Parzellenabschnitt aus.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgeteilt werden:

-Sie haben eine ganze Parzelle ausgewählt.

-Wählen Sie einen Parzellenabschnitt aus.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        Land kann nicht aufgeteilt werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht aufgeteilt werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to join land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        Land kann nicht zusammengelegt werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht zusammengelegt werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandEntireParcelSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You only have one parcel selected.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You only have one parcel selected.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        Land kann nicht zusammengelegt werden:

-Sie haben nur eine Parzelle ausgewählt.

-

-Wählen Sie Land auf beiden Parzellen aus.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht zusammengelegt werden:

-Sie haben nur eine Parzelle ausgewählt.

-Wählen Sie Land auf beiden Parzellen aus.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You must select more than one parcel.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You must select more than one parcel.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        Land kann nicht zusammengelegt werden:

-Sie müssen mehrere Parzellen auswählen.

-

-Wählen Sie Land auf beiden Parzellen aus.

-                </f_translation>

-<f_old_trans>

-                        Land kann nicht zusammengelegt werden:

-Sie müssen mehrere Parzellen auswählen.

-Wählen Sie Land auf beiden Parzellen aus.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//JoinLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

- 

-You will need to reset the name and options of the 

-new parcel. 

- 

-Join land?

-                </d_old>

-<e_new>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

-You will need to reset the name and options of the 

-new parcel.

- 

-Join land?

-                </e_new>

-<f_translation>

-                        Beim Zusammenlegen entsteht aus den vom Auswahlrechteck 

-erfassten Parzellen eine große Parzelle. 

-Sie müssen der neuen Parzelle einen Namen geben und 

-ihre Optionen festlegen.

- 

-Land zusammenlegen?

-                </f_translation>

-<f_old_trans>

-                        Beim Zusammenlegen entsteht aus den vom Auswahlrechteck 

-erfassten Parzellen eine große Parzelle. 

- 

-Sie müssen der neuen Parzelle einen Namen geben und 

-ihre Optionen festlegen. 

- 

-Land zusammenlegen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSaveToAssetStore/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </d_old>

-<e_new>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. 

-

-If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </e_new>

-<f_translation>

-                        [NAME] kann nicht in Zentral-Asset-Speicher geladen werden.

-Dies ist ein temporärer Fehler. Bitte

-passen Sie das Kleidungsstück in einigen

-Minuten noch einmal an und speichern Sie es erneut. 

-

-Tritt dieses Problem wiederholt auf,

-klicken Sie auf das Pulldown-Menü &apos;Hilfe | Fehler melden&apos;

-und geben Sie Details zu Ihrem Netzwerk-Setup an.

-                </f_translation>

-<f_old_trans>

-                        [NAME] kann nicht in Zentral-Asset-Speicher geladen werden.

-Dies ist ein temporärer Fehler. Bitte

-passen Sie das Kleidungsstück in einigen

-Minuten noch einmal an und speichern Sie es erneut. TrittTT dieses Problem wiederholt auf,

-klicken Sie auf das Pulldown-Menü &apos;Hilfe | Fehler melden&apos;

-und geben Sie Details zu Ihrem Netzwerk-Setup an.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AppEarlyExit/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. Please

-uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. 

-

-Please uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        [MESSAGE]

- 

-Dieses Problem kann nicht behoben werden. 

-

-Deinstallieren und reinstallieren Sie das Programm. Sollte dieses

-Problem fortbestehen, finden Sie weitere Hilfe in der Tech-Support-FAQ auf:

-www.secondlife.com/support.

-                </f_translation>

-<f_old_trans>

-                        [MESSAGE]

- 

-Dieses Problem kann nicht behoben werden. Bitte

-deinstallieren und reinstallieren Sie das Programm. Sollte dieses

-Problem fortbestehen, finden Sie weitere Hilfe in der Tech-Support-FAQ auf:

-www.secondlife.com/support.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//YouHaveBeenLoggedOut/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have been logged out of [SECOND_LIFE]:

- 

-[MESSAGE]

- 

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </d_old>

-<e_new>

-                        You have been logged out of [SECOND_LIFE]:

-[MESSAGE]

-

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </e_new>

-<f_translation>

-                        Sie wurden von [SECOND_LIFE] abgemeldet:

-[MESSAGE]

-

-Klicken Sie auf &apos;Weiter&apos;, um IM und Chat anzuzeigen.

-Andere Optionen sind nicht mehr möglich.

-Klicken Sie auf &apos;Beenden&apos;, um [SECOND_LIFE] zu schließen.

-                </f_translation>

-<f_old_trans>

-                        Sie wurden von [SECOND_LIFE] abgemeldet:

- 

-[MESSAGE]

- 

-Klicken Sie auf &apos;Weiter&apos;, um IM und Chat anzuzeigen.

-Andere Optionen sind nicht mehr möglich.

-Klicken Sie auf &apos;Beenden&apos;, um [SECOND_LIFE] zu schließen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddFriend/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

- 

-Offer friendship to [NAME]?

-                </d_old>

-<e_new>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

-

-Offer friendship to [NAME]?

-                </e_new>

-<f_translation>

-                        Freunde können einander die Erlaubnis erteilen, 

-sich gegenseitig auf der Karte verfolgen und 

-ihren Online-Status einsehen zu können. 

-

-[NAME] Freundschaft anbieten?

-                </f_translation>

-<f_old_trans>

-                        Freunde können einander die Erlaubnis erteilen, 

-sich gegenseitig auf der Karte verfolgen und 

-ihren Online-Status einsehen zu können. 

- 

-[NAME] Freundschaft anbieten?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedPublicObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to delete all scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on all others land in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to delete all scripted objects owned by

-** [AVATAR_NAME] **

-on all others land in this sim?

-                </e_new>

-<f_translation>

-                        Möchten Sie alle geskripteten Objekte von

-** [AVATAR_NAME] **

-auf allen anderen Ländern in diesem Sim löschen?

-                </f_translation>

-<f_old_trans>

-                        Möchten Sie alle geskripteten Objekte von

- 

-** [AVATAR_NAME] **

- 

-auf allen anderen Ländern in dieser Sim löschen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL scripted objects owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        Möchten Sie ALLE geskripteten Objekte von

-** [AVATAR_NAME] **

-auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?

-                </f_translation>

-<f_old_trans>

-                        Möchten Sie ALLE geskripteten Objekte von

- 

-** [AVATAR_NAME] **

- 

-auf ALLEN LÄNDERN in dieser Sim LÖSCHEN?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        Möchten Sie ALLE Objekte (einschließlich geskriptete)

-von

-** [AVATAR_NAME] **

-auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?

-                </f_translation>

-<f_old_trans>

-                        Möchten Sie ALLE Objekte (einschließlich geskriptete)

-von

- 

-** [AVATAR_NAME] **

- 

-auf ALLEN LÄNDERN in dieser Sim LÖSCHEN?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//ErrorEncodingSnapshot/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

@@ -1704,697 +17,13 @@ auf ALLEN LÄNDERN in dieser Sim LÖSCHEN?
                         Fehler beim Erstellen des Fotos!

                 </f_old_trans>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmObjectTakeLockNoOwn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

-Are you sure you want to take these items?

-                </d_old>

-<e_new>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

-

-Are you sure you want to take these items?

-                </e_new>

-<f_translation>

-                        Mindestens ein Objekt ist gesperrt.

-Nicht alle Objekte, die Sie aufgenommen haben, gehören Ihnen.

-Wenn Sie fortfahren, werden die Rechte für den nächsten Eigentümer

-abgefragt und Sie können die Objekte

-möglicherweise nicht bearbeiten oder kopieren.

-Die aktuelle Auswahl können Sie jedoch aufnehmen.

-

-Möchten Sie diese Objekte nehmen?

-                </f_translation>

-<f_old_trans>

-                        Mindestens ein Objekt ist gesperrt.

-Nicht alle Objekte, die Sie aufgenommen haben, gehören Ihnen.

-Wenn Sie fortfahren, werden die die Rechte für den nächsen Eigentümer angewandt und Sie können die Objekte

-möglicherweise nicht bearbeiten oder kopieren.

-Die aktuelle Auswahl können Sie jedoch aufnehmen.

-Möchten Sie diese Objekte nehmen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CantBuyLandAcrossMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        Landkauf nicht möglich, da die Auswahl mehrere Regionen umfasst.

-

-Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.

-                </f_translation>

-<f_old_trans>

-                        Landkauf nicht möglich, da die Auswahl mehrere Regionen umfasst.

-Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

-

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe

-über ausreichende Landnutzungsrechte verfügt.

-Dem Eigentümer wird der Kaufpreis für das Land nicht

-rückerstattet. Bei Verkauf der übertragenen Parzelle

-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.

-

-Der Gruppe &apos;[GROUP_NAME]&apos;

- [AREA] m2 Land schenken?

-                </f_translation>

-<f_old_trans>

-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe

-über ausreichende Landnutzungsrechte verfügt.

- 

-Dem Eigentümer wird der Kaufpreis für das Land nicht

-rückerstattet. Bei Verkauf der übertragenen Parzelle

-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.

- 

-Der Gruppe &apos;[GROUP_NAME]&apos;

-[AREA] qm Land schenken?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroupWithContribution/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe

-über ausreichende Landnutzungsrechte verfügt.

-Die Schenkung beinhaltet eine Landübertragung

-an die Gruppe von &apos;[FIRST_NAME] [LAST_NAME]&apos;.

-Dem Eigentümer wird der Kaufpreis für das Land nicht

-rückerstattet. Bei Verkauf der übertragenen Parzelle

-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.

- 

-Der Gruppe &apos;[GROUP_NAME]&apos;

- [AREA] m2 Land schenken?

-                </f_translation>

-<f_old_trans>

-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe

-über ausreichende Landnutzungsrechte verfügt.

- 

-Die Schenkung beinhaltet eine Landübertragung

-an die Gruppe von &apos;[FIRST_NAME] [LAST_NAME]&apos;.

- 

-Dem Eigentümer wird der Kaufpreis für das Land nicht

-rückerstattet. Bei Verkauf der übertragenen Parzelle

-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.

- 

-Der Gruppe &apos;[GROUP_NAME]&apos;

-[AREA] qm Land schenken?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CanNotFindServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Der Server-Domänenname konnte nicht gefunden werden.

-Mögliche Ursachen sind der Verlust der Netzwerkverbindung

-oder ein Serverproblem.

-

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Der Server-Domänenname konnte nicht gefunden werden.

-Mögliche Ursachen sind der Verlust der Netzwerkverbindung

-oder ein Serverproblem.

- 

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SystemMayBeDown/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Möglicherweise handelt es sich um einen Systemausfall.

-

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Verbindung mit [SECOND_LIFE] nicht möglich.

-Möglicherweise handelt es sich um einen Systemausfall.

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AvatarMoved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your [TYPE] location is not currently available.

-[HELP] 

-You have been moved into a nearby region.

-                </d_old>

-<e_new>

-                        Your [TYPE] location is not currently available. [HELP] 

-You have been moved into a nearby region.

-                </e_new>

-<f_translation>

-                        Ihr [TYPE]-Ort ist zurzeit nicht verfügbar. [HELP] 

-Sie wurden zur nächstgelegenen Region teleportiert.

-                </f_translation>

-<f_old_trans>

-                        Ihr [TYPE]-Ort ist zurzeit nicht verfügbar.

-[HELP] 

-Sie wurden zur nächstgelegenen Region teleportiert.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRun/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        Die Installation von [SECOND_LIFE] ist abgeschlossen.

-

-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,

-bevor Sie sich anmelden können.

-Möchten Sie auf www.secondlife.com ein Konto erstellen?

-                </f_translation>

-<f_old_trans>

-                        Die Installation von [SECOND_LIFE] ist abgeschlossen.

- 

-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,

-bevor Sie sich anmelden können.

- 

-Möchten Sie auf www.secondlife.com ein Konto erstellen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SetByHostFail/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        Verbindung zum Server nicht möglich.

-Folgende Domäne konnte nicht aufgelöst werden: [HOST_NAME]

-

-Bitte überprüfen Sie Ihre Netzwerkverbindung.

-                </f_translation>

-<f_old_trans>

-                        Verbindung zum Server nicht möglich.

-Folgende Domäne konnte nicht aufgelöst werden: [HOST_NAME]

-Bitte überprüfen Sie Ihre Netzwerkverbindung.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//LoginPacketNeverReceived/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect.  Login packet never received by

-login server.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect.  Login packet never received by

-login server.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        Verbindung nicht möglich.  Anmeldeserver hat das Anmeldepaket

-nie erhalten.

-

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_translation>

-<f_old_trans>

-                        Verbindung nicht möglich.  Anmeldeserver hat das Anmeldepaket

-nie erhalten.

- 

-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie

-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeNoClothes/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        Ihr Avatar erscheint jeden Moment.

-

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

-Drücken Sie F1 für Hilfe oder für weitere

-Informationen über [SECOND_LIFE].

-                </f_translation>

-<f_old_trans>

-                        Ihr Avatar erscheint jeden Moment.

- 

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

- 

-Drücken Sie F1 für Hilfe oder für weitere

-Informationen über [SECOND_LIFE].

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeChooseSex/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE]. 

- 

-Please choose the male or female avatar.

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-Please choose the male or female avatar.

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        Ihr Avatar erscheint jeden Moment.

-

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

-Drücken Sie F1 für Hilfe oder für weitere

-Informationen über [SECOND_LIFE].

-Bitte wählen Sie einen männlichen oder weiblichen Avatar.

-Sie können sich später noch umentscheiden.

-                </f_translation>

-<f_old_trans>

-                        Ihr Avatar erscheint jeden Moment.

- 

-Benutzen Sie die Pfeiltasten, um sich fortzubewegen.

- 

-Drücken Sie F1 für Hilfe oder für weitere

-Informationen über [SECOND_LIFE]. 

- 

-Bitte wählen Sie einen männlichen oder weiblichen Avatar.

-Sie können sich später noch umentscheiden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FlushMapVisibilityCaches/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This will flush the map caches on this region.

- 

-This is really only useful for debugging. 

- 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </d_old>

-<e_new>

-                        This will flush the map caches on this region.

-This is really only useful for debugging. 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </e_new>

-<f_translation>

-                        Der Kartencache dieser Region wird geleert.

-Diese Aktion ist nur beim Debugging sinnvoll. 

-(Auf dem Produktionssystem warten Sie einfach 5 Minuten. Die Karten werden 

-nach erneuter Anmeldung automatisch aktualisiert.)

-                </f_translation>

-<f_old_trans>

-                        Der Kartencache dieser Region wird geleert.

- 

-Diese Aktion ist nur beim Debugging sinnvoll. 

- 

-(Auf dem Produktionssystem warten Sie einfach 5 Minuten. Die Karten werden 

-nach erneuter Anmeldung automatisch aktualisiert.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainBitDepth/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        Die Regionstexturen konnten nicht festgelegt werden: 

-Die Terraintextur [TEXTURE_NUM] hat eine ungültige Bit-Tiefe [TEXTURE_BIT_DEPTH].

-

-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und

-klicken Sie dann erneut auf &quot;Übernehmen&quot;.

-                </f_translation>

-<f_old_trans>

-                        Die Regionstexturen konnten nicht festgelegt werden: 

- 

-Die Terraintextur [TEXTURE_NUM] hat eine ungültige Bit-Tiefe [TEXTURE_BIT_DEPTH].

- 

-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und

-klicken Sie dann erneut auf &quot;Übernehmen&quot;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainSize/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        Die Regionstexturen konnten nicht festgelegt werden: 

-Die Terraintextur [TEXTURE_NUM] ist mit [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] zu groß. 

-

-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und

-klicken Sie dann erneut auf &quot;Übernehmen&quot;.

-                </f_translation>

-<f_old_trans>

-                        Die Regionstexturen konnten nicht festgelegt werden: 

- 

-Die Terraintextur [TEXTURE_NUM] ist mit [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] zu groß. 

- 

-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und

-klicken Sie dann erneut auf &quot;Übernehmen&quot;.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-You must download this update to use [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        Eine neue Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Sie müssen das Update herunterladen, um [SECOND_LIFE] weiter verwenden zu können.

-                </f_translation>

-<f_old_trans>

-                        Eine neue Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

- 

-Sie müssen das Update herunterladen, um [SECOND_LIFE] weiter verwenden zu können.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

-                </f_translation>

-<f_old_trans>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

- 

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

-                </f_translation>

-<f_old_trans>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

- 

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-

-You must download this update to use [SECOND_LIFE].

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        Eine neue Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Sie müssen das Update herunterladen, um [SECOND_LIFE] weiter verwenden zu können.

-

-In Ihren Anwendungsordner herunterladen?

-                </f_translation>

-<f_old_trans>

-                        Eine neue Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-

-Sie müssen das Update herunterladen, um [SECOND_LIFE] weiter verwenden zu können.

- 

-In Ihren Anwendungsordner herunterladen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMac/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

- 

-In Ihren Anwendungsordner herunterladen?

-                </f_translation>

-<f_old_trans>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

- 

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

- 

-In Ihren Anwendungsordner herunterladen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

- 

-In Ihren Anwendungsordner herunterladen?

-                </f_translation>

-<f_old_trans>

-                        Eine aktualisierte Version von [SECOND_LIFE] ist verfügbar.

-[MESSAGE]

- 

-Dieses Update ist nicht erforderlich, für bessere Leistung und Stabilität sollte es jedoch installiert werden.

- 

-In Ihren Anwendungsordner herunterladen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//AddClassified/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

                         Classified ads appear in the &apos;Classified&apos; section of the

 Search directory and on www.secondlife.com for one week.

- 

 Fill out your ad, then click &apos;Publish...&apos; to add it to the

 directory.

- 

 You&apos;ll be asked for a price to pay when clicking Publish.

 Paying more makes your ad appear higher in the list, and

 also appear higher when people search for keywords.

@@ -2409,7 +38,7 @@ Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.

                 </e_new>

 <f_translation>

-                        Anzeigen erscheinen für eine Woche auf der Registerkarte &apos;Anzeigen&apos;

+                        Anzeigen erscheinen für eine Woche unter &apos;Anzeigen&apos;

 im Suchverzeichnis.

 Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum

 Verzeichnis hinzuzufügen.

@@ -2418,660 +47,80 @@ Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,
 erscheint Ihre Anzeige weiter oben in der Liste.

                 </f_translation>

 <f_old_trans>

-                        Anzeigen erscheinen eine Woche lang auf der Registerkarte &apos;Anzeigen&apos;

+                        Anzeigen erscheinen für eine Woche unter &apos;Anzeigen&apos;

 im Suchverzeichnis.

- 

 Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum

 Verzeichnis hinzuzufügen.

- 

 Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.

 Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,

 erscheint Ihre Anzeige weiter oben in der Liste.

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReturnToOwner/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

- 

-*WARNING* No-transfer deeded objects will be deleted!

-                </d_old>

-<e_new>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

-

-*WARNING* No-transfer deeded objects will be deleted!

-                </e_new>

-<f_translation>

-                        Möchten Sie die ausgewählten Objekte

-an ihre Eigentümer zurückgeben? Transferierbare übertragene

-Objekte werden ihren früheren Eigentümern zurückgegeben.

-

-*WARNUNG* Nicht transferierbare übertragene Objekte werden dabei gelöscht!

-                </f_translation>

-<f_old_trans>

-                        Möchten Sie die ausgewählten Objekte

-an ihre Eigentümer zurückgeben? Transferierbare übertragene

-Objekte werden ihren früheren Eigentümern zurückgegeben.

- 

-*WARNUNG* Nicht transferierbare übertragene Objekte werden dabei gelöscht!

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenEstate/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

- 

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </d_old>

-<e_new>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

-

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </e_new>

-<f_translation>

-                        Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, 

-Teen-Raster, Orientierung usw.) zu verändern. 

-

-Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen 

-auf das Benutzererlebnis hat.  Auf dem Mainland werden tausende 

-Regionen geändert, was den Spaceserver stark belastet.

- 

-Fortfahren?

-                </f_translation>

-<f_old_trans>

-                        Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, 

-Teen-Raster, Orientierung usw.) zu verändern. 

- 

-Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegene Auswirkungen 

-auf das Benutzererlebnis hat.  Auf dem Mainland werden tausende 

-Regionen geändert, was den Spaceserver stark belastet.

- 

-Fortfahren?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenAccess/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

- 

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

- 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </d_old>

-<e_new>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

-

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </e_new>

-<f_translation>

-                        Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz 

-(Mainland, Teen-Raster, Orientierung usw.) zu verändern. 

-

-Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ 

-per Hack in und aus dem Raster zu 

-entfernen. 

-Tausende Regionen werden verändert und der 

-Spaceserver wird dadurch stark belastet. 

-                </f_translation>

-<f_old_trans>

-                        Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz 

-(Mainland, Teen-Raster, Orientierung usw.) zu verändern. 

- 

-Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ 

-per Hack in und aus dem Raster zu 

-entfernen. 

- 

-Tausende Regionen werden verändert und der 

-Spaceserver wird dadurch stark belastet.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PublishClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Remember: Classified ad fees are non-refundable.

- 

-Publish this classified now for L$[AMOUNT]?

-                </d_old>

-<e_new>

-                        Remember: Classified ad fees are non-refundable.

-

-Publish this classified now for L$[AMOUNT]?

-                </e_new>

-<f_translation>

-                        Hinweis: Anzeigengebühren werden nicht zurückerstattet.

-

-Anzeige für [AMOUNT] L$ veröffentlichen?

-                </f_translation>

-<f_old_trans>

-                        Hinweis: Anzeigengebühren werden nicht zurückerstattet.

- 

-Anzeige für [AMOUNT] L$ veröffentlichen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpRegionBlockTerraform/message</b_path>

+</string><string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel</b_path>

 <c_attribute></c_attribute>

-<d_old>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

- 

-Default: off

-                </d_old>

+<d_old></d_old>

 <e_new>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

-

-Default: off

-                </e_new>

-<f_translation>

-                        Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht

-terraformen. Ausgenommen davon ist die parzelleneigene Einstellung &apos; Terrain bearbeiten&apos;.

-

-Standard: aus

-                </f_translation>

-<f_old_trans>

-                        Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht

-terraformen. Ausgenommen davon ist die parzelleneigene Einstellung &apos; Terrain bearbeiten&apos;.

- 

-Standard: aus

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpParcelSearch/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

                         

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </d_old>

-<e_new>

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </e_new>

-<f_translation>

-Dieses Kontrollkästchen zeigt Folgendes an:

-- diese Parzelle in den Suchergebnissen

-- die öffentlichen Objekte dieser Parzelle

-                </f_translation>

-<f_old_trans>

-                        Dieses Kontrollkästchen zeigt Folgendes an:

-- diese Parzelle in den Suchergebnissen

-- die öffentlichen Objekte dieser Parzelle

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//RegionMaturityChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The maturity rating for this region has been updated. 

- 

-It may take some time for the change to be 

-reflected on the map.

-                </d_old>

-<e_new>

-                        The maturity rating for this region has been updated. 

-It may take some time for the change to be 

-reflected on the map.

-                </e_new>

-<f_translation>

-                        Die Alterseinstufung dieser Region wurde aktualisiert. 

-Es kann eine Weile dauern, bis sich die Änderung auf 

-die Karte auswirkt.

-                </f_translation>

-<f_old_trans>

-                        Die Alterseinstufung dieser Region wurde aktualisiert. 

- 

-Es kann eine Weile dauern, bis sich die Änderung auf 

-die Karte auswirkt.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchase/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </e_new>

-<f_translation>

-                        Transaktion:

-[ACTION]

- 

-Möchten Sie diesen Kauf fortsetzen?

-                </f_translation>

-<f_old_trans>

-                        Transaktion:

- 

-[ACTION]

- 

-Möchten Sie diesen Kauf fortsetzen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchasePassword/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </e_new>

-<f_translation>

-                        Transaktion:

-[ACTION]

- 

-Möchten Sie diesen Kauf fortsetzen?

-Geben Sie Ihr Kennwort erneut ein und klicken Sie auf OK.

-                </f_translation>

-<f_old_trans>

-                        Transaktion:

- 

-[ACTION]

- 

-Möchten Sie diesen Kauf fortsetzen?

-Geben Sie Ihr Kennwort erneut ein und klicken Sie auf OK.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MoveInventoryFromScriptedObject/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

- 

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </d_old>

-<e_new>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </e_new>

-<f_translation>

-                        Sie haben &apos;nicht kopierfähige&apos; Inventarobjekte ausgewählt.  Diese Objekte 

-werden nicht kopiert, sondern in Ihr Inventar verschoben.

-Da es sich um ein geskriptetes Objekt handelt, geht 

-die Skriptfunktion beim Verschieben in das Inventar möglicherweise verloren. 

- 

-Inventarobjekt(e) verschieben?

-                </f_translation>

-<f_old_trans>

-                        Sie haben &apos;nicht kopierfähige&apos; Inventarobjekte ausgewählt.  Diese Objekte 

-werden nicht kopiert, sondern in Ihr Inventar verschoben.

- 

-Da es sich um ein geskriptetes Objekt handelt, geht 

-die Skriptfunktion beim Verschieben in das Inventar möglicherweise verloren. 

- 

-Inventarobjekt(e) verschieben?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this abuse report.

- 

-Selecting a category helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please select a category for this abuse report.

-Selecting a category helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        Wählen Sie eine Missbrauchskategorie aus.

-Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.

-                </f_translation>

-<f_old_trans>

-                        Wählen Sie eine Missbrauchskategorie aus.

- 

-Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this bug.

- 

-Selecting a category helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please select a category for this bug.

-Selecting a category helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        Wählen Sie eine Fehler-Kategorie aus.

-Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.

-                </f_translation>

-<f_old_trans>

-                        Wählen Sie eine Fehler-Kategorie aus.

- 

-Die Angabe einer Kategorie hilft uns bei der Bearbeitung des Berichts.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserNameEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the name of the abuser.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the name of the abuser.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        Geben Sie den Namen des Täters ein.

-Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_translation>

-<f_old_trans>

-                        Geben Sie den Namen des Täters ein.

- 

-Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserLocationEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the location where the abuse took place.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the location where the abuse took place.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        Bitte geben Sie den Ort an, an dem der Missbrauch stattgefunden hat.

-Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_translation>

-<f_old_trans>

-                        Bitte geben Sie den Ort an, an dem der Missbrauch stattgefunden hat.

- 

-Eine genaue Angabe hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the abuse that took place.

- 

-Entering an accurate summary helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the abuse that took place.

-Entering an accurate summary helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        Bitte geben Sie eine Zusammenfassung des Vorfalls ein.

-Eine genaue Zusammenfassung hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_translation>

-<f_old_trans>

-                        Bitte geben Sie eine Zusammenfassung des Vorfalls ein.

- 

-Eine genaue Zusammenfassung hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the bug.

- 

-Entering an accurate summary helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the bug.

-Entering an accurate summary helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        Bitte geben Sie eine Zusammenfassung des Fehlers ein.

-Eine genaue Zusammenfassung hilft uns, Fehler schneller zu beseitigen.

-                </f_translation>

-<f_old_trans>

-                        Bitte geben Sie eine Zusammenfassung des Fehlers ein.

- 

-Eine genaue Zusammenfassung hilft uns, Fehler schneller zu beseitigen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

- 

-Entering an accurate description helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

-Entering an accurate description helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        Bitte geben Sie eine ausführliche Beschreibung des Vorfalls ein.

-Eine möglichst genaue Beschreibung mit Namen und

-Einzelheiten

-hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_translation>

-<f_old_trans>

-                        Bitte geben Sie eine ausführliche Beschreibung des Vorfalls ein,

-möglichst genau, mit Namen und Einzelheiten des gemeldeten

-Missbrauchs.

- 

-Eine genaue Beschreibung hilft uns, Fälle von Missbrauch zu ahnden.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

- 

-Entering an accurate description helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

-Entering an accurate description helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        Bitte geben Sie eine ausführliche Fehlerbeschreibung ein.

-Eine möglichst genaue Beschreibung mit Schritten zur Reproduktion des Fehlers

-hilft uns,

-Fehler schneller zu beseitigen.

-                </f_translation>

-<f_old_trans>

-                        Bitte geben Sie eine ausführliche Fehlerbeschreibung ein,

-möglichst genau und mit Schritten zur Reproduktion des Fehlers,

-sofern möglich.

- 

-Eine genaue Beschreibung hilft uns, Fehler schneller zu beseitigen.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseContainsCopyright/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

- 

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </d_old>

-<e_new>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

-

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </e_new>

-<f_translation>

-                        Sehr geehrte(r) Einwohner(in),

- 

-Meldungen über Urheberrechtsverletzungen können nur auf

-http://secondlife.com/corporate/dmca.php eingereicht werden.

-

-Meldungen über Urheberrechtsverletzungen, die über

-&apos;Missbrauch melden&apos; eingereicht wurden, werden automatisch

-gelöscht. Wenn Sie keine Urheberrechtsverletzung melden möchten,

-können Sie dieses Fenster schließen und mit dem Einreichen Ihrer Meldung fortfahren.

- 

-Vielen Dank,

- 

-Linden Lab

-                </f_translation>

-<f_old_trans>

-                        Sehr geehrte(r) Einwohner(in),

- 

-Meldungen über Urheberrechtsverletzungen können nur auf

-http://secondlife.com/corporate/dmca.php eingereicht werden.

- 

-Meldungen über Urheberrechtsverletzungen, die über

-&apos;Missbrauch melden&apos; eingereicht wurden, werden automatisch

-gelöscht. Wenn Sie keine Urheberrechtsverletzung melden möchten,

-können Sie dieses Fenster schließen und mit dem Einreichen Ihrer Meldung fortfahren.

- 

-Vielen Dank,

- 

-Linden Lab

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CopySLURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The following SLURL has been copied to your clipboard:

                         

-                         [SLURL] 

                         

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </d_old>

-<e_new>

-                        The following SLURL has been copied to your clipboard:

-                         [SLURL] 

-

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </e_new>

-<f_translation>

-                        Die folgende SLURL wurde in die Zwischenablage kopiert:

-                         [SLURL] 

-

-                        Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort

-                        zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.

-                </f_translation>

-<f_old_trans>

-                        Die folgende SLURL wurde in die Zwischenablage kopiert:

                         

-                         [SLURL] 

                         

-                        Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort

-                        zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//BadURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-Second Life doesn&apos;t know how to handle the link:

-

-[SLURL]

-

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

-                </d_old>

-<e_new>

-Second Life doesn&apos;t know how to handle the link:

- [SLURL]

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </e_new>

 <f_translation>

-Second Life kann den folgenden Link nicht verarbeiten:

- [SLURL]

-Die meisten Links ähneln dem Folgenden:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Überprüfen Sie die Schreibweise und versuchen Sie es erneut.

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </f_translation>

-<f_old_trans>

-                        Second Life kann den folgenden Link nicht verarbeiten:

-

-[SLURL]

-

-Die meisten Links ähneln dem Folgenden:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Überprüfen Sie die Schreibweise und versuchen Sie es erneut.

-                </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_media_panel/Media texture:</b_path>

 <c_attribute></c_attribute>

@@ -3092,84 +141,27 @@ Einstellungen:
 Einstellungen:

                         </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Limit access to this parcel to:</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                                Limit access to this parcel to:

-                        </d_old>

-<e_new>

-                                Access To This Parcel

-                        </e_new>

-<f_translation>

-                                Zugang zu dieser Parzelle

-                        </f_translation>

-<f_old_trans>

-                                Zugang zu dieser Parzelle beschränken auf:

-                        </f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Group: [GROUP]</d_old>

-<e_new>Allow Group Access: [GROUP]</e_new>

-<f_translation>Gruppenzugang erlauben: [GROUP]</f_translation>

-<f_old_trans>Gruppe: [GROUP]</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Sell passes allowing temporary access:</d_old>

-<e_new>Sell passes to:</e_new>

-<f_translation>Pässe verkaufen an:</f_translation>

-<f_old_trans>Pässe für temporären Zugang verkaufen:</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

-<e_new>Always Allow</e_new>

-<f_translation>Immer erlauben</f_translation>

-<f_old_trans>Avatare: ([LISTED] angezeigt, max. [MAX])</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                          Allowed Residents

-                        </e_new>

-<f_translation>

-                          Zulässige Einwohner

-                        </f_translation>

-<f_old_trans></f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

+<d_old>Always Allow</d_old>

 <e_new>Ban</e_new>

 <f_translation>Verbannen</f_translation>

-<f_old_trans>Avatare: ([LISTED] angezeigt, max. [MAX])</f_old_trans>

+<f_old_trans>Verbannen</f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute></c_attribute>

-<d_old></d_old>

+<d_old>

+                          Allowed Residents

+                        </d_old>

 <e_new>

                           Banned Residents

                         </e_new>

 <f_translation>

                           Verbannte Einwohner

                         </f_translation>

-<f_old_trans></f_old_trans>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/popular_panel/incmature</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Include parcels with Mature Content</d_old>

-<e_new>Include parcels with Restricted Content</e_new>

-<f_translation>Parzellen, die Inhalte mit Zugangsbeschränkung enthalten, einschließen</f_translation>

-<f_old_trans>Parzellen mit Ab-18-Inhalten einschließen</f_old_trans>

-</string><string><a_file>menu_inventory.xml</a_file>

-<b_path>/Popup/Landmark Open</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Open</d_old>

-<e_new>Teleport</e_new>

-<f_translation>Teleportieren</f_translation>

-<f_old_trans>Öffnen</f_old_trans>

+<f_old_trans>

+                                Verbannte Einwohner

+                        </f_old_trans>

 </string><string><a_file>panel_audio_device.xml</a_file>

 <b_path>/device_settings/Input device (microphone):</b_path>

 <c_attribute></c_attribute>

@@ -3204,16 +196,16 @@ Einstellungen:
 <b_path>/panel_login/real_url</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                http://secondlife.com/app/login/

+             https://secondlife.com/app/login/?show_login_form=True

         </d_old>

 <e_new>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </e_new>

 <f_translation>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </f_translation>

 <f_old_trans>

-             https://secondlife.com/app/login/de/?show_login_form=True

+                https://secondlife.com/app/login/?show_login_form=True

         </f_old_trans>

 </string><string><a_file>panel_preferences_audio.xml</a_file>

 <b_path>/Media panel/doppler_effect_text</b_path>

@@ -3245,13 +237,21 @@ Einstellungen:
 <f_old_trans>

                 Protokolloptionen:

         </f_old_trans>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/externally_visible_check</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Public Access</d_old>

-<e_new>Allow Public Access</e_new>

-<f_translation>Freien Zugang erlauben</f_translation>

-<f_old_trans>Öffentlich</f_old_trans>

+</string><string><a_file>panel_preferences_voice.xml</a_file>

+<b_path>/chat/voice_chat_description</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                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.

+        </d_old>

+<e_new>

+                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

+        </e_new>

+<f_translation>

+                HINWEIS: Beim Öffnen der Geräte-Einstellungen oder der Voice-Chat-Einrichtung werden Sie vorübergehend vom Voice-Chat getrennt.

+        </f_translation>

+<f_old_trans>

+                HINWEIS: Beim Öffnen der Geräte-Einstellungen oder der Voice-Chat-Einrichtung werden Sie vorübergehend vom Voice-Chat getrennt.

+        </f_old_trans>

 </string><string><a_file>panel_voice_options.xml</a_file>

 <b_path>/content_panel/push_to_talk_check</b_path>

 <c_attribute>label</c_attribute>

@@ -3259,191 +259,5 @@ Einstellungen:
 <e_new>Start Viewer in Push-to-Talk mode</e_new>

 <f_translation>Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten</f_translation>

 <f_old_trans>Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten</f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Problem encountered processing your teleport request. You may

-                        need to log back in before you can teleport. If you continue

-                        to get  this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support

-                </d_old>

-<e_new>

-                    Problem encountered processing your teleport request. You may

-need to log back in before you can teleport. If you continue

-to get  this message, please check the Tech Support FAQ at:

-www.secondlife.com/support

-                </e_new>

-<f_translation>

-                    Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen

-sich zum Teleportieren eventuell neu anmelden. Wenn Sie diese

-Nachricht       weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:

-www.secondlife.com/support

-                </f_translation>

-<f_old_trans>

-                        Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen sich zum Teleportieren eventuell neu anmelden. Wenn Sie diese Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter: www.secondlife.com/support

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Problem encountered processing your region crossing. You may

-                        need to log back in before you can cross regions. If you continue

-                        to get this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support.

-                </d_old>

-<e_new>

-                    Problem encountered processing your region crossing. You may

-need to log back in before you can cross regions. If you continue

-to get this message, please check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                    Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen

-sich zum Wechsel der Region eventuell neu anmelden. Wenn Sie diese

-Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:

-www.secondlife.com/support.

-                </f_translation>

-<f_old_trans>

-                        Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen sich zum Wechsel der Region eventuell neu anmelden. Wenn Sie diese Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:  www.secondlife.com/support.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/blocked_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-                        If you still cannot teleport, please log out and log back in to

-                        resolve the problem.

-                </d_old>

-<e_new>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-If you still cannot teleport, please log out and log back in to

-resolve the problem.

-                </e_new>

-<f_translation>

-                    Teleportieren ist zurzeit leider nicht möglich. Versuchen Sie es später noch einmal.

-Wenn der Teleport dann immer noch nicht funktioniert, melden Sie

-sich bitte ab und wieder an.

-                </f_translation>

-<f_old_trans>

-                        Teleportieren ist zurzeit leider nicht möglich. Versuchen Sie es später noch einmal. Wenn der Teleport dann immer noch nicht funktioniert, melden Sie sich bitte ab und wieder an.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/timeout_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but system was unable to complete the teleport connection.

-                        Try again in a moment.

-                </d_old>

-<e_new>

-                    Sorry, but system was unable to complete the teleport connection.

-Try again in a moment.

-                </e_new>

-<f_translation>

-                    Das System konnte keine Teleport-Verbindung herstellen.

-Versuchen Sie es später noch einmal.

-                </f_translation>

-<f_old_trans>

-                        Das System konnte keine Teleport-Verbindung herstellen. Versuchen Sie es später noch einmal.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/missing_attach_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Your attachments have not arrived yet. Try waiting for a few

-                        more seconds or log out and back in again before attempting

-                        to teleport.

-                </d_old>

-<e_new>

-                    Your attachments have not arrived yet. Try waiting for a few

-more seconds or log out and back in again before attempting

-to teleport.

-                </e_new>

-<f_translation>

-                    Ihre Anhänge sind noch nicht eingetroffen. Warten Sie kurz

-oder melden Sie sich ab und wieder an, bevor Sie einen neuen

-Teleport-Versuch unternehmen.

-                </f_translation>

-<f_old_trans>

-                        Ihre Anhänge sind noch nicht eingetroffen. Warten Sie kurz oder melden Sie sich ab und wieder an, bevor Sie einen neuen Teleport-Versuch unternehmen.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/too_many_uploads_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    The asset queue in this region is currently clogged so your teleport

-                        request will not be able to succeed in a timely manner. Please try again

-                        in a few minutes or go to a less busy area.

-                </d_old>

-<e_new>

-                    The asset queue in this region is currently clogged so your teleport

-request will not be able to succeed in a timely manner. Please try again

-in a few minutes or go to a less busy area.

-                </e_new>

-<f_translation>

-                    Die Asset-Warteschlange in dieser Region ist zurzeit überlastet.

-Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es

-in einigen Minuten erneut oder besuchen Sie eine weniger überfüllte Region.

-                </f_translation>

-<f_old_trans>

-                        Die Asset-Warteschlange in dieser Region ist zurzeit überlastet. Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in einigen Minuten erneut oder besuchen Sie eine weniger überfüllte Region.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your teleport request

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your teleport request

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    Das System konnte Ihre Teleport-Anfrage nicht

-rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.

-                </f_translation>

-<f_old_trans>

-                        Das System konnte Ihre Teleport-Anfrage nicht rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your region crossing

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your region crossing

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    Das System konnte Ihre Anfrage zum Regionswechsel nicht

-rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.

-                </f_translation>

-<f_old_trans>

-                        Das System konnte Ihre Anfrage zum Regionswechsel nicht rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/no_host</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Unable to find teleport destination. The destination may be

-                        temporarily unavailable or no longer exists. Please try again

-                        in a few minutes.

-                </d_old>

-<e_new>

-                    Unable to find teleport destination. The destination may be

-temporarily unavailable or no longer exists. Please try again

-in a few minutes.

-                </e_new>

-<f_translation>

-                    Teleport-Ziel wurde nicht gefunden. Das Ziel ist

-entweder im Moment nicht verfügbar oder existiert nicht mehr. Versuchen Sie es

-in einigen Minuten erneut.

-                </f_translation>

-<f_old_trans>

-                        Teleport-Ziel wurde nicht gefunden. Das Ziel ist entweder zeitweise nicht verfügbar oder existiert nicht mehr. Versuchen Sie es in einigen Minuten erneut.

-                </f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/de/notify.xml b/linden/indra/newview/skins/xui/de/notify.xml
index e288b45..465de11 100644
--- a/linden/indra/newview/skins/xui/de/notify.xml
+++ b/linden/indra/newview/skins/xui/de/notify.xml
@@ -79,12 +79,12 @@
         </notify>
         <notify name="GestureMissing">
                 <message name="message">
-                        Geste fehlt in Datenbank.
+                        Geste [NAME] fehlt in Datenbank.
                 </message>
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        Geste konnte nicht geladen werden.
+                        Geste [NAME] konnte nicht geladen werden.
 Bitte versuchen Sie es erneut.
                 </message>
         </notify>
@@ -383,6 +383,11 @@ Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
                         Auf diesem Land ist Voice aktiviert.
                 </message>
         </notify>
+        <notify name="NoVoice">
+                <message name="message">
+                        Auf diesem Land ist Voice deaktiviert.
+                </message>
+        </notify>
         <notify name="NoBuild">
                 <message name="message">
                         Auf diesem Land ist Bauen deaktiviert (&apos;Bauen aus&apos;).
@@ -718,6 +723,9 @@ Ist das OK?
                 <option name="No">
                         Nein
                 </option>
+                <option name="Mute">
+                        Stummschalten
+                </option>
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
                 <message name="message">
@@ -917,8 +925,23 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
         </notify>
         <notify name="VoiceInviteAdHoc">
                 <message name="message">
-                        [NAME] lädt Sie zu einer Voice-Chat-Konferenz ein. 
-Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Anrufer stumm zu schalten.
+                        [NAME] ist einem Voice-Konferenz-Chat beigetreten. 
+Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Benutzer stumm zu schalten.
+                </message>
+                <option name="Accept">
+                        Akzeptieren
+                </option>
+                <option name="Decline">
+                        Ablehnen
+                </option>
+                <option name="Mute">
+                        Stummschalten
+                </option>
+        </notify>
+        <notify name="InviteAdHoc">
+                <message name="message">
+                        [NAME] lädt Sie zu einem Konferenz-Chat ein. 
+Klicken Sie auf &apos;Akzeptieren&apos;, um dem Chat beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Benutzer stumm zu schalten.
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -985,4 +1008,14 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
                         Zugang zur Parzelle verweigert. Sie stehen nicht auf der Zugangsliste.
                 </message>
         </notify>
+        <notify name="VoiceNotAllowed">
+                <message name="message">
+                        Sie sind nicht berechtigt, einem Voice-Chat in [VOICE_CHANNEL_NAME] beizutreten.
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError">
+                <message name="message">
+                        Fehler beim Versuch, eine Voice-Chat-Verbindung zu [VOICE_CHANNEL_NAME] herzustellen.  Bitte versuchen Sie es erneut.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/de/panel_avatar.xml b/linden/indra/newview/skins/xui/de/panel_avatar.xml
index 81b8977..0c69249 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_avatar.xml
@@ -5,6 +5,7 @@
                         <text name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
+[AGEVERIFICATION]
                         </text>
                         <text name="AcctTypeResident">
                                 Einwohner
@@ -28,10 +29,10 @@
                                 Keine Zahlungsinfo archiviert
                         </text>
                         <text name="AgeVerified">
-                                , altersgeprüft
+                                Altersgeprüft
                         </text>
                         <text name="NotAgeVerified">
-                                , nicht altersgeprüft
+                                Nicht altersgeprüft
                         </text>
                         <text name="Name:">
                                 Name:
@@ -49,6 +50,8 @@
                              tool_tip="Second Life Partner. Weitere Informationen finden Sie auf www.secondlife.com/partner">
                                 Partner:
                         </text>
+                        <button label="i" label_selected="i" name="partner_info"
+                             tool_tip="Klicken Sie, um das Profil Ihres Partners anzuzeigen" />
                         <button label="?" label_selected="?" name="partner_help" />
                         <line_editor name="partner_edit"
                              tool_tip="Second Life Partner. Weitere Informationen finden Sie auf www.secondlife.com/partner">
diff --git a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml b/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
index e88bf8f..86fbe49 100644
--- a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat">
-        <button label="Verlauf" label_selected="Verlauf" name="History"
+<panel name="chat_bar">
+        <button label="Lokaler Chat" label_selected="Verlauf" name="History"
              tool_tip="Klicken Sie hier zur Anzeige des Gesprächs" />
         <line_editor label="Zum Chatten hier klicken." name="Chat Editor"
              tool_tip="Eingabe für Sprechen, Strg-Eingabe für Rufen." />
diff --git a/linden/indra/newview/skins/xui/de/panel_friends.xml b/linden/indra/newview/skins/xui/de/panel_friends.xml
index 73161ba..a0b1595 100644
--- a/linden/indra/newview/skins/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/de/panel_friends.xml
@@ -2,7 +2,13 @@
 <panel name="friends">

         <scroll_list name="friend_list"

              tool_tip="Halten Sie die Tasten &apos;Umschalt&apos; oder &apos;Strg&apos; gedrückt, um durch Klicken mehrere Freunde auszuwählen.">

-                <column label="Name" name="friend_name" />

+                <column name="icon_online_status" tool_tip="Online-Status" />

+                <column label="Name" name="friend_name" tool_tip="Name" />

+                <column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind" />

+                <column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden" />

+                <column name="icon_edit_mine" tool_tip="Freund kann Ihre Objekte bearbeiten" />

+                <column name="icon_edit_theirs"

+                     tool_tip="Sie können die Objekte dieses Freunds bearbeiten" />

         </scroll_list>

         <panel name="rights_container">

                 <text name="friend_name_label">

diff --git a/linden/indra/newview/skins/xui/de/panel_group_voting.xml b/linden/indra/newview/skins/xui/de/panel_group_voting.xml
index cee7d22..1f4480d 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_voting.xml
@@ -81,10 +81,10 @@ enthalten Sie sich der Stimme.
         </text>
         <button label="Angebot senden" label_selected="Angebot senden" name="btn_submit" />
         <button label="Abbrechen" label_selected="Abbrechen" name="btn_cancel" />
-        <button label="Ja" label_selected="Ja" name="btn_yes"  />
+        <button label="Ja" label_selected="Ja" name="btn_yes" />
         <button label="Nein" label_selected="Nein" name="btn_no" />
-        <button label="Enthalten" label_selected="Enthalten" name="btn_abstain"  />
-        <text  name="txt">
+        <button label="Enthalten" label_selected="Enthalten" name="btn_abstain" />
+        <text name="txt">
                 Alte Gruppenabstimmungen
         </text>
         <text name="instructions">
@@ -113,4 +113,10 @@ klicken Sie für das Ergebnis auf &apos;Objekt anzeigen&apos;.
         <text name="proposals_submit_new_txt">
                 Sende neue Anfrage...
         </text>
+        <text name="vote_recorded">
+                Sie haben abgestimmt.
+        </text>
+        <text name="vote_previously_recorded">
+                Sie haben bereits abgestimmt:  Pro Wahl können Sie nur einmal abstimmen.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_login.xml b/linden/indra/newview/skins/xui/de/panel_login.xml
index 46525cc..c2f78aa 100644
--- a/linden/indra/newview/skins/xui/de/panel_login.xml
+++ b/linden/indra/newview/skins/xui/de/panel_login.xml
@@ -1,6 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
         <text name="real_url">
-                https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text name="first_name_text">
+                Vorname:
+        </text>
+        <text name="last_name_text">
+                Nachname:
+        </text>
+        <text name="password_text">
+                Kennwort:
+        </text>
+        <text name="start_location_text">
+                Startposition:
+        </text>
+        <combo_box name="start_location_combo">
+                <combo_item name="MyHome">
+                        Mein Heimatort
+                </combo_item>
+                <combo_item name="MyLastLocation">
+                        Mein letzter Standort
+                </combo_item>
+                <combo_item name="Typeregionname">
+                        &lt;Region eingeben&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="Kennwort merken" name="remember_check" />
+        <text name="full_screen_text">
+                Die Anzeige schaltet bei Anmeldung auf Vollbild um.
+        </text>
+        <button label="Neues Konto..." label_selected="Neues Konto..." name="new_account_btn" />
+        <button label="Einstellungen..." label_selected="Einstellungen..."
+             name="preferences_btn" />
+        <button label="Verbinden" label_selected="Verbinden" name="connect_btn" />
+        <button label="Beenden" label_selected="Beenden" name="quit_btn" />
+        <text name="version_text">
+                1.23.4 (5)
+        </text>
+        <text name="channel_text">
+                [Viewer Channel Name]
+        </text>
+        <text name="forgot_password_text">
+                Kennwort vergessen?
+        </text>
+        <text name="forgot_password_url">
+                http://secondlife.com/account/request.php
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_media_controls.xml b/linden/indra/newview/skins/xui/de/panel_media_controls.xml
new file mode 100644
index 0000000..9650a6a
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/panel_media_controls.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_controls">

+        <button name="music_play" tool_tip="Streaming-Musik spielen/unterbrechen" />

+        <button name="media_play" tool_tip="Streaming-Video pausieren/wiedergeben" />

+        <volume_slider name="volume_slider" tool_tip="Master-Lautstärke" />

+        <button name="mute_master" tool_tip="Master-Stummschaltung" />

+        <button name="expand" tool_tip="Lautstärke einzeln regeln" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/de/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..39ca5cb
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/panel_media_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_remote">

+        <panel label="Audio und Video" name="Volume Panel" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
index 650edaf..a899bd1 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
@@ -2,14 +2,31 @@
 <panel name="overlay">
         <button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
              tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
-        <button label="Beschäftigt"
-             label_selected="Beschäftigt" name="Set Not Busy"
+        <button label="Beschäftigt" label_selected="Beschäftigt" name="Set Not Busy"
              tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
-        <button label="Freigeben"
-             label_selected="Freigeben" name="Release Keys"
+        <button label="Freigeben" label_selected="Freigeben" name="Release Keys"
              tool_tip="Ein Skript hat die Steuerung übernommen. Klicken Sie hier, um die Steuerung wieder freizugeben." />
         <button label="Mouselook" label_selected="Mouselook" name="Mouselook"
              tool_tip="Mit der Maus steuern Sie die Anzeige. Wenn Sie eine Waffe haben, klicken Sie, um zu schießen." />
         <button label="Aufstehen" label_selected="Aufstehen" name="Stand Up"
              tool_tip="Klicken Sie hier, um aufzustehen." />
+        <layout_stack name="overlay_layout_panel">
+                <layout_panel name="">
+                        <layout_stack name="">
+                                <layout_panel name="state_buttons">
+                                        <button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
+                                             tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
+                                        <button label="Als nicht beschäftigt anzeigen"
+                                             label_selected="Als nicht beschäftigt anzeigen" name="Set Not Busy"
+                                             tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
+                                        <button label="Tasten freigeben" label_selected="Tasten freigeben" name="Release Keys"
+                                             tool_tip="Ein Skript hat die Steuerung übernommen. Klicken Sie hier, um die Steuerung wieder freizugeben." />
+                                        <button label="Mouselook" label_selected="Mouselook" name="Mouselook"
+                                             tool_tip="Mit der Maus steuern Sie die Anzeige. Wenn Sie eine Waffe haben, klicken Sie, um zu schießen." />
+                                        <button label="Aufstehen" label_selected="Aufstehen" name="Stand Up"
+                                             tool_tip="Klicken Sie hier, um aufzustehen." />
+                                </layout_panel>
+                        </layout_stack>
+                </layout_panel>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
index 35bae44..da066a1 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
@@ -77,7 +77,7 @@
                         English (Englisch)
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (Chinesisch)
+                        汉语/漢語 (Chinesisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
                         Deutsch
@@ -92,7 +92,7 @@
                         한국어 (Koreanisch)
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        Português (Portugiesisch)
+                        Português (Portugiesisch) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
                         Español (Spanisch)
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
index db15695..6199691 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
@@ -4,6 +4,9 @@
                 Anzeigeauflösung:
         </text>
         <check_box label="In Fenster ausführen" name="windowed mode" />
+        <text_editor name="voice_chat_description">
+                Wenn deaktiviert, schaltet die Anzeige bei Anmeldung auf Vollbild um.
+        </text_editor>
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 Vollbild-Aspektverhältnis:
         </text>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml
index b339952..8fa2097 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml
@@ -16,7 +16,7 @@
                 Zum Sprechen drücken

         </text>

         <text_editor name="voice_chat_description">

-                Im Modus &apos;Zum Sprechen drücken&apos; können Sie steuern, wann Ihre Stimme übertragen wird. Im Umschaltmodus verwenden Sie die Taste, um die Audioübertragung ein- und auszuschalten. Wenn Sie sich nicht im Umschaltmodus befinden, ist das Mikro nur aktiv während Sie die Taste gedrückt halten.

+                HINWEIS: Beim Öffnen der Geräte-Einstellungen oder der Voice-Chat-Einrichtung werden Sie vorübergehend vom Voice-Chat getrennt.

         </text_editor>

         <check_box label="Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten"

              name="push_to_talk_check" />

@@ -32,6 +32,6 @@
         </text>

         <check_box label="Anrufe nur von Personen auf meiner Freundesliste annehmen"

              name="voice_call_friends_only_check" />

-        <button label="Geräte-Einstellungen..." name="device_settings_btn" />

-        <button label="Voice-Setup-Assistenten ausführen..." name="launch_voice_wizard_button" />

+        <button label="Geräte-Einstellungen" name="device_settings_btn" />

+        <button label="Voice-Chat-Einrichtung" name="launch_voice_wizard_button" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml b/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
index 7944d80..fbb7359 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
@@ -9,4 +9,13 @@
         </text>

         <check_box label="Cookies von Webseiten akzeptieren" name="cookies_enabled" />

         <button label="Jetzt leeren" name="clear_cookies" />

+        <text name="proxy_label">

+                Web-Proxy:

+        </text>

+        <check_box label="Web-Proxy aktivieren" name="web_proxy_enabled" />

+        <text name="proxy_text_label">

+                Adresse:

+        </text>

+        <line_editor name="web_proxy_editor" tool_tip="Name oder IP-Adresse des Proxys" />

+        <spinner label="Port-Nummer:" name="web_proxy_port" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
new file mode 100644
index 0000000..74e9286
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel">

+        <string name="moderator_label">

+                (Moderator)

+        </string>

+        <layout_stack name="">

+                <layout_panel name="moderation_mode_panel">

+                        <combo_box name="moderation_mode">

+                                Moderiertes Voice

+                        </combo_box>

+                </layout_panel>

+                <layout_panel name="moderate_chat_panel">

+                        <scroll_list name="speakers_list">

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

+                        </scroll_list>

+                        <panel name="speaker_controls">

+                                <text name="resident_name">

+                                        Rumpelstilzchen Megakrass

+                                </text>

+                                <button name="mute_btn" tool_tip="Voice für diesen Einwohner stummschalten" />

+                                <check_box label="Text stummschalten" name="mute_text_btn" />

+                        </panel>

+                </layout_panel>

+                <layout_panel name="moderator_controls">

+                        <text name="moderator_controls_label">

+                                Moderator-Steuerung:

+                        </text>

+                </layout_panel>

+        </layout_stack>

+</panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/xui/de/panel_status_bar.xml
index c6d3cef..d0c3460 100644
--- a/linden/indra/newview/skins/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_status_bar.xml
@@ -26,9 +26,13 @@
         <button label="" label_selected="" name="fly" tool_tip="Fliegen aus" />
         <button label="" label_selected="" name="build" tool_tip="Bauen aus" />
         <button label="" label_selected="" name="scripts" tool_tip="Skripts aus" />
+        <button name="no_fly" tool_tip="Fliegen ist unzulässig" />
+        <button name="no_build" tool_tip="Bauen/Rezzen ist unzulässig" />
+        <button name="no_scripts" tool_tip="Skripte sind unzulässig" />
         <button label="" label_selected="" name="restrictpush"
-             tool_tip="llPushObject beschränken" />
+             tool_tip="llPushObject beschränkt" />
         <button name="status_voice" tool_tip="Voice aktiviert" />
+        <button name="status_no_voice" tool_tip="Voice hier nicht möglich" />
         <button label="" label_selected="" name="buyland" tool_tip="Diese Parzelle kaufen" />
         <text name="packet_loss_tooltip">
                 Paketverlust
diff --git a/linden/indra/newview/skins/xui/de/panel_toolbar.xml b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
index 62a9726..8d8d0b6 100644
--- a/linden/indra/newview/skins/xui/de/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_toolbar">
+<panel name="toolbar">
         <button label="IM" name="im_btn" tool_tip="Instant Message an Ihre Freunde." />
+        <string name="Redock Windows">
+                Fenster andocken
+        </string>
         <button label="Unterhalten" name="communicate_btn"
              tool_tip="Unterhalten Sie sich mit Freunden und in Gruppen." />
-        <button label="Chat" name="chat_btn"
-             tool_tip="Mit Leuten in der Nähe sprechen. (Eingabe)" />
+        <button label="Chat" name="chat_btn" tool_tip="Chat-Leiste anzeigen. (Eingabe)" />
         <button label="Freunde" name="friends_btn"
              tool_tip="Suchen und unterhalten Sie sich mit Ihren Freunden." />
         <button label="Fliegen" label_selected="Landen" name="fly_btn"
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_controls.xml b/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
new file mode 100644
index 0000000..5a19d25
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_controls">

+        <button name="speakers_btn"

+             tool_tip="Liste der Einwohner in der Umgebung anzeigen, die Voice-Chat verwenden" />

+        <button label="Sprechen" name="push_to_talk"

+             tool_tip="Zum Sprechen Taste gedrückt halten" />

+        <button name="ptt_lock"

+             tool_tip="Klicken Sie auf das Schloss, um in den Gesprächsmodus zu wechseln" />

+        <button name="show_channel" tool_tip="Klicken, um den aktuellen Voice-Kanal anzuzeigen" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/de/panel_voice_enable.xml b/linden/indra/newview/skins/xui/de/panel_voice_enable.xml
index 31e8098..38fbb5b 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/de/panel_voice_enable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="content_panel">

         <text_editor name="voice_intro_text1">

-                Willkommen beim Second Life Voice-Chat! Mit dem Voice-Chat können Sie sich mit anderen Einwohnern unterhalten. Dieser Assistent führt Sie durch die Einrichtung von Voice-Chat. Bitte beachten Sie, dass Sie für Voice-Chat einen Stereo-Kopfhörer mit Mikrofon benötigen; klicken Sie auf &apos;Hilfe&apos; für weitere Informationen.

+                Willkommen beim Second Life Voice-Chat! Mit dem Voice-Chat können Sie sich mit anderen Einwohnern unterhalten. Dieser Assistent führt Sie durch die Einrichtung von Voice-Chat. Für den Voice-Chat benötigen Sie Lautsprecher und ein Mikrofon bzw. Kopfhörer mit einem eingebauten Mikrofon.

         </text_editor>

         <text_editor name="voice_intro_text2">

                 Möchten Sie Voice-Chat jetzt aktivieren?

diff --git a/linden/indra/newview/skins/xui/de/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/de/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..6ba1d9b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_remote">

+        <button name="end_call_btn" tool_tip="Klicken, um aufzulegen" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 0bd618b..67f7df5 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -147,6 +147,20 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                         No
                 </option>
         </alert>
+        <alert modal="true" name="GrantModifyRightsMultiple">
+                <message name="message">
+                        Granting modify rights to another resident allows them to change 
+ANY objects you may have in-world. Be VERY careful when handing 
+out this permission.
+Do you want to grant modify rights for the selected Residents?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
         <alert modal="true" name="RevokeModifyRights">
                 <message name="message">
                         Do you want to revoke modify rights for [FIRST_NAME] [LAST_NAME]?
@@ -158,6 +172,17 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                         No
                 </option>
         </alert>
+        <alert modal="true" name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        Do you want to revoke modify rights for the selected Residents?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
         <alert modal="true" name="RemoveFriend">
                 <message name="message">
                         Do you want to remove [FIRST] [LAST] from your list of friends?
@@ -480,6 +505,21 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
                 <option default="true" name="Cancel">
                         Cancel
                 </option>
+        </alert>        
+        <alert modal="true" caution="true" name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+ATTENTION: Clicking 'sell to anyone' makes your land available to the entire Second Life community, even those not in this region.
+
+The selected [LAND_SIZE] m2 land is being set for sale.
+Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+ 
+                </message>
+                <option name="Continue">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
         </alert>
         <alert modal="true" name="ReturnObjectsDeededToGroup">
                 <message name="message">
@@ -1143,21 +1183,6 @@ Could not resolve domain name: [DOMAIN]
 Please check your network connection.
                 </message>
         </alert>
-        <alert modal="true" name="CannotConnectLoginPacket">
-                <message name="message">
-                        Unable to connect.  Login packet never received by
-login server.
- 
-Please try again in a few minutes, or click Help
-for advice and a link to the system status web page.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Help">
-                        Help
-                </option>
-        </alert>
         <alert modal="true" name="WelcomeToSecondLife">
                 <message name="message">
                         Welcome to [SECOND_LIFE]! 
@@ -1301,7 +1326,7 @@ If an object is not owned by you and you take it,
 next owner permissions will be applied to it and
 possibly restrict your ability to modify or copy it.
 
-Are you sure you want to take these itmes?
+Are you sure you want to take these items?
                 </message>
                 <option name="Yes">
                         OK
@@ -2446,11 +2471,9 @@ Please check your network connection.
         </alert>
         <alert modal="true" name="LoginPacketNeverReceived">
                 <message name="message">
-                        Unable to connect.  Login packet never received by
-login server.
+We're having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
 
-Please try again in a few minutes, or click Help
-for advice and a link to the system status web page.
+You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
                 </message>
                 <option name="OK">
                         OK
@@ -2458,6 +2481,9 @@ for advice and a link to the system status web page.
                 <option name="Help">
                         Help
                 </option>
+                <option name="Teleport">
+                        Teleport
+                </option>
         </alert>
         <alert modal="true" name="WelcomeNoClothes">
                 <message name="message">
@@ -3016,21 +3042,6 @@ Leave Group?
                         OK
                 </option>
         </alert>
-        <alert modal="true" name="MuteByName" title="Mute object by name">
-                <message name="message">
-                        Mute by name only affects object chat and IM, not sounds. 
-You must type the object&apos;s name exactly.
-                </message>
-                <editline>
-                        Object name
-                </editline>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
-        </alert>
         <alert modal="true" name="MuteByNameFailed" title="Mute object by name failed">
                 <message name="message">
                         You already have muted this name.
@@ -3088,7 +3099,8 @@ object. Do you want to delete that item?
                         Busy mode set.
 Chat and instant messages will be hidden. Instant
 messages will get your Busy mode response. All teleportation
-and inventory offers will be declined.
+offers will be declined. All inventory offers will go to your
+Trash.
                 </message>
                 <ignore name="ignore">
                         When setting busy mode
@@ -3545,7 +3557,7 @@ regardless of the per-parcel &apos;Fly&apos; setting.
 Default: off
                 </message>
         </alert>
-        <alert modal="true" name="HelpRegionAllowDamage" title="Allow Damange">
+        <alert modal="true" name="HelpRegionAllowDamage" title="Allow Damage">
                 <message name="message">
                         If this box is checked, the health system across all parcels
 regardless of individual parcel settings. If this box is left
@@ -3690,7 +3702,7 @@ need to do this in order to travel to the location of a noted
 &apos;top collider&apos;. Once you have arrived at the location, investigate the 
 object - is it constantly colliding with other objects? You may want to 
 contact the owner of the object or delete or return the object. 
-Uncheck the Disable Collisions box and then Applyto reactivate 
+Uncheck the Disable Collisions box and then Apply to reactivate 
 collisions in the region.
  
 Default: off
@@ -4190,8 +4202,7 @@ http://secondlife.com/corporate/tos.php
 http://secondlife.com/corporate/cs.php
 
 All reported abuses of the Terms of Service and Community Standards 
-are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. You can also view the incident 
+are investigated and resolved. You can view the incident 
 resolution on the Police Blotter at:
 
 http://secondlife.com/community/blotter.php
@@ -4399,11 +4410,11 @@ the contents of your Lost And Found folder?
         </alert>
         <alert modal="true" name="CopySLURL">
                 <message name="message">
-                        The following SLURL has been copied to your clipboard:
-                         [SLURL] 
+The following SLURL has been copied to your clipboard:
+ [SLURL] 
 
-                        Put it in a web page to give others easy access to this location or
-                        try it out yourself by pasting it into the address bar of your web browser.
+Put it in a web page to give others easy access to this location or
+try it out yourself by pasting it into the address bar of your web browser.
                 </message>
                 <ignore name="ignore">
                         When copying a SLURL to your clipboard
@@ -4412,7 +4423,7 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionStartError">
             <message name="message">
                     Error starting a new chat session with [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4421,7 +4432,7 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionStartNotVerified">
             <message name="message">
                     Error starting a new chat session with [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4430,16 +4441,16 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionEventError">
             <message name="message">
                     Error [EVENT] [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
                 </option>
         </alert>
         <alert modal="true" name="ForceCloseChatterBoxSession">
-            <message name="messsage">
+            <message name="message">
                     Your chat session with [NAME] must close.
-            [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4523,3 +4534,4 @@ Would you like to visit the Second Life website to set this up?
                 <url option="0">https://secondlife.com/account/</url>
         </alert>
 </alerts>
+
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 03c07b9..85ac175 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
@@ -458,24 +458,18 @@
                              halign="center" height="16" hidden="false" label="Return objects..."
                              label_selected="Return objects..." left="220" mouse_opaque="true"
                              name="Return objects..." width="164" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="" label_selected=""
-                             left="4" mouse_opaque="true" name="Type" tool_tip="Sort by Type" width="24" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="Name"
-                             label_selected="Name" left="28" mouse_opaque="true" name="Name"
-                             tool_tip="Sort by Name" width="220" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="Count"
-                             label_selected="Count" left="248" mouse_opaque="true" name="Count"
-                             tool_tip="Sort by Count" width="64" />
-                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
-                             column_padding="0" draw_border="true" draw_heading="false"
+      <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329" draw_heading="true"
+                             column_padding="0" draw_border="true"
                              draw_stripes="true" enabled="true" fg_disable_color="1 1 1 1"
                              fg_selected_color="1 1 1 1" fg_unselected_color="1 1 1 1"
-                             follows="left|top|right|bottom" height="97" hidden="false" left="4"
+                             follows="left|top|right|bottom" height="117" hidden="false" left="4"
                              mouse_opaque="true" multi_select="false" name="owner list"
-                             name_column_index="2" width="450" />
+                             name_column_index="2" width="450">
+        <column width="24" label="Type" sort="online_status"/>
+        <column width="-1" name="online_status"/>
+        <column dynamicwidth="true" label="Name"/>
+        <column width="70" label="Count"/>
+      </name_list>/>
                 </panel>
                 <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" hidden="false" label="Options" 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
index bf7734e..933baad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -9,7 +9,7 @@
         can_minimize="true"

         can_close="true"

         can_drag_on_left="false"

-        min_width="220"

+        min_width="180"

         min_height="200"

         >

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

@@ -18,7 +18,7 @@
                         left="10"

                         right="-10"

                         top="-20"

-                        bottom="60"

+                        bottom="35"

                         column_padding="0"

                         can_resize="true"

                         follows="left|top|bottom|right"

@@ -35,9 +35,9 @@
                         name="volume_container"

                         left="10"

                         right="-10"     

-                        height="30"

-                        bottom="20"     

-                        border="true"

+                        height="20"

+                        bottom="5"      

+                        border="false"

                         mouse_opaque="true"

                         bevel_style="in"

                         background_visible="false"

@@ -59,14 +59,11 @@
                                 increment="0.05"

                                 initial_val="0.5"

                         />

-                        <button

-                                name="mute_btn"

-                                left_delta="115"

-                                bottom_delta="-2"

-                                width="70"

-                                height="25"

-                                label="Mute"

-                                />

+                        <button bottom_delta="0" height="20"

+                                image_selected="icn_speaker-muted_dark.tga"

+                                image_unselected="icn_speaker_dark.tga" label="" left_delta="115"

+                                name="mute_btn" toggle="true" width="25" tool_tip="Mute voice for this resident"/>

+

                 </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
index dc31951..ab0c0ad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="40" left="40" height="225" width="180" 
+<floater bottom="40" left="40" height="200" width="180" 
          rect_control="FloaterAudioVolumeRect"
-         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="false"
          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"
+               hidden="false" label="Volume" left="5" height="180" width="175"
                mouse_opaque="true" name="Volume Panel"
                filename="panel_audio.xml">
         </panel>
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 2c738ec..ce87e38 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
@@ -3,11 +3,13 @@
      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="Residents Near Me (Chat History)" short_title="Near Me" width="435">
+     title="Local Chat" width="435">
 
         <string name="ringing">Connecting to in-world Voice Chat...</string>
         <string name="connected">Connected</string>
+        <string name="unavailable">Voice not available at your current location</string>
         <string name="hang_up">Disconnected from in-world Voice Chat</string>
+        <string name="voice_icon">icn_voice-localchat.tga</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">
@@ -45,68 +47,21 @@
                                 <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"
+                                        label="Click here to chat." left="0" right="-90" 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" />
+                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-80"
+                                        mouse_opaque="true" name="Say" tool_tip="(Enter)" width="70" list_position="above">
+                                        <flyout_button_item value="shout">Shout</flyout_button_item>
+                                        <flyout_button_item value="say">Say</flyout_button_item>
+                                </flyout_button>
                         </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|bottom|right" width="100" 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_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"
+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"
+                     width="140"/>
         </layout_stack>
 
 </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
index 3c95030..c620e8b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
@@ -1,4 +1,4 @@
-<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings"

+<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings" can_drag_on_left="false"

      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_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index af865f4..321b585 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="false" height="570" min_height="570" min_width="780"
      name="directory" rect_control="FloaterFindRect2"
      title="Search Second Life" width="780">
         <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
@@ -10,6 +10,8 @@
                      label="All" left="1" mouse_opaque="false"
                      name="find_all_panel"
                      width="778">
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
                         <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20" 
                                 label="Back"
                                 left="10" 
@@ -99,7 +101,9 @@
                                                 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="&lt; Prev" label_selected="&lt; Prev" right="258"
                              mouse_opaque="true" name="&lt; Prev" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -179,7 +183,9 @@
                 <panel border="true" bottom="-549" default_tab_group="1"
                      follows="left|top|right|bottom" height="533" label="Events" left="1"
                      mouse_opaque="false" name="events_panel" width="778">
-                        <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
                              mouse_opaque="true" name="date_mode" width="300">
                                 <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
                                      name="current" width="174">
@@ -309,7 +315,9 @@
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Popular Places" left="1" mouse_opaque="false" name="popular_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -350,7 +358,9 @@ the amount of time people spend there.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="390"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -427,7 +437,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -521,7 +533,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="330"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -556,7 +570,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Groups" left="1" mouse_opaque="false" name="groups_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -598,7 +614,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="All (old)" left="1" mouse_opaque="false"
                      name="find_all_old_panel" width="778">
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
                              mouse_opaque="true" name="&lt; Prev" width="60" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
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 1e08fb2..a3c43ad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
@@ -24,22 +24,22 @@
                 You belong to [COUNT] groups (of [MAX] maximum).
         </text>
         <pad bottom="-17" height="0" left="-90" width="1" />
-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+        <button 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"
+        <button 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"
+        <button 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"
+        <button 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"
+        <button 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_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 2e4171a..2c55711 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -8,21 +8,21 @@
              name="html_floater_browser" right="-15" top="-56" />
         <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
              left="15" name="back_btn" width="80" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="83" name="home_btn" width="80" />
+<!--    <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20" -->
+<!--         label="Home" left_delta="75" name="home_btn" width="70" /> -->
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
              label="Forward" left_delta="83" name="forward_btn" width="80" />
              
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="90" max_length="256" mouse_opaque="true"
-             name="url_edit" select_all_on_focus_received="true" width="345" />
+             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="75" max_length="256" mouse_opaque="true"
+             name="url_edit" select_all_on_focus_received="true" width="435" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
-             label="Go" left_delta="350" name="go_btn" width="70" />
+             label="Go" left_delta="450" name="go_btn" width="70" />
              
         <!-- web_browser bottom="20" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" / -->
 
-        <text hidden="true" name="home_page_url">http://www.google.com</text>
+        <text hidden="true" name="home_page_url">http://www.secondlife.com</text>
         
         <text hidden="true" name="in-world_help_title">In-World Help</text>
         <text hidden="true" name="in-world_help_url">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml b/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
deleted file mode 100644
index 91c0873..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="500" min_height="300" min_width="300" name="htmlhelp"
-     title="Second Life Help" width="700">
-        <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-             left="15" name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Forward" left_delta="75" name="forward_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="75" name="home_btn" width="70" />
-        <text bottom_delta="5"
-                follows="top|left|right"
-                left_delta="100"
-                name="status_text"
-                right="-5"
-                height="16">
-                Ready
-        </text>
-        <web_browser name="html_help_browser"
-                bottom="10"
-                follows="top|left|bottom|right"
-                font="SansSerifSmall"
-                left="15"
-            right="-15" top="-55" start_url="http://secondlife.com/app/help/" />
-</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 fee153a..ae14c00 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_im.xml
@@ -13,14 +13,27 @@
         <string name="offline_message">
                 [FIRST] [LAST] is offline.
         </string>
+        <string name="invite_message">
+                Click the [BUTTON NAME] button to accept/connect to this voice chat.
+        </string>
+
         <string name="generic_request_error">
             Error making request, please try again later.
         </string>
         <string name="insufficient_perms_error">
             You do not have sufficient permissions.
         </string>
-        <string name="user_no_help">
-            The requested user is no longer in the help session.
+        <string name="session_does_not_exist_error">
+            The session no longer exists
+        </string>
+        <string name="no_ability_error">
+            You do not have that ability.
+        </string>
+        <string name="not_a_mod_error">
+            You are not a session moderator.
+        </string>
+        <string name="muted_error">
+            You have been muted.
         </string>
         <string name="add_session_event">
             adding agents to chat session with
@@ -28,13 +41,13 @@
         <string name="message_session_event">
             messaging chat session with
         </string>
-        <string name="teleport_session_event">
-            teleporting to creator of
+        <string name="mute_agent_event">
+            muting agent in
         </string>
         <string name="removed_from_group">
             You have been removed from the group.
         </string>
-        <string name="invite_message">
-                Click the [BUTTON NAME] button to accept/connect to this voice chat.
+        <string name="close_on_no_ability">
+            You no longer have the ability to be in the chat session
         </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 637c8ba..b6a7932 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
@@ -1,71 +1,64 @@
-<!-- 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="true"
-     can_resize="true"
-     enabled="true"
-     follows="left|top|right|bottom"
-     height="297"
-     hidden="false"
-     label="(unknown)"
-     left="1"
-     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>
+<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1"
+     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
+     min_height="155" min_width="345" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+        <string name="ringing">
+                Calling...
+        </string>
+        <string name="answering">
+                Connecting...
+        </string>
+        <string name="connected">
+                Connected, click End Call to hang up
+        </string>
+        <string name="hang_up">
+                Call ended
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Instant Message with [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] is typing...
+        </string>
+        <string name="session_start_string">
+                Starting session with [NAME] please wait.
+        </string>
+        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
+             name="profile_callee_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="center" height="20"
+             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+             label="Call" left_delta="85" name="start_call_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="right" height="20"
+             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+             label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"
+             pad_right="10"/>
+        <panel border="false" bottom="-40" follows="left|top|right" height="20"
+             left_delta="77" name="speaker_controls" width="344">
+                <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05"
+                     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
+                     name="speaker_volume" width="80" />
+        <button bottom_delta="0" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+             name="mute_btn" width="25" tool_tip="Mute voice"/>
+        </panel>
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              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"
+             follows="left|top|right|bottom" font="SansSerif" height="225" 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="5"
-             enabled="true" follows="left|right|bottom" font="SansSerif"
-             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="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"
+             follows="left|right|bottom" font="SansSerif" height="20"
+             label="Click here to instant message" 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="421" />
+        <button bottom="4" follows="right|bottom" font="SansSerif" halign="center" height="20"
+             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 *** 
@@ -73,13 +66,4 @@ Please first check our SL Help Pages by pressing F1, or by accessing the Knowled
 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_ad_hoc.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
index f58273e..eba2603 100644
--- 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
@@ -24,12 +24,21 @@
         <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>

-

+        <string name="voice_icon">icn_voice-groupfocus.tga</string>

+        <string name="title_string">

+                Instant Message with [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] is typing...

+        </string>

+        <string name="session_start_string">

+            Starting session with [NAME] please wait.

+        </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."/>

+                        <button left="4" bottom="-24" height="20" width="80" label="Call" enabled="false" follows="left|top" name="start_call_btn" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" halign="center"/>

+                        <button left_delta="0" bottom_delta="0" height="20" width="80" label="End Call" halign="right" follows="left|top" name="end_call_btn" visible="false" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" />

+                <button left="460" right="493" bottom_delta="0" height="20" width="80" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to toggle 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"

@@ -49,57 +58,9 @@
                                 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_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"

+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"

+                     width="140"/>

         </layout_stack>

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

                 *** Welcome to Help Request *** 

@@ -107,13 +68,5 @@ Please first check our SL Help Pages by pressing F1, or by accessing the Knowled
 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
index 1b7dd4e..0c9fe38 100644
--- 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
@@ -1,160 +1,82 @@
-<!-- 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>                

+<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"

+     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"

+     follows="left|top|right|bottom" height="296" hidden="false"

+     label="(unknown)" left="1" min_height="200" min_width="360"

+     mouse_opaque="true" name="im_floater" rect_control="" title="(unknown)"

+     width="501">

+        <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>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

+        <string 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 -=-=-

+        </string>

+        <string name="title_string">

+                Instant Message with [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] is typing...

+        </string>

+        <string name="session_start_string">

+                Starting session with [NAME] please wait.

+        </string>

+        <string name="moderated_chat_label">

+                (Moderated)

+        </string>

+        <string name="default_text_label">

+                Click here to instant message.

+        </string>

+        <string name="muted_text_label">

+                Text chat has been disabled by a Group Moderator.

+        </string>

+        <layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="276" left="2"

+             orientation="horizontal" tab_group="1" width="495">

+                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"

+                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">

+                        <button follows="left|top" height="20" label="Group Info" left="4"

+                             name="group_info_btn" tab_group="0" width="80" />

+                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"

+                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"

+                             label="Join Call" left_delta="85" name="start_call_btn" width="80" pad_right="12"/>

+                        <button bottom_delta="0" follows="left|top" height="20" halign="right"

+                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"

+                             label="End Call" left_delta="0" name="end_call_btn" visible="false" pad_right="12"

+                             width="80" />

+                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"

+                             label_selected="&gt; &gt;" left="140" name="toggle_active_speakers_btn"

+                             right="173"

+                             tool_tip="Click here to toggle list of active partipants in this IM session."

+                             visible="true" width="70" />

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

+                             bottom="27" 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" top="102" 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"

+                             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" />

+                        <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" />

                 </layout_panel>

-                

+                <layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"

+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"

+                     width="140"/>

         </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 1790162..b834821 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
@@ -4,7 +4,7 @@
      name="item properties" rect_control="PropertiesRect"
      title="Inventory Item Properties" width="350">
         <icon bottom="-21" follows="top|right" height="16" left="294" mouse_opaque="true"
-             name="IconLocked" width="16" />
+             name="IconLocked" image_name="icon_lock.tga" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-35" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index c8d730a..8ff118f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -3,7 +3,7 @@
      can_resize="true" can_tear_off="true" enabled="true" height="300"
      hidden="false" left="45" min_height="140" min_width="220"
      mouse_opaque="true" name="mute floater" rect_control="FloaterMuteRect3"
-     title="Muted Residents &amp; Objects" width="300">
+     title="Muted Residents &amp; Objects" short_title="Mute List" width="300">
         <scroll_list background_visible="false" bottom="-220" column_padding="5" draw_border="true"
              draw_heading="false" draw_stripes="true" enabled="true"
              fg_disable_color="1 1 1 1" fg_selected_color="1 1 1 1"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
new file mode 100644
index 0000000..db064dc
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="140" min_height="140" min_width="375"
+     name="mute by name" title="Mute object by name" width="375">
+        <text left_delta="25" bottom_delta="-50" font="SansSerif" follows="top|left" height="16" left="20"
+             name="message" right="380" text_color="white">
+Mute by name only affects object chat and IM, not sounds.
+You must type the object&apos;s name exactly.
+        </text>
+        <line_editor bottom_delta="-40" follows="top|right" height="18" left_delta="0"
+             name="object_name" width="320" font="SansSerif">
+                Object name
+        </line_editor>
+        <button bottom_delta="-30" follows="bottom|left" height="20" label="Ok" left="108"
+             name="OK" width="75" />
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Cancel" left="190"
+             name="Cancel" width="75" />
+</floater>
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
index 50c69c6..264286d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,9 +1,13 @@
 <?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"/>

+<floater can_close="false" can_drag_on_left="false" can_minimize="true"

+     can_resize="true" can_tear_off="true" height="390" min_height="240"

+     rect_control="FloaterContactsRect"

+     min_width="365" name="floater_my_friends" title="Contacts" width="395">

+        <tab_container bottom="10" follows="left|right|top|bottom" height="360" left="0"

+             name="friends_and_groups" tab_position="top" tab_width="80" width="388">

+                <panel bottom="0" filename="panel_friends.xml" label="Friends" left="0"

+                     name="friends_panel" width="370" />

+                <panel bottom="0" filename="panel_groups.xml" label="Groups" left="0"

+                     name="groups_panel" width="370" />

         </tab_container>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
index fcc04c5..a59bc73 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" hidden="false" left="242"
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" hidden="false"
      mouse_opaque="true"
      name="url_preview" width="440" title="Place Information" rect_control="PreviewURLRect">
   <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
new file mode 100644
index 0000000..36f0989
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
@@ -0,0 +1,5 @@
+<floater can_close="true" can_minimize="true" can_resize="false" name="regioninfo" can_drag_on_left="false"

+     rect_control="FloaterRegionInfo" title="Region/Estate">

+        <tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1"

+             name="region_panels" right="-1" tab_position="top" top="-20" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index d4a0034..6600349 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -130,9 +130,9 @@
         </text>
         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
              border_thickness="1" bottom_delta="-18" follows="left|top"
-             font="SansSerifSmall" height="16" left="16" max_length="32"
+             font="SansSerifSmall" height="16" left="16" max_length="256"
              mouse_opaque="true" name="abuse_location_edit"
-             text_readonly_color="1, 1, 1, 1" width="180" />
+             text_readonly_color="1, 1, 1, 1" width="356" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
index d4c4add..6f47e2a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
@@ -32,29 +32,4 @@
         <button bottom="-170" follows="left|bottom" font="SansSerif" halign="center"
              height="20" label="Upload (L$10)" label_selected="Upload (L$10)"
              left_delta="0" mouse_opaque="true" name="ok_btn" width="130" /-->
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-120" drop_shadow_visible="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-             mouse_opaque="true" name="text" v_pad="0" width="87">
-                Bitrate (kbps):
-        </text>
-        <radio_group bottom_delta="-22" follows="left|top" height="22" left="13" mouse_opaque="true"
-             name="bitrate" width="274">
-                <radio_item bottom="-21" follows="left|top" height="19" left="20" mouse_opaque="true"
-                     name="32" width="60">
-                        32
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="80" mouse_opaque="true"
-                     name="64" width="60">
-                        64
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="140" mouse_opaque="true"
-                     name="96" width="60">
-                        96
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="200" mouse_opaque="true"
-                     name="128" width="60">
-                        128
-                </radio_item>
-        </radio_group>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index 26a9aa4..b32091c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -169,7 +169,7 @@
              name="location_icon" width="16" />
         <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
              left_delta="20" name="location" select_on_focus="true"
-             tool_tip="Type the name of a region" width="140" />
+             tool_tip="Type the name of a region" width="140"/>
         <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
              height="20" label="Search" left_delta="145" mouse_opaque="true"
              name="DoSearch" tool_tip="Search for region" width="60" />
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 3dfe14a..c1b72d4 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -197,6 +197,7 @@
              mouse_opaque="true" name="Animation Audition" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
         </menu_item_call>
+        <menu_item_separator name="Send Instant Message Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Send Instant Message"
              left="0" mouse_opaque="true" name="Send Instant Message" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />
@@ -219,6 +220,9 @@
              mouse_opaque="true" name="Deactivate" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
         </menu_item_call>
+
+<!-- from this line down the attach session is read in reverse order -->        
+
         <menu_item_separator name="Attach Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Detach From Yourself"
              left="0" mouse_opaque="true" name="Detach From Yourself" width="128">
@@ -234,7 +238,9 @@
         <menu bottom_delta="-18" height="18" hidden="false" label="Attach To HUD" left="0"
              mouse_opaque="true" name="Attach To HUD" opaque="true" tear_off="false"
              width="128" />
-        <menu_item_separator name="Wearable Separator" />
+                 
+<!-- from this line down the wearable session is read in reverse order -->              
+         
         <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" />
@@ -249,4 +255,5 @@
         </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="--no options--" left="0"
              mouse_opaque="true" name="--no options--" width="128" />
+        <menu_item_separator name="Wearable Separator" />        
 </menu>
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 8643c7e..1fa57da 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -848,7 +848,7 @@
                         left="0" mouse_opaque="true" name="separator7" width="250" />
                         <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
                     left="0" mouse_opaque="true" name="Report Bug..." width="166">
-                        <on_click function="ShowFloater" userdata="bug reporter" />
+                        <on_click function="PromptShowURL" userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                         </menu_item_call>
                 </menu>
         </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index cbd2789..d1964e0 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -79,12 +79,12 @@
         </notify>
         <notify name="GestureMissing" tip="true">
                 <message name="message">
-                        Gesture is missing from database.
+                        Gesture [NAME] is missing from database.
                 </message>
         </notify>
         <notify name="UnableToLoadGesture" tip="true">
                 <message name="message">
-                        Unable to load gesture.
+                        Unable to load gesture [NAME].
 Please try again.
                 </message>
         </notify>
@@ -378,9 +378,9 @@ You cannot fly here.
 You cannot push others here unless you own the land.
                 </message>
         </notify>
-        <notify name="VoiceAvailablity" tip="false" unique="true">
+        <notify name="NoVoice" tip="false" unique="true">
                 <message name="message">
-                        This land has voice enabled.
+                        This land has voice disabled.
                 </message>
         </notify>
         <notify name="NoBuild" tip="false" unique="true">
@@ -720,6 +720,9 @@ Is this OK?
                 <option name="No">
                         No
                 </option>
+                <option name="Mute">
+                        Mute
+                </option>
         </notify>
   <!-- the special chat messages to log when caution permissions have been granted or denied -->
   <notify name="ScriptQuestionCautionChatGranted" tip="false">
@@ -917,8 +920,23 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
         </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.
+                        [NAME] has joined a Voice Chat call with a conference chat.. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="InviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a conference chat. 
+Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
                 </message>
                 <option name="Accept">
                         Accept
@@ -960,6 +978,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
                 </message>
         </notify>
+
         <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
                 <message name="message">
                         Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
@@ -970,11 +989,6 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         We are creating a voice channel for you. This may take up to one minute.
                 </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>
         <notify name="Cannot enter parcel: not a group member" tip="true">
                 <message name="message">
                         Cannot enter parcel, you are not a member of the appropriate group.
@@ -990,4 +1004,19 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         Cannot enter parcel, you are not on the access list.
                 </message>
         </notify>
+        <notify name="VoiceNotAllowed" tip="true" unique="true">
+          <message name="message">
+            You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+          </message>
+        </notify>
+        <notify name="VoiceCallGenericError" tip="true" unique="true">
+          <message name="message">
+            An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+          </message>
+        </notify>
+        <notify name="ServerVersionChanged" tip="true" caution="true" duration="10">
+                <message name="message">
+                  "The region you have entered is running a different simulator version. Click this message for details."
+                </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
index e237f99..ead0846 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -1,39 +1,60 @@
 <?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="55" 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="55" 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="55" 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="55" 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="55" 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="55" 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="55" volume="true" />
+<panel border="false" follows="left|top|right|bottom" height="160"
+     label="Audio &amp; Video" name="Media panel" width="175">
+        <slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Master"
+             label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
+             name="System Volume" show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Music"
+             label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Media"
+             label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Voice"
+             label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Sounds"
+             label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Ambient"
+             label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
+             left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
+             volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
 </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
index d40e562..08d1cf4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
@@ -65,12 +65,17 @@
 

         <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"

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

              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">

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

                 Please wait

         </text>

+        <locate name="bar0" left_delta="0" width="20" bottom_delta="-5" height="20"/>

+        <locate name="bar1" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar2" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar3" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar4" left_delta="22" width="20" bottom_delta="0" height="20"/>

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

 

         <text hidden="true" name="default_text">"Default"</text>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index a51b8e7..1aa8899 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -84,8 +84,11 @@
                              v_pad="0" width="130">
                                 Partner:
                         </text>
+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             height="18" label="i" label_selected="i" left_delta="44"
+                             mouse_opaque="true" name="partner_info" tool_tip="Click to open partner's profile" width="18" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="53"
+                             height="18" label="?" label_selected="?" left_delta="24"
                              mouse_opaque="true" name="partner_help" width="18" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
new file mode 100644
index 0000000..8896cd6
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
@@ -0,0 +1,11 @@
+<panel enabled="true" follows="left|right|top|bottom" mouse_opaque="false" height="768" left="0"

+     name="bottom_panel" width="1024">

+        <panel name="status" left="0" bottom="040" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+     <layout_stack name="bar_stack" left="0" bottom="0" height="768" width="1024" 

+                        follows="left|right|bottom|top" mouse_opaque="false" orientation="vertical" border_size="0" use_bounding_rect="true">

+                <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+                <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+     </layout_stack>

+        <panel name="hud" left="0" bottom="50" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
new file mode 100644
index 0000000..797fb9e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
@@ -0,0 +1,12 @@
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20" use_bounding_rect="true"

+     left="0" name="bg_tab" width="100">

+        <icon bottom="-36" color="DefaultShadowDark"

+             follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"

+             left="1" width="100" />

+        <icon bottom="-36" color="DefaultHighlightLight"

+             follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"

+             left="0" width="98" />

+        <icon bottom="-36" color="FocusBackgroundColor"

+             follows="left|right|top|bottom" height="37" image_name="rounded_square.tga"

+             left="1" width="99" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
index 8fd971e..fd252d4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
@@ -1,28 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="24" enabled="true" follows="left|right|bottom" height="29"
-     hidden="false" left="-1" mouse_opaque="true" name="chat" width="256" 
-     default_tab_group="1">
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="History"
-             label_selected="History" left="0" mouse_opaque="true" name="History"
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="23"
+     left="0" name="chat_bar" width="395">
+        <panel left="-397" bottom="0" width="397" height="23" follows="left|right|bottom" use_bounding_rect="true">
+                <panel left="0" bottom="0" width="397" height="23" filename="panel_bg_tab.xml"/>
+        </panel>
+        <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="22"
+             label="Local Chat" left="1" name="History"
              tool_tip="Click here to see what has been said" width="100" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-             enabled="true" follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="24" hidden="false"
-             label="Click here to chat." left="107" max_length="254"
-             mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1"
-             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="100" />
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="Say" label_selected="Say"
-             left="748" mouse_opaque="true" name="Say" tool_tip="(Enter)" width="100" />
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="Shout"
-             label_selected="Shout" left="855" mouse_opaque="true" name="Shout"
-             tool_tip="(Ctrl-Enter)" width="100" />
-        <combo_box allow_text_entry="false" bottom="-26" enabled="true" follows="left|bottom"
-             height="20" hidden="false" label="Gestures" left="962" max_chars="20"
-             mouse_opaque="true" name="Gesture" width="150">
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+             follows="left|right|bottom" handle_edit_keys_directly="false" height="19" font="SansSerif"
+             label="Click here to chat." left="107" max_length="254" name="Chat Editor"
+             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
+             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
+        <flyout_button bottom="-23" follows="right|bottom" height="22" label="Say" left_delta="110"
+             mouse_opaque="true" name="Say" tool_tip="(Enter)" width="80" list_position="above">
+                <flyout_button_item value="say">Say</flyout_button_item>
+                <flyout_button_item value="shout">Shout</flyout_button_item>
+        </flyout_button>
+        <combo_box allow_text_entry="false" bottom="-22" follows="right|bottom" height="19"
+             label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="80">
                 <combo_item name="Gestures">
                         Gestures
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
index 67c830b..97779d9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -1,45 +1,17 @@
 <panel name="friends" border="true">

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

+        <scroll_list bottom="10" 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" />

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

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

+                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" tool_tip="Friend can see when you're online"/>

+                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" tool_tip="Friend can locate you on the map"/>

+                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" tool_tip="Friend can edit your objects"/>

+                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" tool_tip="You can edit this friend's objects"/>

+                <column name="friend_last_update_generation" width="0"/>

         </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 find me on the world 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"

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 ca43c27..c79db97 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
@@ -154,7 +154,7 @@ including the Everyone and Owner Roles.
                              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">
+                             tool_tip="Select an Ability to view more details." width="392" draw_stripes="false">
                                 <column label="" name="icon" width="18" />
                                 <column label="" name="action" width="356" />
                         </scroll_list>
@@ -177,14 +177,14 @@ things in this group. There&apos;s a broad variety of Abilities.
                 </text>
                 <scroll_list bottom_delta="-199" draw_border="true" draw_heading="false" enabled="false"
                      height="198" left="0" multi_select="false" name="member_assigned_roles"
-                     width="145">
+                     width="145" draw_stripes="false">
                         <column label="" name="checkbox" width="18" />
                         <column label="" name="role" width="109" />
                 </scroll_list>
                 <scroll_list bottom_delta="0" draw_border="true" draw_heading="false" enabled="false"
                      height="198" left="150" multi_select="false" name="member_allowed_actions"
                      tool_tip="For Details of each Allowed Ability see the Abilities tab."
-                     width="254">
+                     width="254" draw_stripes="false">
                         <column label="" name="icon" width="14" />
                         <column label="" name="action" width="224" />
                 </scroll_list>
@@ -240,7 +240,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                         Allowed Abilities
                 </text>
                 <scroll_list bottom_delta="-105" draw_border="true" enabled="false" height="105" left="0"
-                     multi_select="false" name="role_assigned_members" width="145" />
+                     multi_select="false" name="role_assigned_members" width="145" draw_stripes="false"/>
                 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Members are visible" left="0"
                      mouse_opaque="true" name="role_visible_in_list" radio_style="false"
@@ -249,7 +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"
+                     search_column="2" draw_stripes="false"
                      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_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 582e17d..8059fd1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -226,4 +226,10 @@ Submitting Abstain to proposal...
         <text name="proposals_submit_new_txt" hidden="true">
 Submitting new proposal...
         </text>
+        <text name="vote_recorded" hidden="true">
+Your vote was received.
+        </text>
+        <text name="vote_previously_recorded" hidden="true">
+You have previously voted.  You are only allowed to vote once during an election.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
index 9dd0461..0c36027 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
@@ -25,19 +25,19 @@
         <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"

+        <button 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"

+        <button 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"

+        <button 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"

+        <button 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"

+        <button 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_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 18a60af..acb016d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -1,11 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="0" follows="left|top|right|bottom" height="600" hidden="false" left="0"
      mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" caret_color="1 1 1 1" follows="top|left|bottom|right" left="0"
+        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
              name="login_html" right="-1"
              start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
              top="-1" />
         <text hidden="true" name="real_url">
-             https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
+                First Name:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="32" max_length="31" mouse_opaque="true"
+             name="first_name_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
+                Last Name:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="164" max_length="31" mouse_opaque="true"
+             name="last_name_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+                Password:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="296" max_length="16" mouse_opaque="true"
+             name="password_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="10" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
+             width="85">
+                Start Location:
+        </text>
+        <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
+             hidden="false" left_delta="97" max_chars="128" mouse_opaque="true"
+             name="start_location_combo" width="140">
+                <combo_item name="MyHome" value="My Home">
+                        My Home
+                </combo_item>
+                <combo_item name="MyLastLocation" value="My Last Location">
+                        My Last Location
+                </combo_item>
+                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+                        &lt;Type region name&gt;
+                </combo_item>
+        </combo_box>
+        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+             hidden="false" initial_value="false" label="Remember password"
+             left_delta="167" mouse_opaque="true" name="remember_check" width="138" />
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" hidden="false" label="Connect" label_selected="Connect"
+             left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+             width="120" />
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" hidden="false" label="Quit" label_selected="Quit" left="572"
+             mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
+        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+             hidden="false" left_delta="135" max_chars="20" mouse_opaque="true"
+             name="server_combo" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="30" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-202" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
+             hover="true">
+                [Viewer Channel Name]
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="18" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-102" mouse_opaque="true" name="version_text" v_pad="0" width="100"
+             hover="true">
+                1.23.4 (5)
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="2" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-172" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
+             hover="true">
+                Forgot your password?
+        </text>
+        <text hidden="true" name="forgot_password_url">
+                http://secondlife.com/account/request.php
         </text>
 </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
index ac1a46f..eb0a6d7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
@@ -1,13 +1,15 @@
 <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"
+     name="master_volume">
+        <button bottom="-22" height="22" image_overlay="icn-overlay_volume-panel.tga" label=""
+             left="2" name="volume" toggle="true"
              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" />
+        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
+             initial_val="0.5" left_delta="22" max_val="1" min_val="0"
+             mouse_opaque="true" name="volume_slider"
+             tool_tip="Change the volume using this slider" width="50" />
+        <button bottom="-20" control_name="MuteAudio" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             toggle="true"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
+             name="mute_master" width="25" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
new file mode 100644
index 0000000..66886b7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
@@ -0,0 +1,23 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="2"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0"

+     name="media_controls" width="185">

+        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"

+             image_overlay="icn_music-play.tga" label="" left_delta="2"

+             mouse_opaque="true" name="music_play" scale_image="true" toggle="true"

+             tool_tip="Play/pause streaming music" width="40" />

+        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"

+             image_overlay="icn_media-play.tga" label="" left_delta="40"

+             mouse_opaque="true" name="media_play" scale_image="true" toggle="true"

+             tool_tip="Play/pause streaming movies" width="40" />

+        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"

+             initial_val="0.5" left_delta="34" max_val="1" min_val="0"

+             mouse_opaque="true" name="volume_slider"

+             tool_tip="Master Volume" width="60" />

+        <button bottom="-20" control_name="MuteAudio" height="20"

+             image_selected="icn_speaker-muted_dark.tga"

+             image_unselected="icn_speaker_dark.tga" label="" left_delta="60"

+             name="mute_master" toggle="true" width="25" tool_tip="Master Mute"/>

+        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""

+                left_delta="25" name="expand" scale_image="true" toggle="true"

+                tool_tip="Adjust individual volume levels" width="22" />

+</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 f14ec61..cd0b985 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,30 +1,6 @@
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     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_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_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"
-             image_disabled="button_disabled_32x128.tga"
-             image_disabled_selected="button_disabled_32x128.tga"
-             image_selected="button_anim_pause_selected.tga"
-             image_unselected="button_anim_pause.tga" label="" label_selected=""
-             left_delta="0" mouse_opaque="true" name="media_pause" scale_image="true"
-             tool_tip="Pause media stream" width="17" />
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"
+     name="media_remote" width="185">
+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="22"/>
+        <panel filename="panel_media_controls.xml" left="0" bottom="0" width="185" height="20"/>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..6c9d3a5
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
@@ -0,0 +1,8 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"

+     height="185" hidden="false" follows="right|bottom" left="0" use_bounding_rect="true"

+     name="media_remote" width="185">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="187"/>

+        <panel border="false" bottom="20" filename="panel_audio.xml" height="160"

+             label="Audio &amp; Video" name="Volume Panel" width="185" />

+        <panel bottom_delta="-10" left="0" filename="panel_media_controls.xml"/>

+</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 acb453b..774b70a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,43 +1,52 @@
-<?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="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"
-             tool_tip="You have an instant message pending. Click to show IMs."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Set Not Busy"
-             label_selected="Set Not Busy" left="114" mouse_opaque="true"
-             name="Set Not Busy" scale_image="true"
-             tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Release Keys"
-             label_selected="Release Keys" left="229" mouse_opaque="true"
-             name="Release Keys" scale_image="true"
-             tool_tip="A script has taken control of your keys. Click here to release them."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Mouselook" label_selected="Mouselook"
-             left="343" mouse_opaque="true" name="Mouselook" scale_image="true"
-             tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Stand Up" label_selected="Stand Up"
-             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="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="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 follows="left|right|bottom|top" height="200" left="-1"
+     mouse_opaque="false" name="overlay" width="728" use_bounding_rect="true">
+        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="1" mouse_opaque="false"
+             orientation="horizontal" right="-1" name="overlay_layout_panel" use_bounding_rect="true">
+                <layout_panel auto_resize="true" bottom="0" left="0" min_width="420" user_resize="false" mouse_opaque="false"
+                     width="420" use_bounding_rect="true">
+      <layout_stack name="chatbar_and_buttons" bottom="0" follows="left|right|bottom|top" height="50" left="1" mouse_opaque="false" orientation="vertical" right="420" use_bounding_rect="true">
+        <layout_panel auto_resize="true" bottom="0" left="0" min_width="100" user_resize="false"
+                                        width="420" height="0" min_height="20" name="padding" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true"/>
+        <layout_panel auto_resize="false" bottom="0" left="0" min_width="100" user_resize="false"
+                                        width="420" height="20" min_height="20" name="state_buttons" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true">
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="IM Received" label_selected="IM Received" left="0"
+                                                name="IM Received" scale_image="true"
+                                                tool_tip="You have an instant message pending. Click to show IMs."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Set Not Busy" label_selected="Set Not Busy" left="114"
+                                                name="Set Not Busy" scale_image="true"
+                                                tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Release Keys" label_selected="Release Keys" left="229"
+                                                name="Release Keys" scale_image="true"
+                                                tool_tip="A script has taken control of your keys. Click here to release them."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
+                                                scale_image="true"
+                                                tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
+                                                scale_image="true" tool_tip="Click here to stand up." width="102" />
+                                </layout_panel>
+                                <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
+                                        filename="panel_chat_bar.xml" follows="left|right|bottom" left="0" mouse_opaque="false"
+                                        name="chat_bar" min_height="23" width="395" use_bounding_rect="true"/>
+                        </layout_stack>
+                </layout_panel>
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="185" user_resize="false"
+                     width="185" use_bounding_rect="true" name="media_remote_container" mouse_opaque="false">
+                        <panel background_visible="false" border="false" bottom="1"
+                             name="media_remote" /> 
+                </layout_panel>
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="128" user_resize="false"
+                     width="128" name="voice_remote_container" use_bounding_rect="true" mouse_opaque="false">
+                        <panel background_visible="false" border="false" bottom="1"
+                             name="voice_remote" />
+                </layout_panel>
+        </layout_stack>
 </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 cb65ba9..7ef1b6f 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
@@ -22,13 +22,6 @@
              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>
 
         <panel border="true" bottom="-195" enabled="true" follows="left|top|right|bottom"
                hidden="false" label="Volume" left="148" height="180" width="205"
@@ -81,24 +74,4 @@
              left="148" max_val="10000" min_val="0" mouse_opaque="true"
              name="Health Change Threshold" width="192" />
 
-        <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"
-                     left="5" mouse_opaque="true" name="32kbps" width="80">
-                        32 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="85" mouse_opaque="true" name="64kbps" width="80">
-                        64 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="165" mouse_opaque="true" name="96kbps" width="80">
-                        96 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="245" mouse_opaque="true" name="128kbps" width="80">
-                        128 kbps
-                </radio_item>
-        </radio_group>
 </panel>
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
index c728e23..fcf3147 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -4,35 +4,24 @@
         <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
+             hide_scrollbar="true" left_delta="8" max_length="65535" mouse_opaque="true"
+             name="voice_unavailable" tab_stop="false" width="450" 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_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"
@@ -44,18 +33,20 @@
              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>
+             mouse_opaque="true" name="voice_chat_description" tab_stop="false"
+             width="450" 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" />
+             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" />
+             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"
@@ -63,36 +54,40 @@
              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="280" />
-
+             control_name="PushToTalkButton" 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"
+             width="280" />
         <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="115" />
-        <button bottom_delta="0" follows="left" font="SansSerif" halign="center"
-             height="20" label="Middle Mouse Button" left_delta="120"
-             mouse_opaque="true" name="set_voice_middlemouse_button" width="160" />
-
+             height="20" label="Set Key" left_delta="0" mouse_opaque="true"
+             name="set_voice_hotkey_button" width="115" />
+        <button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
+             label="Middle Mouse Button" left_delta="120" 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">
+             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"
+        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"
              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="150" />
-        <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="225" />
+             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" />
+        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-40"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="35" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="-20" max_length="65535"
+             mouse_opaque="true" name="voice_chat_description" tab_stop="false"
+             width="450" word_wrap="true">
+                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.
+        </text_editor>
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Device Settings" left_delta="0" mouse_opaque="true"
+             name="device_settings_btn" width="150" />
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
+             name="launch_voice_wizard_button" width="140" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
index 1b7f73e..160bace 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -43,7 +43,7 @@
                 Address:
         </text>
         <line_editor bottom="-156" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="178" name="web_proxy_editor"     tool_tip="The name or IP address of the proxy you would like to use"
+             height="20" left="216" name="web_proxy_editor"     tool_tip="The name or IP address of the proxy you would like to use"
              width="140" />                   
         <spinner bottom="-180" control_name="BrowserProxyPort" decimal_digits="0"
              enabled="true" follows="left|top" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
new file mode 100644
index 0000000..5d51eed
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel" left="0" bottom="0" width="140" border="true" bevel_style="in" height="120" follows="left|bottom|right">

+        <string name="moderator_label">(Moderator)</string>

+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="120" left="0"

+             orientation="vertical" tab_group="1" width="140">

+                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0"

+                     min_height="25" name="moderation_mode_panel" top_delta="0" visible="false"

+                     width="140" user_resize="false">

+                     <combo_box follows="left|top|right|bottom" left="5" width="130" bottom="0" height="20" name="moderation_mode">

+                                <combo_item value="unmoderated">Open Voice (default)</combo_item>

+                                <combo_item value="moderated">Moderated Voice</combo_item>

+                     </combo_box>

+                </layout_panel>

+

+                <layout_panel auto_resize="true" user_resize="false" bottom="0" can_resize="false" height="120" left="0"

+                     min_height="100" name="moderate_chat_panel" top_delta="0" visible="true"

+                     width="140">

+                        <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true"

+                                        draw_stripes="false" follows="left|top|bottom|right" left="0"

+                                        multi_select="false" name="speakers_list" right="140" search_column="1"

+                                        top="120">

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

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

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

+                        </scroll_list>

+

+                        <panel name="speaker_controls" left="0" bottom="0" width="140" border="false" mouse_opaque="true" 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|right" width="140" font="SansSerif">Rumplstiltskin Califragilistic</text>

+                                <volume_slider

+                                        name="speaker_volume"

+                                        left="5"

+                                        width="110"

+                                        bottom_delta="-29"

+                                        height="15"

+                                        follows="left|top"

+                                        min_val="0.0"

+                                        max_val="1.0"

+                                        increment="0.05"

+                                        initial_val="0.5"

+                                />

+                                <button bottom_delta="0" height="20"

+                                        image_selected="icn_speaker-muted_dark.tga"

+                                        image_unselected="icn_speaker_dark.tga" label="" left_delta="110"

+                                        name="mute_btn" width="25" tool_tip="Mute voice for this resident"/>

+                                <check_box

+                                        name="mute_text_btn"

+                                        width="50"

+                                        bottom_delta="-25"

+                                        left="4"

+                                        follows="left|top"

+                                        height="25"

+                                        enabled="false"

+                                        label="Mute Text"

+                                />

+                        </panel>

+                </layout_panel>

+                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0"

+                     name="moderator_controls" top_delta="0" visible="false"

+                     width="140" user_resize="false">

+                     <text left="5" bottom="-20" right="-5" height="20" follows="left|right|top|bottom" name="moderator_controls_label">Moderator Controls:</text>

+                     <check_box name="moderator_allow_voice" left_delta="0" bottom_delta="-16" height="20" right="-5" follows="left|right|top|bottom">Allow voice chat</check_box>

+                     <check_box name="moderator_allow_text" left_delta="0" bottom_delta="-20" height="20" right="-5" follows="left|right|top|bottom">Allow text chat</check_box>

+                </layout_panel>

+

+        </layout_stack>

+</panel>

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 30bb347..f4ec6e1 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
@@ -9,7 +9,7 @@
              height="18" hidden="false" left="561" mouse_opaque="true"
              name="ParcelNameText"
              tool_tip="Name of land parcel on which you are standing. Click for About Land."
-             v_pad="2" width="1039">
+             v_pad="2" width="1039" hover="true">
                 parcel name goes here
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -22,8 +22,6 @@
         </text>
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" hidden="false"
-             image_disabled="status_buy_currency.tga"
-             image_disabled_selected="status_buy_currency_pressed.tga"
              image_selected="status_buy_currency_pressed.tga"
              image_unselected="status_buy_currency.tga" label="" label_selected=""
              left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
@@ -38,72 +36,59 @@
                 12:00 AM
         </text>
         
-        <text hidden="true" name="StatBarDaysOfWeek">
+        <string name="StatBarDaysOfWeek">
                 Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-        </text>
-        <text hidden="true" name="StatBarMonthsOfYear">
+        </string>
+        <string name="StatBarMonthsOfYear">
                 January:February:March:April:May:June:July:August:September:October:November:December
-        </text>
+        </string>
 
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16" hidden="false"
-             image_disabled="status_script_debug.tga"
-             image_disabled_selected="status_script_debug.tga"
+             halign="center" height="16" visible="false"
              image_selected="status_script_debug.tga"
              image_unselected="status_script_debug.tga" label="" label_selected=""
              left="378" mouse_opaque="true" name="scriptout" scale_image="false"
              tool_tip="Script Warnings and Errors" width="16" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_health.tga"
-             image_disabled_selected="status_health.tga"
+             halign="center" height="18" visible="false"
              image_selected="status_health.tga" image_unselected="status_health.tga"
              label="" label_selected="" left="394" mouse_opaque="true" name="health"
              scale_image="false" tool_tip="Health" width="24" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-18" disabled_color="1 1 1 1" drop_shadow_visible="true"
-             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="left" height="18" hidden="false" left="418" mouse_opaque="true"
+             enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
+             halign="left" height="18" visible="false" left="418" mouse_opaque="true"
              name="HealthText" text_color="1 1 1 1" tool_tip="Health" v_pad="2"
              width="31">
                 100%
         </text>
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" image_disabled="status_fly.tga"
-             image_disabled_selected="status_fly.tga" image_selected="status_fly.tga"
-             image_unselected="status_fly.tga" label="" label_selected="" left="449"
-             mouse_opaque="true" name="fly" scale_image="false" tool_tip="No Fly"
+             halign="center" height="18" visible="false" image_selected="status_no_fly.tga"
+             image_unselected="status_no_fly.tga" label="" label_selected="" left="449"
+             mouse_opaque="true" name="no_fly" scale_image="false" tool_tip="Flying not allowed"
              width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_build.tga"
-             image_disabled_selected="status_build.tga"
-             image_selected="status_build.tga" image_unselected="status_build.tga"
-             label="" label_selected="" left="473" mouse_opaque="true" name="build"
-             scale_image="false" tool_tip="No Build" width="24" />
+             halign="center" height="18" visible="false"
+             image_selected="status_no_build.tga" image_unselected="status_no_build.tga"
+             label="" label_selected="" left="473" name="no_build"
+             scale_image="false" tool_tip="Building/Rezzing not allowed" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_scripts.tga"
-             image_disabled_selected="status_scripts.tga"
-             image_selected="status_scripts.tga" image_unselected="status_scripts.tga"
-             label="" label_selected="" left="497" mouse_opaque="true" name="scripts"
-             scale_image="false" tool_tip="No Scripts" width="24" />
+             halign="center" height="18" visible="false"
+             image_selected="status_no_scripts.tga" image_unselected="status_no_scripts.tga"
+             label="" label_selected="" left="497" mouse_opaque="true" name="no_scripts"
+             scale_image="false" tool_tip="Scripts not allowed" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" image_disabled="status_push.tga"
-             image_disabled_selected="status_push.tga" image_selected="status_push.tga"
-             image_unselected="status_push.tga" label="" label_selected="" left="521"
+             halign="center" height="18" visible="false" image_selected="status_no_push.tga"
+             image_unselected="status_no_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="Restrict llPushObject" width="24" />
+             tool_tip="llPushObject restricted" 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" />
+             halign="center" height="18" visible="false" image_selected="status_no_voice.tga"
+             image_unselected="status_no_voice.tga" label="" label_selected="" left="545"
+             mouse_opaque="true" name="status_no_voice" scale_image="false"
+             tool_tip="Voice not available here" 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"
+             halign="center" height="16" visible="false"
              image_selected="status_buy_land_pressed.tga"
              image_unselected="status_buy_land.tga" label="" label_selected=""
              left="569" mouse_opaque="true" name="buyland" scale_image="true"
@@ -153,4 +138,10 @@
           tool_tip="Search Second Life"
           width="20" />
           
+        <string name="packet_loss_tooltip">
+                Packet Loss
+        </string>
+        <string name="bandwidth_tooltip">
+                Bandwidth
+        </string>
 </panel>
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 2a2affe..1e53f89 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <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="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" />
+     height="26" name="toolbar" width="1024" bottom="0">
+        <string name="Redock Windows">Redock Windows</string>
+        <button bottom="0" font="SansSerif" height="24"
+             image_selected="btn_chatbar_selected.tga" scale_image="true"
+             image_unselected="btn_chatbar.tga" label="" left="0" name="chat_btn"
+             image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+             width="50" />
+        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
+             name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
+             list_position="above"
+             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_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
new file mode 100644
index 0000000..7b70066
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
@@ -0,0 +1,18 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="2"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0"

+     mouse_opaque="true" name="voice_controls" width="128">

+        <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" 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" toggle="true"

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

+        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="40"

+             name="voice_volume" width="16" />

+        <button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""

+             left_delta="20" name="show_channel" scale_image="true" toggle="true"

+             tool_tip="Click to show current voice channel" width="22" />

+</panel>

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
index 3a25ccc..45d2541 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
@@ -16,7 +16,7 @@
                         font="SansSerifSmall" 

                         left_delta="0" 

                         width="400" 

-                        height="65" 

+                        height="85" 

                         length="1" 

                         max_length="65535"

                         hide_border="true"

@@ -25,7 +25,7 @@
                         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>

+                        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. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.</text_editor>

 

                 <text_editor 

                         name="voice_intro_text2" 

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
index 28cead3..3fd0dda 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
@@ -1,12 +1,6 @@
-<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 bg_visible="false" border="false" border_visible="false" bottom="1"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"

+     mouse_opaque="true" name="voice_remote" width="128">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="22"/>

+        <panel filename="panel_voice_controls.xml" left="0" bottom="0" width="127" height="20"/>

 </panel>

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

+     follows="right|bottom" height="45" hidden="false" left="0" use_bounding_rect="true"

+     mouse_opaque="true" name="voice_remote" width="128">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="47"/>

+        <button bottom="-23" height="22" image_overlay="icn_voice-call-end.tga" label=""

+             left="2" name="end_call_btn" tool_tip="Click to hang up" width="24" />

+        <button bottom="-23" height="23" image_unselected="icn_rounded-text-field.tga" 

+                image_selected="icn_rounded-text-field.tga" image_hover_selected="icn_rounded-text-field.tga"

+                image_hover_unselected="icn_rounded-text-field.tga" image_disabled_selected="icn_rounded-text-field.tga" 

+                image_disabled="icn_rounded-text-field.tga" label="" scale_image="true"

+             left_delta="26" name="voice_channel_bg" width="97" />

+        <icon bottom="-20" height="16" image_name="icn_voice-localchat.tga" label=""

+             left_delta="7" name="voice_channel_icon" width="16" mouse_opaque="false"/>

+        <text bottom="-21" font="SansSerifSmall" height="16" label="" left_delta="18"

+             mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />

+        <panel bottom_delta="-14" filename="panel_voice_controls.xml" left="0" />

+</panel>

+        
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/es/floater_html_help.xml b/linden/indra/newview/skins/xui/es/floater_html_help.xml
deleted file mode 100644
index a47de1a..0000000
--- a/linden/indra/newview/skins/xui/es/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="htmlhelp" title="Ayuda de Second Life">

-        <button label="Volver" name="back_btn" />

-        <button label="Casa" name="home_btn" />

-        <button label="Avanzar" name="forward_btn" />

-        <button label="Cerrar" name="close_btn" />

-        <text name="status_text">

-                Terminado

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/panel_chat_bar.xml b/linden/indra/newview/skins/xui/es/panel_chat_bar.xml
index a4ef228..e388719 100644
--- a/linden/indra/newview/skins/xui/es/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/es/panel_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="chat">

+<panel name="chat_bar">

         <button label="Historial" label_selected="Historial" name="History"

              tool_tip="Click here to see what has been said" />

         <line_editor label="Click here to chat." name="Chat Editor"

diff --git a/linden/indra/newview/skins/xui/es/panel_login.xml b/linden/indra/newview/skins/xui/es/panel_login.xml
index b8aa1b6..d2e60bd 100644
--- a/linden/indra/newview/skins/xui/es/panel_login.xml
+++ b/linden/indra/newview/skins/xui/es/panel_login.xml
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="panel_login">

         <text name="real_url">

-             https://secondlife.com/app/login/?show_login_form=True

+                http://secondlife.com/app/login/

+        </text>

+        <text name="first_name_text">

+                Nombre de pila:

+        </text>

+        <text name="last_name_text">

+                Apellido:

+        </text>

+        <text name="password_text">

+                Contraseña:

+        </text>

+        <text name="start_location_text">

+                Local de inicio:

+        </text>

+        <combo_box name="start_location_combo">

+                <combo_item name="MyHome">

+                        Mi casa

+                </combo_item>

+                <combo_item name="MyLastLocation">

+                        Mi última posición

+                </combo_item>

+                <combo_item name="&lt;Typeregionname&gt;">

+                        &lt;Teclee un nombre de región&gt;

+                </combo_item>

+        </combo_box>

+        <check_box label="Recordar contraseña" name="remember_check" />

+        <text name="full_screen_text">

+                Exhibirá en pantalla completa cuando la sesión sea iniciada.

+        </text>

+        <button label="Nueva Cuenta..." label_selected="Nueva Cuenta..." name="new_account_btn" />

+        <button label="Preferencias..." label_selected="Preferencias..." name="preferences_btn" />

+        <button label="Conectar" label_selected="Conectar" name="connect_btn" />

+        <button label="Salir" label_selected="Salir" name="quit_btn" />

+        <text name="version_text">

+                1.23.4 (5)

         </text>

 </panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_toolbar.xml b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
index c7355bc..bd20679 100644
--- a/linden/indra/newview/skins/xui/es/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="panel_toolbar">

+<panel name="toolbar">

         <button label="MI" name="im_btn"

              tool_tip="Enviar mensaje instantáneo para sus amigos." />

         <button label="Chat" name="chat_btn" tool_tip="Talk to people nearby. (Enter)" />

diff --git a/linden/indra/newview/skins/xui/fr/floater_html_help.xml b/linden/indra/newview/skins/xui/fr/floater_html_help.xml
deleted file mode 100644
index 8a3976c..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="htmlhelp" title="Aide sur Second Life">

-        <button label="Retour" name="back_btn" />

-        <button label="Domicile" name="home_btn" />

-        <button label="Avancer" name="forward_btn" />

-        <button label="Fermer" name="close_btn" />

-        <text name="status_text">

-                Terminé

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml b/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml
index c4e1ed5..addbca5 100644
--- a/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="chat">

+<panel name="chat_bar">

         <button label="Historique" label_selected="Historique" name="History" />

         <line_editor name="Chat Editor"

              tool_tip="Enter&apos; pour parler, &apos;Ctrl-Enter&apos; pour crier." />

diff --git a/linden/indra/newview/skins/xui/fr/panel_login.xml b/linden/indra/newview/skins/xui/fr/panel_login.xml
index b8aa1b6..c8d237b 100644
--- a/linden/indra/newview/skins/xui/fr/panel_login.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_login.xml
@@ -1,6 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="panel_login">

         <text name="real_url">

-             https://secondlife.com/app/login/?show_login_form=True

+                http://secondlife.com/app/login/

+        </text>

+        <text name="first_name_text">

+                Prénom :

+        </text>

+        <text name="last_name_text">

+                Nom :

+        </text>

+        <text name="password_text">

+                Mot de passe :

+        </text>

+        <text name="start_location_text">

+                Lieu d&apos;arrivée :

+        </text>

+        <combo_box name="start_location_combo">

+                <combo_item name="MyHome">

+                        Mon domicile

+                </combo_item>

+                <combo_item name="MyLastLocation">

+                        Dernier lieu visité

+                </combo_item>

+                <combo_item name="&lt;Typeregionname&gt;">

+                        &lt;Choisir région&gt;

+                </combo_item>

+        </combo_box>

+        <check_box label="Mémoriser" name="remember_check" />

+        <text name="full_screen_text">

+                Le plein écran sera activé après identification.

+        </text>

+        <button label="Nouveau Compte..." label_selected="Nouveau Compte..."

+             name="new_account_btn" />

+        <button label="Se connecter" label_selected="Se connecter" name="connect_btn" />

+        <button label="Préférences..." label_selected="Préférences..."

+             name="preferences_btn" />

+        <button label="Quitter" label_selected="Quitter" name="quit_btn" />

+        <text name="version_text">

+                1.23.4 (5)

         </text>

 </panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
index 9daae10..c0a821d 100644
--- a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="panel_toolbar">

+<panel name="toolbar">

         <button label="IM" name="im_btn"

              tool_tip="Envoyez des messages instantanés à vos amis." />

         <button label="Chat" name="chat_btn"

diff --git a/linden/indra/newview/skins/xui/ja/alerts.xml b/linden/indra/newview/skins/xui/ja/alerts.xml
index 139e0f8..195717b 100644
--- a/linden/indra/newview/skins/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/xui/ja/alerts.xml
@@ -176,6 +176,20 @@ Studio exhibitのウェブ・ページで確認してください。
                         いいえ
                 </option>
         </alert>
+        <alert name="GrantModifyRightsMultiple">
+                <message name="message">
+                        変更権限を与えると、その人はあなたが作成した全てのオブジェクトを 
+変更することができます。この許可を与えるときには細心の注意を 
+払ってください。
+選択した住人に変更権限を与えますか?
+                </message>
+                <option name="Yes">
+                        はい
+                </option>
+                <option name="No">
+                        いいえ
+                </option>
+        </alert>
         <alert name="RevokeModifyRights">
                 <message name="message">
                         [FIRST_NAME][LAST_NAME]に対して変更権限を取り消しますか？
@@ -187,6 +201,17 @@ Studio exhibitのウェブ・ページで確認してください。
                         いいえ
                 </option>
         </alert>
+        <alert name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        選択した住人から変更権限を取り下げますか?
+                </message>
+                <option name="Yes">
+                        はい
+                </option>
+                <option name="No">
+                        いいえ
+                </option>
+        </alert>
         <alert name="RemoveFriend">
                 <message name="message">
                         [FIRST][LAST]をフレンドリストから削除しますか？
@@ -507,6 +532,20 @@ Studio exhibitのウェブ・ページで確認してください。
                         取り消し
                 </option>
         </alert>
+        <alert name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+                        注:「誰にでも売却する」をクリックすると、あなたの土地は、Second Lifeのコミュニティのどこからでも（この地域にないコミュニティを含む）購入できるようになります。
+
+選択された[LAND_SIZE]平方メートルの土地は、売り出し中に設定されています。
+売却価格L$[SALE_PRICE]で、[NAME]に売却を認可します。
+                </message>
+                <option name="Continue">
+                        OK
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
                         この区画のグループ[NAME]共有のすべてのオブジェクトを、以前のオーナーの持ち物に戻そうとしています。
@@ -758,6 +797,17 @@ Studio exhibitのウェブ・ページで確認してください。
                         取り消し
                 </option>
         </alert>
+        <alert name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        QuickTimeのバージョンが古いために無効化されている場合
+                </ignore>
+                <message name="message">
+                        あなたのコンピュータにインストールされているQuickTimeのバージョンが古いため、 
+ストリーミング・ビデオが無効化されています。 
+
+http://www.apple.com/quicktime/で、最新版をダウンロードしてください。
+                </message>
+        </alert>
         <alert name="AddClassified">
                 <message name="message">
                         検索ディレクトリの「クラシファイド」セクションに、
@@ -765,7 +815,8 @@ Studio exhibitのウェブ・ページで確認してください。
 広告を記入後、[公開]をクリックし、ディレクトリに
 追加します。
 [公開]をクリックすると、支払金額を尋ねられます。
-多く払うほど、広告がクラシファイド・リストとキーワード検索の上位に表示されます。
+多く払うほど、広告がクラシファイド・リストとキーワード検索
+の上位に表示されます。
                 </message>
                 <option name="OK">
                         OK
@@ -1467,8 +1518,8 @@ www.secondlife.comに戻って、新規アカウントの作成を行います�
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
-                        一つ以上のオブジェクトがロックされているか、またはあなたが所有していないオブジェクトが少なくとも1つあります。
-あなたが所有していないオブジェクトを取得すると、
+                        一つ以上のオブジェクトがロックされているか、またはあなたが所有していないオブジェクトが少なくとも一つあります。
+あなたが所有していないオブジェクトを取得すると、 
 次のオーナーの権限がそのオブジェクトに適用されます。
 そのため、将来、変更やコピーの能力が制限される可能性があります。
 
@@ -2601,11 +2652,9 @@ www.secondlife.comに戻って、新規アカウントの作成を行います�
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        接続できません。ログイン・パケットがログイン・サーバーに
-到達しませんでした。
+                        接続に問題が生じています。 あなたのインターネット接続、またはSecond Lifeサーバーに問題がある可能性があります。
 
-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス
-・ウェブ・ページへのリンクをクリックしてください。
+あなたのインターネット接続を確認して数分後にもう一度試みるか、[ヘルプ]をクリックして当社のサポート・サイトに接続してください。または、[テレポート]をクリックしてホームにテレポートしてみてください。
                 </message>
                 <option name="OK">
                         OK
@@ -2613,6 +2662,9 @@ www.secondlife.comに戻って、新規アカウントの作成を行います�
                 <option name="Help">
                         ヘルプ
                 </option>
+                <option name="Teleport">
+                        テレポート
+                </option>
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
@@ -3172,10 +3224,11 @@ F1キーを押してください。
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        ビジーモードのセット。
-チャットとインスタントメッセージが隠れます。インスタント
-メッセージは、ビジーモードの応答を受け取ります。全てのテレポートと
-持ち物のオファーは、拒否されます。
+                        ビジーモードに設定されました。
+チャットとＩＭが隠れます。 ＩＭ
+は、ビジーモードの応答を受け取ります。 全てのテレポート
+のオファーは拒否されます。 全ての持ち物のオファーはゴミ箱に
+送られます。
                 </message>
                 <ignore name="ignore">
                         ビジー・モードを設定するとき
@@ -3616,7 +3669,7 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか�
 デフォルト：オフ
                 </message>
         </alert>
-        <alert name="HelpRegionAllowDamage" title="損害��許可">
+        <alert name="HelpRegionAllowDamage" title="���メー���許可">
                 <message name="message">
                         このボックスをチェックすると、各区画の個別の設定にかかわらず、全ての区画における
 ヘルスシステムを有効にします。このボックスがチェックされていない場合でも、
@@ -3733,24 +3786,24 @@ L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか�
         </alert>
         <alert name="HelpRegionDisableCollisions" title="衝突を無効化">
                 <message name="message">
-                        ������ジカル��ブジェクトが原因でシムの���況が悪くなる場合があります。 
-統計グラフを������(Ctrl-Shift-1)シミュレーターフィジックス
-FPSを見てください。45より数が低ければ、一���下に位置しているタイムパネルを
-開いてください。もしシムタイム (物理的作用)
+                        物理的オブジェクトが原因でシムの処���が重くなる場合があります。 
+統計グラフを開��て(Ctrl-Shift-1) シミュレーターフィジックス 
+FPSを見てください。  数値が45より低ければ、���計バーの下に位置しているタイムパネルを 
+開いてください。 もしシムタイム (物理的作用) 
 が20 msより長い場合は、「トップ・コライダーを取得」をクリックしてください。 
-悪影響を及ぼしている���������トの
+悪影響を及ぼしている可能性�������物理��������ェク���の 
 名前と位置が現れます。
  
 「衝突を無効にする」をチェックし「適用」をクリックすると、
-オブジェクト同士の衝突が一時的に無効になります。トップ・コライダーで
-検索��たスクリプト��位置まで到達するには、
-����ステップが必要になる場合もあります。スクリプト位置に到着後、
-オブジェクトを見て常時他のオブジェクトと衝突しているか調査してください。オブジェクトの所有者に
-連絡するか、あるいはオブジェクトの削除または返却��考����れま��。 
-「衝突を無効にする」のチェックを外し、「適用」をクリックして
+オブジェクト同士の衝突が一時的に無効になります。 当該������ップ・コライダー 
+の位置まで到達するには 
+上記のステップが必要になる場合もあります。 到着後、 
+オブジェクトを見て常時他のオブジェクトと衝突しているか調査してください。 オブジェクトの所有者に 
+連絡するか、あるいはオブジェクトの削除または返却��考慮�����きか���������ま�������� 
+「衝突を無効にする」のチェックを外し、「適用」をクリックして 
 地域全体の衝突を有効に戻してください。
  
-デフォルト:オフ
+デフォルト：オフ
                 </message>
         </alert>
         <alert name="HelpRegionDisablePhysics" title="物理作用を無効化">
@@ -4182,17 +4235,16 @@ Linden社所有のメインランドの不動産での太陽の位置に
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        このツール��、利用規約���������������ミュニティ��スタンダード
-への違���を���告してください。 参照先： 
--
+                        このツール��利用規約���反��コミュニティ��スタンダード違反の 
+報告��使用��てください。 参照:
+
 http://secondlife.com/corporate/tos.php 
-http://secondlife.com/corporate/cs.php 
--
-利用規約ならびにコミュニティ・スタンダードへの違反は
-すべて調査され、解決されます。 問題が解決した時点で、Ｅメールで
-ご報告します。 解決結果は下記アドレスの
-[警察日誌]でも表示可能です：
-- 
+http://secondlife.com/corporate/cs.php
+
+利用規約違反とコミュニティースタンダード違反に関する全てのレポートは 
+調査され、解決されます。 以下のPolice Blotterで 
+解決の確認をすることができます:
+
 http://secondlife.com/community/blotter.php
                 </message>
         </alert>
@@ -4382,10 +4434,10 @@ Linden Lab
         <alert name="CopySLURL">
                 <message name="message">
                         以下のSLURLがクリップボードにコピーされました。
-                         [SLURL] 
+ [SLURL] 
 
-                        他の人がアクセスしやすいようにウェブ・ページに載せたり、
-                        ブラウザのアドレス・バーに貼り付けて、自分でアクセスしてみましょう。
+他の人がアクセスしやすいようにウェブ・ページに載せたり、
+ブラウザのアドレス・バーに貼り付けて、自分でアクセスしてみましょう。
                 </message>
                 <ignore name="ignore">
                         SLURLをクリップボードにコピーするとき
@@ -4430,7 +4482,7 @@ Linden Lab
         <alert name="ChatterBoxSessionStartError">
                 <message name="message">
                         [RECIPIENT]との新しいチャットの開始の際にエラーが発生しました。
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4439,7 +4491,7 @@ Linden Lab
         <alert name="ChatterBoxSessionStartNotVerified">
                 <message name="message">
                         [RECIPIENT]との新しいチャットの開始の際にエラーが発生しました。
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4448,7 +4500,7 @@ Linden Lab
         <alert name="ChatterBoxSessionEventError">
                 <message name="message">
                         エラー[EVENT][RECIPIENT]。
-                        [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -4459,6 +4511,10 @@ Linden Lab
                         [NAME]とのチャットセッションを閉じます。
             [REASON]
                 </message>
+                <message name="message">
+                        [NAME]とのチャットセッションを閉じます。
+[REASON]
+                </message>
                 <option name="OK">
                         OK
                 </option>
diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
index 8fdd584..ba7c6d5 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
@@ -241,6 +241,8 @@
                              tool_tip="名前で振り分け" />
                         <button label="カウント" label_selected="カウント" name="Count"
                              tool_tip="カウントで振り分け" />
+                        <name_list label="カウント" name="owner list" />
+                        /&gt;
                 </panel>
                 <panel label="オプション" name="land_options_panel">
                         <text type="string" length="1" name="allow_label">
@@ -366,7 +368,7 @@
                         </text>
                         <text type="string" length="1" name="Media texture:">
                                 サウンド
-設定：
+設定:
                         </text>
                         <text type="string" length="1" name="Replace this texture:">
                                 このテクスチャーを置換：
@@ -401,11 +403,12 @@
                         </text>
                         <check_box label="パブリック・アクセスを許可" name="public_access" />
                         <text name="Only Allow">
-                                次��のアクセスを制限：
+                                次��住人のアクセスをブロック：
                         </text>
-                        <check_box label="Linden Labに支払い情報を登録済����住人"
+                        <check_box label="Linden Labに支払い情報を登録����いない住人"
                              name="limit_payment" tool_tip="年齢未確認の住人を排除する" />
-                        <check_box label="年齢確認済みの成人" name="limit_age_verified"
+                        <check_box label="年齢確認を済ませていない成人の住人"
+                             name="limit_age_verified"
                              tool_tip="年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。" />
                         <string name="estate_override">
                                 1つ以上のオプションが、不動産レベルで設定されています。
diff --git a/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml b/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml
index 1793f6d..643033f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml
@@ -5,7 +5,8 @@
                         <column label="名前" name="speaker_name" />

                 </scroll_list>

                 <panel name="volume_container">

-                        <button label="ミュート" name="mute_btn" />

+                        <button label="ミュート" name="mute_btn"

+                             tool_tip="この住人のボイスをミュート（消声）します。" />

                 </panel>

         </panel>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
index 253ed4c..8e9f5fa 100644
--- a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
@@ -9,7 +9,13 @@
         <string name="connected">
                 接続しました
         </string>
+        <string name="unavailable">
+                あなたの現在のロケーションでは、ボイスを利用できません。
+        </string>
         <string name="hang_up">
                 インワールドボイスチャットの通話が切断されました
         </string>
+        <string name="voice_icon">
+                icn_voice-localchat.tga
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_directory.xml b/linden/indra/newview/skins/xui/ja/floater_directory.xml
index dc49cfb..81b533b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_directory.xml
@@ -23,6 +23,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="全て" name="find_all_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="戻る" name="back_btn" />
                         <button label="進む" name="forward_btn" />
                         <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
@@ -62,6 +68,12 @@
                         </text>
                 </panel>
                 <panel label="クラシファイド広告" name="classified_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
@@ -113,6 +125,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="イベント" name="events_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
                                         進行中と近日予定
@@ -189,6 +207,12 @@
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                 </panel>
                 <panel label="人気のある場所" name="popular_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <check_box label="写真のある場所だけ表示" name="incpictures" />
@@ -206,6 +230,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="土地の販売" name="land_sales_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <combo_box name="type">
@@ -252,6 +282,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="場所" name="places_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
@@ -308,6 +344,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="人々" name="people_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
@@ -321,6 +363,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="グループ" name="groups_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
@@ -337,6 +385,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="全(旧)" name="find_all_old_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした
+                        </string>
                         <button label="＜戻る" label_selected="＜戻る" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
diff --git a/linden/indra/newview/skins/xui/ja/floater_html.xml b/linden/indra/newview/skins/xui/ja/floater_html.xml
index cc58a24..bc204a8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_html.xml
@@ -6,7 +6,7 @@
         <button label="進む" name="forward_btn" />
         <button label="移動" name="go_btn" />
         <text name="home_page_url">
-                http://www.google.com
+                http://www.secondlife.com
         </text>
         <text name="in-world_help_title">
                 インワールド・ヘルプ：
diff --git a/linden/indra/newview/skins/xui/ja/floater_html_help.xml b/linden/indra/newview/skins/xui/ja/floater_html_help.xml
deleted file mode 100644
index e0bc67d..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlhelp" title="Second Life ヘルプ">
-        <button label="戻る" name="back_btn" />
-        <button label="ホーム" name="home_btn" />
-        <button label="転送" name="forward_btn" />
-        <button label="閉じる" name="close_btn" />
-        <text name="status_text">
-                準備完了
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_im.xml b/linden/indra/newview/skins/xui/ja/floater_im.xml
index 6f75073..a89916d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_im.xml
@@ -15,6 +15,18 @@
         <text name="user_no_help">
                 リクエストされたユーザーは、もうヘルプセッションにはいません。
         </text>
+        <string name="session_does_not_exist_error">
+                このセッションは既に切断されています。
+        </string>
+        <string name="no_ability_error">
+                あなたにはその能力がありません。
+        </string>
+        <string name="not_a_mod_error">
+                あなたはセッション・モデレータではありません。
+        </string>
+        <string name="muted_error">
+                あなたはミュートされています。
+        </string>
         <text name="add_session_event">
                 ...とのチャット・セッションにエージェントを追加中...
         </text>
@@ -24,10 +36,16 @@
         <text name="teleport_session_event">
                 のクリエーターにテレポート
         </text>
+        <string name="mute_agent_event">
+                次の地域にいるエージェントをミュートしています
+        </string>
         <text name="removed_from_group">
                 あなたはグループから削除されました。
         </text>
         <string name="invite_message">
                 このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
         </string>
+        <string name="close_on_no_ability">
+                このチャット・セッションを継続することができません。
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
index 172b701..c28925f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="（不明）" name="im_floater" title="（不明）">
         <string name="ringing">
-                かけていますc
+                呼び出し中...
+        </string>
+        <string name="answering">
+                接続しています...
         </string>
         <string name="connected">
                 接続しました、通話を終了する場合は「通話の終了」をクリックしてください。
@@ -9,11 +12,15 @@
         <string name="hang_up">
                 通話が終了しました
         </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
         <button label="プロフィール..." name="profile_callee_btn" />
         <button label="コール" name="start_call_btn" />
         <button label="コールの終了" name="end_call_btn" />
         <panel name="speaker_controls">
-                <check_box label="ボイスチャットをミュート" name="mute_btn" />
+                <check_box label="ボイスチャットをミュート" name="mute_btn"
+                     tool_tip="ボイスをミュート(消声)" />
         </panel>
         <line_editor label="IMを開始するには、ここをクリックします。"
              name="chat_editor" />
@@ -35,6 +42,6 @@
                 [NAME]は入力中...
         </text>
         <text name="session_start_string">
-                [NAME]と������ッションを開始します。お待ちください。
+                [NAME]とセッションを開始します。お待ちください。
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
index 75c90d1..3704fcc 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
@@ -34,6 +34,9 @@
         <string name="hang_up">

                 ボイスチャットから退席しました

         </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

         <text name="live_help_dialog">

                 *** ヘルプリクエストへようこそ *** 

 まずF1を押してSLヘルプページを開くか、ナレッジベースのページ http://secondlife.com/knowledgebase/ へアクセスしてください。

diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
index d88ffca..adf0df0 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
@@ -42,12 +42,39 @@
                 </layout_panel>

         </layout_stack>

         <string name="ringing">

-                ボイスチャットに参加��ま��．．．

+                ボイスチャットに参加する．．．

         </string>

         <string name="connected">

                 接続しました、通話を終了する場合は「通話の終了」をクリックしてください。

         </string>

         <string name="hang_up">

-                ボイスチャットから退席しました

+                ボイスチャットから退席する

+        </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

+        <string name="live_help_dialog">

+                *** ヘルプリクエストへようこそ ***  

+        まず「F1」キーを押してSLヘルプページを開くか、知識ベースのページ http://secondlife.com/knowledgebase/ へアクセスしてください。 

+        そこで回答が見つからない場合は質問を入力し、ヘルパーが応答するまで、しばらくお持ちください。

+        -=-=- 応答時間は、ピークタイムなど混雑の状態によって異なります -=-=-

+        </string>

+        <string name="title_string">

+                [NAME]とＩＭ

+        </string>

+        <string name="typing_start_string">

+                [NAME]が入力中です...

+        </string>

+        <string name="session_start_string">

+                [NAME]とセッションを開始します。お待ちください。

+        </string>

+        <string name="moderated_chat_label">

+                (モデレート済み)

+        </string>

+        <string name="default_text_label">

+                ここをクリックしてIM

+        </string>

+        <string name="muted_text_label">

+                テキスト・チャットはグループ・モデレータによって無効化されています。

         </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ja/floater_mute_object.xml b/linden/indra/newview/skins/xui/ja/floater_mute_object.xml
new file mode 100644
index 0000000..abb738a
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/floater_mute_object.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="mute by name" title="オブジェクト名でミュート(消声)する">

+        <text name="message">

+                名前によるミュート(消声)は、オブジェクト・チャット、およびＩＭのみに影響し、サウンド(環境音など)には影響しません。

+正確なオブジェクト名をタイプする必要があります。

+        </text>

+        <line_editor name="object_name">

+                オブジェクト名

+        </line_editor>

+        <button label="OK" name="OK" />

+        <button label="キャンセル" name="Cancel" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml
index 53aab4d..7375404 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml
@@ -49,4 +49,10 @@
         <text name="none_text">
                 -- なし --
         </text>
+        <text name="stop_txt">
+                止まる
+        </text>
+        <text name="preview_txt">
+                プレビュー
+        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_region_info.xml b/linden/indra/newview/skins/xui/ja/floater_region_info.xml
new file mode 100644
index 0000000..153cdc7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="regioninfo" />

diff --git a/linden/indra/newview/skins/xui/ja/menu_login.xml b/linden/indra/newview/skins/xui/ja/menu_login.xml
index dcfec28..ecad945 100644
--- a/linden/indra/newview/skins/xui/ja/menu_login.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_login.xml
@@ -7,6 +7,7 @@
                 <menu_item_call label="環境設定..." name="Preferences..." />

         </menu>

         <menu label="ヘルプ" name="Help">

+                <menu_item_call label="セカンドライフヘルプ" name="Second Life Help" />

                 <menu_item_call label="Second Lifeについて..." name="About Second Life..." />

         </menu>

 </menu_bar>

diff --git a/linden/indra/newview/skins/xui/ja/need_to_long.xml b/linden/indra/newview/skins/xui/ja/need_to_long.xml
index 764f9aa..3e584c6 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_long.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_long.xml
@@ -1,99 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmObjectTakeLockNoOwn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

-Are you sure you want to take these items?

-                </d_old>

-<e_new>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

 

-Are you sure you want to take these items?

-                </e_new>

-<f_translation>

-                        1つ以上のオブジェクトがロックされています。

-取得しようとしているオブジェクトには、あなたの所有物でないオブジェクトが含まれています。

-あなたの所有物ではないオブジェクトを取得すると、次のオーナーの権限が

-そのオブジェクトに適用されます。

-そのため、将来、変更やコピーの能力が制限される可能性があります。

-この選択内容のままで続行することは可能ですが、

-

-これらのアイテムの取得を続けますか？

-                </f_translation>

-<f_old_trans>

-                        一つ以上のオブジェクトがロックされています。

-取得しようとしているオブジェクトには、あなたの所有物でないオブジェクトが含まれています。

-あなたの所有物ではないオブジェクトを取得すると、次のオーナーの権限が

-そのオブジェクトに適用されます。

-そのため、将来、変更やコピーの能力が制限される可能性があります。

-この選択内容のままで続行することは可能ですが、

-これらのアイテムの取得を続けますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroupWithContribution/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        この区画の譲渡に際しては、このグループが

-十分な土地クレジットを保有および維持していることが必要です。

-この譲渡により、

-「[FIRST_NAME] [LAST_NAME]」からグループに対して土地が同時に提供されます。

-土地の購入価格は、オーナーに

-返金されません。譲渡された区画が売れると、

-販売価格はグループ・メンバーに均等に分配されます。

- 

-この[AREA]平方メートルの土地を、グループ「[GROUP_NAME]」に譲渡しますか？

-                </f_translation>

-<f_old_trans>

-                        この区画の譲渡に際しては、このグループが

-十分な土地クレジットを保有および維持していることが必要です。

- 

-この譲渡により、

-&apos;[FIRST_NAME] [LAST_NAME]&apos;からグループに対して土地が同時に提供されます。

- 

-土地の購入価格は、オーナーに

-返金されません。譲渡された区画が売れると、

-販売価格はグループ・メンバーに均等に分配されます。

- 

-この[AREA]平方メートルの土地を、グループ&apos;[GROUP_NAME]&apos;に譲渡しますか？

-                </f_old_trans>

-</string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/need_to_translate.xml b/linden/indra/newview/skins/xui/ja/need_to_translate.xml
index 9129587..1128fc9 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_translate.xml
@@ -1,293 +1,174 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        You need to be age-verified in order to access this parcel.

-Would you like to visit the Second Life website to verify your age?

-

-[_URL]

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        この区画にアクセスするためには、年齢確認を行う必要があります。

-Second Lifeのウェブサイトにアクセスして、年齢確認を行いますか？

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/ignore</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Warn about lack of age verification

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        年齢の未確認について警告する

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/Yes</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        はい

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/No</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        No

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        いいえ

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        This parcel requires that you have payment information on file before you can access it.

-Would you like to visit the Second Life website to set this up?

-

-[_URL]

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        この区画にアクセスするには、支払い情報が事前に登録されている必要があります。

-Second Lifeのウェブサイトにアクセスして、設定しますか？

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/ignore</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Warn about lack of payment info

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        支払い情報の未登録について警告する

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/Yes</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        はい

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/No</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        No

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        いいえ

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/public_access</b_path>

+<string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Allow Public Access</e_new>

+<e_new>Type</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>パブリック・アクセスを許可</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Only Allow</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                                Restrict Access To:

-                        </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                                次へのアクセスを制限：

-                        </f_translation>

+<f_translation>タイプ</f_translation>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Residents who have given payment info to Linden Lab</e_new>

+<e_new>Name</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Linden Labに支払い情���を登録済みの住人</f_translation>

+<f_translation>���前</f_translation>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

+<e_new>Count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢未確認���住人��排除������</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

+<f_translation>�����������</f_translation>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Age-verified adults</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢確認済みの成人</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_chatterbox.xml</a_file>

+<b_path>/floater_chatterbox</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

+<e_new>Communicate</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/estate_override</b_path>

-<c_attribute></c_attribute>

+<f_translation>コミュニケーション</f_translation>

+</string><string><a_file>floater_device_settings.xml</a_file>

+<b_path>/floater_device_settings</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>One ore more of these options is set at the estate level</e_new>

+<e_new>Voice Chat Device Settings</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>1���以上のオ����������������不動�����������設定されています。</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>�������チ���ッ��機器��設定</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Set group in the General tab.</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>[��般]タブで、グループを選択してください。</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>検索��...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Allows temporary access to this parcel</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����区画�����一��的����������������許可</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Anyone</b_path>

+<f_translation>何���見����������������������</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Anyone

-                                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        誰でも

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Group</b_path>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Group

-                                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        グループ

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>何も見つかりませんでした</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED]リスト入り、[MAX]������)</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>���も見つか��ませんでした</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>追加...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>削��</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>何も見��かりませんでした</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>削��</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/BannedList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED]���������入り���[MAX]最��)</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>何��見�����������せん��した</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>追加...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����...</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���も見つか��ませんでした</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>削��</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>���索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>削��</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>何も見��かりませんでした</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Communicate</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����������������������</f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>何��見�����������������������た</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_old_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ボイスチャット���器の��定</f_translation>

+<f_translation>���索��...</f_translation>

 </string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_panel/redirect_404_url</b_path>

+<b_path>/directory/Directory Tabs/find_all_old_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>http://secondlife.com/app/search/notfound.html</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>http://secondlife.com/app/search/notfound.html</f_translation>

+<f_translation>何も見つかりませんでした</f_translation>

 </string><string><a_file>floater_directory.xml</a_file>

 <b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

 <c_attribute>label</c_attribute>

@@ -302,6 +183,50 @@ Second Lifeのウェブサイトにアクセスして、設定しますか？
 <e_new></e_new>

 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/no_ability_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You do not have that ability.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            あなたにはその能力がありません。

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/not_a_mod_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You are not a session moderator.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            あなたはセッション・モデレータではありません。

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You have been muted.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            あなたはミュートされています。

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/mute_agent_event</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            muting agent in

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            次の地域にいるエージェントをミュートしています

+        </f_translation>

 </string><string><a_file>floater_preview_classified.xml</a_file>

 <b_path>/classified_preview</b_path>

 <c_attribute>title</c_attribute>

@@ -323,6 +248,13 @@ Second Lifeのウェブサイトにアクセスして、設定しますか？
 <e_new>Place Information</e_new>

 <f_old_trans></f_old_trans>

 <f_translation>場所の情報</f_translation>

+</string><string><a_file>floater_region_info.xml</a_file>

+<b_path>/regioninfo</b_path>

+<c_attribute>title</c_attribute>

+<d_old></d_old>

+<e_new>Region/Estate</e_new>

+<f_old_trans></f_old_trans>

+<f_translation>地域/不動産</f_translation>

 </string><string><a_file>floater_select_key.xml</a_file>

 <b_path>/modal container</b_path>

 <c_attribute>title</c_attribute>

@@ -330,110 +262,55 @@ Second Lifeのウェブサイトにアクセスして、設定しますか？
 <e_new> </e_new>

 <f_old_trans></f_old_trans>

 <f_translation> </f_translation>

-</string><string><a_file>floater_texture_ctrl.xml</a_file>

-<b_path>/texture picker/choose_picture</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>&quot;Click to choose a picture&quot;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&quot;クリックして写真を選択&quot;</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File</b_path>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>File</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ファイル</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File/Quit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Quit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>終了</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_media</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Edit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>編集</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit/Preferences...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_voice</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Preferences...</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>環境設定...</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_sfx</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Help</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ヘルプ</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help/About Second Life...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_wind</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>About Second Life...</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Second Lifeについて...</f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not a group member/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not a member of the appropriate group.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        適切なグループのメンバーではないため、区画に入ることができません。

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: banned/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you have been banned.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        排除されているため、区画に入ることができません。

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not on access list/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not on the access list.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        アクセス・リストに含まれていないため、区画に入ることができません。

-                </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/AgeVerified</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                                , Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                、年齢確認済み

-                        </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/NotAgeVerified</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_ui</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                                , Not Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                、年齢未確認

-                        </f_translation>

+<f_translation></f_translation>

 </string><string><a_file>panel_groups.xml</a_file>

 <b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

@@ -442,54 +319,54 @@ Second Lifeのウェブサイトにアクセスして、設定しますか？
 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

 </string><string><a_file>panel_login.xml</a_file>

-<b_path>/panel_login/forgot_password_url</b_path>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                http://secondlife.com/account/request.php

+                Forgot your password?

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                http://secondlife.com/account/request.php

+                パスワードをお忘れですか?

         </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/Only Allow</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_url</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-              Restrict Access To:

-            </e_new>

+                http://secondlife.com/account/request.php

+        </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-              次へのアクセスを制限：

-            </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

+                http://secondlife.com/account/request.php

+        </f_translation>

+</string><string><a_file>panel_master_volume.xml</a_file>

+<b_path>/master_volume/mute_master</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Residents with payment info on file</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>支払い情報登録済みの住人</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_bg</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢未確認の住人を排除する</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_icon</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Age-verified adults</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢確認済みの成人</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/channel_label</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。</f_translation>

+<f_translation></f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/need_to_update.xml b/linden/indra/newview/skins/xui/ja/need_to_update.xml
index 6d4a15d..99df7a5 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_update.xml
@@ -1,1683 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//ConnectTimeout/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-システムがダウンしている可能性があります。

-

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-システムがダウンしている可能性があります。

-数分後にもう一度試すか、[ヘルプ]とシステムステータス・ウェブ・ページへの

-リンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CharacterSnapshotSaved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A snapshot of your character has been saved.

- 

-Visit the Webpage Studio exhibit to see it.

-                </d_old>

-<e_new>

-                        A snapshot of your character has been saved.

-Visit the Webpage Studio exhibit to see it.

-                </e_new>

-<f_translation>

-                        あなたのアバターのスナップショットが保存されました。

-Studio exhibitのウェブ・ページで確認してください。

-                </f_translation>

-<f_old_trans>

-                        あなたのキャラクターのスナップショットが保存されました。

- 

-Studio exhibitのウェブ・ページで確認してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CreateGroupCanAfford/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Creating a group costs L$[COST].

- 

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </d_old>

-<e_new>

-                        Creating a group costs L$[COST].

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </e_new>

-<f_translation>

-                        グループ作成にはL$[COST]かかります。

-3日間以上グループを維持するためには、

-全体で2名以上のメンバー数が必要です。

- 

-グループを作成しますか？

-                </f_translation>

-<f_old_trans>

-                        グループ作成にはL$[COST]かかります。

- 

-3日間以上グループを維持するためには、

-全体で3名以上のメンバー数が必要です。

- 

-グループを設立しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered inappropriate for a minor

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        [ウェブサイト上で公開]オプションを選択すると、

-[SECOND_LIFE]ウェブサイト上でグループ名、記章、特権、タイトル、

-創立者を公開できます。上記のコンテンツがコミュニティ・スタンダードにおいて

-成人向けコンテンツと判断されるかどうかについては、

-あなた自身がそれを明記しなければなりません。

-                </f_translation>

-<f_old_trans>

-                        [ウェブ上で公開]オプションを選択すると、

-[SECOND_LIFE]ウェブ・サイト上でグループ名、記章、特権、タイトル、および創立者を公開できます。 上記のコンテンツがコミュニティ・スタンダードにおいて

-成人向けコンテンツと判断されるかどうかについては、

-あなた自身がそれを明記しなければなりません。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpPostcard/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered inappropriate for a minor 

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        [ウェブサイト上で公開]オプションを選択すると、[SECOND_LIFE]ウェブサイト上で、撮影者の[SECOND_LIFE]名、題名、ロケーション、メッセージ、およびスナップショットを公開できます。上記のコンテンツがコミュニティ・スタンダードにおいて

-成人向けコンテンツと判断されるかどうかについては、

-あなた自身がそれをスナップショットごとに明記しなければなりません。

-                </f_translation>

-<f_old_trans>

-                        [ウェブ上で公開]オプションを選択すると、

-[SECOND_LIFE]ウェブ・サイト上で撮影者の[SECOND_LIFE]名、題名、ロケーション、メッセージ、およびスナップショットを公開できます。 上記のコンテンツがコミュニティ・スタンダードにおいて

-成人向けコンテンツと判断されるかどうかについては、

-あなた自身がそれをスナップショットごとに明記しなければなりません。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmLandSaleChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

- 

-                </d_old>

-<e_new>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

-                </e_new>

-<f_translation>

-                        選択された[LAND_SIZE]平方メートルの土地は、売り出し中に設定されています。

-売却価格L$[SALE_PRICE]で、[NAME]に売却を認可します。

-                </f_translation>

-<f_old_trans>

-                        選択された[LAND_SIZE]平方メートルの土地は、売り出し中に設定されています。

-売却価格L$[SALE_PRICE]で、[NAME]に売却を認可します。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MustHaveAccountToLogIn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You must have an account to connect to [SECOND_LIFE].

- 

-Go to www.secondlife.com to create an account?

-                </d_old>

-<e_new>

-                        You must have an account to connect to [SECOND_LIFE].

-Go to www.secondlife.com to create an account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続するにはアカウントが必要です。

-アカウントを作成するためにwww.secondlife.comを開きますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続するにはアカウントが必要です。

- 

-アカウントを作成するためにwww.secondlife.comを開きますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

- 

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

- 

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </d_old>

-<e_new>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </e_new>

-<f_translation>

-                        検索ディレクトリの「クラシファイド」セクションとwww.secondlife.comに、

-クラシファイド広告が1週間掲載されます。

-広告を記入後、[公開]をクリックし、ディレクトリに

-追加します。

-[公開]をクリックすると、支払金額を尋ねられます。

-多く払うほど、広告がクラシファイド・リストとキーワード検索の上位に表示されます。

-                </f_translation>

-<f_old_trans>

-                        検索ディレクトリの「クラシファイド」セクションに、

-クラシファイド広告が1週間掲載されます。

- 

-広告を記入後、「発行」をクリックし、ディレクトリに

-追加します。

- 

-「発行」をクリックすると、支払金額を尋ねられます。

-多く払うほどクラシファイドリストとキーワード検索

-の上位に表示されます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DisplayChangeRestart/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

- 

-Apply those changes and quit

-                </d_old>

-<e_new>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

-

-Apply those changes and quit?

-                </e_new>

-<f_translation>

-                        あなたが表示に対して行った変更には、

-[SECOND_LIFE]の即時シャットダウンを必要とするものが

-含まれています。これにより、現在の作業内容が失われる可能性があります。

-

-これらの変更を適用し、終了しますか？

-                </f_translation>

-<f_old_trans>

-                        あなたが表示に対して行った変更には、[SECOND_LIFE]の即時シャットダウンを

-必要とするものが含まれています。

-これにより、現在の作業内容が失われる可能性があります。

- 

-それらの変更を適用した後、終了します。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotFindDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        サーバーのドメイン名が見つかりません。

-ネットワーク接続が失われたか、

-サーバーに問題があります。

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        サーバーのドメイン名が見つかりません。

-ネットワーク接続が失われたか、サーバーに問題が

-あります。

- 

-数分後にもう一度試すか、[ヘルプ]とシステムステータス・ウェブ・ページへの

-リンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectDNSError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-DNSはホスト名を解決できませんでした。

-

-www.secondlife.comウェブサイトに接続できることを確認してください。接続できてもこのエラーが出る場合は、

-www.secondlife.com/supportに行き、この問題を報告してください。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-DNSはホスト名を解決できませんでした。

-www.secondlife.comウェブサイトに接続できることを確認

-してください。接続できてもこのエラーが出る場合は、

-www.secondlife.com/supportに行き、この問題を報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectSecurityError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-Please ensure the time and date are set correctly.

- 

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-

-Please ensure the time and date are set correctly.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        ログインサーバーとの接続が確立できません。

-あなたのコンピュータの時計の設定が間違っていることが考えられます。

-

-時間と日付が正しく設定されていることを確認してください。

-もしこのエラーが続く場合は、

-www.secondlife.com/support

-に行き、この問題を報告してください。

-                </f_translation>

-<f_old_trans>

-                        ログインサーバーとの接続が確立できません。

-あなたのコンピュータの時計の設定が間違っていることが考えられます。

-時間と日付が正しく設定されていることを確認してください。

- 

-もしこのエラーが続く場合は、

-www.secondlife.com/supportに行き、

-この問題を報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectVerificationError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-ログインサーバーは、SSLを介してサーバー自身を確認できませんでした。

-

-もしこのエラーが続く場合は、

-www.secondlife.com/support

-に行き、この問題を報告してください。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-ログインサーバーは、SSLを介してサーバー自身を確認できませんでした。

-もしこのエラーが続く場合は、

-www.secondlife.com/supportに行き、

-この問題を報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-最善の努力にも関わらず、予期しない出来事が発生しました。

-

-www.secondlife.com/support

-に行き、この問題を報告してください。  可能であれば、

- C:\Documents and Settings\(PCログイン名

-)\Application Data\SecondLife\logsからの、あなたのログファイルを含めて送ってください。

-ご協力ありがとうございます。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-最善の努力にも関わらず、予期しない出来事が発生しました。

-www.secondlife.com/supportに行き、

-この問題を報告してください。可能で

-あれば、C:\Documents and Settings\(name)\Application Data\SecondLife\logsからの、あなたのログファイルを含めて送ってください。

-ご協力ありがとうございます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorDarwin/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-最善の努力にも関わらず、予期しない出来事が発生しました。

-

-www.secondlife.com/support

-に行き、この問題を報告してください。可能であれば、

-~/Library/Application Support/SecondLife/logsからの、あなたのログファイルを含めて送ってください。

-ご協力ありがとうございます。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-最善の努力にも関わらず、予期しない出来事が発生しました。

-www.secondlife.com/supportに行き、

-この問題を報告してください。可能で

-あれば、~/Library/Application Support/SecondLife/logsからの、あなたのログファイルを含めて送ってください。

-ご協力ありがとうございます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveLoginToken/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        There was a problem resolving your login

-authentication token. Please try logging in

-again. If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        There was a problem resolving your login

-authentication token. Please try logging in again. 

-

-If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        ログイン認証の解決に

-問題が発生しました。もう一度ログインしてください。 

-

-もしこのエラーが続く場合は、www.secondlife.com/supportを参照してください。

-                </f_translation>

-<f_old_trans>

-                        ログイン認証の解決に問題が

-発生しました。もう一度ログイン

-してください。もしこのエラーが続く場合は、

-www.secondlife.com/supportを参照してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectNoMessage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unknown problem trying to connect.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unknown problem trying to connect.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        接続中に未知の問題が発生しました。

-

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        接続中に未知の問題が発生しました。

- 

-数分後にやり直してください。

-またはヘルプを参照し、システムステータスページへのリンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRunDialog/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のインストールが完了しました。

-

-[SECOND_LIFE]の使用が初めての方は、ログイン前にアカウントの作成が必要です。

-www.secondlife.comに戻って、新規アカウントの作成を行いますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] のインストールが完了しました。

- 

-[SECOND_LIFE]の使用が初めての方は、ログイン前に

-アカウントの作成が必要です。 

-www.secondlife.comに戻って新規アカウントの作成を行いますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        サーバーに接続できません

-ドメイン名[DOMAIN]を確認できませんでした。

-

-ネットワーク接続を確認してください。

-                </f_translation>

-<f_old_trans>

-                        サーバーに接続できません。

- ドメイン名[DOMAIN]を確認できませんでした。 

-ネットワーク接続を確認してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLife/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar. 

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]! 

-

-Use arrow keys to walk.

-Please choose the male or female avatar. 

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]にようこそ! 

-

-矢印キーを使用して歩きます。

-男性あるいは女性のアバターを選択してください。 

-あなたの決定は後で変更できます。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]にようこそ! 

- 

-矢印キーを使用して歩きます。

- 

-男性あるいは女性のアバターを選択してください。 

-あなたの決定は後で変更できます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLifeSimple/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]!

-

-Use arrow keys to walk.

-Please choose the male or female avatar.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]にようこそ!

-

-矢印キーを使用して歩きます。

-男性あるいは女性のアバターを選択してください。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]にようこそ! 

- 

-矢印キーを使用して歩きます。

- 

-男性あるいは女性のアバターを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PromptGoToCurrencyPage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [EXTRA]

- 

- 

-Go to [URL] for information on purchasing currency?

-                </d_old>

-<e_new>

-                        [EXTRA]

-

-Go to [URL] for information on purchasing currency?

-                </e_new>

-<f_translation>

-                        [EXTRA]

-

-[URL]に移動して貨幣購入に関する情報を確認しますか？

-                </f_translation>

-<f_old_trans>

-                        [EXTRA]

- 

- 

-[URL]に移動して貨幣購入に関する情報を確認しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkModify/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  Make sure none are locked, and that

-you own all of them.

-                </d_old>

-<e_new>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  

-

-Please make sure none are locked, and that you own all of them.

-                </e_new>

-<f_translation>

-                        すべてのオブジェクトに対する修正許可があなたにないため、

-リンクできません。  

-

-オブジェクトがすべてロックされておらず、あなたのものであることを確認してください。

-                </f_translation>

-<f_old_trans>

-                        すべてのオブジェクトに対する修正許可があなたにない

-ため、リンクできません。  オブジェクトがすべてロックされておらず、あなたのものであることを

-確認してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkDifferentOwners/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because not all of the objects have the

-same owner. Make sure you own all of the selected objects.

-                </d_old>

-<e_new>

-                        Unable to link because not all of the objects have the

-same owner. 

-

-Please make sure you own all of the selected objects.

-                </e_new>

-<f_translation>

-                        所有者が異なるため、すべてのオブジェクトを

-リンクできません。 

-

-自分が所有しているオブジェクトだけを選択してください。

-                </f_translation>

-<f_old_trans>

-                        所有者が異なるため、すべてのオブジェクトを

-リンクできません。 自分が所有しているオブジェクトだけを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NoFileExtension/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        No file extension for the file: &apos;[FILE]&apos;

-Please make sure the file has a correct file extension

-                </d_old>

-<e_new>

-                        No file extension for the file: &apos;[FILE]&apos;

-

-Please make sure the file has a correct file extension.

-                </e_new>

-<f_translation>

-                        ファイル「[FILE]」の拡張子が無効です。

-

-このファイルの拡張子が正しいかどうかを確認してください。

-                </f_translation>

-<f_old_trans>

-                        ファイル[FILE]の拡張子が無効です。

-このファイルの拡張子が正しいかどうかを確認してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotRecompileSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;recompilation&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;recompilation&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        「再編集」は不可能です。

-

-変更修正権限のある

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        再編集は不可能です。

-変更修正権限のあるスクリプト化された

-オブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        「再設定」を行うことができません。

-

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        再設定を行うことができません。

-スクリプト化されたオブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        「再設定」を行うことができません。

-

-変更修正権限のある

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        再設定を行うことができません。

-変更修正権限のあるスクリプト化された

-オブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        スクリプトの「実行」の設定ができません。

-

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        スクリプトの実行の設定ができません。

-スクリプト化されたオブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        スクリプトの「実行」の設定ができません。

-

-変更修正権限のある

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        スクリプトの実行の設定ができません。

-変更修正権限のあるスクリプト化された

-オブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        スクリプトを「実行しない」に設定できません。

-

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        スクリプトを実行しないように設定できません。

-スクリプト化されたオブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        スクリプトを「実行しない」に設定できません。

-

-変更修正権限のある

-スクリプト化されたオブジェクトを選択してください。

-                </f_translation>

-<f_old_trans>

-                        スクリプトを実行しないように設定できません。

-変更修正権限のあるスクリプト化された

-オブジェクトを選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        複数の地域が選択されたため、土地を購入できません。

-

-選択する面積を小さくしてもう一度試してください。

-                </f_translation>

-<f_old_trans>

-                        複数の地域が選択されたため、土地を購入できません。

-選択する面積を小さくしてもう一度試してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        土地を購入できません：

-複数の区画が選択されています。

-

-これより1つの区画を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を購入できません:

-複数の区画が選択されています。

-これより1つの区画を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        土地を譲渡できません：

-複数の区画が選択されています。

-

-これより1つの区画を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を譲渡できません:

-複数の区画が選択されています。

-これより1つの区画を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMusic/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming music. 

- 

-Music requires a 768 kbps or faster

-Internet connection.

- 

-Play music when available?

-                </d_old>

-<e_new>

-                        This location can play streaming music. 

-Music requires a 768 kbps or faster

-Internet connection.

-

-Play music when available?

-                </e_new>

-<f_translation>

-                        ここではストリーミング・ミュージック再生が可能です。 

-ミュージックの再生には768 kbpsより速い

-接続環境が必要です。

-

-利用可能になったら再生しますか？

-                </f_translation>

-<f_old_trans>

-                        ここではストリーミング・ミュージック再生が可能です。 

- 

- ミュージックの再生には768 kbpsより速い

-接続環境が必要です。

- 

-利用可能になったら再生しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming video. 

- 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

- 

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        ここではストリーミング・ビデオ再生が可能です。 

-ビデオの再生には768 kbpsより速い

-接続環境が必要です。

- 

-利用可能になったら再生しますか？

-（このオプションは、

-[環境設定]＞[音声とビデオ]を通じて後からでも変更できます)

-                </f_translation>

-<f_old_trans>

-                        ここではストリーミング・ビデオ再生が可能です。 

- 

-ビデオの再生には768 kbps より速い 

-接続環境が必要です。

- 

-使用可能になったら再生しますか？

- 

-(このオプションは、[環境設定]＞[音声とビデオ]を通じて

-後からでも変更できます)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Waiting for server to report cost.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Waiting for server to report cost.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        土地を購入できません：

-サーバーからの価格情報を待っています。

-

-再度、試みてください。

-                </f_translation>

-<f_old_trans>

-                        土地を購入できません:

-サーバーからの価格情報を待っています。

-再度、試みてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Waiting for server to report ownership.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Waiting for server to report ownership.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        土地を譲渡できません：

-サーバーからの所有権情報を待っています。

-

-再度、試みてください。

-                </f_translation>

-<f_old_trans>

-                        土地を譲渡できません:

-サーバーからの所有権情報を待っています。

-再度、試みてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotButLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        土地を購入できません：

-この土地がある地域が見つかりません。

-

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_translation>

-<f_old_trans>

-                        土地を購入できません：

-この土地がある地域が見つかりません。

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandForGroupNotOfficer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-Please activate another group using Edit -&gt; Groups...

-                </d_old>

-<e_new>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-

-Please activate another group using Edit -&gt; Groups...

-                </e_new>

-<f_translation>

-                        グループ用に土地を購入できません：

-あなたはこのグループの役員ではありません。

-

-[編集]＞[グループ...]を使って他のグループをアクティブにしてください。

-                </f_translation>

-<f_old_trans>

-                        このグループ用に土地を購入できません：

-あなたはこのグループの役員ではありません。

-[編集]＞[グループ...]を使って他のグループをアクティブにしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandWatingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-Try again in a few seconds.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-

-Try again in a few seconds.

-                </e_new>

-<f_translation>

-                        土地を破棄できません：

-サーバーが区画情報を更新するのを待っています。

-

-もう少し後でやり直してください。

-                </f_translation>

-<f_old_trans>

-                        土地を捨てることができません：

-サーバーが区画情報を更新するのを待っています。

-もう少し後でやり直してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-Please select a single parcel.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-

-Please select a single parcel.

-                </e_new>

-<f_translation>

-                        土地を破棄できません：

-あなたは、選択したすべての区画を所有していません。

-

-1つの区画を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を捨てることができません：

-あなたは、選択したすべての区画を所有していません。

-1つの区画を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        土地を破棄できません：

-この土地がある地域が見つかりません。

-

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_translation>

-<f_old_trans>

-                        土地を破棄できません：

-この土地がある地域が見つかりません。

-[ツール]＞[バグを報告する]を使ってバグを報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-Select an entire parcel, or divide your parcel first.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-

-Select an entire parcel, or divide your parcel first.

-                </e_new>

-<f_translation>

-                        土地を破棄できません：

-区画全体を選択して解放する必要があります。

-

-区画全体を選択するか、または、まず最初に区画を分割してください。

-                </f_translation>

-<f_old_trans>

-                        土地を捨てることができません：

-区画全体を選択して解放する必要があります。

-区画全体を選択するか、または、まず最初に区画を分割してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReleaseLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

- 

-Release this land?

-                </d_old>

-<e_new>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

-

-Release this land?

-                </e_new>

-<f_translation>

-                        あなたは、[AREA]平方メートルの土地を解放しようとしています。

-この区画を解放すると、あなたの土地所有から外れますが、

-L$は贈与されません。

-

-土地を解放しますか？

-                </f_translation>

-<f_old_trans>

-                        あなたは、[AREA]平方メートルの土地を解放しようとしています。

-この区画を解放すると、あなたの土地所有から外れますが、

-L$でのクレジットはされません。

- 

-土地を解放しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNothingSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-No parcels selected.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-No parcels selected.

-                </e_new>

-<f_translation>

-                        土地を分割できません：

-

-区画が選定されていません。

-                </f_translation>

-<f_old_trans>

-                        土地を分割できません:

-区画が選定されていません。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </e_new>

-<f_translation>

-                        土地を分割できません：

-

-区画全体が選択されています。

-区画の一部を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を分割できません:

-区画全体が選択されています。

-区画の一部を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        土地を分割できません：

-この土地がある地域が見つかりません。

-

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_translation>

-<f_old_trans>

-                        土地を分割できません：

-この土地がある地域が見つかりません。

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to join land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        土地を統合できません：

-この土地がある地域が見つかりません。

-

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_translation>

-<f_old_trans>

-                        土地を統合できません：

-この土地がある地域が見つかりません。

-[ツール]＞[バグを報告する]を使って報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandEntireParcelSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You only have one parcel selected.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You only have one parcel selected.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        土地を統合できません：

-1つの区画しか選択されていません。

-

-両方の区画をまたいで土地を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を統合できませんでした：

-1つの区画しか選択されていません。

-両方の区画をまたいで土地を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You must select more than one parcel.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You must select more than one parcel.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        土地を統合できません：

-1つ以上の区画を選択する必要があります。

-

-両方の区画をまたいで土地を選択してください。

-                </f_translation>

-<f_old_trans>

-                        土地を統合できませんでした：

-1つ以上の区画を選択する必要があります。

-両方の区画をまたいで土地を選択してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//JoinLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

- 

-You will need to reset the name and options of the 

-new parcel. 

- 

-Join land?

-                </d_old>

-<e_new>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

-You will need to reset the name and options of the 

-new parcel.

- 

-Join land?

-                </e_new>

-<f_translation>

-                        この土地を統合すると、選択された長方形に交差する

-全ての区画を基にして1つの大きな区画が作成されます。 

-新しい区画の名前とオプションを再設定する必要があります。

- 

-土地を統合しますか？

-                </f_translation>

-<f_old_trans>

-                        この土地を統合すると、選択された長方形に交差する全ての区画を基にして1つの大きな区画が作成されます。

-

-新しい区画の名前とオプションを再設定する必要があります。

-

-

-土地を統合しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSaveToAssetStore/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </d_old>

-<e_new>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. 

-

-If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </e_new>

-<f_translation>

-                        [NAME]を中央資産格納庫に保存できません。

-これは一時的な不具合です。服飾品などを

-カスタマイズし、数分後にもう一度

-保存してください。 

-

-この問題が続くようなら、[ツール]＞[バグを報告する]をクリックし、お使いのネットワーク設定の詳細を報告してください。

-                </f_translation>

-<f_old_trans>

-                        [NAME] を中央資産格納庫に保存できません。

-通常、これは一時的な不具合です。 服を

-カスタマイズし、数分後にもう一度保存

-してください。 この問題が続くようなら、[ツール]＞

-[バグを報告する]をクリックし、お使いの

-ネットワーク設定の詳細を報告してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AppEarlyExit/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. Please

-uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. 

-

-Please uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        [MESSAGE]

- 

-この問題から正常復帰することができません。 

-

-いったんアンインストールしてから再インストールした後、もう一度試してください。この問題を

-解決できない場合は、Tech SupportFAQ（www.secondlife.com/support）を

-参照してください。

-                </f_translation>

-<f_old_trans>

-                        [MESSAGE]

- 

-この問題から正常復帰することができません。 

-いったんアンインストールしてから再インストールした後、もう一度試してください。 

-この問題を解決できない場合は、Tech SupportFAQ（

-www.secondlife.com/support）を参照してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//YouHaveBeenLoggedOut/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have been logged out of [SECOND_LIFE]:

- 

-[MESSAGE]

- 

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </d_old>

-<e_new>

-                        You have been logged out of [SECOND_LIFE]:

-[MESSAGE]

-

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </e_new>

-<f_translation>

-                        あなたは[SECOND_LIFE]からログアウトされました：

-[MESSAGE]

-

-[続行]をクリックすると現在あるIMとチャットを確認できます。

-これ以外の操作はできません。

-[終了]をクリックして、すぐに[SECOND_LIFE]を終了してください。

-                </f_translation>

-<f_old_trans>

-                        あなたは[SECOND_LIFE]からログアウトされました：

- 

-[MESSAGE]

- 

-[続行]をクリックすると現在あるIM とチャットを見られます。

-これ以外の操作はできません。

-[終了]をクリックして、すぐに [SECOND_LIFE] から退出してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddFriend/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

- 

-Offer friendship to [NAME]?

-                </d_old>

-<e_new>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

-

-Offer friendship to [NAME]?

-                </e_new>

-<f_translation>

-                        フレンド同士は、地図上で互いを追跡し、

-オンライン・ステータスの更新情報を受信する

-権限を与え合うことができます。 

-

-[NAME]とフレンド登録をしますか？

-                </f_translation>

-<f_old_trans>

-                        フレンド同士は、

-地図上で互いを追跡し、

-オンライン・ステータスの更新情報を受信する権限を与え合うことができます。 

- 

-[NAME]にフレンドシップを贈りますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedPublicObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to delete all scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on all others land in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to delete all scripted objects owned by

-** [AVATAR_NAME] **

-on all others land in this sim?

-                </e_new>

-<f_translation>

-                        

-**[AVATAR_NAME]**

-所有のすべてのスクリプト・オブジェクトをこのシム内の他のすべての土地から削除しようとしています。操作を続行しますか？

-                </f_translation>

-<f_old_trans>

-                        **[AVATAR_NAME]**

-

-所有のすべてのスクリプト・オブジェクトをこのシム内の他のすべての土地から削除しようとしています。操作を続行しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL scripted objects owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        

-**[AVATAR_NAME]**

-所有のすべてのスクリプト・オブジェクトをこのシム内のすべての土地から削除しようとしています。操作を続行しますか？

-                </f_translation>

-<f_old_trans>

-                        **[AVATAR_NAME]**

-

-所有のすべてのスクリプト・オブジェクトをこのシムのすべての土地から削除しようとしています。操作を続行しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        

-**[AVATAR_NAME]**

-所有のすべてのオブジェクト（スクリプト・オブジェクトと非スクリプト・オブジェクト）を

-このシム内のすべての土地から削除しようとしています。操作を続行しますか？

-                </f_translation>

-<f_old_trans>

-                        **[AVATAR_NAME]**

-

-所有のすべてのオブジェクト（スクリプト・オブジェクトと非スクリプト・オブジェクト）をこのシムのすべての土地から削除しようとしています。操作を続行しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//ErrorEncodingSnapshot/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

@@ -1693,597 +17,13 @@ on ALL LAND in this sim?
                         スナップショットのエンコード化でエラーが出ました！

                 </f_old_trans>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//CantBuyLandAcrossMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        複数の地域が選択されたため、土地を購入できません。

-

-選択する面積を小さくしてもう一度試してください。

-                </f_translation>

-<f_old_trans>

-                        複数の地域が選択されたため、土地を購入できません。

-選択する面積を小さくしてもう一度試してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

-

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        この区画の譲渡に際しては、このグループが十分な土地クレジットを

-保有および維持していることが必要です。

-土地の購入価格は、オーナーに返金されません。譲渡された区画が売れると、販売価格は

-グループ・メンバーに均等に分配されます。

-

-この[AREA]平方メートルの土地を、グループ

-「[GROUP_NAME]」に譲渡しますか？

-                </f_translation>

-<f_old_trans>

-                        この区画の譲渡に際しては、このグループが

-十分な土地クレジットを保有および維持していることが必要です。

- 

-土地の購入価格は、オーナーに

-返金されません。譲渡された区画が売れると、

-販売価格はグループ・メンバーに均等に分配されます。

- 

-この[AREA]平方メートルの土地を、グループ&apos;[GROUP_NAME]&apos;に譲渡しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CanNotFindServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        サーバーのドメイン名が見つかりません。

-ネットワーク接続が失われたか、

-サーバーに問題があります。

-

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        サーバーのドメイン名が見つかりません。

-ネットワーク接続が失われたか、サーバーに問題が

-あります。

- 

-数分後にもう一度試すか、[ヘルプ]とシステムステータス・ウェブ・ページへの

-リンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SystemMayBeDown/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]に接続できません。

-システムがダウンしている可能性があります。

-

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]に接続できません。

-システムがダウンしている可能性があります。

-数分後にもう一度試すか、[ヘルプ]とシステムステータス・ウェブ・ページへの

-リンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AvatarMoved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your [TYPE] location is not currently available.

-[HELP] 

-You have been moved into a nearby region.

-                </d_old>

-<e_new>

-                        Your [TYPE] location is not currently available. [HELP] 

-You have been moved into a nearby region.

-                </e_new>

-<f_translation>

-                        [TYPE]のロケーションは現在利用できません。 [HELP] 

-あなたは近くの地域に移されました。

-                </f_translation>

-<f_old_trans>

-                        あなたの [TYPE] のロケーションは現在使用不可能です。

-[HELP] 

-あなたは近くの地域に移されました。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRun/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のインストールが完了しました。

-

-[SECOND_LIFE]の使用が初めての方は、ログイン前にアカウントの作成が必要です。

-www.secondlife.comに戻って、新規アカウントの作成を行いますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] のインストールが完了しました。

- 

-[SECOND_LIFE]の使用が初めての方は、ログイン前に

-アカウントの作成が必要です。 

-www.secondlife.comに戻って新規アカウントの作成を行いますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SetByHostFail/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        サーバーに接続できません

-ドメイン名[HOST_NAME]を確認できませんでした。

-

-ネットワーク接続を確認してください。

-                </f_translation>

-<f_old_trans>

-                        サーバーに接続できません。

-ドメイン名を確認できませんでした。 [HOST_NAME]

-ネットワーク接続を確認してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//LoginPacketNeverReceived/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect.  Login packet never received by

-login server.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect.  Login packet never received by

-login server.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        接続できません。ログイン・パケットがログイン・サーバーに

-到達しませんでした。

-

-数分後にもう一度試みるか、または[ヘルプ]とシステム・ステータス

-・ウェブ・ページへのリンクをクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        接続できません。  ログインパケットがログインサーバーに

-到達しませんでした。

- 

-数分後にもう一度試すか、[ヘルプ]とシステムステータス・ウェブ・ページへの

-リンクをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeNoClothes/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        まもなくあなたのアバターが表示されます。

-

-矢印キーを使用して歩きます。

-ヘルプが必要なときや[SECOND_LIFE]について知りたいときは、

-F1キーを押してください。

-                </f_translation>

-<f_old_trans>

-                        まもなくあなたのアバターが表示されます。

- 

-矢印キーを使うと歩くことができます。

- 

-ヘルプが必要なときや[SECOND_LIFE]について知りたいときは、

-いつでも F1 キーを押してください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeChooseSex/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE]. 

- 

-Please choose the male or female avatar.

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-Please choose the male or female avatar.

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        まもなくあなたのアバターが表示されます。

-

-矢印キーを使用して歩きます。

-ヘルプが必要なときや[SECOND_LIFE]について知りたいときは、

-F1キーを押してください。

-男性あるいは女性のアバターを選択してください。

-あなたの決定は後で変更できます。

-                </f_translation>

-<f_old_trans>

-                        まもなくあなたのアバターが表示されます。

- 

-矢印キーを使用して歩きます。

- 

-ヘルプが必要な時や[SECOND_LIFE]について知りたいときは、いつでもF1キーを押してください。

- 

-男性あるいは女性のアバターを選択してください。

-あなたの決定は後で変更できます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FlushMapVisibilityCaches/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This will flush the map caches on this region.

- 

-This is really only useful for debugging. 

- 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </d_old>

-<e_new>

-                        This will flush the map caches on this region.

-This is really only useful for debugging. 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </e_new>

-<f_translation>

-                        この手順は、この地域の地図のキャッシュを消去します。

-これが便利なのはデバッグ時のみです。 

-（作成中は5分間経つと、全員の地図が再度ログイン後に

-更新されます）

-                </f_translation>

-<f_old_trans>

-                        この手順は、この地域の地図のキャッシュを消去します。

- 

-これが便利なのはデバッグ時のみです。 

- 

-（作成中は5分間経つと、全員の地図が再度

-ログイン後に更新されます）

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainBitDepth/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        地域テクスチャを設定できませんでした： 

-地形テクスチャ[TEXTURE_NUM]は、無効のビット深度[TEXTURE_BIT_DEPTH]です。

-

-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、

-[適用]を再度クリックしてください。

-                </f_translation>

-<f_old_trans>

-                        地域テクスチャを設定できませんでした： 

- 

-地形テクスチャ[TEXTURE_NUM]は、無効のビット深度[TEXTURE_BIT_DEPTH]です。

- 

-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、

-「適用」を再度クリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainSize/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        地域テクスチャを設定できませんでした： 

-地形テクスチャ[TEXTURE_NUM]は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]では大きすぎます。 

-

-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、

-[適用]を再度クリックしてください。

-                </f_translation>

-<f_old_trans>

-                        地域テクスチャを設定できませんでした： 

- 

-地形テクスチャ[TEXTURE_NUM]は、[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]では大きすぎます。 

- 

-テクスチャ[TEXTURE_NUM]を24ビット512x512かそれ以下のイメージと交換し、

-「適用」を再度クリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-You must download this update to use [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]の新しいバージョンが利用可能です。

-[MESSAGE]

-[SECOND_LIFE]を使用するために、このアップデートをダウンロードする必要があります。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]の新しいバージョンをダウンロードできます。

-[MESSAGE]

- 

-[SECOND_LIFE]を使用するために、このアップデートをダウンロードする必要があります。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

- 

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

- 

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-

-You must download this update to use [SECOND_LIFE].

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]の新しいバージョンが利用可能です。

-[MESSAGE]

-[SECOND_LIFE]を使用するために、このアップデートをダウンロードする必要があります。

-

-アプリケーションがあるフォルダにダウンロードしますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]の新しいバージョンをダウンロードできます。

-[MESSAGE]

-

-[SECOND_LIFE]を使用するために、このアップデートをダウンロードする必要があります。

- 

-アプリケーション・フォルダにダウンロードしますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMac/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

- 

-アプリケーションがあるフォルダにダウンロードしますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

- 

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

- 

-アプリケーション・フォルダにダウンロードしますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

- 

-アプリケーションがあるフォルダにダウンロードしますか？

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]のアップデート・バージョンが利用可能です。

-[MESSAGE]

- 

-このアップデートは必須ではありませんが、パフォーマンスと安定性を向上させるためにインストールすることをお勧めします。

- 

-アプリケーション・フォルダにダウンロードしますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//AddClassified/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

                         Classified ads appear in the &apos;Classified&apos; section of the

 Search directory and on www.secondlife.com for one week.

- 

 Fill out your ad, then click &apos;Publish...&apos; to add it to the

 directory.

- 

 You&apos;ll be asked for a price to pay when clicking Publish.

 Paying more makes your ad appear higher in the list, and

 also appear higher when people search for keywords.

@@ -2303,652 +43,84 @@ also appear higher when people search for keywords.
 広告を記入後、[公開]をクリックし、ディレクトリに

 追加します。

 [公開]をクリックすると、支払金額を尋ねられます。

-多く払うほど、広告がクラシファイド・リストとキーワード検索の上位に表示されます。

+多く払うほど、広告がクラシファイド・リストとキーワード検索

+の上位に表示されます。

                 </f_translation>

 <f_old_trans>

                         検索ディレクトリの「クラシファイド」セクションに、

 クラシファイド広告が1週間掲載されます。

- 

-広告を記入後、「発行」をクリックし、ディレクトリに

+広告を記入後、[公開]をクリックし、ディレクトリに

 追加します。

- 

-「発行」をクリックすると、支払金額を尋ねられます。

-多く払うほどクラシファイドリストとキーワード検索

+[公開]をクリックすると、支払金額を尋ねられます。

+多く払うほど、広告がクラシファイド・リストとキーワード検索

 の上位に表示されます。

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReturnToOwner/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

- 

-*WARNING* No-transfer deeded objects will be deleted!

-                </d_old>

-<e_new>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

-

-*WARNING* No-transfer deeded objects will be deleted!

-                </e_new>

-<f_translation>

-                        選択したオブジェクトを、所有者に返却しますか？

-譲渡可能なオブジェクトは

-以前の所有者に返却されます。

-

-*警告*　移転が不可能の譲渡されたオブジェクトは削除されます！

-                </f_translation>

-<f_old_trans>

-                        選択したオブジェクトを、

-所有者に返却しますか？譲渡可能なオブジェクトは、

-以前の所有者に返却されます。

- 

-*警告* 移転が不可能の譲渡されたオブジェクトは削除されます！

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenEstate/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

- 

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </d_old>

-<e_new>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

-

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </e_new>

-<f_translation>

-                        あなたはLinden所有の不動産（メインランド、ティーン・グリッド、オリエンテーションなど）を変更しようとしています。 

-

-これはユーザーの経験を根本から揺るがしかねない「非常に危険な行為」です。

-これにより、メインランドで多数の地域が変更され、スペースサーバーに悪影響が生じます。

- 

-操作を続行しますか？

-                </f_translation>

-<f_old_trans>

-                        あなたはLinden所有の不動産(メインランド、ティーングリッド、

-オリエンテーションなど)を変更しようとしています。 

- 

-これはユーザーの経験を根本から揺るがしかねない

-「非常に危険な行為」です。  メインランドで何千もの地域が

-変わり、スペースサーバーに悪影響が出ます。

- 

-操作を続行しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenAccess/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

- 

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

- 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </d_old>

-<e_new>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

-

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </e_new>

-<f_translation>

-                        あなたはLinden所有の不動産（メインランド、ティーン・グリッド、オリエンテーションなど）へのアクセス・リストを変更しようとしています。 

-

-この行為は「危険」であり、グリッドからオブジェクトやお金の転送をもたらす

-ハッキングを引き起こす可能性が

-あるため、完全にそれを意図した場合のみ行うべきものです。 

-これにより多数の地域が変更され、スペースサーバーに

-悪影響が生じます。 

-                </f_translation>

-<f_old_trans>

-                        あなたは、Linden 所有の

-不動産 (メインランド、ティーングリッド、オリエンテーションなど) へのアクセス・リストを変更しようとしています。 

- 

-この行為は「危険」であり、グリッドからオブジェクトやお金の

-転移をもたらすハッキングを引き起こす可能性が

-あります。 

- 

-何千もの地域を変更してしまい、

-スペースサーバーに悪影響を与えます。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PublishClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Remember: Classified ad fees are non-refundable.

- 

-Publish this classified now for L$[AMOUNT]?

-                </d_old>

-<e_new>

-                        Remember: Classified ad fees are non-refundable.

-

-Publish this classified now for L$[AMOUNT]?

-                </e_new>

-<f_translation>

-                        注意：クラシファイド広告の料金は払い戻しされません。

-

-L$[AMOUNT]で、このクラシファイド広告を今すぐ公開しますか？

-                </f_translation>

-<f_old_trans>

-                        注意：クラシファイド広告の料金は払い戻しされません。

- 

-L$[AMOUNT]で、このクラシファイド広告を今すぐ掲載しますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpRegionBlockTerraform/message</b_path>

+</string><string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel</b_path>

 <c_attribute></c_attribute>

-<d_old>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

- 

-Default: off

-                </d_old>

+<d_old></d_old>

 <e_new>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

-

-Default: off

-                </e_new>

-<f_translation>

-                        このボックスがチェックされている場合、

-区画ごとの[領域を編集]の設定にかかわらず、土地オーナーは土地整備ができません。

-

-デフォルト：オフ

-                </f_translation>

-<f_old_trans>

-                        このボックスがチェックされている場合、区画ごとの「領域を編集」設定にかかわらず、土地オーナーは土地整備ができません。

- 

-デフォルト：オフ

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpParcelSearch/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

                         

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </d_old>

-<e_new>

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </e_new>

-<f_translation>

-このボックスをチェックすると表示：

-- 検索結果におけるこの区画

-- この区画のパブリック・オブジェクト

-                </f_translation>

-<f_old_trans>

-                        このボックスにチェックすると表示:

-- 検索結果におけるこの区画

-- この区画のパブリック・オブジェクト

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//RegionMaturityChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The maturity rating for this region has been updated. 

- 

-It may take some time for the change to be 

-reflected on the map.

-                </d_old>

-<e_new>

-                        The maturity rating for this region has been updated. 

-It may take some time for the change to be 

-reflected on the map.

-                </e_new>

-<f_translation>

-                        この地域の成人指定がアップデートされました。 

-この変更が地図に反映されるまでには、しばらく時間がかかります。

-

-                </f_translation>

-<f_old_trans>

-                        この地域の成人指定がアップデートされました。 

- 

-この変更が地図に反映されるまでには、

-一定の時間がかかります。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchase/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </e_new>

-<f_translation>

-                        この取引は以下のとおり行われます：

-[ACTION]

- 

-この購入を続行しますか？

-                </f_translation>

-<f_old_trans>

-                        この手続きをすると以下のことが起こります。

- 

-[ACTION]

- 

-購入の手続きを続けますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchasePassword/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </e_new>

-<f_translation>

-                        この取引は以下のとおり行われます：

-[ACTION]

- 

-この購入を続行しますか？

-パスワードを再入力し、[OK]をクリックしてください。

-                </f_translation>

-<f_old_trans>

-                        この取引は以下のとおり行われます:

- 

-[ACTION]

- 

-この購入を続行しますか？

-パスワードを再入力し、OKをクリックしてください。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MoveInventoryFromScriptedObject/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

- 

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </d_old>

-<e_new>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </e_new>

-<f_translation>

-                        「コピー禁止」の持ち物アイテムが選択されました。これらのアイテムは 

-コピーされるのではなく、あなたの持ち物に移動されます。

-このオブジェクトはスクリプト付きなので、持ち物に移動させると

-スクリプトに誤動作が起きる可能性があります。 

- 

-持ち物アイテムを移動しますか？

-                </f_translation>

-<f_old_trans>

-                        [コピー禁止]の持ち物アイテムが選択されました。  これらの

-アイテムはコピーされないまま、あなたの持ち物に移動されます。

- 

-このオブジェクトはスクリプト付きなので、

-あなたの持ち物に移動させると誤動作が起きるかもしれません。 

- 

-アイテムを動かしますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this abuse report.

- 

-Selecting a category helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please select a category for this abuse report.

-Selecting a category helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        嫌がらせ報告のカテゴリを選択してください。

-カテゴリを選択することにより、嫌がらせ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        この嫌がらせ報告のカテゴリーを選択してください。

- 

-嫌がらせ報告を適切に処理できるように、カテゴリーの選択をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this bug.

- 

-Selecting a category helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please select a category for this bug.

-Selecting a category helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        バグのカテゴリを選択してください。

-カテゴリを選択することにより、バグ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        このバグのカテゴリーを選択してください。

- 

-バグ報告を適切に処理できるように、カテゴリーの選択をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserNameEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the name of the abuser.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the name of the abuser.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        嫌がらせ行為をした人の名前を入力してください。

-正確な情報の入力は、嫌がらせ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        嫌がらせ行為をした人の名前を入力してください。

- 

-嫌がらせ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserLocationEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the location where the abuse took place.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the location where the abuse took place.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        嫌がらせがあった場所を入力してください。

-正確な情報の入力は、嫌がらせ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        嫌がらせがあった場所を入力してください。

- 

-嫌がらせ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the abuse that took place.

- 

-Entering an accurate summary helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the abuse that took place.

-Entering an accurate summary helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        嫌がらせの概要を入力してください。

-正確な概要の入力は、嫌がらせ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        嫌がらせの概要を入力してください。

- 

-嫌がらせ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the bug.

- 

-Entering an accurate summary helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the bug.

-Entering an accurate summary helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        バグの概要を入力してください。

-正確な概要の入力は、バグ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        バグの概要を入力してください。

- 

-バグ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

- 

-Entering an accurate description helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

-Entering an accurate description helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        嫌がらせの詳細な説明を入力してください。

-名前や嫌がらせの詳細を、できるだけ具体的に入力してください。

-

-正確な説明の入力は、嫌がらせ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        嫌がらせの詳細な説明を入力してください。

-名前や嫌がらせの詳細をできるだけ具体的に記入してください。

-

- 

-嫌がらせ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

- 

-Entering an accurate description helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

-Entering an accurate description helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        バグの詳細な説明を入力してください。

-バグがどのような条件で再現するかなどを、できるだけ具体的に入力してください。

-

-正確な説明の入力は、バグ報告の処理や保管に大変役立ちます。

-                </f_translation>

-<f_old_trans>

-                        バグについての詳細な説明を入力してください。

-

-バグがどのような条件で再現するかなどを

-できるだけ具体的に示してください。

- 

-バグ報告を適切に処理できるように、正確な記述をお願いいたします。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseContainsCopyright/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

- 

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </d_old>

-<e_new>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

-

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </e_new>

-<f_translation>

-                        親愛なる住人の皆様へ：

- 

-著作権侵害に関する報告はhttp://secondlife.com/corporate/dmca.phpの

-記述に従ってのみ提出することができます。

-

-[嫌がらせ報告]機能を通じて著作権侵害に関する報告を提出しても、その報告は自動的に破棄されます。著作権侵害に関係のない報告であれば、このウィンドウを閉じて報告を提出することができます。

- 

-ご協力ありがとうございます。

- 

-Linden Lab

-                </f_translation>

-<f_old_trans>

-                        親愛なる住人の皆様へ：

-著作権侵害に関する報告は 

-http://secondlife.com/corporate/dmca.phpの記述に従ってのみ提出することができます。 

-「嫌がらせ報告」を通じて著作権侵害に関する報告を提出しても、その報告は自動的に破棄されます。

- 著作権侵害に関係のない報告であれば、このウィンドウを閉じて報告を提出することができます。

- 

-敬具。

-

-Linden Lab

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CopySLURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The following SLURL has been copied to your clipboard:

                         

-                         [SLURL] 

                         

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </d_old>

-<e_new>

-                        The following SLURL has been copied to your clipboard:

-                         [SLURL] 

-

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </e_new>

-<f_translation>

-                        以下のSLURLがクリップボードにコピーされました。

-                         [SLURL] 

-

-                        他の人がアクセスしやすいようにウェブ・ページに載せたり、

-                        ブラウザのアドレス・バーに貼り付けて、自分でアクセスしてみましょう。

-                </f_translation>

-<f_old_trans>

-                        以下のSLURLがクリップボードにコピーされました。

-   

-                        [SLURL] 

-   

-                        他の人がアクセスしやすいよう、ウェブ・ページに載せたり

-                        あなたのブラウザのアドレス・バーに貼り付けてみましょう。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//BadURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-Second Life doesn&apos;t know how to handle the link:

-

-[SLURL]

-

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

-                </d_old>

-<e_new>

-Second Life doesn&apos;t know how to handle the link:

- [SLURL]

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </e_new>

 <f_translation>

-Second Life がリンク（[SLURL]）を処理できません。

-ほとんどのリンクは、次のような形式です。

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-つづりを確認し、もう一度試してください。

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </f_translation>

-<f_old_trans>

-                        Second Life がリンクを処理できません。

-

-[SLURL]

-

-ほとんどのリンクは、次のような形式です。

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-つづりをチェックし、もう一度試してください。

-                </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_media_panel/Media texture:</b_path>

 <c_attribute></c_attribute>

@@ -2962,89 +134,34 @@ Settings:
                         </e_new>

 <f_translation>

                                 サウンド

-設定：

+設定:

                         </f_translation>

 <f_old_trans>

                                 サウンド

 設定:

                         </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Limit access to this parcel to:</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                                Limit access to this parcel to:

-                        </d_old>

-<e_new>

-                                Access To This Parcel

-                        </e_new>

-<f_translation>

-                                この区画にアクセス

-                        </f_translation>

-<f_old_trans>

-                                この区画へのアクセスを制限：

-                        </f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Group: [GROUP]</d_old>

-<e_new>Allow Group Access: [GROUP]</e_new>

-<f_translation>グループ・アクセスを許可：[GROUP]</f_translation>

-<f_old_trans>グループ： [GROUP]</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Sell passes allowing temporary access:</d_old>

-<e_new>Sell passes to:</e_new>

-<f_translation>パスを販売：</f_translation>

-<f_old_trans>一時アクセス用のパスを販売：</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

-<e_new>Always Allow</e_new>

-<f_translation>常に許可</f_translation>

-<f_old_trans>アバター:([LISTED]リスト済み、[MAX]最大)</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                          Allowed Residents

-                        </e_new>

-<f_translation>

-                          許可された住人

-                        </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

+<d_old>Always Allow</d_old>

 <e_new>Ban</e_new>

 <f_translation>禁止</f_translation>

-<f_old_trans>アバター:([LISTED]リスト済���、[MAX]���大)</f_old_trans>

+<f_old_trans>�����</f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute></c_attribute>

-<d_old></d_old>

+<d_old>

+                          Allowed Residents

+                        </d_old>

 <e_new>

                           Banned Residents

                         </e_new>

 <f_translation>

                           禁止された住人

                         </f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/popular_panel/incmature</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Include parcels with Mature Content</d_old>

-<e_new>Include parcels with Restricted Content</e_new>

-<f_translation>成人向けコンテンツがある区画を含める</f_translation>

-<f_old_trans>成人向けコンテンツのある区画を含める</f_old_trans>

-</string><string><a_file>menu_inventory.xml</a_file>

-<b_path>/Popup/Landmark Open</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Open</d_old>

-<e_new>Teleport</e_new>

-<f_translation>テレポート</f_translation>

-<f_old_trans>開く</f_old_trans>

+<f_old_trans>

+                                禁止された住人

+                        </f_old_trans>

 </string><string><a_file>panel_audio_device.xml</a_file>

 <b_path>/device_settings/Input device (microphone):</b_path>

 <c_attribute></c_attribute>

@@ -3055,7 +172,7 @@ Settings:
                         Input device (microphone):

                 </e_new>

 <f_translation>

-                        入力機器（マイクロフォン）：

+                        入力機器 (マイクロフォン):

                 </f_translation>

 <f_old_trans>

                 入力レベル

@@ -3079,16 +196,16 @@ Settings:
 <b_path>/panel_login/real_url</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                http://secondlife.com/app/login/

+             https://secondlife.com/app/login/?show_login_form=True

         </d_old>

 <e_new>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </e_new>

 <f_translation>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </f_translation>

 <f_old_trans>

-             https://secondlife.com/app/login/pt/?show_login_form=True

+                https://secondlife.com/app/login/?show_login_form=True

         </f_old_trans>

 </string><string><a_file>panel_preferences_audio.xml</a_file>

 <b_path>/Media panel/doppler_effect_text</b_path>

@@ -3115,225 +232,32 @@ Settings:
                 Logging Options:

         </e_new>

 <f_translation>

+                ログインオプション：

+        </f_translation>

+<f_old_trans>

                 ログイン・オプション：

+        </f_old_trans>

+</string><string><a_file>panel_preferences_voice.xml</a_file>

+<b_path>/chat/voice_chat_description</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                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.

+        </d_old>

+<e_new>

+                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

+        </e_new>

+<f_translation>

+                メモ： 「機器の設定」または「ボイス・チャットの設定」を実行すると、一時的にボイス・チャットから切断されます。

         </f_translation>

 <f_old_trans>

-                ログインオプション：

+                メモ： 「機器の設定」または「ボイス・チャットの設定」を実行すると、一時的にボイス・チャットから切断されます。

         </f_old_trans>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/externally_visible_check</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Public Access</d_old>

-<e_new>Allow Public Access</e_new>

-<f_translation>パブリック・アクセスを許可</f_translation>

-<f_old_trans>パブリック・アクセス</f_old_trans>

 </string><string><a_file>panel_voice_options.xml</a_file>

 <b_path>/content_panel/push_to_talk_check</b_path>

 <c_attribute>label</c_attribute>

 <d_old>Only allow Friends to initiate Voice Calls with me</d_old>

 <e_new>Start Viewer in Push-to-Talk mode</e_new>

-<f_translation>プッシュ・トゥ・トーク・モードでビュアーを起動</f_translation>

-<f_old_trans>プッシュ・トゥ・トークモードでビュアーを起動</f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Problem encountered processing your teleport request. You may

-                        need to log back in before you can teleport. If you continue

-                        to get  this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support

-                </d_old>

-<e_new>

-                    Problem encountered processing your teleport request. You may

-need to log back in before you can teleport. If you continue

-to get  this message, please check the Tech Support FAQ at:

-www.secondlife.com/support

-                </e_new>

-<f_translation>

-                    テレポート・リクエストの処理中に問題が発生しました。テレポートするには、

-再度ログインする必要があります。このメッセージが

-        引き続き表示される場合は、技術サポートFAQ（www.secondlife.com/support）

-を参照してください。

-                </f_translation>

-<f_old_trans>

-                        あなたのテレポートリクエストの処理中に問題が発生しました。地域間の移動を行うには、

-   ログインを再度し直す必要があります。このメッセージが

-   引き続き 表示される場合は、次の技術サポートFAQを参照してください:

-   www.secondlife.com/support

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Problem encountered processing your region crossing. You may

-                        need to log back in before you can cross regions. If you continue

-                        to get this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support.

-                </d_old>

-<e_new>

-                    Problem encountered processing your region crossing. You may

-need to log back in before you can cross regions. If you continue

-to get this message, please check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                    地域間の移動の処理中に問題が発生しました。地域間を

-移動するには、再度ログインする必要があります。このメッセージが

-引き続き表示される場合は、技術サポートFAQ（www.secondlife.com/support）

-を参照してください。

-                </f_translation>

-<f_old_trans>

-                        あなたの地域間の移動の処理中に問題が発生しました。地域間の移動を行うには、

-   ログインを再度し直す必要があります。このメッセージが

-   表示される場合は、次の技術サポートFAQを参照してください:

-   www.secondlife.com/support.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/blocked_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-                        If you still cannot teleport, please log out and log back in to

-                        resolve the problem.

-                </d_old>

-<e_new>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-If you still cannot teleport, please log out and log back in to

-resolve the problem.

-                </e_new>

-<f_translation>

-                    申し訳ございません。テレポートは現在、ブロックされています。もう少し後でやり直してください。

-やり直してもテレポートできない場合は、いったんログアウトし、再度ログインして

-問題を解決してください。

-                </f_translation>

-<f_old_trans>

-                        残念ながら、テレポートは現在、ブロックされています。もう少し後でやり直してください。

-   まだテレポートができない場合は、一度ログアウトし、再度ログインし直して

-   問題を解決してください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/timeout_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but system was unable to complete the teleport connection.

-                        Try again in a moment.

-                </d_old>

-<e_new>

-                    Sorry, but system was unable to complete the teleport connection.

-Try again in a moment.

-                </e_new>

-<f_translation>

-                    申し訳ございません。システムはテレポート接続を完了できませんでした。

-もう少し後でやり直してください。

-                </f_translation>

-<f_old_trans>

-                        残念ながら、システムはテレポート接続を完了できませんでした。

-   もう少し後でやり直してください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/missing_attach_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Your attachments have not arrived yet. Try waiting for a few

-                        more seconds or log out and back in again before attempting

-                        to teleport.

-                </d_old>

-<e_new>

-                    Your attachments have not arrived yet. Try waiting for a few

-more seconds or log out and back in again before attempting

-to teleport.

-                </e_new>

-<f_translation>

-                    添付物は、まだ到着していません。あと数秒間お待ちいただくか、いったんログアウトし、再度ログインしてからテレポートをやり直してださい。

-                </f_translation>

-<f_old_trans>

-                        あなたの添付物は、まだ到着していません。あと数秒間お待ちいただくか、

-   いったんログアウトし、再度ログインしてから

-   テレポートを試みてください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/too_many_uploads_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    The asset queue in this region is currently clogged so your teleport

-                        request will not be able to succeed in a timely manner. Please try again

-                        in a few minutes or go to a less busy area.

-                </d_old>

-<e_new>

-                    The asset queue in this region is currently clogged so your teleport

-request will not be able to succeed in a timely manner. Please try again

-in a few minutes or go to a less busy area.

-                </e_new>

-<f_translation>

-                    この地域の資産キューが現在込み合っているため、テレポート・

-リクエストを時間通りに処理することが難しい状況です。数分後にやり直すか、

-または混雑していない他の地域をお試しください。

-                </f_translation>

-<f_old_trans>

-                        この地域の資産キューが、現在込み合っています。あなたのテレポート

-   リクエストを、時間どおりに処理することは難しい状況です。数分後に

-   再度試みるか、または混雑していない他の地域をお試しください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your teleport request

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your teleport request

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    申し訳ございません。システムはテレポート・リクエストを時間どおりに

-完了できませんでした。数分後にやり直してください。

-                </f_translation>

-<f_old_trans>

-                        残念ながら、システムはテレポートリクエストを時間どおりに

-   完了できませんでした。数分後にやり直してください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your region crossing

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your region crossing

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    申し訳ございません。システムは地域間の移動を時間どおりに完了できませんでした。

-数分後にやり直してください。

-                </f_translation>

-<f_old_trans>

-                        残念ながら、システムは地域間の移動を時間どおりに

-   完了できませんでした。数分後にやり直してください。

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/no_host</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Unable to find teleport destination. The destination may be

-                        temporarily unavailable or no longer exists. Please try again

-                        in a few minutes.

-                </d_old>

-<e_new>

-                    Unable to find teleport destination. The destination may be

-temporarily unavailable or no longer exists. Please try again

-in a few minutes.

-                </e_new>

-<f_translation>

-                    テレポート目的地を見つけられません。目的地が一時的に利用できない

-状態か、またはすでに消滅している可能性があります。数分後にやり直してください。

-

-                </f_translation>

-<f_old_trans>

-                        テレポート目的地を見つけられません。目的地は、

-   一時的に利用できない状態か、または既に消滅している可能性があります。数分後に

-   やり直してください。

-                </f_old_trans>

+<f_translation>プッシュ・トゥ・トークモードでビュアーを起動</f_translation>

+<f_old_trans>プッシュ・トゥ・トーク モードでビュアーを起動</f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/notify.xml b/linden/indra/newview/skins/xui/ja/notify.xml
index df3f0a9..6a95c55 100644
--- a/linden/indra/newview/skins/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/xui/ja/notify.xml
@@ -79,13 +79,13 @@
         </notify>
         <notify name="GestureMissing">
                 <message name="message">
-                        ジェスチャーがデータベースにありません。
+                        ジェスチャー[NAME]がデータベースにありません。
                 </message>
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        ジェスチャーを��������できません。
-も��一度試��てください。
+                        ジェスチャー[NAME]を������������とが��きません。
+���度、試��てください。
                 </message>
         </notify>
         <notify name="InventoryLoaded">
@@ -383,6 +383,11 @@
                         この土地はボイスが有効に設定されています。
                 </message>
         </notify>
+        <notify name="NoVoice">
+                <message name="message">
+                        この土地はボイスが無効に設定されています。
+                </message>
+        </notify>
         <notify name="NoBuild">
                 <message name="message">
                         この土地は建造無効（「建造不可」）に設定されています。
@@ -716,6 +721,9 @@
                 <option name="No">
                         いいえ
                 </option>
+                <option name="Mute">
+                        ミュート
+                </option>
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
                 <message name="message">
@@ -915,8 +923,23 @@ Mキーを押して移行します。
         </notify>
         <notify name="VoiceInviteAdHoc">
                 <message name="message">
-                        [NAME]が、あなたをボイスチャット・コンファレンスコールに招待しています。 
-コールに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。このコールをしている人をミュートにする場合は「ミュート」をクリックしてください。
+                        [NAME]が、会議チャットでボイスチャットコールに参加しました。 
+コールに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。 このユーザーをミュート（消声）する場合は「ミュート」をクリックしてください。
+                </message>
+                <option name="Accept">
+                        受け入れる
+                </option>
+                <option name="Decline">
+                        拒否
+                </option>
+                <option name="Mute">
+                        ミュート
+                </option>
+        </notify>
+        <notify name="InviteAdHoc">
+                <message name="message">
+                        [NAME]が、あなたを会議チャットに招待しています。 
+チャットに参加するには「受け入れる」をクリックし、招待を断るときは「拒否」をクリックしてください。このユーザーをミュート（消声）する場合は「ミュート」をクリックしてください。
                 </message>
                 <option name="Accept">
                         受け入れる
@@ -983,4 +1006,14 @@ Mキーを押して移行します。
                         アクセス・リストに含まれていないため、区画に入ることができません。
                 </message>
         </notify>
+        <notify name="VoiceNotAllowed">
+                <message name="message">
+                        あなたには[VOICE_CHANNEL_NAME]のボイス・チャットに接続する権限がありません。
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME]のボイス・チャットに接続中に、エラーが発生しました。後でもう一度お試しください。
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/xui/ja/panel_avatar.xml
index 4ce8cdf..37d491b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_avatar.xml
@@ -5,6 +5,7 @@
                         <text name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
+[AGEVERIFICATION]
                         </text>
                         <text name="AcctTypeResident">
                                 住人
@@ -28,10 +29,10 @@
                                 支払い情報未登録
                         </text>
                         <text name="AgeVerified">
-                                、年齢確認済み
+                                年齢確認済み
                         </text>
                         <text name="NotAgeVerified">
-                                、年齢未確認
+                                年齢未確認
                         </text>
                         <text name="Name:">
                                 名前：
@@ -49,6 +50,8 @@
                              tool_tip="Second Lifeパートナーです。 設定方法の詳細については、www.secondlife.com/partnerを参照してください。">
                                 ﾊﾟｰﾄﾅｰ：
                         </text>
+                        <button label="i" label_selected="i" name="partner_info"
+                             tool_tip="クリックして、パートナーのプロフィールを開けてください。" />
                         <button label="?" label_selected="?" name="partner_help" />
                         <line_editor name="partner_edit"
                              tool_tip="Second Lifeパートナーです。 設定方法の詳細については、www.secondlife.com/partnerを参照してください。">
diff --git a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml b/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
index 6e1af21..e33a928 100644
--- a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat">
-        <button label="履���" label_selected="履歴" name="History"
+<panel name="chat_bar">
+        <button label="��ーカル・チャット" label_selected="履歴" name="History"
              tool_tip="過去の発言を表示するには、ここをクリック" />
         <line_editor label="チャットを開始するには、ここをクリックします。"
              name="Chat Editor"
diff --git a/linden/indra/newview/skins/xui/ja/panel_friends.xml b/linden/indra/newview/skins/xui/ja/panel_friends.xml
index 07cf5f7..d0ede63 100644
--- a/linden/indra/newview/skins/xui/ja/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_friends.xml
@@ -2,7 +2,16 @@
 <panel name="friends">

         <scroll_list name="friend_list"

              tool_tip="複数のフレンドを選択するには、ShiftキーまたはCtrlキーを押しながら名前をクリックします。">

-                <column label="名前" name="friend_name" />

+                <column name="icon_online_status" tool_tip="オンライン・ステータス" />

+                <column label="名前" name="friend_name" tool_tip="名前" />

+                <column name="icon_visible_online"

+                     tool_tip="フレンドは、あなたがオンラインかどうか確認することができます。" />

+                <column name="icon_visible_map"

+                     tool_tip="フレンドは、地図であなたの居場所を見つけることができます。" />

+                <column name="icon_edit_mine"

+                     tool_tip="フレンドは、あなたのオブジェクトを編集することができます。" />

+                <column name="icon_edit_theirs"

+                     tool_tip="あなたは、このフレンドのオブジェクトを編集することができます。" />

         </scroll_list>

         <panel name="rights_container">

                 <text name="friend_name_label" right="-10">

diff --git a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml b/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
index 2fd1b0a..a4b2e5e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
@@ -20,8 +20,6 @@
         <text name="proposals_header_view_inst">
                 投票したい提案をダブルクリックします。
 新しい提案を作成する場合は、[ 提案を作成 ] をクリックします。
-                <!--投票したい提案をダブルクリックするか、
-提案作成ボタンを押して、新しい提案を作成してください。-->
         </text>
         <text name="proposals_header_create_txt">
                 提案を作成
@@ -114,4 +112,10 @@
         <text name="proposals_submit_new_txt">
                 新しい提案を送信中...
         </text>
+        <text name="vote_recorded">
+                あなたの投票は受理されました。
+        </text>
+        <text name="vote_previously_recorded">
+                あなたは既に投票を済ませています。選挙中、投票できるのは一度だけです。
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/xui/ja/panel_login.xml
index 46525cc..68b87fb 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_login.xml
@@ -1,6 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
         <text name="real_url">
-                https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text name="first_name_text">
+                ファーストネーム：
+        </text>
+        <text name="last_name_text">
+                ラストネーム：
+        </text>
+        <text name="password_text">
+                パスワード：
+        </text>
+        <text name="start_location_text">
+                開始ロケーション：
+        </text>
+        <combo_box name="start_location_combo">
+                <combo_item name="MyHome">
+                        自宅（ホーム）
+                </combo_item>
+                <combo_item name="MyLastLocation">
+                        最後のロケーション
+                </combo_item>
+                <combo_item name="Typeregionname">
+                        &lt;地域の名前入力&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="パスワードを記憶" name="remember_check" />
+        <text name="full_screen_text">
+                ログイン時にはフルスクリーン表示になります
+        </text>
+        <button label="新規アカウント..." label_selected="新規アカウント..."
+             name="new_account_btn" />
+        <button label="環境設定..." label_selected="環境設定..." name="preferences_btn" />
+        <button label="接続" label_selected="接続" name="connect_btn" />
+        <button label="終了" label_selected="終了" name="quit_btn" />
+        <text name="version_text">
+                1.23.4 (5)
+        </text>
+        <text name="channel_text">
+                [Viewer Channel Name]
+        </text>
+        <text name="forgot_password_text">
+                パスワードをお忘れですか?
+        </text>
+        <text name="forgot_password_url">
+                http://secondlife.com/account/request.php
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_media_controls.xml b/linden/indra/newview/skins/xui/ja/panel_media_controls.xml
new file mode 100644
index 0000000..ca2fb5b
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/panel_media_controls.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_controls">

+        <button name="music_play"

+             tool_tip="ストリーミング・ミュージックの再生/一時停止" />

+        <button name="media_play"

+             tool_tip="ストリーミング・ムービーの再生/一時停止" />

+        <volume_slider name="volume_slider" tool_tip="マスター・ボリューム" />

+        <button name="mute_master" tool_tip="マスター・ミュート" />

+        <button name="expand" tool_tip="個別のボリューム・レベルを調節する。" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/ja/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..df4b46d
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/panel_media_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_remote">

+        <panel label="オーディオとビデオ" name="Volume Panel" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
index 4b07515..d201c8c 100644
--- a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
@@ -11,4 +11,23 @@
              tool_tip="視界の移動にマウスを使用。 銃を持っているときは、クリックで発砲" />
         <button label="立ち上がる" label_selected="立ち上がる" name="Stand Up"
              tool_tip="立ち上がるには、ここをクリックします。" />
+        <layout_stack name="overlay_layout_panel">
+                <layout_panel name="">
+                        <layout_stack name="">
+                                <layout_panel name="state_buttons">
+                                        <button label="受信済みIM" label_selected="受信済みIM" name="IM Received"
+                                             tool_tip="インスタント・メッセージが保留になっています。ここをクリックして、IMを見てください。" />
+                                        <button label="取り込み中の解除" label_selected="取り込み中の解除"
+                                             name="Set Not Busy"
+                                             tool_tip="「チャット」と「IM」ボタンが隠れています。ここをクリックして「取り込み中」を解除してください。" />
+                                        <button label="キーを解除" label_selected="キーを解除" name="Release Keys"
+                                             tool_tip="スクリプトが、あなたのキーを制御しています。ここをクリックして解除してください。" />
+                                        <button label="マウスルック" label_selected="マウスルック" name="Mouselook"
+                                             tool_tip="視点を操作するのにマウスを使用してください。銃器を持っている場合、クリックすると発砲します。" />
+                                        <button label="立ち上がる" label_selected="立ち上がる" name="Stand Up"
+                                             tool_tip="ここをクリックして、立ち上がってください。" />
+                                </layout_panel>
+                        </layout_stack>
+                </layout_panel>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
index dfa5edf..dc7d2ff 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -82,7 +82,7 @@
                         English (英語)
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (中国語) 
+                        汉语/漢語(中国語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
                         Deutsch (ドイツ語)
@@ -97,7 +97,7 @@
                         한국어 (韓国語)
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        Português (ポルトガル語)
+                        Português (ポルトガル語) – ベータ
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
                         Español (スペイン語)
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
index 5ac0c95..b6e791e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
@@ -4,6 +4,9 @@
                 表示解像度：
         </text>
         <check_box label="ウィンドウ内で実行" name="windowed mode" />
+        <text_editor name="voice_chat_description">
+                チェックされていない場合は、ログインするとフルスクリーンで表示します。
+        </text_editor>
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 全画面の縦横比：
         </text>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
index 25fc656..097e9e9 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
@@ -26,6 +26,6 @@
         <check_box label="タイムスタンプに日付を加える" name="log_date_timestamp" />
         <button label="パス変更" label_selected="パス変更" name="log_path_button" />
         <text type="string" length="1" name="text_box3">
-                ログイン������プション：
+                ログインオプション：
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml
index 10769a8..5b8f29a 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml
@@ -16,7 +16,7 @@
                 プッシュ・トゥ・トーク

         </text>

         <text_editor name="voice_chat_description">

-                プッシュ・トゥ・トークモードは、あなたのボイスが転送される時に、コントロールを可能にします。切り替えモードの時は、プッシュ・トゥ・トークトリガーを押してから放し、マイクロフォンのオンとオフを切り替えます。切り替えモードでない時は、マイクロフォンは、トリガーを押し続けている時のみアクティブとなります。

+                メモ： 「機器の設定」または「ボイス・チャットの設定」を実行すると、一時的にボイス・チャットから切断されます。

         </text_editor>

         <check_box label="プッシュ・トゥ・トークモードでビュアーを起動"

              name="push_to_talk_check" />

@@ -33,7 +33,6 @@
         <check_box

              label="自分のフレンドリストにある人からのみ、ボイスコールを受け付ける"

              name="voice_call_friends_only_check" />

-        <button label="機器の設定..." name="device_settings_btn" />

-        <button label="ボイス設定ウィザードを実行..."

-             name="launch_voice_wizard_button" />

+        <button label="機器の設定" name="device_settings_btn" />

+        <button label="ボイス・チャットの設定" name="launch_voice_wizard_button" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
index 4fb2db6..467fa0e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
@@ -9,4 +9,15 @@
         </text>

         <check_box label="サイトからのクッキーを承認" name="cookies_enabled" />

         <button label="今すぐクリア" name="clear_cookies" />

+        <text name="proxy_label">

+                ウェブ・プロキシ：

+        </text>

+        <check_box label="ウェブ・プロキシを有効にします。"

+             name="web_proxy_enabled" />

+        <text name="proxy_text_label">

+                アドレス:

+        </text>

+        <line_editor name="web_proxy_editor"

+             tool_tip="使用したいプロキシの名前、あるいはIPアドレス" />

+        <spinner label="ポート番号：" name="web_proxy_port" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
new file mode 100644
index 0000000..4e26137
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel">

+        <string name="moderator_label">

+                (モデレータ)

+        </string>

+        <layout_stack name="">

+                <layout_panel name="moderation_mode_panel">

+                        <combo_box name="moderation_mode">

+                                モデレート済みボイス

+                        </combo_box>

+                </layout_panel>

+                <layout_panel name="moderate_chat_panel">

+                        <scroll_list name="speakers_list">

+                                <column label="名前" name="speaker_name" />

+                        </scroll_list>

+                        <panel name="speaker_controls">

+                                <text name="resident_name">

+                                        Rumplstiltskin Califragilistic

+                                </text>

+                                <button name="mute_btn"

+                                     tool_tip="この住人のボイスをミュート(消声)します。" />

+                                <check_box label="テキストをミュート（消字）" name="mute_text_btn" />

+                        </panel>

+                </layout_panel>

+                <layout_panel name="moderator_controls">

+                        <text name="moderator_controls_label">

+                                モデレータ・コントロール:

+                        </text>

+                </layout_panel>

+        </layout_stack>

+</panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml b/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
index 1dd7dfa..bfbb2c1 100644
--- a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
@@ -26,8 +26,13 @@
         <button label="" label_selected="" name="fly" tool_tip="飛行禁止" />
         <button label="" label_selected="" name="build" tool_tip="作成禁止" />
         <button label="" label_selected="" name="scripts" tool_tip="スクリプトなし" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObjectを制限" />
+        <button name="no_fly" tool_tip="飛行禁止" />
+        <button name="no_build" tool_tip="制作/ＲＥＺ禁止" />
+        <button name="no_scripts" tool_tip="スクリプト禁止" />
+        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject制限" />
         <button name="status_voice" tool_tip="ボイス有効" />
+        <button name="status_no_voice"
+             tool_tip="ここではボイスを使用できません。" />
         <button label="" label_selected="" name="buyland" tool_tip="この区画を購入" />
         <text name="packet_loss_tooltip">
                 パケット損失
diff --git a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
index f544a11..38bcb69 100644
--- a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_toolbar">
+<panel name="toolbar">
         <button label="IM" name="im_btn"
              tool_tip="フレンドとインスタント・メッセージ" />
+        <string name="Redock Windows">
+                ウィンドウを再置する
+        </string>
         <button label="コミュニケート" name="communicate_btn"
              tool_tip="フレンドやグループとコミュケート。" />
         <button label="チャット" name="chat_btn"
-             tool_tip="近�����人���話をします。 （Enter）" />
+             tool_tip="������������・バー���表示します。(Enter)" />
         <button label="フレンド" name="friends_btn"
              tool_tip="フレンドを探して会話する" />
         <button label="飛行" label_selected="飛行を停止" name="fly_btn"
@@ -17,7 +20,7 @@
         <button label="建造" name="build_btn" tool_tip="オブジェクト新規作成" />
         <button label="ミニマップ" name="radar_btn"
              tool_tip="あなたの周辺領域の地図。 （Ctrl＋Shift＋M）" />
-        <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋Enter）" />
+        <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋M）" />
         <button label="持ち物" name="inventory_btn"
              tool_tip="あなたのアイテム。 (Ctrl-I)" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_controls.xml b/linden/indra/newview/skins/xui/ja/panel_voice_controls.xml
new file mode 100644
index 0000000..a71563e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/panel_voice_controls.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_controls">

+        <button name="speakers_btn"

+             tool_tip="自分の周りでボイスチャットを使用している住人のリストを表示" />

+        <button label="話す" name="push_to_talk" tool_tip="ボタンを押し続けて話す" />

+        <button name="ptt_lock"

+             tool_tip="ロックをクリックして、トークモードに切り替える" />

+        <button name="show_channel"

+             tool_tip="クリックして、現在のボイス・チャンネルを見る" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml b/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml
index 21c8115..ca2a02b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="content_panel">

         <text_editor name="voice_intro_text1">

-                Second Lifeのボイスチャットへようこそ！ボイスチャットで、他の住人と会話を楽しむことができます。このウィザードは、ボイスチャットの設定に必要な手順をガイドします。ボイスチャットには、マイクロフォン付きのステレオヘッドセットが必要です。ヘルプボタンをクリックして詳細をご覧ください。

+                Second Lifeのボイスチャットへようこそ！ ボイスチャットで、他の住人と会話を楽しむことができます。 このウィザードは、ボイスチャットの設定に必要な手順を案内します。 ボイス・チャットを使用するには、オーディオ・スピーカーが必要です。また、他の人と話をするには、マイクロフォンまたはマイクロフォン付きのステレオ・ヘッドセットが必要です。

         </text_editor>

         <text_editor name="voice_intro_text2">

                 今すぐボイスチャットを有効にしますか？

diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_options.xml b/linden/indra/newview/skins/xui/ja/panel_voice_options.xml
index d58d2bf..d1a9878 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_voice_options.xml
@@ -11,7 +11,7 @@
                         アバターの位置からボイスチャットを聞く。

                 </radio_item>

         </radio_group>

-        <check_box label="プッシュ・トゥ・トーク����ードでビュアーを起動"

+        <check_box label="プッシュ・トゥ・トークモードでビュアーを起動"

              name="push_to_talk_check" />

         <check_box label="切り替えモードで、プッシュ・トゥ・トークを使用"

              name="push_to_talk_toggle_check" />

diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/ja/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..57052c2
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_remote">

+        <button name="end_call_btn" tool_tip="クリックして、通話を終了する" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ko/alerts.xml b/linden/indra/newview/skins/xui/ko/alerts.xml
index 2a41f06..a07fe33 100644
--- a/linden/indra/newview/skins/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/xui/ko/alerts.xml
@@ -178,6 +178,20 @@
                         아니오
                 </option>
         </alert>
+        <alert name="GrantModifyRightsMultiple">
+                <message name="message">
+                        제3의 주민에게 수정 권한을 부여함으로써, 제3의 주민은 사용자가 인월드에서 가지고 있는 오브젝트 모두를 
+변경할 수 있습니다. 본 허가권의 취급 시 각별히 
+주의하십시오.
+선택한 주민에게 수정할 수 있는 권리를 부여하시겠습니까?
+                </message>
+                <option name="Yes">
+                        예
+                </option>
+                <option name="No">
+                        아니오
+                </option>
+        </alert>
         <alert name="RevokeModifyRights">
                 <message name="message">
                         [FIRST_NAME] [LAST_NAME]님의 수정 권한을 취소하시겠습니까?
@@ -189,6 +203,17 @@
                         아니오
                 </option>
         </alert>
+        <alert name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        선택한 주민의 수정 권한을 취소하시겠습니까?
+                </message>
+                <option name="Yes">
+                        예
+                </option>
+                <option name="No">
+                        아니오
+                </option>
+        </alert>
         <alert name="RemoveFriend">
                 <message name="message">
                         [FIRST] [LAST]님을 친구에서 제거하시겠습니까?
@@ -502,6 +527,20 @@ L$0로 판매하는 경우, 팔 사람을 선택하십시오.
                         취소
                 </option>
         </alert>
+        <alert name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+                        주의사항: &apos;다른 사람에게 판매&apos;를 클릭하면 이 지역에 토지가 속하지 않은 경우에도 전체 세컨드라이프 커뮤니티에서 해당 토지를 사용할 수 있도록 설정할 수 있습니다.
+
+선택된 [LAND_SIZE]제곱미터의 토지는 판매용으로 설정되어 있습니다.
+판매 가격은 L$[SALE_PRICE]이고 [NAME]에게 판매가 승인됩니다.
+                </message>
+                <option name="Continue">
+                        확인
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
                         이 토지 구획 내에서 그룹 &apos;[NAME]&apos;과(와) 공유하는
@@ -753,15 +792,26 @@ www.secondlife.com으로 이동하여 새로운 계정을 만드시겠습니까?
                         취소
                 </option>
         </alert>
+        <alert name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        QuickTime이 구버전이기 때문에 비활성화된 경우
+                </ignore>
+                <message name="message">
+                        현재 시스템에 설치된 QuickTime이 구버전이기 때문에 
+스트리밍 비디오가 비활성화되었습니다. 
+
+http://www.apple.com/quicktime/을 방문하여 최신 버전을 다운로드하십시오.
+                </message>
+        </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        안내 광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션에
-���타��니다.
+                        광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션에
+게시���니다.
 광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에
 추가합니다.
 게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.
-��� ���은 가격을 지불할수록 목록���서 더 높��� 위치에 게���되고
-키워드 검색 시 결과에 더 우선적으로 표시됩니다.
+높은 가격을 지불 할수록 목록��� ���단 위치에 게���되고
+키워드 검색결과에 더 우선적으로 표시됩니다.
                 </message>
                 <option name="OK">
                         확인
@@ -1409,13 +1459,12 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
-                        1개 이상의 오브젝트가 잠겨 있거나 귀하의 소유가 아닙니다.
-귀하의 소유가 아닌 오브젝트를 귀하가 가지면 
-이 오브젝트에 다음 소유자 권한이 적용되어
-이후에 귀하가 수정하거나 복사할 권한이 제한될 수
-있습니다.
-하지만 현재 원하는 아이템을 선택할 수 있습니다.
-이 아이템을 소유 하시겠습니까?
+                        1개 이상의 오브젝트가 잠겨 있거나 본인의 소유가 아닙니다.
+자신의 소유가 아닌 오브젝트를 가지면 
+오브젝트에 다음 소유자 권한이 적용되어
+아이템에 대한 본인의 수정 또는 복사 권한이 제한될 수도 있습니다.
+
+이 아이템을 소유하시겠습니까?
                 </message>
                 <option name="Yes">
                         예
@@ -2561,11 +2610,9 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        연결할 수 없습니다.  로그인 서버에서 로그인 패킷이
-수신되지 않았습니다.
+                        연결 중 문제가 발생했습니다. 인터넷 연결에 문제가 있거나 세컨드라이프 서버에 있을 수 있습니다.
 
-몇 분 후에 다시 시도하거나 도움말을 클릭하여
-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.
+인터넷 연결을 확인하고 몇 분 후에 다시 시도하거나 도움말을 클릭하여 지원 사이트에 문의를 접수해 주십시오. 또는 텔리포트를 클릭하여 텔리포트 홈으로 이동해 보십시오.
                 </message>
                 <option name="OK">
                         확인
@@ -2573,6 +2620,9 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
                 <option name="Help">
                         도움말
                 </option>
+                <option name="Teleport">
+                        텔리포트
+                </option>
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
@@ -3190,8 +3240,10 @@ Applications 폴더에 다운로드하시겠습니까?
         <alert name="BusyModeSet">
                 <message name="message">
                         다른 용무 중 모드가 설정되었습니다.
-채팅 및 메신저가 숨겨집니다. 메신저를
-받으면 귀하의 다른 용무 중 응답이 답변 됩니다. 모든 텔리포트 및 아이템 제공이 거부됩니다.
+채팅 및 메신저가 숨겨집니다. 메신저는
+귀하의 다른 용무 중 응답으로 처리됩니다. 모든 텔리포트
+제공이 거부되고 모든 아이템 제공이 휴지통으로
+이동합니다.
                 </message>
                 <ignore name="ignore">
                         다른 용무 중 모드를 설정할 때
@@ -3754,20 +3806,14 @@ L$[AMOUNT]의 비용을 지불하고 이 광고물을 지금 게재하시겠습�
         <alert name="HelpRegionDisableCollisions" title="충돌 끄기">
                 <message name="message">
                         시뮬레이션 성능이 저조할 경우 물리 엔진에 문제가 있을 수 있습니다. 
-Ctrl-Shift-1을 눌러 통계보기를 엽니다. Simulator Physics FPS를
-확인하십시오.  45 미만인 경우 통계보기 하단에 있는 시간
-패널을 여십시오. 시뮬레이션 시간(물리)이
-20밀리초 이상인 경우에는 대용량 콜라이더 보기 버튼을 클릭하십시오. 
-성능이 저조한 원인이 되는 물리 엔진의 이름과
-위치가 표시됩니다.
+Ctrl-Shift-1을 눌러 통계보기를 엽니다. Simulator Physics FPS를 확인하십시오.  45 미만인 경우 통계보기 하단에 있는 시간 패널을 여십시오. 시뮬레이션 시간(물리)이 20밀리초 이상인 경우에는 대용량 충돌 보기 버튼을 클릭하십시오. 
+성능이 저조한 원인이 되는 물리 엔진의 이름과 위치가 표시됩니다.
  
-충돌 끄기 상자를 선택한 후 적용버튼을 누르면
-오브젝트 간의 모든 충돌이 일시적으로 비활성화됩니다. 지역 횡단을 하기 전에
-위치로 이동하기 위해서는 이 작업을 수행해야 할 수도
-있습니다. 해당 위치로 이동하면 오브젝트를 검사하여 오브젝트가
-계지지ㅈ속적으로 다른 오브젝트와 충돌하는지 여부를 확인하십시오. 오브젝트
+충돌 끄기 상자를 선택한 후 적용 버튼을 누르면 오브젝트 간의 모든 충돌이 일시적으로 비활성화됩니다. &apos;대용량 충돌&apos;로 표시된 위치로 이동하기 위해서는 이 작업을 수행해야 할 수도 
+있습니다. 해당 위치로 이동하면 오브젝트를 검사하여 오브젝트가 
+계속적으로 다른 오브젝트와 충돌하는지 여부를 확인하십시오. 오브젝트 
 소유주에게 문의하거나 오브젝트를 삭제 또는 반환할 수 있습니다. 
-충돌 끄기 상자를 선택 해제한 후 적용을 클릭하면
+충돌 끄기 상자를 선택 해제한 후 적용을 클릭하면 
 지역 내 충돌이 다시 활성화됩니다.
  
 기본 설정: 꺼짐
@@ -4215,18 +4261,17 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        이 도구를 사용하여 서비스 약관과 커뮤니티 표준의 위반 사항을 
-보고합니다. 다음을 참조하십시오. 
--
-http://secondlife.com/community/support.php 
-http://secondlife.com/community/support.php 
--
-보고된 서비스 조항과 커뮤니티 표준의 남용 사례는 모두  
-조사해서 해결합니다. 사건이 해결되면 신고자에게는 사건해결을
-알리는 메일이 발송됩니다. 사건 해결은 다음 주소에 있는 
-경찰 사건 기록부에서도 확인하실 수 있습니다.
-- 
-http://secondlife.com/community/support.php
+                        이 도구를 사용하여 서비스 약관과 커뮤니티 규칙의 위반 사항을 
+신고할 수 있습니다. 다음을 참조하십시오.
+
+http://secondlife.com/corporate/tos.php 
+http://secondlife.com/corporate/cs.php
+
+보고된 서비스 조항과 커뮤니티 규칙에 대한 모든 남용 사례는 
+조사를 통해 해결됩니다. 사건 해결은 다음 주소에 있는 
+경찰 사건 기록부에서 확인하실 수 있습니다.
+
+http://secondlife.com/community/blotter.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
@@ -4426,10 +4471,10 @@ http://secondlife.com/community/support.php
         <alert name="CopySLURL">
                 <message name="message">
                         클립보드에 다음과 같은 SLURL이 복사되었습니다.
-                         [SLURL] 
+ [SLURL] 
 
-                        웹 페이지에 올려서 타인들이 이 위치에 쉽게 접근하도록 하거나
-                        웹 브라우저의 주소창에 붙여넣기를 해서 직접 시험해보십시오.
+웹 페이지에 올려서 타인들이 이 위치에 쉽게 접근하도록 하거나
+웹 브라우저의 주소창에 붙여넣기를 해서 직접 시험해보십시오.
                 </message>
                 <ignore name="ignore">
                         SLURL을 클릭보드로 복사할 때
@@ -4473,8 +4518,8 @@ http://secondlife.com/community/support.php
         </alert>
         <alert name="ChatterBoxSessionStartError">
                 <message name="message">
-                        [RECIPIENT](와)과의 새 채팅 세션 시작 중 오류가 발생했습니다.
-   [REASON]
+                        [RECIPIENT](과)������ 새 채팅 세션 시작 중 오류가 발생했습니다.
+[REASON]
                 </message>
                 <option name="OK">
                         확인
@@ -4482,8 +4527,8 @@ http://secondlife.com/community/support.php
         </alert>
         <alert name="ChatterBoxSessionStartNotVerified">
                 <message name="message">
-                        [RECIPIENT](와)과의 새 채팅 세션 시작 중 오류가 발생했습니다.
-   [REASON]
+                        [RECIPIENT](과)������ 새 채팅 세션 시작 중 오류가 발생했습니다.
+[REASON]
                 </message>
                 <option name="OK">
                         확인
@@ -4492,7 +4537,7 @@ http://secondlife.com/community/support.php
         <alert name="ChatterBoxSessionEventError">
                 <message name="message">
                         오류: [EVENT] [RECIPIENT]
-   [REASON]
+[REASON]
                 </message>
                 <option name="OK">
                         확인
@@ -4503,6 +4548,10 @@ http://secondlife.com/community/support.php
                         [NAME](와)과의 채팅 세션을 종료해야 합니다.
             [REASON]
                 </message>
+                <message name="message">
+                        [NAME](과)와의 채팅 세션을 종료해야 합니다.
+[REASON]
+                </message>
                 <option name="OK">
                         확인
                 </option>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
index 4a353e5..52b7e2e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -239,6 +239,8 @@
                              tool_tip="이름 기준 정렬" />
                         <button label="개수" label_selected="개수" name="Count"
                              tool_tip="수 기준 정렬" />
+                        <name_list label="개수" name="owner list" />
+                        /&gt;
                 </panel>
                 <panel label="옵션" name="land_options_panel">
                         <text type="string" length="1" name="allow_label">
@@ -398,11 +400,13 @@
                         </text>
                         <check_box label="일반 공개 허용" name="public_access" />
                         <text name="Only Allow">
-                                출입 제한 대���:
+                                출입 제한 기���:
                         </text>
-                        <check_box label="린든랩에 결제 정보를 제공한 사용자" name="limit_payment"
+                        <check_box label="린든랩에 결제 정보를 제공하지 않은 사용자"
+                             name="limit_payment"
                              tool_tip="확인되지 않은 사용자는 출입이 차단됩니다." />
-                        <check_box label="성인 인증을 완료한 사용자" name="limit_age_verified"
+                        <check_box label="성인 인증을 완료하지 않은 사용자"
+                             name="limit_age_verified"
                              tool_tip="성인 인증을 완료하지 않은 사용자는 출입이 차단됩니다. 자세한 사항은 support.secondlife.com을 참조하십시오." />
                         <string name="estate_override">
                                 이러한 옵션 중 하나 이상이 사유지 레벨에 설정되어 있습니다.
diff --git a/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml b/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml
index 1b44301..fa5c28c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml
@@ -5,7 +5,7 @@
                         <column label="이름" name="speaker_name" />

                 </scroll_list>

                 <panel name="volume_container">

-                        <button label="음소거" name="mute_btn" />

+                        <button label="음소거" name="mute_btn" tool_tip="이 사용자의 음성 소거" />

                 </panel>

         </panel>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
index 1112789..182f566 100644
--- a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
@@ -9,7 +9,13 @@
         <string name="connected">
                 연결됨
         </string>
+        <string name="unavailable">
+                현재 위치에서 음성을 사용할 수 없습니다.
+        </string>
         <string name="hang_up">
                 음성 채팅 연결 끊김
         </string>
+        <string name="voice_icon">
+                icn_voice-localchat.tga
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/xui/ko/floater_directory.xml
index e7a2e4b..646976b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_directory.xml
@@ -23,6 +23,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="전체" name="find_all_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="뒤로" name="back_btn" />
                         <button label="앞으로" name="forward_btn" />
                         <line_editor label="검색" name="search_editor" tool_tip="검색" />
@@ -62,6 +68,12 @@
                         </text>
                 </panel>
                 <panel label="광고" name="classified_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <text name="find">
@@ -113,6 +125,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="이벤트" name="events_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
                                         작업진행과 다음과정
@@ -189,6 +207,12 @@
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                 </panel>
                 <panel label="인기 장소" name="popular_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <check_box label="사진이 있는 장소만 보기" name="incpictures" />
@@ -205,6 +229,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="토지 매물" name="land_sales_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <combo_box name="type">
@@ -249,6 +279,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="장소" name="places_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <text name="find">
@@ -305,6 +341,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="사람" name="people_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <text name="find">
@@ -318,6 +360,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="그룹" name="groups_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <text name="find">
@@ -334,6 +382,12 @@
                         </scroll_list>
                 </panel>
                 <panel label="전체(구)" name="find_all_old_panel">
+                        <string name="searching_text">
+                                검색...
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
                         <text name="find">
diff --git a/linden/indra/newview/skins/xui/ko/floater_html.xml b/linden/indra/newview/skins/xui/ko/floater_html.xml
index 9329db3..4184704 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_html.xml
@@ -6,7 +6,7 @@
         <button label="앞으로" name="forward_btn" />
         <button label="이동" name="go_btn" />
         <text name="home_page_url">
-                http://www.google.com
+                http://www.secondlife.com
         </text>
         <text name="in-world_help_title">
                 인월드 도움말
diff --git a/linden/indra/newview/skins/xui/ko/floater_html_help.xml b/linden/indra/newview/skins/xui/ko/floater_html_help.xml
deleted file mode 100644
index 2a2f355..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlhelp" title="세컨드라이프 도움말">
-        <button label="뒤로" name="back_btn" />
-        <button label="홈" name="home_btn" />
-        <button label="앞으로" name="forward_btn" />
-        <button label="닫기" name="close_btn" />
-        <text name="status_text">
-                준비
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_im.xml b/linden/indra/newview/skins/xui/ko/floater_im.xml
index 6920056..6fae990 100644
--- a/linden/indra/newview/skins/xui/ko/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_im.xml
@@ -15,6 +15,18 @@
         <text name="user_no_help">
                 요청된 사용자는 더 이상 도움말 세션에 있지 않습니다.
         </text>
+        <string name="session_does_not_exist_error">
+                세션이 더 이상 존재하지 않습니다.
+        </string>
+        <string name="no_ability_error">
+                해당 권한이 없습니다.
+        </string>
+        <string name="not_a_mod_error">
+                귀하는 현재 세션 진행자가 아닙니다.
+        </string>
+        <string name="muted_error">
+                귀하는 음소거된 상태입니다.
+        </string>
         <text name="add_session_event">
                 채팅 세션에 에이전트 추가
         </text>
@@ -24,10 +36,16 @@
         <text name="teleport_session_event">
                 생성자로 텔리포트
         </text>
+        <string name="mute_agent_event">
+                에이전트 음소거
+        </string>
         <text name="removed_from_group">
                 그룹에서 제거되었습니다.
         </text>
         <string name="invite_message">
                 음성 채팅을 수락/연결하려면 [BUTTON NAME] 버튼을 클릭하십시오.
         </string>
+        <string name="close_on_no_ability">
+                채팅 세션에 더 이상 참여할 수 없습니다.
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
index 935de51..c038555 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">
         <string name="ringing">
-                음성 채팅 연결  중...
+                음성 채팅 연결 중...
+        </string>
+        <string name="answering">
+                연결하는 중...
         </string>
         <string name="connected">
                 연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.
@@ -9,11 +12,14 @@
         <string name="hang_up">
                 통화 종료
         </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
         <button label="프로필¡¦}" name="profile_callee_btn" />
         <button label="전화" name="start_call_btn" />
         <button label="전화 종료" name="end_call_btn" />
         <panel name="speaker_controls">
-                <check_box label="음성 소거" name="mute_btn" />
+                <check_box label="음성 소거" name="mute_btn" tool_tip="음성 소거" />
         </panel>
         <line_editor label="메신저를 사용하려면 여기를 클릭하십시오."
              name="chat_editor" />
@@ -34,6 +40,6 @@
                 [NAME]님 입력 중...
         </text>
         <text name="session_start_string">
-                [NAME](으)��� 된 세션을 시작하는 중입니다. 잠시만 기다리십시오.
+                [NAME]���과의 세션을 시작하는 중입니다. 잠시만 기다리십시오.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
index e99555b..6f51f83 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
@@ -35,6 +35,9 @@
         <string name="hang_up">

                 음성 채팅에서 나왔습니다.

         </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

         <text name="live_help_dialog">

                 *** 도움말 요청에 오신 것을 환영합니다 *** 

 먼저, F1을 누르거나 지식창고(http://secondlife.com/ support/)에서 SL 도움말 페이지를 확인하십시오.

diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
index b93d4e7..a06c626 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
@@ -43,7 +43,7 @@
                 </layout_panel>

         </layout_stack>

         <string name="ringing">

-                그룹 음성 채팅에 참가 중...

+                그룹 음성 채팅에 참가 중

         </string>

         <string name="connected">

                 연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.

@@ -51,4 +51,31 @@
         <string name="hang_up">

                 그룹 음성 채팅에서 나왔습니다.

         </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

+        <string name="live_help_dialog">

+                *** 도움말 요청에 오신 것을 환영합니다 *** 

+        먼저, F1을 누르거나 고객지원(http://secondlife.com/ support/) 페이지에서 도움말을 확인하십시오. 

+        답변을 찾을 수 없는 경우, 질문을 입력하고 시작하면 응답 가능한 도우미가 곧 응답할 것입니다.

+        -=-=- 바쁜 시간대에는 응답에 지연이 있을 수 있습니다. -=-=-

+        </string>

+        <string name="title_string">

+                [NAME](과)와 메신저하기

+        </string>

+        <string name="typing_start_string">

+                [NAME]님 입력 중...

+        </string>

+        <string name="session_start_string">

+                [NAME]님과의 세션을 시작하는 중입니다. 잠시만 기다리십시오.

+        </string>

+        <string name="moderated_chat_label">

+                (중재됨)

+        </string>

+        <string name="default_text_label">

+                메신저를 사용하려면 여기를 클릭하십시오.

+        </string>

+        <string name="muted_text_label">

+                그룹 진행자에 의해 채팅 텍스트가 비활성화되었습니다.

+        </string>

 </floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_mute_object.xml b/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
new file mode 100644
index 0000000..864cffb
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="mute by name" title="이름별 오브젝트 음소거">

+        <text name="message">

+                이름별 음소거는 오브젝트 채팅과 메신저에만 영향을 주며 사운드에는 영향을 주지 않습니다.

+오브젝트의 이름을 정확하게 입력해야 합니다.

+        </text>

+        <line_editor name="object_name">

+                오브젝트 이름

+        </line_editor>

+        <button label="확인" name="OK" />

+        <button label="취소" name="Cancel" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
index 661713c..62dce9c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
@@ -49,4 +49,10 @@
         <text name="none_text">
                 -- 없음 --
         </text>
+        <text name="stop_txt">
+                중지
+        </text>
+        <text name="preview_txt">
+                미리보기
+        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_region_info.xml b/linden/indra/newview/skins/xui/ko/floater_region_info.xml
new file mode 100644
index 0000000..153cdc7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="regioninfo" />

diff --git a/linden/indra/newview/skins/xui/ko/menu_login.xml b/linden/indra/newview/skins/xui/ko/menu_login.xml
index 4dd9614..73bbf9c 100644
--- a/linden/indra/newview/skins/xui/ko/menu_login.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_login.xml
@@ -7,6 +7,7 @@
                 <menu_item_call label="환경 설정" name="Preferences..." />

         </menu>

         <menu label="도움말" name="Help">

+                <menu_item_call label="세컨드라이프 도움말" name="Second Life Help" />

                 <menu_item_call label="Second Life 정보" name="About Second Life..." />

         </menu>

 </menu_bar>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_long.xml b/linden/indra/newview/skins/xui/ko/need_to_long.xml
index 6ce7783..3e584c6 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_long.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_long.xml
@@ -1,60 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroupWithContribution/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The deed will include a simultaneous land

-contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        이 구획을 양도하는 데 있어서 이 그룹은 토지 사용을

-위한 충분한 크레딧이 있어야 합니다.

-양도에는 '[LAST_NAME] [FIRST_NAME]'이(가)

-그룹에게 행하는 동시 토지 기부 행위가 포함됩니다.

-토지 구매 가격은 소유주에게 환불되지

-않습니다. 양도된 구획이 판매되는 경우 판매

-가격은 그룹 회원에게 균등하게 분배됩니다.

- 

-[AREA] 제곱미터의 이 토지를 다음 그룹에게 양도하시겠습니까?

-&apos;[GROUP_NAME]&apos;

-                </f_translation>

-<f_old_trans>

-                        이 구획을 양도하는 데 있어서 이 그룹은 토지 사용을

-위한 충분한 신용이 있어야 합니다.

- 

-양도에는 &apos;[FIRST_NAME] [LAST_NAME]&apos;이(가)

-그룹에게 행하는 동시 토지 기부 행위가 포함됩니다.

- 

-토지 구매 가격은 소유주에게 환불되지

-않습니다. 양도된 구획이 판매되는 경우 판매

-가격은 그룹 회원에게 균등하게 분배됩니다.

- 

-[AREA]제곱미터의 이 토지를 다음 그룹에게 양도 하시겠습니까?

-&apos;[GROUP_NAME]&apos;

-                </f_old_trans>

-</string>

+

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_translate.xml b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
index 0ae8856..e00cbbd 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
@@ -1,293 +1,174 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        You need to be age-verified in order to access this parcel.

-Would you like to visit the Second Life website to verify your age?

-

-[_URL]

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        이 구획에 출입하려면 성인 인증이 필요합니다.

-Second Life 웹사이트를 방문하여 성인 인증을 하시겠습니까?

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/ignore</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Warn about lack of age verification

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        성인 인증 미완료에 관한 경고

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/Yes</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        예

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NotAgeVerified/No</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        No

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        아니오

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        This parcel requires that you have payment information on file before you can access it.

-Would you like to visit the Second Life website to set this up?

-

-[_URL]

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        이 구획에 출입 하려면 결제 수단 정보가 있어야 합니다.

-Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?

-

-[_URL]

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/ignore</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Warn about lack of payment info

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        결제 수단 미등록  경고

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/Yes</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Yes

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        예

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//Cannot enter parcel: no payment info on file/No</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        No

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        아니오

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/public_access</b_path>

+<string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Allow Public Access</e_new>

+<e_new>Type</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>일반 공개 허용</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Only Allow</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                                Restrict Access To:

-                        </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                                출입 제한 대상:

-                        </f_translation>

+<f_translation>유형</f_translation>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Residents who have given payment info to Linden Lab</e_new>

+<e_new>Name</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>린든랩��� 결제 정����� 제공한 사용자</f_translation>

+<f_translation>������</f_translation>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

+<b_path>/floaterland/landtab/land_objects_panel/owner list/</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

+<e_new>Count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>확인되지 않은 사용자는 �����이 차단됩��다.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

+<f_translation>����</f_translation>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Age-verified adults</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>성인 인증을 완료한 사용자</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_chatterbox.xml</a_file>

+<b_path>/floater_chatterbox</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

+<e_new>Communicate</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>성인 인증을 완료하지 않은 사용자는 출입이 차단됩니다. 자세한 사항은 support.secondlife.com을 참조하십시오.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/estate_override</b_path>

-<c_attribute></c_attribute>

+<f_translation>커뮤니케이트</f_translation>

+</string><string><a_file>floater_device_settings.xml</a_file>

+<b_path>/floater_device_settings</b_path>

+<c_attribute>title</c_attribute>

 <d_old></d_old>

-<e_new>One ore more of these options is set at the estate level</e_new>

+<e_new>Voice Chat Device Settings</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��러한 ���션 ��� ���나 ������이 ���유지 레벨에 ���정되어 있습니다.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>����� ������ ������ 설정</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Set group in the General tab.</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>일반 탭에서 ���룹��� 설정하십시오.</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>������...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Allows temporary access to this parcel</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>이 ���획에 ���한 ������ 통행�� 부여</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Anyone</b_path>

+<f_translation>발�������� ������.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Anyone

-                                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        모든 사람

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/pass_combo/Group</b_path>

+<f_translation>검색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/classified_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Group

-                                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        그룹

-                                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>발견되지 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED] 목록에 있음, [MAX] 최��)</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/events_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>추���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>���견되�� 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>추���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/popular_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_allowed</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>�����되지 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>제���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/BannedList</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/land_sales_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>([LISTED] listed, [MAX] max)</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>([LISTED] �������� ���음, [MAX] 최대)</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���견��지 ���음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>추���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/add_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>���색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Add...</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>추���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���견되�� 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>제���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/remove_banned</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>���색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Remove</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>�����되지 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>검색...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Communicate</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>커���������������</f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>���견������ ���음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/find_all_old_panel/searching_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���성 채팅 장치 설정</f_translation>

+<f_translation>검���...</f_translation>

 </string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_panel/redirect_404_url</b_path>

+<b_path>/directory/Directory Tabs/find_all_old_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>http://secondlife.com/app/search/notfound.html</e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>http://secondlife.com/app/search/notfound.html</f_translation>

+<f_translation>발견되지 않음.</f_translation>

 </string><string><a_file>floater_directory.xml</a_file>

 <b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

 <c_attribute>label</c_attribute>

@@ -302,6 +183,50 @@ Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?
 <e_new></e_new>

 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/no_ability_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You do not have that ability.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            해당 권한이 없습니다.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/not_a_mod_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You are not a session moderator.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            귀하는 현재 세션 진행자가 아닙니다.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_error</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            You have been muted.

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            귀하는 음소거된 상태입니다.

+        </f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/mute_agent_event</b_path>

+<c_attribute></c_attribute>

+<d_old></d_old>

+<e_new>

+            muting agent in

+        </e_new>

+<f_old_trans></f_old_trans>

+<f_translation>

+            에이전트 음소거

+        </f_translation>

 </string><string><a_file>floater_preview_classified.xml</a_file>

 <b_path>/classified_preview</b_path>

 <c_attribute>title</c_attribute>

@@ -323,6 +248,13 @@ Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?
 <e_new>Place Information</e_new>

 <f_old_trans></f_old_trans>

 <f_translation>장소 정보</f_translation>

+</string><string><a_file>floater_region_info.xml</a_file>

+<b_path>/regioninfo</b_path>

+<c_attribute>title</c_attribute>

+<d_old></d_old>

+<e_new>Region/Estate</e_new>

+<f_old_trans></f_old_trans>

+<f_translation>지역/사유지</f_translation>

 </string><string><a_file>floater_select_key.xml</a_file>

 <b_path>/modal container</b_path>

 <c_attribute>title</c_attribute>

@@ -330,110 +262,55 @@ Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?
 <e_new> </e_new>

 <f_old_trans></f_old_trans>

 <f_translation> </f_translation>

-</string><string><a_file>floater_texture_ctrl.xml</a_file>

-<b_path>/texture picker/choose_picture</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>&quot;Click to choose a picture&quot;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&quot;그림을 선택하려면 클릭하십시오.&quot;</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File</b_path>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>File</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>파일</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/File/Quit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_music</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Quit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>종료</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_media</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Edit</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>편집</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Edit/Preferences...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_voice</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Preferences...</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>환경 설정</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_sfx</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Help</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>도움말</f_translation>

-</string><string><a_file>menu_login.xml</a_file>

-<b_path>/Login Menu/Help/About Second Life...</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_wind</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>About Second Life...</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Second Life 정보</f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not a group member/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not a member of the appropriate group.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        구획에 입장할 수 없습니다. 해당 그룹의 회원이 아닙니다.

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: banned/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you have been banned.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        구획에 입장할 수 없습니다. 출입이 차단되었습니다.

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//Cannot enter parcel: not on access list/message</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cannot enter parcel, you are not on the access list.

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        구획에 입장할 수 없습니다. 출입 권한 리스트에 등록되어 있지 않습니다.

-                </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/AgeVerified</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                                , Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                , 성인 인증 완료

-                        </f_translation>

-</string><string><a_file>panel_avatar.xml</a_file>

-<b_path>/Panel Avatar/tab/2nd Life/NotAgeVerified</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_audio.xml</a_file>

+<b_path>/Media panel/mute_ui</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                                , Not Age-verified

-                        </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                , 성인 인증 미완료

-                        </f_translation>

+<f_translation></f_translation>

 </string><string><a_file>panel_groups.xml</a_file>

 <b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

@@ -442,54 +319,54 @@ Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?
 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

 </string><string><a_file>panel_login.xml</a_file>

-<b_path>/panel_login/forgot_password_url</b_path>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                http://secondlife.com/account/request.php

+                Forgot your password?

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                http://secondlife.com/account/request.php

+                암호를 잊으셨습니까?

         </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/Only Allow</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_url</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-              Restrict Access To:

-            </e_new>

+                http://secondlife.com/account/request.php

+        </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-              출입 제한 대상:

-            </f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

+                http://secondlife.com/account/request.php

+        </f_translation>

+</string><string><a_file>panel_master_volume.xml</a_file>

+<b_path>/master_volume/mute_master</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Residents with payment info on file</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>파일에 결제 정보가 있는 사용자</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_payment</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_bg</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban unidentified residents.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>확인되지 않은 사용자는 출입이 차단됩니다.</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/voice_channel_icon</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Age-verified adults</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>성인 인증을 완료한 사용자</f_translation>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/limit_age_verified</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

+<b_path>/voice_remote/channel_label</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Ban residents who have not verified their age. See support.secondlife.com for more information.</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>성인 인증을 완료하지 않은 사용자는 출입이 차단됩니다. 자세한 사항은 support.secondlife.com을 참조하십시오.</f_translation>

+<f_translation></f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_update.xml b/linden/indra/newview/skins/xui/ko/need_to_update.xml
index dc7995d..6671486 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_update.xml
@@ -1,1711 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//ConnectTimeout/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-시스템이 다운된 것일 수 있습니다.

-

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-시스템이 다운될 수 있습니다.

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CharacterSnapshotSaved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A snapshot of your character has been saved.

- 

-Visit the Webpage Studio exhibit to see it.

-                </d_old>

-<e_new>

-                        A snapshot of your character has been saved.

-Visit the Webpage Studio exhibit to see it.

-                </e_new>

-<f_translation>

-                        귀하의 아바타에 대한 스냅샷이 저장되었습니다.

-스냅샷을 보려면 Webpage Studio를 방문하십시오.

-                </f_translation>

-<f_old_trans>

-                        귀하의 아바타에 대한 스냅샷이 저장되었습니다.

- 

-스냅샷을 보려면 Webpage Studio를 방문하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CreateGroupCanAfford/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Creating a group costs L$[COST].

- 

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </d_old>

-<e_new>

-                        Creating a group costs L$[COST].

-To maintain the group for more than three days,

-you must reach a total of two or more members.

- 

-Create group?

-                </e_new>

-<f_translation>

-                        그룹을 생성하려면 L$[COST]가 듭니다.

-그룹을 3일 이상 유지하려면

-회원 수가 총 2인 이상이 되어야 합니다.

- 

-그룹을 생성하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        그룹을 생성하려면 L$[COST]가 듭니다.

- 

-그룹을 3일 이상 유지하려면

-회원 수가 총 3인 이상이 되어야 합니다.

- 

-그룹을 생성 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the group name, insignia, charter, titles, and founder on the

-[SECOND_LIFE] website. You are responsible for indicating if any

-of the above content is considered inappropriate for a minor

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        &quot;웹에 게시 옵션&quot;을 선택하면

-[SECOND_LIFE] 웹 사이트에 그룹 이름, 로고, 설립 조항, 타이틀 및 설립자 이름을

-게시할 수 있습니다. 커뮤니티 표준에 따라 사용자는

-위 컨텐츠 중 미성년자에게 적합하지 않은 부분이 있을 경우

-적절히 공지를 할 책임이 있습니다.

-                </f_translation>

-<f_old_trans>

-                        웹에 게시 옵션을 선택하면 

-[SECOND_LIFE] 

- 웹 사이트에 그룹 이름, 로고, 설립 조항, 타이틀 및 설립자 이름을 게시할 수 있습니다.상기 내용 중 지역 사회 기준으로 볼 때 

- 성인 전용으로 간주될 수 있는 내용이 있을 경우 그 사실을 

- 표시할 의무가 있습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ClickPublishHelpPostcard/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered Mature according to the

-Community Standards.

-                </d_old>

-<e_new>

-                        Selecting the &quot;Publish on the Web&quot; option allows us to publish

-the photographer&apos;s [SECOND_LIFE] name, subject line, location, message and

-snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any

-of the above content for each snapshot is considered inappropriate for a minor 

-according to the Community Standards.

-                </e_new>

-<f_translation>

-                        &quot;웹에 게시 옵션&quot;을 선택하면

-[SECOND_LIFE] 웹 사이트에 촬영자의 [SECOND_LIFE] 이름, 제목, 위치, 메시지 및

-스냅샷을 게시할 수 있습니다. 커뮤니티 표준에 따라 사용자는

-위의 각 스냅샷에 대한 컨텐츠 중 미성년자에게 적합하지 않은 부분이 있을 경우 

-적절히 공지를 할 책임이 있습니다.

-                </f_translation>

-<f_old_trans>

-                        웹에 게시 옵션을 선택하면 

-[SECOND_LIFE] 

- 웹 사이트에 촬영자의 [SECOND_LIFE] 이름, 제목, 위치, 메시지 및 스냅샷을 게시할 수 있습니다.상기 내용 중 지역 사회 기준으로 볼 때 

- 성인 전용으로 간주될 수 있는 스냅샷 내용이 있을 경우 그 사실을 

- 표시할 의무가 있습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmLandSaleChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

- 

-                </d_old>

-<e_new>

-                        The selected [LAND_SIZE] m2 land is being set for sale.

-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].

-                </e_new>

-<f_translation>

-                        선택된 [LAND_SIZE] 제곱미터의 토지는 판매용으로 설정되어 있습니다.

-판매 가격은 L$[SALE_PRICE]이고 [NAME]에게 판매가 승인됩니다.

-                </f_translation>

-<f_old_trans>

-                        선택된 [LAND_SIZE] 평방 미터의 토지가 판매용으로 설정되었습니다.

-판매 가격은 L$[SALE_PRICE]이고 [NAME]에게 판매가 승인됩니다.

- 

-이 변경 사항을 계속 적용하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MustHaveAccountToLogIn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You must have an account to connect to [SECOND_LIFE].

- 

-Go to www.secondlife.com to create an account?

-                </d_old>

-<e_new>

-                        You must have an account to connect to [SECOND_LIFE].

-Go to www.secondlife.com to create an account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하려면 계정을 갖고 있어야 합니다.

-www.secondlife.com으로 이동하여 새로운 계정을 만드시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하려면 계정을 갖고 있어야 합니다.

- 

-www.secondlife.com으로 이동하여 새로운 계정을 만드시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

- 

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

- 

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </d_old>

-<e_new>

-                        Classified ads appear in the &apos;Classified&apos; section of the

-Search directory and on www.secondlife.com for one week.

-Fill out your ad, then click &apos;Publish...&apos; to add it to the

-directory.

-You&apos;ll be asked for a price to pay when clicking Publish.

-Paying more makes your ad appear higher in the list, and

-also appear higher when people search for keywords.

-                </e_new>

-<f_translation>

-                        안내 광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션 및

-www.secondlife.com에 나타납니다.

-광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에

-추가합니다.

-게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.

-더 높은 가격을 지불할수록 목록에서 더 높은 위치에 게재되고

-키워드 검색 시 결과에 더 우선적으로 표시됩니다.

-                </f_translation>

-<f_old_trans>

-                        분류된 광고가 1주일 동안 디렉토리의 &apos;광고&apos; 섹션에

-나타납니다.

- 

-광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에

-추가합니다.

- 

-게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.

-더 높은 가격을 지불할수록 목록에서 더 높은 위치에 게재되고

-키워드 검색 시 결과에 더 우선적으로 표시됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DisplayChangeRestart/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

- 

-Apply those changes and quit

-                </d_old>

-<e_new>

-                        Some of the display changes that you have made

-require [SECOND_LIFE] to shut down immediately,

-which will cause you to lose any work in progress.

-

-Apply those changes and quit?

-                </e_new>

-<f_translation>

-                        일부 디스플레이 변경 사항을 적용하려면

-[SECOND_LIFE]를 즉시 종료해야 합니다.

-그렇지 않으면 진행 중인 모든 작업이 손실됩니다.

-

-해당 변경 사항을 적용한 후 종료하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        일부 디스플레이 변경 사항을 적용하려면

-[SECOND_LIFE]를 즉시 종료해야 합니다.

-그렇지 않으면 진행 중인 모든 작업이 손실됩니다.

- 

-해당 변경 사항을 적용한 후 종료하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotFindDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        서버 도메인 이름을 찾을 수 없습니다.

-이로 인해 네트워크 연결이 손실되거나 서버 문제가

-발생할 수 있습니다.

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        서버 도메인 이름을 찾을 수 없습니다.

-이로 인해 네트워크 연결이 손실되거나 서버 문제가

-발생할 수 있습니다.

- 

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectDNSError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-DNS could not resolve the host name.

-

-Please verify that you can connect to the www.secondlife.com

-web site.  If you can, but continue to receive this error,

-please go to www.secondlife.com/support and report this problem.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-DNS가 호스트 이름을 확인할 수 없습니다.

-

-www.secondlife.com 웹사이트에 연결할 수 있는지 여부를

-확인하십시오.  연결이 되어 있지만 이 오류가 계속 발생하는 경우

-www.secondlife.com/support로 이동하여 이 문제를 신고해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-DNS가 호스트 이름을 확인할 수 없습니다.

-www.secondlife.com 웹사이트에 연결할 수 있는지 여부를

-확인하십시오.  연결이 되었지만 이 오류가 계속 발생하는 경우

-지원 섹션으로 이동하여 이 문제를 신고해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectSecurityError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-Please ensure the time and date are set correctly.

- 

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to establish a secure connection to the login server.

-Often this means that your computer&apos;s clock is set incorrectly.

-

-Please ensure the time and date are set correctly.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        로그인 서버에 대한 보안 연결을 설정할 수 없습니다.

-종종 이 문제는 컴퓨터 시계가 잘못 설정된 것을 의미합니다.

-

-제어판으로 이동하여 시간과 날짜가 올바르게 설정되었는지 확인하십시오.

-이 오류가 계속해서 발생하는 경우에는

-www.secondlife.com/support로 이동한 다음

-문제를 신고해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        로그인 서버에 대한 보안 연결을 설정할 수 없습니다.

-종종 이 문제는 컴퓨터 시계가 잘못 설정된 것을 의미합니다.

-제어판으로 이동하여 시간과 날짜가 올바르게 설정되었는지

-확인하십시오.

- 

-이 오류가 계속해서 발생하는 경우에는

-SecondLife.com 웹사이트의 Support 섹션으로 이동한 후

-문제를 신고해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectVerificationError/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-The login server couldn&apos;t verify itself via SSL.

-

-If you continue to receive this error, please go

-to www.secondlife.com/support

-and report the problem.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-SSL을 통해 로그인 서버가 확인되지 않습니다.

-

-이 오류가 계속해서 발생하는 경우에는

-www.secondlife.com/support로 이동한 다음

-문제를 신고해 주십시오..

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-SSL을 통해 로그인 서버가 확인되지 않습니다.

-이 오류가 계속해서 발생하는 경우에는

-SecondLife.com 웹사이트의 Support 섹션으로 이동한 다음

-문제를 신고해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs

-Thank you.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-예상치 못한 문제가 발생했습니다.

-

-www.secondlife.com/support로 이동한 다음

-문제를 신고해 주십시오..  가능하면 C:\Documents and Settings\(name)\Application Data\SecondLife\logs에

-있는 SecondLife.log 파일을 함께 보내주십시오.

-감사합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-최선의 노력에도 불구하고 예상치 못한 문제가 발생했습니다.

-SecondLife.com 웹사이트의 Support 섹션에서

-문제를 신고해 주십시오.  가능하면 C:\Documents and Settings\(name)\Application Data\SecondLife\logs에

-있는 귀하의 SecondLife.log 파일을 함께 보내주십시오.

-감사합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectUnknownErrorDarwin/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE].

-Despite our best efforts, something unexpected has gone wrong.

-

-Please go to www.secondlife.com/support

-and report the problem.  If possible, include your SecondLife.log

-file from: ~/Library/Application Support/SecondLife/logs

-Thank you.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-예상치 못한 문제가 발생했습니다.

-

-www.secondlife.com/support로 이동한 다음

-문제를 신고해 주십시오..  가능하면 ~/Library/Application Support/SecondLife/logs에

-있는 SecondLife.log 파일을 함께 보내주십시오.

-감사합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-최선의 노력에도 불구하고 예상치 못한 문제가 발생했습니다.

-SecondLife.com 웹사이트의 Support 섹션에서

-문제를 신고해 주십시오.  가능하면 ~/Library/Application Support/SecondLife/logs에

-있는 귀하의 SecondLife.log 파일을 함께 보내주십시오.

-감사합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveLoginToken/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        There was a problem resolving your login

-authentication token. Please try logging in

-again. If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        There was a problem resolving your login

-authentication token. Please try logging in again. 

-

-If you continue to receive this error,

-please go to www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        로그인 인증을 확인하는 중 문제가

-발생했습니다. 로그인을 다시 시도해 보시기 바랍니다. 

-

-이 오류가 계속해서 발생하는 경우에는

-www.secondlife.com/support에서 관련 정보를 참고하십시오.

-                </f_translation>

-<f_old_trans>

-                        로그인 인증을 확인하는 중 문제가

-발생했습니다. 로그인을 다시 시도해

-보시되 오류가 계속해서 발생하는 경우에는

-SecondLife.com 웹사이트의 Support 섹션에서 관련정보를 참고 하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotConnectNoMessage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unknown problem trying to connect.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unknown problem trying to connect.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        연결을 시도하는 중 알 수 없는 문제가 발생했습니다.

-

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        연결을 시도하는 중 알 수 없는 문제가 발생했습니다.

-(서버의 공백 오류 메시지)

- 

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRunDialog/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 설치가 완료되었습니다.

-

-[SECOND_LIFE]를 처음 사용하시는 경우 먼저 계정을 만들어야

-로그인할 수 있습니다.

-www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 설치가 완료되었습니다.

- 

-[SECOND_LIFE]를 처음 사용하시는 경우 먼저 계정을 만들어야

-로그인할 수 있습니다.

- 

-www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResolveDomain/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [DOMAIN]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        서버에 연결하지 못했습니다.

-다음 도메인 이름을 확인할 수 없습니다: [DOMAIN]

-

-네트워크 연결을 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        서버에 연결하지 못했습니다.

-다음 도메인 이름을 확인할 수 없습니다: [DOMAIN]

-네트워크 연결을 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLife/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar. 

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]! 

-

-Use arrow keys to walk.

-Please choose the male or female avatar. 

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 오신 것을 환영합니다! 

-

-화살표 키를 이용하여 걸을 수 있습니다.

-남성 또는 여성 캐릭터를 선택해 주십시오. 

-캐릭터는 차후에 변경이 가능합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 오신 것을 환영합니다! 

- 

-화살표 키를 이용하여 걸을 수 있습니다.

- 

-남성 또는 여성 캐릭터를 선택해 주십시오. 

-차후에 변경이 가능합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeToSecondLifeSimple/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Welcome to [SECOND_LIFE]! 

- 

-Use arrow keys to walk.

- 

-Please choose the male or female avatar.

-                </d_old>

-<e_new>

-                        Welcome to [SECOND_LIFE]!

-

-Use arrow keys to walk.

-Please choose the male or female avatar.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 오신 것을 환영합니다!

-

-화살표 키를 이용하여 걸을 수 있습니다.

-남성 또는 여성 캐릭터를 선택해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 오신 것을 환영합니다! 

- 

-화살표 키를 이용하여 걸을 수 있습니다.

- 

-남성 또는 여성 캐릭터를 선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PromptGoToCurrencyPage/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [EXTRA]

- 

- 

-Go to [URL] for information on purchasing currency?

-                </d_old>

-<e_new>

-                        [EXTRA]

-

-Go to [URL] for information on purchasing currency?

-                </e_new>

-<f_translation>

-                        [EXTRA]

-

-린든달러(L$) 구매 정보를 보기 위해 [URL](으)로 이동하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [EXTRA]

- 

- 

-린든달러(L$) 구매 정보를 보기 위해 [URL](으)로 이동하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkModify/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  Make sure none are locked, and that

-you own all of them.

-                </d_old>

-<e_new>

-                        Unable to link because you don&apos;t have modify permission

-on all the objects.  

-

-Please make sure none are locked, and that you own all of them.

-                </e_new>

-<f_translation>

-                        모든 오브젝트에 대한 수정 권한이 없으므로

-연결할 수 없습니다.  

-

-잠겨 있는 오브젝트가 없는지, 모든 오브젝트를 소유하고 있는지 여부를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        모든 오브젝트에 대한 수정 권한이 없으므로

-연결할 수 없습니다.  잠겨 있는 오브젝트가 없는지, 모든 오브젝트를 소유하고 있는지

-여부를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotLinkDifferentOwners/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to link because not all of the objects have the

-same owner. Make sure you own all of the selected objects.

-                </d_old>

-<e_new>

-                        Unable to link because not all of the objects have the

-same owner. 

-

-Please make sure you own all of the selected objects.

-                </e_new>

-<f_translation>

-                        모든 오브젝트가 동일한 소유자를 갖고 있지 않으므로

-연결할 수 없습니다. 

-

-선택한 모든 오브젝트를 소유하고 있는지 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        모든 오브젝트가 동일한 소유자를 갖고 있지

-않으므로 연결할 수 없습니다. 선택한 모든 오브젝트를 소유하고 있는지 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//NoFileExtension/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        No file extension for the file: &apos;[FILE]&apos;

-Please make sure the file has a correct file extension

-                </d_old>

-<e_new>

-                        No file extension for the file: &apos;[FILE]&apos;

-

-Please make sure the file has a correct file extension.

-                </e_new>

-<f_translation>

-                        파일 확장자 없음: &apos;[FILE]&apos;

-

-파일 확장자가 올바른지 확인해주십시오.

-                </f_translation>

-<f_old_trans>

-                        파일 확장자 없음: &apos;[FILE]&apos;

-파일 확장자가 올바른 지 확인하세요.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotRecompileSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;recompilation&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;recompilation&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;리컴파일링&apos;을 수행할 수 없음.

-

-수정 권한이 있는 스크립트의 오브젝트를

-선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        리컴파일링을 수행할 수 없음.

-내가 수정할 권한이 있는 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        &apos;초기화&apos;를 수행할 수 없음.

-

-올바른 스크립트의 오브젝트를 선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        초기화를 수행할 수 없음.

-올바른 

- 스크립트의 오브젝트틀 선택합니다..

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotResetSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to perform &apos;reset&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to perform &apos;reset&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        &apos;초기화&apos;를 수행할 수 없음.

-

-수정 권한이 있는 스크립트의 오브젝트를

-선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        초기화를 수행할 수 없음.

-내가 수정할 권한이 있는 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        스크립트를 &apos;실행&apos;함으로 설정할 수 없음.

-

-올바른 스크립트의 오브젝트를 선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        스크립트를 실행 함으로 설정할 수 없음.

-올바른 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Not able to set any scripts to &apos;running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Not able to set any scripts to &apos;running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        스크립트를 &apos;실행&apos;함으로 설정할 수 없음.

-

-수정 권한이 있는 스크립트의 오브젝트를

-선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        스크립트를 실행 함으로 설정할 수 없음.

-내가 수정할 권한이 있는 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoScripts/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts.

-                </e_new>

-<f_translation>

-                        스크립트를 &apos;실행 안 함&apos;으로 설정할 수 없음.

-

-올바른 스크립트의 오브젝트를 선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        스크립트를 실행 안 함으로 설정할 수 없음.

-올바른 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSetRunningNotSelectObjectsNoPermission/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to set any scripts to &apos;not running&apos;.

-Select objects with scripts that you

-have permission to modify.

-                </d_old>

-<e_new>

-                        Unable to set any scripts to &apos;not running&apos;.

-

-Select objects with scripts that you

-have permission to modify.

-                </e_new>

-<f_translation>

-                        스크립트를 &apos;실행 안 함&apos;으로 설정할 수 없음.

-

-수정 권한이 있는 스크립트의 오브젝트를

-선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        스크립트를 실행 안 함으로 설정할 수 없음.

-내가 수정할 권한이 있는 

- 스크립트의 오브젝트틀 선택합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        선택 항목이 여러 지역에 분산되어 있기 때문에 토지를 매입할 수 없습니다.

-

-더 작은 영역을 선택한 후 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        선택 항목이 여러 지역에 분산되어 있기 때문에 토지를 매입할 수 없습니다.

-더 작은 영역을 선택한 후 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        토지를 구매하지 못했습니다:

-여러 개의 각기 다른 구획이 선택되었습니다.

-

-더 작은 영역을 선택해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 구매하지 못했습니다:

-여러 개의 각기 다른 구획이 선택되었습니다.

-더 작은 영역을 선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandMultipleSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Multiple parcels selected.

-Try selecting a single parcel.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Multiple parcels selected.

-

-Try selecting a single parcel.

-                </e_new>

-<f_translation>

-                        토지를 양도하지 못했습니다:

-여러 개의 각기 다른 구획이 선택되었습니다.

-

-더 작은 영역을 선택해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 양도하지 못했습니다:

-여러 개의 각기 다른 구획이 선택되었습니다.

-더 작은 영역을 선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMusic/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming music. 

- 

-Music requires a 768 kbps or faster

-Internet connection.

- 

-Play music when available?

-                </d_old>

-<e_new>

-                        This location can play streaming music. 

-Music requires a 768 kbps or faster

-Internet connection.

-

-Play music when available?

-                </e_new>

-<f_translation>

-                        이 지역에서는 스트리밍 음악을 재생할 수 있습니다. 

-음악을 재생하려면 768 kbps 이상의

-인터넷 연결이 필요합니다.

-

-가능한 경우 음악을 재생하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        이 지역에서는 스트리밍 음악을 재생할 수 있습니다. 

- 

-음악을 재생 하려면 768 kbps 이상의

-인터넷 연결이 필요합니다.

- 

-음악 유효시 재생 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This location can play streaming video. 

- 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

- 

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        이 지역에서는 스트리밍 비디오를 재생할 수 있습니다. 

-스트리밍 비디오를 재생하려면 768 kbps 이상의 

-인터넷 연결이 필요합니다.

- 

-가능한 경우 스트리밍 비디오를 재생하시겠습니까?

-(나중에 '환경 설정 &gt; 사운드/비디오'에서 

-이 옵션을 변경할 수 있습니다.)

-                </f_translation>

-<f_old_trans>

-                        이 지역에서는 스트리밍 비디오를 재생할 수 있습니다. 

- 

-스트리밍 비디오를 재생하려면 768 kbps 이상의 

-인터넷 연결이 필요합니다.

- 

-스트리밍 비디오 유효시 재생 하시겠습니까?

- 

-(환경 설정 &gt;사운드/ 비디오 에서 

-옵션을 변경할 수 있습니다.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Waiting for server to report cost.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Waiting for server to report cost.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        토지를 구매하지 못했습니다:

-서버가 비용을 보고할 때까지 기다리는 중입니다.

-

-몇 초 후 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 구매하지 못했습니다:

-서버가 비용을 보고할 때까지 기다리는 중입니다.

-몇 초 후 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDeedLandWaitingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to deed land:

-Waiting for server to report ownership.

-Please try again.

-                </d_old>

-<e_new>

-                        Unable to deed land:

-Waiting for server to report ownership.

-

-Please try again.

-                </e_new>

-<f_translation>

-                        토지를 양도하지 못했습니다:

-서버가 소유권을 보고할 때까지 기다리는 중입니다.

-

-몇 초 후 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 양도하지 못했습니다:

-서버가 소유권을 보고할 때까지 기다리는 중입니다.

-몇 초 후 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotButLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        토지를 구매하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-

-도구 -&gt; 오류 보고에서 버그를 신고해주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 구매하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-도구 -&gt; 버그 신고 에서 신고하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandForGroupNotOfficer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-Please activate another group using Edit -&gt; Groups...

-                </d_old>

-<e_new>

-                        Unable to buy land for the group:

-You are not an officer in your current group.

-

-Please activate another group using Edit -&gt; Groups...

-                </e_new>

-<f_translation>

-                        그룹을 대신해 토지를 매입하지 못했습니다:

-귀하는 현재 그룹에서 간부가 아닙니다.

-

-'편집 -&gt; 그룹...'을 이용하여 다른 그룹을 활성화하십시오.

-                </f_translation>

-<f_old_trans>

-                        그룹을 대신해 토지를 매입하지 못했습니다:

-귀하는 현재 그룹에서 간부가 아닙니다.

-편집 -&gt; 그룹...을 이용하여 다른 그룹을 활성화하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandWatingForServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-Try again in a few seconds.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Waiting for server to update parcel information.

-

-Try again in a few seconds.

-                </e_new>

-<f_translation>

-                        토지를 포기하지 못했습니다:

-서버의 구획 정보 업데이트를 대기 중입니다.

-

-몇 초 후 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 포기하지 못했습니다:

-서버가 비용을 보고할 때까지 기다리는 중입니다.

-몇 초 후 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-Please select a single parcel.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You do not own all the parcels selected.

-

-Please select a single parcel.

-                </e_new>

-<f_translation>

-                        토지를 포기하지 못했습니다:

-선택된 모든 구획을 소유하고 있지 않습니다.

-

-한 개의 구획을 선택하십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 포기하지 못했습니다:

-여러 개의 각기 다른 구획이 선택되었습니다.

-더 작은 영역을 선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandRegionNotFound/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        토지를 포기하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-

-도구 -&gt; 오류 보고에서 버그를 신고해주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 포기하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-도구 -&gt; 버그 신고 에서 신고하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotReleaseLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-Select an entire parcel, or divide your parcel first.

-                </d_old>

-<e_new>

-                        Unable to abandon land:

-You must select an entire parcel to release it.

-

-Select an entire parcel, or divide your parcel first.

-                </e_new>

-<f_translation>

-                        토지를 포기하지 못했습니다:

-토지를 포기하려면 전체 구획을 선택해야 합니다.

-

-전체 구획을 선택하거나 자신의 구획을 먼저 분할하십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 포기하지 못했습니다:

-토지를 방출하려면 전체 구획을 선택해야 합니다.

-전체 구획을 선택하려면 더블 클릭하거나 

-먼저 구획을 분할해 보십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReleaseLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

- 

-Release this land?

-                </d_old>

-<e_new>

-                        You are about to release [AREA] m2 of land.

-Releasing this parcel will remove it from your land

-holdings, but will not grant any L$.

-

-Release this land?

-                </e_new>

-<f_translation>

-                        귀하께서는 토지의 [AREA] 제곱미터를 포기하려고 합니다.

-이 구획을 포기하면 소유한 토지에서 제거되지만

-토지에 대한 크레딧(L$)이 적립되지 않습니다.

-

-이 토지를 포기하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        귀하께서는 토지의 [AREA] 평방 미터를 방출하려고 합니다.

-이 구획을 방출하면 소유한 토지에서 제거되지만

-토지에 대한 신용(L$)이 적립되지 않습니다.

- 

-이 토지를 방출하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNothingSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-No parcels selected.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-No parcels selected.

-                </e_new>

-<f_translation>

-                        토지를 분할하지 못했습니다:

-

-선택한 항목이 없습니다.

-                </f_translation>

-<f_old_trans>

-                        토지를 분할하지 못했습니다:

-선택한 항목이 없습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandPartialSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-

-You have an entire parcel selected.

-Try selecting a part of the parcel.

-                </e_new>

-<f_translation>

-                        토지를 분할하지 못했습니다:

-

-전체 구획을 선택하셨습니다.

-영역을 클릭하고 드래그하여 더 작은 영역을 선택해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 분할하지 못했습니다:

-전체 구획을 선택하셨습니다.

-영역을 클릭하고 드래그하여 더 작은 영역을

-선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotDivideLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to divide land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to divide land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        토지를 분할하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-

-도구 -&gt; 오류 보고에서 버그를 신고해주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 분할하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-도구 -&gt; 버그 신고 에서 신고하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandNoRegion/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-Cannot find the region this land is in.

-Please use Tools -&gt; Report Bug to report this.

-                </d_old>

-<e_new>

-                        Unable to join land:

-Cannot find the region this land is in.

-

-Please use Tools -&gt; Report Bug to report this.

-                </e_new>

-<f_translation>

-                        토지를 결합하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-

-도구 -&gt; 오류 보고에서 버그를 신고해주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 결합하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-&apos;도구 -&gt; 오류보고&apos;에서 신고하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandEntireParcelSelected/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You only have one parcel selected.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You only have one parcel selected.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        토지를 결합하지 못했습니다:

-선택한 구획만을 소유하는 상태입니다.

-

-두 구획을 가로 지르는 토지를 선택하여 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 결합하지 못했습니다:

-전체 구획을 선택하셨습니다.

-영역을 클릭하고 드래그하여 더 큰 영역을

-선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotJoinLandSelection/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to join land:

-You must select more than one parcel.

-Select land across both parcels.

-                </d_old>

-<e_new>

-                        Unable to join land:

-You must select more than one parcel.

-

-Select land across both parcels.

-                </e_new>

-<f_translation>

-                        토지를 결합하지 못했습니다:

-둘 이상의 구획을 선택해야 합니다.

-

-두 구획을 가로 지르는 토지를 선택하여 주십시오.

-                </f_translation>

-<f_old_trans>

-                        토지를 결합하지 못했습니다:

-둘 이상의 구획을 선택해야 합니다.

-영역을 클릭하고 드래그하여 더 큰 영역을

-선택해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//JoinLandWarning/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

- 

-You will need to reset the name and options of the 

-new parcel. 

- 

-Join land?

-                </d_old>

-<e_new>

-                        Joining this land will create one large parcel 

-out of all parcels intersecting the selected rectangle. 

-You will need to reset the name and options of the 

-new parcel.

- 

-Join land?

-                </e_new>

-<f_translation>

-                        이 토지를 결합하면 선택한 사각형을 통과하는 모든 구획으로부터 

-큰 구획이 만들어집니다. 

-새로운 구획의 이름과 옵션을 재설정해야 

-합니다.

- 

-토지를 결합하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        이 토지의 결합은 선택한 사각형과 교차하는 모든 구획들로 하나의 큰 구획을 만듭니다.

- 

-새로운 

-구획의 이름과 옵션을 재설정해야 합니다. 

- 

-토지를 결합 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotSaveToAssetStore/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </d_old>

-<e_new>

-                        Unable to save [NAME] to central asset store.

-This is usually a temporary failure. Please

-customize and save the wearable again in a

-few minutes. 

-

-If this problem persists, please

-click on the &apos;Tools | Report Bug&apos; pull down menu

-and provide details about your network setup.

-                </e_new>

-<f_translation>

-                        [NAME](을)를 중앙 자산 매장에 저장하는 데 실패했습니다.

-보통 일시적인 장애 현상입니다. 착용물을

-맞춤화한 후 다시

-저장해보십시오. 

-

-같은 문제가 계속될 경우

-&apos;도구 | 오류 보고&apos; 풀다운 메뉴를 클릭하고

-네트워크 설정에 관한 세부 사항을 입력하십시오.

-                </f_translation>

-<f_old_trans>

-                        [NAME](을)를 중앙 자산 매장에 저장하는데 실패했습니다.

-보통 일시적 장애입니다. 착용물을

-맞춤화한 후 다시 저장해보십시오. 같은 문제가 계속될 경우

-도구 &gt; 오류보고 풀다운 메뉴를 클릭하고

-네트워크 설정에 관한 세부 사항을 입력하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AppEarlyExit/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. Please

-uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </d_old>

-<e_new>

-                        [MESSAGE]

- 

-We are unable to recover from this problem. 

-

-Please uninstall and reinstall before trying again. If this

-problem persists, check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                        [MESSAGE]

- 

-이 문제를 복구할 수 없습니다. 

-

-설치 제거 후 다시 설치한 다음 시도해 주시기 바랍니다. 문제가

-지속되면 www.secondlife.com/support에서

-기술 지원 FAQ를 참조하십시오.

-                </f_translation>

-<f_old_trans>

-                        [MESSAGE]

- 

-이 문제를 복구할 수 없습니다. 설치

-제거후 다시 설치한 다음 시도해 주시기 바랍니다. 문제가

-계속되면 www.secondlife.com/support에서

-기술 지원 FAQ를 참조하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//YouHaveBeenLoggedOut/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have been logged out of [SECOND_LIFE]:

- 

-[MESSAGE]

- 

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </d_old>

-<e_new>

-                        You have been logged out of [SECOND_LIFE]:

-[MESSAGE]

-

-Click Continue to look at existing IM and chat.

-You will not be able to perform any other operations.

-Click Quit to exit [SECOND_LIFE] immediately.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에서 로그아웃하셨습니다:

-[MESSAGE]

-

-기존의 메신저와 채팅을 보려면 '계속'을 클릭하십시오.

-다른 작업은 수행할 수 없습니다.

-[SECOND_LIFE]를 즉시 끝내려면 '종료'를 클릭하십시오.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에서 로그아웃하셨습니다:

- 

-[MESSAGE]

- 

-기존의 메신저와 채팅을 보려면 &apos;계속&apos;을 클릭하십시오.

-다른 작업은 수행할 수 없습니다.

-[SECOND_LIFE]를 즉시 끝내려면 &apos;종료&apos;를 클릭하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AddFriend/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

- 

-Offer friendship to [NAME]?

-                </d_old>

-<e_new>

-                        Friends can give permissions to 

-track each other on the map and 

-receive online status updates. 

-

-Offer friendship to [NAME]?

-                </e_new>

-<f_translation>

-                        친구들은 

-지도에서 서로의 위치를 추적할 수 있으며 

-온라인 상태 업데이트도 받을 수 있습니다. 

-

-[NAME]에게 친구 추가를 요청하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        친구들은 

-지도에서 서로 추적할 수 있으며  

-온라인 상태 업데이트도 받을 수 있습니다. 

- 

-[NAME]에게 우정을 제공하겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedPublicObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to delete all scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on all others land in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to delete all scripted objects owned by

-** [AVATAR_NAME] **

-on all others land in this sim?

-                </e_new>

-<f_translation>

-                        이 시뮬레이션 내 해당 아바타(소유자:

-** [AVATAR_NAME] **

-)의 타인의 토지에 있는 스크립트 오브젝트를 모두 삭제하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        이 시뮬레이션 내 모든 타인 토지에서 스크립트 오브젝트(소유자:

- 

-** [AVATAR_NAME] **

- 

-)를 모두 삭제하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllScriptedObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL scripted objects owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL scripted objects owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        이 시뮬레이션 내 해당 아바타(소유자:

-** [AVATAR_NAME] **

-)의 모든 토지에 있는 스크립트 오브젝트를 모두 삭제하시겠습니까

-                </f_translation>

-<f_old_trans>

-                        이 시뮬레이션 내 모든 토지의 모든 스크립트 오브젝트(소유자:

- 

-** [AVATAR_NAME] **

- 

-)를 삭제하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//GodDeleteAllObjectsByUser/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

- 

-** [AVATAR_NAME] **

- 

-on ALL LAND in this sim?

-                </d_old>

-<e_new>

-                        Are you sure you want to DELETE ALL objects (scripted or not)

-owned by

-** [AVATAR_NAME] **

-on ALL LAND in this sim?

-                </e_new>

-<f_translation>

-                        이 시뮬레이션 내 해당 아바타(

-소유자:

-** [AVATAR_NAME] **

-)의 모든 토지의 오브젝트를 모두 삭제하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        이 시뮬레이션 내 모든 토지의 오브젝트를 모두 삭제하시겠습니까?

-소유자:

- 

-** [AVATAR_NAME] **

- 

-(스크립트 오브젝트 여부 무관)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//ErrorEncodingSnapshot/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

@@ -1721,644 +17,13 @@ on ALL LAND in this sim?
                         스냅샷 인코딩 중 오류가 발생했습니다.

                 </f_old_trans>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmObjectTakeLockNoOwn/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

-Are you sure you want to take these items?

-                </d_old>

-<e_new>

-                        At least one object is locked.

-You do not own all of the objects you are taking.

-If you continue, next owner permissions will be

-applied and possibly restrict your

-ability to modify or copy them.

-However, you can take the current selection.

-

-Are you sure you want to take these items?

-                </e_new>

-<f_translation>

-                        1개 이상의 오브젝트가 잠겨 있습니다.

-가져오려는 오브젝트 중 일부가 귀하의 소유가 아닙니다.

-계속하면 오브젝트에 다음 소유자 권한이

-적용되어 이후에 귀하가 수정하거나 복사할

-권한이 제한될 수 있습니다.

-하지만 현재 원하는 아이템을 선택할 수 있습니다.

-

-이 아이템을 소유하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        1개 이상의 오브젝트가 잠겨 있습니다.

-가지려는 오브젝트 중 일부가 귀하의 소유가 아닙니다.

-계속하면 오브젝트에 다음 소유자 권한이

-적용되어 이후에 귀하가 수정하거나 복사할

-권한이 제한될 수 있습니다.

-하지만 현재 원하는 아이템을 선택할 수 있습니다.

-이 아이템을 소유 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CantBuyLandAcrossMultipleRegions/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to buy land because selection spans multiple regions.

-Please select a smaller area and try again.

-                </d_old>

-<e_new>

-                        Unable to buy land because selection spans multiple regions.

-

-Please select a smaller area and try again.

-                </e_new>

-<f_translation>

-                        선택 항목이 여러 지역에 분산되어 있기 때문에 토지를 매입할 수 없습니다.

-

-더 작은 영역을 선택한 후 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        선택 항목이 여러 지역에 분산되어 있기 때문에 토지를 매입할 수 없습니다.

-더 작은 영역을 선택한 후 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DeedLandToGroup/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

- 

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

- 

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </d_old>

-<e_new>

-                        By deeding this parcel, the group will be required

-to have and maintain sufficient land use credits.

-The purchase price of the land is not refunded to

-the owner. If a deeded parcel is sold, the sale

-price will be divided evenly among group members.

-

-Deed this [AREA] m2 of land to the group

-&apos;[GROUP_NAME]&apos;?

-                </e_new>

-<f_translation>

-                        이 구획을 양도하는 데 있어서 이 그룹은 토지 사용을

-위한 충분한 크레딧이 있어야 합니다.

-토지 구매 가격은 소유주에게 환불되지

-않습니다. 양도된 구획이 판매되는 경우 판매

-가격은 그룹 회원에게 균등하게 분배됩니다.

-

-[AREA] 제곱미터의 이 토지를 다음 그룹에게 양도하시겠습니까?

-&apos;[GROUP_NAME]&apos;?

-                </f_translation>

-<f_old_trans>

-                        이 구획을 양도하는 데 있어서 이 그룹은 토지 사용을

-위한 충분한 신용이 있어야 합니다.

- 

-토지 구매 가격은 소유주에게 환불되지

-않습니다. 양도된 구획이 판매되는 경우 판매

-가격은 그룹 회원에게 균등하게 분배됩니다.

- 

-[AREA]제곱미터의 이 토지를 다음 그룹에게 양도 하시겠습니까?

-&apos;[GROUP_NAME]&apos;

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CanNotFindServer/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to find the server domain name.

-This could be the result of a lost network connection

-or a server problem.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        서버 도메인 이름을 찾을 수 없습니다.

-이로 인해 네트워크 연결이 손실되거나 서버 문제가

-발생할 수 있습니다.

-

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        서버 도메인 이름을 찾을 수 없습니다.

-이로 인해 네트워크 연결이 손실되거나 서버 문제가

-발생할 수 있습니다.

- 

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SystemMayBeDown/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect to [SECOND_LIFE]

-The system may be down.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-시스템이 다운된 것일 수 있습니다.

-

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE]에 연결하지 못했습니다.

-시스템이 다운될 수 있습니다.

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//AvatarMoved/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your [TYPE] location is not currently available.

-[HELP] 

-You have been moved into a nearby region.

-                </d_old>

-<e_new>

-                        Your [TYPE] location is not currently available. [HELP] 

-You have been moved into a nearby region.

-                </e_new>

-<f_translation>

-                        현재 [TYPE] 위치를 사용할 수 없습니다. [HELP] 

-귀하는 주변의 지역으로 옮겨졌습니다.

-                </f_translation>

-<f_old_trans>

-                        현재 [TYPE] 위치를 사용할 수 없습니다.

-[HELP] 

-귀하는 주변의 지역으로 옮겨졌습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FirstRun/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        [SECOND_LIFE] installation is complete.

- 

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

- 

-Return to www.secondlife.com to create a new account?

-                </d_old>

-<e_new>

-                        [SECOND_LIFE] installation is complete.

-

-If this is your first time using [SECOND_LIFE], you will need to create

-an account before you can log on.

-Return to www.secondlife.com to create a new account?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 설치가 완료되었습니다.

-

-[SECOND_LIFE]를 처음 사용하시는 경우 먼저 계정을 만들어야

-로그인할 수 있습니다.

-www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 설치가 완료되었습니다.

- 

-[SECOND_LIFE]를 처음 사용하시는 경우 먼저 계정을 만들어야

-로그인할 수 있습니다.

- 

-www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//SetByHostFail/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-Please check your network connection.

-                </d_old>

-<e_new>

-                        Unable to connect to server.

-Could not resolve domain name: [HOST_NAME]

-

-Please check your network connection.

-                </e_new>

-<f_translation>

-                        서버에 연결하지 못했습니다.

-다음 도메인 이름을 확인할 수 없습니다: [HOST_NAME]

-

-네트워크 연결을 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        서버에 연결하지 못했습니다.

-다음 도메인 이름을 확인할 수 없습니다: [HOST_NAME]

-네트워크 연결을 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//LoginPacketNeverReceived/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Unable to connect.  Login packet never received by

-login server.

- 

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </d_old>

-<e_new>

-                        Unable to connect.  Login packet never received by

-login server.

-

-Please try again in a few minutes, or click Help

-for advice and a link to the system status web page.

-                </e_new>

-<f_translation>

-                        연결할 수 없습니다.  로그인 서버에서 로그인 패킷이

-수신되지 않았습니다.

-

-몇 분 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_translation>

-<f_old_trans>

-                        연결할 수 없습니다.  로그인 서버에서 로그인 패킷이

-수신되지 않았습니다.

- 

-몇 초 후에 다시 시도하거나 도움말을 클릭하여

-시스템 상태 웹 페이지에 대한 지원 정보 및 링크를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeNoClothes/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        잠시 후 선택하신 캐릭터가 나타납니다.

-

-화살표 키를 이용하여 걸을 수 있습니다.

-언제든지 F1 키를 누르면 도움말을 보거나

-[SECOND_LIFE]를 자세히 배울 수 있습니다.

-                </f_translation>

-<f_old_trans>

-                        잠시 후 선택하신 캐릭터가 나타납니다.

- 

-화살표 키를 이용하여 걸을 수 있습니다.

- 

-F1 키를 눌러 도움말을 보거나 

-[SECOND_LIFE]를 자세히 배울 수 있습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WelcomeChooseSex/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Your character will appear in a moment.

- 

-Use arrow keys to walk.

- 

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE]. 

- 

-Please choose the male or female avatar.

-You can change your mind later.

-                </d_old>

-<e_new>

-                        Your character will appear in a moment.

-

-Use arrow keys to walk.

-Press the F1 key at any time for help or

-to learn more about [SECOND_LIFE].

-Please choose the male or female avatar.

-You can change your mind later.

-                </e_new>

-<f_translation>

-                        잠시 후 선택하신 캐릭터가 나타납니다.

-

-화살표 키를 이용하여 걸을 수 있습니다.

-언제든지 F1 키를 누르면 도움말을 보거나

-[SECOND_LIFE]를 자세히 배울 수 있습니다.

-남성 또는 여성 캐릭터를 선택해 주십시오.

-캐릭터는 차후에 변경이 가능합니다.

-                </f_translation>

-<f_old_trans>

-                        잠시 후 선택하신 캐릭터가 나타납니다.

- 

-화살표 키를 이용하여 걸을 수 있습니다.

- 

-F1 키를 눌러 도움말을 보거나 

-[SECOND_LIFE]를 자세히 배울 수 있습니다.

- 

-남성 또는 여성 캐릭터를 선택해 주십시오.

-차후에 변경이 가능합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FlushMapVisibilityCaches/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This will flush the map caches on this region.

- 

-This is really only useful for debugging. 

- 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </d_old>

-<e_new>

-                        This will flush the map caches on this region.

-This is really only useful for debugging. 

-(In production, wait 5 minutes, then everyone&apos;s map will 

-update after they relog.)

-                </e_new>

-<f_translation>

-                        이 지역의 지도 캐시가 삭제됩니다.

-이 작업은 버그 제거에만 사용됩니다. 

-(프로덕션에서 5분간 기다리시면 모든 사람의 지도가 

-재로그인한 후 업데이트됩니다.)

-                </f_translation>

-<f_old_trans>

-                        이 지역의 지도 캐시가 삭제됩니다.

- 

-이 작업은 버그 제거에만 사용됩니다. 

- 

-(프로덕션에서 5분간 기다리시면 모든 사람의 지도가 

-재로그인한 후 업데이트됩니다.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainBitDepth/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        지역 텍스처를 설정할 수 없습니다: 

-지형 텍스처 [TEXTURE_NUM]의 비트 수준 [TEXTURE_BIT_DEPTH]이(가) 유효하지 않습니다.

-

-텍스처 [TEXTURE_NUM]을(를) 24비트의 512x512(또는 더 작은) 이미지로 교체하고

-&quot;적용&quot;을 다시 클릭하십시오.

-                </f_translation>

-<f_old_trans>

-                        지역 텍스처를 설정할 수 없습니다: 

- 

-지형 텍스처 [TEXTURE_NUM]의 비트 수준 [TEXTURE_BIT_DEPTH]이(가) 유효하지 않습니다.

- 

-텍스처 [TEXTURE_NUM]을(를) 24비트의 512x512(또는 더 작은) 이미지로 교체하고

-&quot;설정&quot;을 다시 클릭하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//InvalidTerrainSize/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Couldn&apos;t set region textures: 

- 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

- 

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </d_old>

-<e_new>

-                        Couldn&apos;t set region textures: 

-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 

-

-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image

-then click &quot;Apply&quot; again.

-                </e_new>

-<f_translation>

-                        지역 텍스처를 설정할 수 없습니다: 

-지형 텍스처 [TEXTURE_NUM]이(가) 너무 큽니다([TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]). 

-

-텍스처 [TEXTURE_NUM]을(를) 24비트의 512x512(또는 더 작은) 이미지로 교체하고

-&quot;적용&quot;을 다시 클릭하십시오.

-                </f_translation>

-<f_old_trans>

-                        지역 텍스처를 설정할 수 없습니다: 

-                        

- 

-지형 텍스처 [TEXTURE_NUM]이(가) 너무 큽니다([TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]). 

- 

-텍스처 [TEXTURE_NUM]을(를) 24비트의 512x512(또는 더 작은) 이미지로 교체하고

-&quot;설정&quot;을 다시 클릭하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-You must download this update to use [SECOND_LIFE].

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 새 버전이 출시되었습니다.

-[MESSAGE]

-[SECOND_LIFE]를 사용하려면 이 업데이트를 다운로드해야 합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 새 버전이 출시되었습니다.

-[MESSAGE]

- 

-시스템을 사용하려면 이 업데이트를 다운로드해야 합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindows/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

- 

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadWindowsReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

- 

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacMandatory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-

-You must download this update to use [SECOND_LIFE].

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        A new version of [SECOND_LIFE] is available.

-[MESSAGE]

-You must download this update to use [SECOND_LIFE].

-

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 새 버전이 출시되었습니다.

-[MESSAGE]

-[SECOND_LIFE]를 사용하려면 이 업데이트를 다운로드해야 합니다.

-

-Applications 폴더에 다운로드하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 새 버전이 출시되었습니다.

-[MESSAGE]

-

-시스템을 사용하려면 이 업데이트를 다운로드해야 합니다.

- 

-Applications 폴더에 다운로드하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMac/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

- 

-Applications 폴더에 다운로드하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

- 

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

- 

-애플리케이션 폴더에 다운로드하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//DownloadMacReleaseForDownload/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

- 

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </d_old>

-<e_new>

-                        An updated version of [SECOND_LIFE] is available.

-[MESSAGE]

-This update is not required, but we suggest you install it to improve performance and stability.

- 

-Download to your Applications folder?

-                </e_new>

-<f_translation>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

- 

-Applications 폴더에 다운로드하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        [SECOND_LIFE] 업데이트 버전이 출시되었습니다.

-[MESSAGE]

- 

-본 업데이트는 필수 사항은 아니나 성능 및 안전성 향상을 위해 설치를 권장합니다.

- 

-애플리케이션 폴더에 다운로드하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

 <b_path>//AddClassified/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

                         Classified ads appear in the &apos;Classified&apos; section of the

 Search directory and on www.secondlife.com for one week.

- 

 Fill out your ad, then click &apos;Publish...&apos; to add it to the

 directory.

- 

 You&apos;ll be asked for a price to pay when clicking Publish.

 Paying more makes your ad appear higher in the list, and

 also appear higher when people search for keywords.

@@ -2373,672 +38,89 @@ Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.

                 </e_new>

 <f_translation>

-                        안내 광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션에

-���타��니다.

+                        광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션에

+게시���니다.

 광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에

 추가합니다.

 게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.

-��� ���은 가격을 지불할수록 목록���서 더 높��� 위치에 게���되고

-키워드 검색 시 결과에 더 우선적으로 표시됩니다.

+높은 가격을 지불 할수록 목록��� ���단 위치에 게���되고

+키워드 검색결과에 더 우선적으로 표시됩니다.

                 </f_translation>

 <f_old_trans>

-                        분류된 광고가 1주일 동안 디렉토리의 &apos;광고&apos; 섹션에

-나타납니다.

- 

+                        광고가 1주일 동안 디렉토리 검색의&apos;광고&apos; 섹션에

+게시됩니다.

 광고를 작성한 후 &apos;게시하기&apos;를 클릭하여 디렉토리에

 추가합니다.

- 

 게시하기를 클릭하면 요금 결제를 묻는 메시지가 나타납니다.

-더 높은 가격을 지불할수록 목록에서 더 높은 위치에 게재되고

-키워드 검색 시 결과에 더 우선적으로 표시됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReturnToOwner/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

- 

-*WARNING* No-transfer deeded objects will be deleted!

-                </d_old>

-<e_new>

-                        Are you sure you want to return the selected

-objects to their owners? Transferable deeded

-objects will be returned to their previous owners.

-

-*WARNING* No-transfer deeded objects will be deleted!

-                </e_new>

-<f_translation>

-                        선택한 오브젝트를 소유주에게

-반환하시겠습니까? 양도된

-양도 가능 오브젝트들은 이전 소유자에게 반환됩니다.

-

-*경고* 양도된 양도 불가능 오브젝트는 삭제됩니다.

-                </f_translation>

-<f_old_trans>

-                        선택한 오브젝트를 소유주에게

-반환 하시겠습니까? 양도된

-양도 가능 오브젝트가 이전 소유자에게 반환됩니다.

-(반환되는 모든 오브젝트는 최종 소속 폴더로 반환됩니다.)

- 

-*경고* 양도된 양도 불가능 오브젝트는 삭제됩니다.

+높은 가격을 지불 할수록 목록의 상단 위치에 게시되고

+키워드 검색결과에 더 우선적으로 표시됩니다.

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenEstate/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

- 

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </d_old>

-<e_new>

-                        You are about to change a Linden owned estate (mainland, 

-teen grid, orientation, etc.). 

-

-This is EXTREMELY DANGEROUS because it can fundamentally 

-affect the user experience.  On the mainland, it will change 

-thousands of regions and make the spaceserver hiccup.

- 

-Proceed?

-                </e_new>

-<f_translation>

-                        귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)를 

-변경하려고 합니다. 

-

-이렇게 하면 기본적으로 사용자가 게임을 즐기는 데 영향을 

-줄 수 있으므로 매우 위험합니다.  또한 메인랜드에서 수천가지의 지역이 변경되고 

-공간 서버가 일시적으로 중단될 수도 있습니다.

- 

-계속하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)를 

-변경하려고 합니다. 

- 

-이렇게 하면 기본적으로 사용자가 게임을 즐기는 데 영향을 

-줄 수 있으므로 매우 위험합니다.  또한 메인랜드에서 수천가지의 지역이 변경되고 

-공간 서버가 일시적으로 중단될 수도 있습니다.

- 

-계속하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ChangeLindenAccess/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

- 

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

- 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </d_old>

-<e_new>

-                        You are about to change the access list for a Linden owned 

-estate (mainland, teen grid, orientation, etc.). 

-

-This is DANGEROUS and should only be done to invoke the 

-hack allowing objects/L$ to be transfered in/out of 

-a grid. 

-It will change thousands of regions and make the 

-spaceserver hiccup. 

-                </e_new>

-<f_translation>

-                        귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)에 대한 

-접근 목록을 변경하려고 합니다. 

-

-이는 위험한 작업이며 오브젝트/금액을 그리드에서 송수신할 수 있도록 

-핵을 불러내는 경우에만 수행할 수 

-있습니다. 

-이렇게 하면 수천가지의 지역이 변경되고 

-공간 서버가 일시적으로 중단될 수도 있습니다. 

-                </f_translation>

-<f_old_trans>

-                        귀하께서는 린든 소유의 사유지(메인랜드, 틴 그리드, 오리엔테이션 등)에 대한 

-접근 목록을 변경하려고 합니다. 

- 

-이는 위험한 작업이며 오브젝트/금액을 그리드에서 송수신할 수 있도록 

-핵을 불러내는 경우에만 수행할 수 

-있습니다. 

- 

-이렇게 하면 수천가지의 지역이 변경되고 

-공간 서버가 일시적으로 중단될 수도 있습니다. 

- 

-계속하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//PublishClassified/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Remember: Classified ad fees are non-refundable.

- 

-Publish this classified now for L$[AMOUNT]?

-                </d_old>

-<e_new>

-                        Remember: Classified ad fees are non-refundable.

-

-Publish this classified now for L$[AMOUNT]?

-                </e_new>

-<f_translation>

-                        주의: 광고 수수료는 환불이 되지 않음.

-

-L$[AMOUNT]의 비용을 지불하고 이 광고물을 지금 게재하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        기억할 것: 광고 수수료는 환불 되지 않음.

- 

-광고를 L$[AMOUNT]에 지금 게재 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpRegionBlockTerraform/message</b_path>

+</string><string><a_file>floater_about_land.xml</a_file>

+<b_path>/floaterland/landtab/land_objects_panel</b_path>

 <c_attribute></c_attribute>

-<d_old>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

- 

-Default: off

-                </d_old>

+<d_old></d_old>

 <e_new>

-                        If this box is checked, land owners will not be able to terraform

-their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.

-

-Default: off

-                </e_new>

-<f_translation>

-                        이 상자에 체크 표시가 되어 있는 경우, 토지 소유주들은 각 구획의 &apos;지형 편집&apos; 설정에 관계 없이

-자신의 토지를 변형(테라폼)할 수 없습니다.

-

-기본 설정: 꺼짐

-                </f_translation>

-<f_old_trans>

-                        체크가 되었을 경우, 토지 소유주들은 각 구획의 &apos;지형 편집&apos; 설정에 관계 없이 자신의 토지를 테라폼할 수 없습니다.

- 

-기본 설정: 꺼짐

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpParcelSearch/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

                         

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </d_old>

-<e_new>

-Checking this box will show:

-- this parcel in search results

-- this parcel&apos;s public objects

-                </e_new>

-<f_translation>

-이 확인란을 선택하면:

-- 이 구획의 검색 결과

-- 이 구획의 일반 오브젝트

-                </f_translation>

-<f_old_trans>

-                        이 확인란을 선택하면:

-- 이 구획의 검색 결과

-- 이 구획의 일반 오브젝트

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//RegionMaturityChange/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The maturity rating for this region has been updated. 

- 

-It may take some time for the change to be 

-reflected on the map.

-                </d_old>

-<e_new>

-                        The maturity rating for this region has been updated. 

-It may take some time for the change to be 

-reflected on the map.

-                </e_new>

-<f_translation>

-                        이 영역에 대한 성인용 등급이 업데이트되었습니다. 

-시스템이 주기적으로 지도 정보만 업데이트하기 때문에 

-월드 지도를 업데이트하려면 약 5분 정도 소요됩니다.

-                </f_translation>

-<f_old_trans>

-                        이 영역에 대한 성인용 등급이 업데이트되었습니다. 

- 

-시스템이 주기적으로 지도 정보만 업데이트하기 때문에 

-월드 지도를 업데이트하려면 약 5분 정도 

-소요됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchase/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-                </e_new>

-<f_translation>

-                        이 거래 내역은 다음과 같습니다:

-[ACTION]

- 

-이 구매를 진행하시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        거래는 다음과 같습니다:

- 

-[ACTION]

- 

-구매를 진행 하시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmPurchasePassword/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        This transaction will:

- 

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </d_old>

-<e_new>

-                        This transaction will:

-[ACTION]

- 

-Are you sure you want to proceed with this purchase?

-Please re-enter your password and click OK.

-                </e_new>

-<f_translation>

-                        이 거래 내역은 다음과 같습니다:

-[ACTION]

- 

-이 구매를 진행하시겠습니까?

-암호를 다시 입력하고 '확인'을 클릭하십시오.

-                </f_translation>

-<f_old_trans>

-                        거래는 다음과 같습니다:

- 

-[ACTION]

- 

-구매를 진행하시겠습니까?

-암호를 다시 입력하고 &apos;확인&apos;을 클릭하십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MoveInventoryFromScriptedObject/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

- 

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </d_old>

-<e_new>

-                        You have selected &apos;no copy&apos; inventory items.  These items 

-will be moved to your inventory, not copied.

-Because this object is scripted, moving these items 

-to your inventory may cause the script to malfunction. 

- 

-Move the inventory item(s)?

-                </e_new>

-<f_translation>

-                        &apos;복사 불가&apos; 인벤토리 아이템을 선택하셨습니다.  이러한 아이템은 

-인벤토리에서 제거되며 복사할 수 없습니다.

-이러한 오브젝트는 스크립트되었기 때문에 

-이 아이템을 인벤토리로 이동하면 스크립트에 문제가 발생할 수 있습니다. 

- 

-아이템을 옮기시겠습니까?

-                </f_translation>

-<f_old_trans>

-                        복사 불가&apos; 인벤토리 아이템을 선택하셨습니다.  이러한 아이템은 

-인벤토리에서 제거되며 복사할 수 없습니다.

- 

-이러한 오브젝트는 스크립트되었기 때문에 이 아이템을 

-인벤토리로 이동하면 스크립트에 문제가 발생할 수 있습니다. 

- 

-아이템을 옮기시겠습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this abuse report.

- 

-Selecting a category helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please select a category for this abuse report.

-Selecting a category helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        이 악용 신고에 대한 카테고리를 선택하십시오.

-카테고리를 선택하면 악용 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        이 악용 신고에 대한 카테고리를 선택하십시오.

- 

-카테고리를 선택하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSelectCategory/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please select a category for this bug.

- 

-Selecting a category helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please select a category for this bug.

-Selecting a category helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        이 버그에 대한 카테고리를 선택하십시오.

-카테고리를 선택하면 버그 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        이 버그에 대한 카테고리를 선택하십시오.

- 

-카테고리를 선택하면 버그 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserNameEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the name of the abuser.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the name of the abuser.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        악용자의 이름을 입력하십시오.

-정확한 값을 입력하면 악용 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        악용자의 이름을 입력하십시오.

- 

-정확한 값을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseAbuserLocationEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter the location where the abuse took place.

- 

-Entering an accurate value helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter the location where the abuse took place.

-Entering an accurate value helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        악용이 발생된 위치를 입력하십시오.

-정확한 값을 입력하면 악용 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        악용이 발생된 위치를 입력하십시오.

- 

-정확한 값을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the abuse that took place.

- 

-Entering an accurate summary helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the abuse that took place.

-Entering an accurate summary helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        발생된 악용에 대한 요약 사항을 입력하십시오.

-정확한 요약 사항을 입력하면 악용 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        발생된 악용에 대한 요약 사항을 입력하십시오.

- 

-정확한 요약 사항을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugSummaryEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a summary of the bug.

- 

-Entering an accurate summary helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a summary of the bug.

-Entering an accurate summary helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        버그에 대한 요약 사항을 입력하십시오.

-정확한 요약 사항을 입력하면 버그 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        버그에 대한 요약 사항을 입력하세요.

- 

-정확한 요약 사항을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

- 

-Entering an accurate description helps us file and process abuse reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the abuse that took place.

-Be as specific as you can, including names and the details of the

-incident you are reporting.

-Entering an accurate description helps us file and process abuse reports.

-                </e_new>

-<f_translation>

-                        발생한 악용에 대한 자세한 설명을 입력하십시오.

-관련자 이름 및 신고 사건의 세부 내용 등을 포함하여

-구체적으로 적어 주십시오.

-정확한 설명을 입력하면 악용 신고를 처리하는데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        발생한 악용에 대해 자세한 설명을 입력하십시오.

-구체적으로 적어 주시고 관련자 이름 및 신고 사건의 

- 세부 내용도 적어 주십시오.

- 

-정확한 설명을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportBugDetailsEmpty/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

- 

-Entering an accurate description helps us file and process bug reports.

-                </d_old>

-<e_new>

-                        Please enter a detailed description of the bug.

-Be as specific as you can, including steps to reproduce the bug

-if possible.

-Entering an accurate description helps us file and process bug reports.

-                </e_new>

-<f_translation>

-                        버그에 대한 자세한 설명을 입력하십시오.

-버그 재생 단계를 포함하여

-구체적으로 적어 주십시오.

-정확한 설명을 입력하면 버그 신고를 처리하는 데 도움이 됩니다.

-                </f_translation>

-<f_old_trans>

-                        버그에 대한 자세한 설명을 입력하세요.

-구체적으로 적어 주시고 

- 가능하면 버그 재생 단계도 적어 주십시오.

- 

-정확한 설명을 입력하면 악용 신고를 제출하고 처리하는 데 도움이 됩니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpReportAbuseContainsCopyright/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

- 

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </d_old>

-<e_new>

-                        Dear Resident,

- 

-Reports about copyright infringement can only be submitted

-as described at http://secondlife.com/corporate/dmca.php.

-

-Reports concerning copyright infringement will automatically

-be discarded if they are submitted through the &apos;Abuse Report&apos;

-feature. If your report does not relate to copyright infringement,

-you may close this window and finish submitting your report.

- 

-Thank you,

- 

-Linden Lab

-                </e_new>

-<f_translation>

-                        주민 여러분께,

- 

-저작권 침해에 대한 신고는 http://secondlife.com/corporate/dmca.php의

-설명에 따라 제출해 주셔야 합니다.

-

-저작권 침해에 대한 신고가 &apos;악용 신고&apos;

-기능을 통해 제출되는 경우 자동으로

-폐기됩니다. 신고하시는 내용이 저작권 침해와 관련이 없다면

-이 창을 닫아 신고를 종료하실 수 있습니다.

- 

-감사합니다.

- 

-린든랩 드림

-                </f_translation>

-<f_old_trans>

-                        주민 여러분께,

- 

-저작권 침해에 대한 신고는 http://secondlife.com/corporate/dmca.php의

-설명에 따라 제출해 주셔야 합니다.

- 

-저작권 침해에 대한 신고가 &apos;악용 신고&apos;

-기능을 통해 제출되는 경우 자동으로

-폐기됩니다. 신고하시는 내용이 저작권 침해와 관련이 없다면

-이 창을 닫아 신고를 종료하실 수 있습니다.

- 

-감사합니다.

- 

-린든랩 드림

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CopySLURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                        The following SLURL has been copied to your clipboard:

                         

-                         [SLURL] 

                         

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </d_old>

-<e_new>

-                        The following SLURL has been copied to your clipboard:

-                         [SLURL] 

-

-                        Put it in a web page to give others easy access to this location or

-                        try it out yourself by pasting it into the address bar of your web browser.

-                </e_new>

-<f_translation>

-                        클립보드에 다음과 같은 SLURL이 복사되었습니다.

-                         [SLURL] 

-

-                        웹 페이지에 올려서 타인들이 이 위치에 쉽게 접근하도록 하거나

-                        웹 브라우저의 주소창에 붙여넣기를 해서 직접 시험해보십시오.

-                </f_translation>

-<f_old_trans>

-                        클립보드에 다음과 같은 SLURL이 복사되었습니다.

-   

-                        [SLURL] 

-   

-                        웹 페이지에 올려서 타인들이 이 위치에 쉽게 접근하도록 하거나

-                        웹 브라우저의 주소창에 붙여넣기 해서 직접 시험해보십시오.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//BadURL/message</b_path>

-<c_attribute></c_attribute>

-<d_old>

-Second Life doesn&apos;t know how to handle the link:

-

-[SLURL]

-

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

-                </d_old>

-<e_new>

-Second Life doesn&apos;t know how to handle the link:

- [SLURL]

-Most links are similar to this:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-Please check the spelling and try again.

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </e_new>

 <f_translation>

-Second Life에서 링크로 연결되지 않습니다:

- [SLURL]

-대부분의 링크 형식은 다음과 유사합니다:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-맞춤법을 확인하고 다시 시도하십시오.

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+                        

+      /&gt;

                 </f_translation>

-<f_old_trans>

-                        Second Life에서 링크로 연결되지 않습니다:

-

-[SLURL]

-

-대부분의 링크 형식은 다음과 유사합니다:

-

-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-

-fd37083abc4c/about

-

-맞춤법을 확인하고 다시 시도하십시오.

-                </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_media_panel/Media texture:</b_path>

 <c_attribute></c_attribute>

@@ -3059,82 +141,27 @@ Settings:
 설정:

                         </f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/Limit access to this parcel to:</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                                Limit access to this parcel to:

-                        </d_old>

-<e_new>

-                                Access To This Parcel

-                        </e_new>

-<f_translation>

-                                이 구획에 대한 사용권한을 다음으로 제한:

-                        </f_translation>

-<f_old_trans>

-                                이 구획에 대한 사용권한을 다음으로 제한:

-                        </f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/GroupCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Group: [GROUP]</d_old>

-<e_new>Allow Group Access: [GROUP]</e_new>

-<f_translation>그룹 접근 허용: [GROUP]</f_translation>

-<f_old_trans>그룹: [GROUP]</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/PassCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Sell passes allowing temporary access:</d_old>

-<e_new>Sell passes to:</e_new>

-<f_translation>다음 사용자에게 통행권 판매:</f_translation>

-<f_old_trans>임시 통행권 판매:</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

-<e_new>Always Allow</e_new>

-<f_translation>항상 허용</f_translation>

-<f_old_trans>아바타: ([LISTED] 목록에 있음, [MAX] 최대)</f_old_trans>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                          Allowed Residents

-                        </e_new>

-<f_translation>

-                          허용된 주민

-                        </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute>label</c_attribute>

-<d_old>Avatars: ([LISTED] listed, [MAX] max)</d_old>

+<d_old>Always Allow</d_old>

 <e_new>Ban</e_new>

 <f_translation>차단</f_translation>

-<f_old_trans>������타: ([LISTED] ���록에 있음, [MAX] 최대)</f_old_trans>

+<f_old_trans>�����</f_old_trans>

 </string><string><a_file>floater_about_land.xml</a_file>

 <b_path>/floaterland/landtab/land_access_panel/AccessCheck</b_path>

 <c_attribute></c_attribute>

-<d_old></d_old>

+<d_old>

+                          Allowed Residents

+                        </d_old>

 <e_new>

                           Banned Residents

                         </e_new>

 <f_translation>

                           출입금지된 주민

                         </f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/popular_panel/incmature</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Include parcels with Mature Content</d_old>

-<e_new>Include parcels with Restricted Content</e_new>

-<f_translation>성인 컨텐츠가 있는 구획 포함</f_translation>

-<f_old_trans>성인용 컨텐츠 구획 포함</f_old_trans>

-</string><string><a_file>menu_inventory.xml</a_file>

-<b_path>/Popup/Landmark Open</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Open</d_old>

-<e_new>Teleport</e_new>

-<f_translation>텔리포트</f_translation>

-<f_old_trans>열기</f_old_trans>

+<f_old_trans>

+                                출입금지된 주민

+                        </f_old_trans>

 </string><string><a_file>panel_audio_device.xml</a_file>

 <b_path>/device_settings/Input device (microphone):</b_path>

 <c_attribute></c_attribute>

@@ -3169,16 +196,16 @@ Settings:
 <b_path>/panel_login/real_url</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                http://secondlife.com/app/login/

+             https://secondlife.com/app/login/?show_login_form=True

         </d_old>

 <e_new>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </e_new>

 <f_translation>

-             https://secondlife.com/app/login/en/?show_login_form=True

+                http://secondlife.com/app/login/

         </f_translation>

 <f_old_trans>

-             https://secondlife.com/app/login/ko/?show_login_form=True

+                https://secondlife.com/app/login/?show_login_form=True

         </f_old_trans>

 </string><string><a_file>panel_preferences_audio.xml</a_file>

 <b_path>/Media panel/doppler_effect_text</b_path>

@@ -3210,221 +237,27 @@ Settings:
 <f_old_trans>

                 로그인 옵션:

         </f_old_trans>

-</string><string><a_file>panel_region_estate.xml</a_file>

-<b_path>/Estate/externally_visible_check</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Public Access</d_old>

-<e_new>Allow Public Access</e_new>

-<f_translation>일반 공개 허용</f_translation>

-<f_old_trans>일반 공개</f_old_trans>

-</string><string><a_file>panel_voice_options.xml</a_file>

-<b_path>/content_panel/push_to_talk_check</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Only allow Friends to initiate Voice Calls with me</d_old>

-<e_new>Start Viewer in Push-to-Talk mode</e_new>

-<f_translation>Push-to-Talk 모드로 Second Life 시작</f_translation>

-<f_old_trans>Push-to-Talk 모드로 세컨드라이프 시작</f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_tport</b_path>

+</string><string><a_file>panel_preferences_voice.xml</a_file>

+<b_path>/chat/voice_chat_description</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                    Problem encountered processing your teleport request. You may

-                        need to log back in before you can teleport. If you continue

-                        to get  this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support

-                </d_old>

-<e_new>

-                    Problem encountered processing your teleport request. You may

-need to log back in before you can teleport. If you continue

-to get  this message, please check the Tech Support FAQ at:

-www.secondlife.com/support

-                </e_new>

-<f_translation>

-                    텔리포트 요청 처리 중 문제가 발생했습니다. 지역 횡단을 하기 전에

-다시 로그인을 해야 합니다. 이러한 메시지를

-계속 받는   경우에는 www.secondlife.com/support에서 기술 지원 FAQ를

-참조하십시오.

-                </f_translation>

-<f_old_trans>

-                        텔레포트 요청 처리 중 문제가 발생했습니다. 지역 횡단을 하기 전에

-   다시 로그인을 해야 합니다. 이러한 메시지를

-   계속 받는 경우에는 www.secondlife.com/support FAQ를 확인하십시오.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/invalid_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Problem encountered processing your region crossing. You may

-                        need to log back in before you can cross regions. If you continue

-                        to get this message, please check the Tech Support FAQ at:

-                        www.secondlife.com/support.

-                </d_old>

-<e_new>

-                    Problem encountered processing your region crossing. You may

-need to log back in before you can cross regions. If you continue

-to get this message, please check the Tech Support FAQ at:

-www.secondlife.com/support.

-                </e_new>

-<f_translation>

-                    지역 횡단 처리 중 문제가 발생했습니다. 지역 횡단을 하기 전에

-다시 로그인을 해야 합니다. 이러한 메시지를

-계속 받는 경우에는 www.secondlife.com/support에서 기술 지원 FAQ를

-참조하십시오.

-                </f_translation>

-<f_old_trans>

-                        지역 횡단 처리 중 문제가 발생했습니다. 지역 횡단을 하기 전에

-   다시 로그인을 해야 합니다. 이러한 메시지를

-   계속 받는 경우에는 www.secondlife.com/support FAQ를

-   확인하십시오.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/blocked_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-                        If you still cannot teleport, please log out and log back in to

-                        resolve the problem.

-                </d_old>

-<e_new>

-                    Sorry, teleport is currently blocked. Try again in a moment.

-If you still cannot teleport, please log out and log back in to

-resolve the problem.

-                </e_new>

-<f_translation>

-                    텔리포트가 현재 차단된 상태입니다. 잠시 후에 다시 시도해 주십시오.

-텔리포트를 지속적으로 할 수 없는 경우에는 로그아웃을 하고 문제 해결을 위해

-다시 로그인 하시기 바랍니다.

-                </f_translation>

-<f_old_trans>

-                        텔레포트가 현재 차단된 상태입니다. 잠시 후에 다시 시도해 주십시오.

-   텔레포트를 지속적으로 할 수 없는 경우에는 로그 아웃을 하고 문제 해결을 위해

-   다시 로그인 하시기 바랍니다.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/timeout_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but system was unable to complete the teleport connection.

-                        Try again in a moment.

-                </d_old>

-<e_new>

-                    Sorry, but system was unable to complete the teleport connection.

-Try again in a moment.

-                </e_new>

-<f_translation>

-                    시스템이 텔리포트 연결을 마칠 수 없습니다.

-잠시 후에 다시 시도해 주십시오.

-                </f_translation>

-<f_old_trans>

-                        시스템이 텔레포트 연결을 마칠 수 없습니다.

-   잠시 후에 다시 시도해 주십시오.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/missing_attach_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Your attachments have not arrived yet. Try waiting for a few

-                        more seconds or log out and back in again before attempting

-                        to teleport.

-                </d_old>

-<e_new>

-                    Your attachments have not arrived yet. Try waiting for a few

-more seconds or log out and back in again before attempting

-to teleport.

-                </e_new>

-<f_translation>

-                    액세서리가 아직 도착하지 않았습니다. 잠시만 기다리시거나

-로그아웃한 후 다시 로그인 하여

-텔리포트를 시도해 보십시오.

-                </f_translation>

-<f_old_trans>

-                        액세서리가 아직 도착하지 않았습니다. 잠시만 기다리시거나

-    다시 로그인 하여

-   텔레포트를 시도합니다.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/too_many_uploads_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    The asset queue in this region is currently clogged so your teleport

-                        request will not be able to succeed in a timely manner. Please try again

-                        in a few minutes or go to a less busy area.

-                </d_old>

-<e_new>

-                    The asset queue in this region is currently clogged so your teleport

-request will not be able to succeed in a timely manner. Please try again

-in a few minutes or go to a less busy area.

-                </e_new>

-<f_translation>

-                    이 지역의 자산 열이 현재 막혀 있어서 텔리포트

-요청이 적절한 방법으로 성공할 수 없습니다. 잠시 후 다시 시도하거나

-덜 분주한 지역으로 가보시기 바랍니다.

-                </f_translation>

-<f_old_trans>

-                        이 지역의 자산 열이 현재 막혀 있어서 텔레포트

-   요청이 적절한 방법으로 성공할 수 없습니다. 잠시 후 다시

-   덜 분주한 지역으로 가보시기 바랍니다.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_tport</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your teleport request

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your teleport request

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    죄송합니다. 시스템이 텔리포트 요청 처리를 적절하게

-마칠 수 없습니다. 잠시 후 다시 시도해 보십시오.

-                </f_translation>

-<f_old_trans>

-                        죄송합니다. 시스템이 텔레포트 요청 처리를 적절하게

-   마칠 수 없습니다. 잠시 후 다시 시도하세요.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/expired_region_handoff</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Sorry, but the system was unable to complete your region crossing

-                        in a timely fashion. Please try again in a few minutes.

-                </d_old>

-<e_new>

-                    Sorry, but the system was unable to complete your region crossing

-in a timely fashion. Please try again in a few minutes.

-                </e_new>

-<f_translation>

-                    시스템이 지역 횡단 처리를 적절하게

-마칠 수 없습니다. 잠시 후 다시 시도해 보십시오.

-                </f_translation>

-<f_old_trans>

-                        시스템이 지역 횡단 처리를 적절하게

-   마칠 수 없습니다. 잠시 후 다시 시도하세요.

-                </f_old_trans>

-</string><string><a_file>teleport_strings.xml</a_file>

-<b_path>//errors/no_host</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                    Unable to find teleport destination. The destination may be

-                        temporarily unavailable or no longer exists. Please try again

-                        in a few minutes.

-                </d_old>

+                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.

+        </d_old>

 <e_new>

-                    Unable to find teleport destination. The destination may be

-temporarily unavailable or no longer exists. Please try again

-in a few minutes.

-                </e_new>

+                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

+        </e_new>

 <f_translation>

-                    텔리포트 목적지를 찾을 수 없습니다. 텔리포트 목적지가

-잠시 사용불가하거나 존재하지 않습니다. 잠시 후 다시 시도해

-주십시오.

-                </f_translation>

+                참고: 장치 설정 또는 음성 채팅 설정을 실행하면 일시적으로 음성 채팅 연결이 끊길 수 있습니다.

+        </f_translation>

 <f_old_trans>

-                        텔레포트 목적지를 찾을 수 없습니다. 목적지를

-   잠시 사용불가이거나 존재하지 않습니다. 잠시 후 다시

-   시도하여 주십시요.

-                </f_old_trans>

+                참고: 장치 설정 또는 음성 채팅 설정을 실행하면 일시적으로 음성 채팅 연결이 끊길 수 있습니다.

+        </f_old_trans>

+</string><string><a_file>panel_voice_options.xml</a_file>

+<b_path>/content_panel/push_to_talk_check</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Only allow Friends to initiate Voice Calls with me</d_old>

+<e_new>Start Viewer in Push-to-Talk mode</e_new>

+<f_translation>말하기 조절 모드로 세컨드라이프 시작</f_translation>

+<f_old_trans>말하기 조절 모드로 세컨드라이프 시작</f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/notify.xml b/linden/indra/newview/skins/xui/ko/notify.xml
index 51d0afb..4541c5c 100644
--- a/linden/indra/newview/skins/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/xui/ko/notify.xml
@@ -79,13 +79,13 @@
         </notify>
         <notify name="GestureMissing">
                 <message name="message">
-                        제스처가 데이터베이스에 없습니다.
+                        [NAME] 제스처가 데이터베이스에 없습니다.
                 </message>
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        제스처 로���에 실패했습니다.
-다시 시도해 주십시오.
+                        [NAME] 제스처 로���에 실패했습니다.
+��� 초 후 ���시 시도해 주십시오.
                 </message>
         </notify>
         <notify name="InventoryLoaded">
@@ -382,6 +382,11 @@
                         음성 가능한 토지
                 </message>
         </notify>
+        <notify name="NoVoice">
+                <message name="message">
+                        음성 불가능 토지
+                </message>
+        </notify>
         <notify name="NoBuild">
                 <message name="message">
                         이 토지는 만들기 비활성화 지역입니다(&apos;만들기 금지&apos;).
@@ -718,6 +723,9 @@
                 <option name="No">
                         아니오
                 </option>
+                <option name="Mute">
+                        음소거
+                </option>
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
                 <message name="message">
@@ -917,8 +925,23 @@ sculpted prim은 그 형태를 지정하는 특별한 텍스처를 요구합니�
         </notify>
         <notify name="VoiceInviteAdHoc">
                 <message name="message">
-                        [NAME] 님이 당신을 음성 컨퍼런스 채팅으로 초대하고 있습니다. 
-동의를 클릭하여 음성 채팅에 참여하거나 거부를 클릭하여 채팅 초대를 거부할 수 있습니다. 음소거를 클릭하여 송신자의 음성을 소거할 수 있습니다.
+                        [NAME]님이 음성 컨퍼런스 채팅에 참여하였습니다. 
+동의를 클릭하여 음성 채팅에 참여하거나 거부를 클릭하여 채팅 초대를 거부할 수 있습니다. 음소거를 클릭하여 사용자의 음성을 소거할 수 있습니다.
+                </message>
+                <option name="Accept">
+                        동의
+                </option>
+                <option name="Decline">
+                        거부
+                </option>
+                <option name="Mute">
+                        음소거
+                </option>
+        </notify>
+        <notify name="InviteAdHoc">
+                <message name="message">
+                        [NAME]님이 컨퍼런스 채팅으로 귀하를 초대하고 있습니다. 
+동의를 클릭하여 음성 채팅에 참여하거나 거부를 클릭하여 채팅 초대를 거부할 수 있습니다. 음소거를 클릭하여 이 사용자의 음성을 소거할 수 있습니다.
                 </message>
                 <option name="Accept">
                         동의
@@ -985,4 +1008,14 @@ sculpted prim은 그 형태를 지정하는 특별한 텍스처를 요구합니�
                         구획에 입장할 수 없습니다. 출입 권한 리스트에 등록되어 있지 않습니다.
                 </message>
         </notify>
+        <notify name="VoiceNotAllowed">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME]과(와)의 음성 채팅 권한이 없습니다.
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME]과(와)의 음성 채팅에 연결하는 중 오류가 발생했습니다.  다시 시도해 주십시오.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar.xml b/linden/indra/newview/skins/xui/ko/panel_avatar.xml
index 4fb8974..ec02aa5 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar.xml
@@ -5,6 +5,7 @@
                         <text name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
+[AGEVERIFICATION]
                         </text>
                         <text name="AcctTypeResident">
                                 주민
@@ -28,10 +29,10 @@
                                 결제수단 미등록자
                         </text>
                         <text name="AgeVerified">
-                                , 성인 인증 완료
+                                성인 인증 완료
                         </text>
                         <text name="NotAgeVerified">
-                                , 성인 인증 미완료
+                                성인 인증 미완료
                         </text>
                         <text name="Name:">
                                 이름:
@@ -49,6 +50,8 @@
                              tool_tip="세컨드라이프 파트너. 자세한 설정 방법은 www.secondlife.com/partner를 참고함">
                                 파트너:
                         </text>
+                        <button label="i" label_selected="i" name="partner_info"
+                             tool_tip="파트너 프로필을 열려면 클릭하십시오." />
                         <button label="?" label_selected="?" name="partner_help" />
                         <line_editor name="partner_edit"
                              tool_tip="세컨드라이프 파트너. 자세한 설정 방법은 www.secondlife.com/partner를 참고함">
diff --git a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml b/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
index f494366..d10958f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat">
-        <button label="기��" label_selected="기록" name="History"
+<panel name="chat_bar">
+        <button label="��컬 채팅" label_selected="기록" name="History"
              tool_tip="대화 내용을 보려면 여기를 클릭하십시오." />
         <line_editor label="채팅하려면 여기를 클릭하십시오." name="Chat Editor"
              tool_tip="Enter를 눌러 말하고, Ctrl-Enter를 눌러 외칩니다." />
diff --git a/linden/indra/newview/skins/xui/ko/panel_friends.xml b/linden/indra/newview/skins/xui/ko/panel_friends.xml
index feff26c..dae90ae 100644
--- a/linden/indra/newview/skins/xui/ko/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_friends.xml
@@ -2,9 +2,18 @@
 <panel name="friends">

         <scroll_list name="friend_list"

              tool_tip="Shift키 또는 Control키를 누른 상태에서 클릭하여 여러 명의 친구를 선택하십시오.">

-                <column label="이름" name="friend_name" />

+                <column name="icon_online_status" tool_tip="온라인 상태" />

+                <column label="이름" name="friend_name" tool_tip="이름" />

+                <column name="icon_visible_online"

+                     tool_tip="내 온라인 상태를 친구가 볼 수 있도록 설정" />

+                <column name="icon_visible_map"

+                     tool_tip="친구가 지도에서 내 위치를 찾을 수 있도록 설정" />

+                <column name="icon_edit_mine"

+                     tool_tip="친구가 내 오브젝트를 편집할 수 있도록 설정" />

+                <column name="icon_edit_theirs"

+                     tool_tip="내가 친구의 오브젝트를 편집할 수 있도록 설정" />

         </scroll_list>

-        <panel name="rights_container" >

+        <panel name="rights_container">

                 <text name="friend_name_label" right="-10">

                         친구를 선택하여 권한 변경

                 </text>

@@ -21,21 +30,17 @@
                 </text>

         </panel>

         <pad left="-95" />

-        <button label="메신저/전화" name="im_btn" 

-                 tool_tip="메신저 세션 열기"

+        <button label="메신저/전화" name="im_btn" tool_tip="메신저 세션 열기"

              width="90" />

         <button label="프로필" name="profile_btn"

-             tool_tip="그림, 그룹 및 기타 정보 표시" 

-                 width="90" />

+             tool_tip="그림, 그룹 및 기타 정보 표시" width="90" />

         <button label="텔레포트..." name="offer_teleport_btn"

              tool_tip="친구에게 내 현재 위치로 텔레포트를 제공함"

              width="90" />

-        <button label="지불" name="pay_btn"

-             tool_tip="친구에게 린든 달러(L$) 주기" 

-                 width="90" />

+        <button label="지불" name="pay_btn" tool_tip="친구에게 린든 달러(L$) 주기"

+             width="90" />

         <button label="제거" name="remove_btn"

-             tool_tip="이 사람을 내 친구 목록에서 삭제" 

-                 width="90" />

+             tool_tip="이 사람을 내 친구 목록에서 삭제" width="90" />

         <button label="추가..." name="add_btn" tool_tip="주민에게 친구 추가 요청"

              width="90" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
index ef22bf0..d1e7d25 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
@@ -110,4 +110,10 @@
         <text name="proposals_submit_new_txt">
                 새로운 제안 전송중...
         </text>
+        <text name="vote_recorded">
+                귀하의 투표가 접수되었습니다.
+        </text>
+        <text name="vote_previously_recorded">
+                투표를 마치신 제안 입니다.   1회 투표만 허용됩니다.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/xui/ko/panel_login.xml
index 46525cc..a0a6912 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_login.xml
@@ -1,6 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
         <text name="real_url">
-                https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text name="first_name_text">
+                이름:
+        </text>
+        <text name="last_name_text">
+                성
+        </text>
+        <text name="password_text">
+                비밀번호:
+        </text>
+        <text name="start_location_text">
+                시작 위치:
+        </text>
+        <combo_box name="start_location_combo">
+                <combo_item name="MyHome">
+                        홈
+                </combo_item>
+                <combo_item name="MyLastLocation">
+                        최종 방문지
+                </combo_item>
+                <combo_item name="Typeregionname">
+                        &lt;지역명 입력&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="비밀번호 기억" name="remember_check" />
+        <text name="full_screen_text">
+                로그인할 때 뷰어에 전체 화면이 표시됩니다.
+        </text>
+        <button label="신규 계정" label_selected="신규 계정" name="new_account_btn" />
+        <button label="환경 설정" label_selected="환경 설정" name="preferences_btn" />
+        <button label="연결" label_selected="연결" name="connect_btn" />
+        <button label="종료" label_selected="종료" name="quit_btn" />
+        <text name="version_text">
+                1.23.4 (5)
+        </text>
+        <text name="channel_text">
+                [Viewer Channel Name]
+        </text>
+        <text name="forgot_password_text">
+                암호를 잊으셨습니까?
+        </text>
+        <text name="forgot_password_url">
+                http://secondlife.com/account/request.php
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_media_controls.xml b/linden/indra/newview/skins/xui/ko/panel_media_controls.xml
new file mode 100644
index 0000000..9344262
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/panel_media_controls.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_controls">

+        <button name="music_play" tool_tip="스트리밍 음악 재생/일시 정지" />

+        <button name="media_play" tool_tip="스트리밍 동영상 재생/일시 정지" />

+        <volume_slider name="volume_slider" tool_tip="전체 소리" />

+        <button name="mute_master" tool_tip="전체 음소거" />

+        <button name="expand" tool_tip="개별 소리 조정" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/ko/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..98bcdd6
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/panel_media_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="media_remote">

+        <panel label="오디오 &amp; 비디오" name="Volume Panel" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
index 0f0df1e..dc89ec5 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
@@ -11,4 +11,23 @@
              tool_tip="마우스를 사용하여 보기를 조정합니다. 총이 있는 경우 클릭하면 발사됩니다." />
         <button label="서기" label_selected="서기" name="Stand Up"
              tool_tip="일어서려면 여기를 클릭하십시오." />
+        <layout_stack name="overlay_layout_panel">
+                <layout_panel name="">
+                        <layout_stack name="">
+                                <layout_panel name="state_buttons">
+                                        <button label="메신저 수령" label_selected="메신저 수령" name="IM Received"
+                                             tool_tip="도착한 메시지가 있습니다. 메시지를 확인 하시려면 메신저 버튼을 클릭하십시오." />
+                                        <button label="다른 용무 중 해제" label_selected="다른 용무 중 해제"
+                                             name="Set Not Busy"
+                                             tool_tip="채팅과 메신저가 숨겨져 있습니다. 다른 용무 중을 해제하려면 여기를 클릭하십시오." />
+                                        <button label="키 해제" label_selected="키 해제" name="Release Keys"
+                                             tool_tip="스크립트에 의해 키가 제어됩니다. 설정을 해제하려면 여기를 클릭하십시오." />
+                                        <button label="1인칭 시점" label_selected="1인칭 시점" name="Mouselook"
+                                             tool_tip="마우스를 사용하여 보기를 조정합니다. 총이 있는 경우 클릭하면 발사됩니다." />
+                                        <button label="서기" label_selected="서기" name="Stand Up"
+                                             tool_tip="서려면 여기를 클릭하십시오." />
+                                </layout_panel>
+                        </layout_stack>
+                </layout_panel>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
index e833130..a893254 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
@@ -32,7 +32,8 @@
         <check_box label="다음 시작할 때 그래픽 하드웨어 자동 감지"
              name="probe_hardware_checkbox"
              tool_tip="세컨드라이프는 사용자의 하드웨어에 따라 일부 그래픽 설정을 자동으로 구성합니다.  새로운 하드웨어를 설치하려는 경우, 세컨드라이프가 이를 다시 감지하도록 해야 합니다." />
-        <check_box label="시스템 기본색 관리 사용" name="use_system_color_picker_checkbox"
+        <check_box label="시스템 기본색 관리 사용"
+             name="use_system_color_picker_checkbox"
              tool_tip="세컨드라이프에서 제공하는 것 대신 기본 시스템 색관리를 사용합니다." />
         <text type="string" length="1" name="start_location_textbox">
                 시작 위치:
@@ -77,7 +78,7 @@
                         English (영어)
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (중국어)
+                        汉语/漢語(중국어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
                         Deutsch (독일어)
@@ -92,10 +93,10 @@
                         한국어
                 </combo_item>
                 <combo_item type="string" length="1" name="Portugese">
-                        Português (포르투갈어)
+                        Português(포르투갈어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Spanish">
-                        Español (스페인어) 
+                        Español (스페인어)
                 </combo_item>
         </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
index f00beb1..7b39de5 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
@@ -4,6 +4,9 @@
                 디스플레이 해상도:
         </text>
         <check_box label="하나의 창에서 실행" name="windowed mode" />
+        <text_editor name="voice_chat_description">
+                선택을 해제하면 로그인 시 전체화면으로 표시됩니다.
+        </text_editor>
         <text type="string" length="1" name="Fullscreen Aspect Ratio:">
                 전체 화면 비율:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml
index 8d9a48d..598fa6f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml
@@ -16,7 +16,7 @@
                 Push To Talk

         </text>

         <text_editor name="voice_chat_description">

-                말하기 조절 모드로 사용자의 음성 전송 시기를 조절할 수 있습니다. 토글 모드로서push-to-talk 트리거를 누르거나 해제하여 마이크로폰의 상태를 온/오프로 변경할 수 있습니다. 토글 모드가 아닌 경우에는 마이크로폰이 트리거 상태에서만 작동합니다.

+                참고: 장치 설정 또는 음성 채팅 설정을 실행하면 일시적으로 음성 채팅 연결이 끊길 수 있습니다.

         </text_editor>

         <check_box label="Push-to-Talk 모드로 뷰어 시작" name="push_to_talk_check" />

         <check_box label="Push-to-Talk 토글 모드 사용" name="push_to_talk_toggle_check" />

@@ -30,6 +30,6 @@
         </text>

         <check_box label="친구 목록에 있는 사람들만 음성 채팅 수락"

              name="voice_call_friends_only_check" />

-        <button label="장치 설정..." name="device_settings_btn" />

-        <button label="음성 설정 마법사 실행..." name="launch_voice_wizard_button" />

+        <button label="장치 설정" name="device_settings_btn" />

+        <button label="음성 ���팅 ��정" name="launch_voice_wizard_button" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
index 6dbd240..fc12384 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
@@ -9,4 +9,13 @@
         </text>

         <check_box label="사이트로부터 쿠키 허용" name="cookies_enabled" />

         <button label="지금 제거" name="clear_cookies" />

+        <text name="proxy_label">

+                웹 프록시:

+        </text>

+        <check_box label="웹 프록시 사용" name="web_proxy_enabled" />

+        <text name="proxy_text_label">

+                주소:

+        </text>

+        <line_editor name="web_proxy_editor" tool_tip="사용할 프록시 이름 또는 IP 주소" />

+        <spinner label="포트 번호:" name="web_proxy_port" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
new file mode 100644
index 0000000..66948e9
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel">

+        <string name="moderator_label">

+                (진행자)

+        </string>

+        <layout_stack name="">

+                <layout_panel name="moderation_mode_panel">

+                        <combo_box name="moderation_mode">

+                                음성 제어

+                        </combo_box>

+                </layout_panel>

+                <layout_panel name="moderate_chat_panel">

+                        <scroll_list name="speakers_list">

+                                <column label="이름" name="speaker_name" />

+                        </scroll_list>

+                        <panel name="speaker_controls">

+                                <text name="resident_name">

+                                        Rumplstiltskin Califragilistic

+                                </text>

+                                <button name="mute_btn" tool_tip="이 사용자의 음성 소거" />

+                                <check_box label="텍스트 차단" name="mute_text_btn" />

+                        </panel>

+                </layout_panel>

+                <layout_panel name="moderator_controls">

+                        <text name="moderator_controls_label">

+                                진행자 제어:

+                        </text>

+                </layout_panel>

+        </layout_stack>

+</panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
index da61e70..bc3bb85 100644
--- a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
@@ -27,8 +27,13 @@
         <button label="" label_selected="" name="fly" tool_tip="비행 안함" />
         <button label="" label_selected="" name="build" tool_tip="만들기 안함" />
         <button label="" label_selected="" name="scripts" tool_tip="스크립트 없음" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject  한정" />
+        <button name="no_fly" tool_tip="비행이 허용되지 않습니다." />
+        <button name="no_build" tool_tip="제작/리징이 허용되지 않습니다." />
+        <button name="no_scripts" tool_tip="스크립트가 허용되지 않습니다." />
+        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject 제한" />
         <button name="status_voice" tool_tip="음성 사용함" />
+        <button name="status_no_voice"
+             tool_tip="여기서는 음성을 사용할 수 없습니다." />
         <button label="" label_selected="" name="buyland" tool_tip="현재 구획 구매" />
         <text name="packet_loss_tooltip">
                 패킷 손실
diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
index 7b319ea..40e5f0e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_toolbar">
+<panel name="toolbar">
         <button label="메신저" name="im_btn" tool_tip="친구들과 메신저 하기." />
+        <string name="Redock Windows">
+                창 합치기
+        </string>
         <button label="통신" name="communicate_btn"
              tool_tip="친구 및 그룹과 통신합니다." />
-        <button label="채팅" name="chat_btn"
-             tool_tip="부근 사람들과 대화를 나눕니다. (입력)" />
+        <button label="채팅" name="chat_btn" tool_tip="채팅 표시줄 표시 (입력)" />
         <button label="친구" name="friends_btn"
              tool_tip="친구를 찾아 이야기합니다." />
         <button label="비행" label_selected="비행 중지" name="fly_btn"
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml b/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
new file mode 100644
index 0000000..f079158
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_controls">

+        <button name="speakers_btn" tool_tip="음성 채팅 사용 주민 보기" />

+        <button label="말하기" name="push_to_talk"

+             tool_tip="말하기를 하려면 버튼을 누릅니다." />

+        <button name="ptt_lock"

+             tool_tip="말하기 모드로 변경하려면 잠금을 클릭합니다." />

+        <button name="show_channel"

+             tool_tip="현재 음성 채널을 표시하려면 클릭하십시오." />

+</panel>

diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml b/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml
index 22b943b..adfe7ee 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="content_panel">

         <text_editor name="voice_intro_text1">

-                Second Life 음성 채팅입니다. 음성 채팅을 통해 주민들과 대화할 수 있습니다. 이 마법사는 음성 채팅 설정에 필요한 처리 단계를 안내해 드립니다. 음성 채팅을 하려면 마이크로폰이 장착된 스테레오 헤드셋이 필요합니다. 자세한 사항은 도움말 버튼을 클릭합니다.

+                세컨드라이프 음성 채팅입니다. 음성 채팅을 통해 주민들과 대화할 수 있습니다. 이 마법사는 음성 채팅 설정에 필요한 처리 단계를 안내해 드립니다. 음성 채팅을 하려면 오디오 스피커가 필요하고, 다른 사용자들과 대화를 하려면 마이크 또는 마이크가 장착된 스테레오 헤드셋이 필요합니다.

         </text_editor>

         <text_editor name="voice_intro_text2">

                 음성 채팅을 지금 사용하시겠습니까?

diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml b/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
index a9431c0..f909586 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
@@ -11,7 +11,8 @@
                         아바타 위치에서 음성 채팅 청취

                 </radio_item>

         </radio_group>

-        <check_box label="Push-to-Talk 모드로 Second Life 시작" name="push_to_talk_check" />

+        <check_box label="말하기 조절 모드로 세컨드라이프 시작"

+             name="push_to_talk_check" />

         <check_box label="Push-to-Talk 토글 모드 사용" name="push_to_talk_toggle_check" />

         <text name="push_to_talk_label">

                 Push-to-Talk 트리거:

diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/ko/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..cc42d40
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_remote">

+        <button name="end_call_btn" tool_tip="연결을 끊으려면 클릭하십시오." />

+</panel>

diff --git a/linden/indra/newview/skins/xui/pt/floater_html_help.xml b/linden/indra/newview/skins/xui/pt/floater_html_help.xml
deleted file mode 100644
index 7722084..0000000
--- a/linden/indra/newview/skins/xui/pt/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>

-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"     height="500" min_height="300" min_width="300" name="htmlhelp"     title="Ajuda do Second Life" width="700"><button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Voltar"             left="15" name="back_btn" width="70" />

-<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"        label="Home" left_delta="75" name="home_btn" width="70" />

-<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"        label="Adiante" left_delta="75" name="forward_btn" width="70" />

-<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"         label="Fechar" name="close_btn" right="-10" width="50" />

-<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"            name="html_help_browser" right="-15" top="-55" start_url="http://help.secondlifebrasil.com.br" />

-

-

-<text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"        top="25">Conclu�do</text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml b/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml
index 775bf7a..b12c687 100644
--- a/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>

-<panel bottom="24" enabled="true" follows="left|right|bottom" height="29"     hidden="false" left="-1" mouse_opaque="true" name="chat" width="256"      default_tab_group="1"><button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"             halign="center" height="24" hidden="false" label="Hist�rico"            label_selected="Hist�rico" left="0" mouse_opaque="true" name="History"          tool_tip="Clique aqui para ver o que foi dito" width="100" />

+<panel bottom="24" enabled="true" follows="left|right|bottom" height="29"     hidden="false" left="-1" mouse_opaque="true" name="chat_bar" width="256"      default_tab_group="1"><button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"         halign="center" height="24" hidden="false" label="Hist�rico"            label_selected="Hist�rico" left="0" mouse_opaque="true" name="History"          tool_tip="Clique aqui para ver o que foi dito" width="100" />

 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"          enabled="true" follows="left|right|bottom" font="SansSerif"             handle_edit_keys_directly="false" height="24" hidden="false"            label="Clique aqui para iniciar o chat" left="107" max_length="254"             mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"             select_on_focus="false" tab_group="1"           tool_tip="Pressione Enter para dizer" width="100" />

 <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"           halign="center" height="24" hidden="false" label="Dizer" label_selected="Dizer"         left="748" mouse_opaque="true" name="Say" tool_tip="Enter" width="100" />

 <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"           halign="center" height="24" hidden="false" label="Gritar"       label_selected="Gritar" left="855" mouse_opaque="true" name="Shout"             tool_tip="Ctrl-Enter" width="100" />

diff --git a/linden/indra/newview/skins/xui/pt/panel_login.xml b/linden/indra/newview/skins/xui/pt/panel_login.xml
index b8aa1b6..f2703df 100644
--- a/linden/indra/newview/skins/xui/pt/panel_login.xml
+++ b/linden/indra/newview/skins/xui/pt/panel_login.xml
@@ -1,6 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="panel_login">

-        <text name="real_url">

-             https://secondlife.com/app/login/?show_login_form=True

-        </text>

+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>

+<panel bottom="0" follows="left|top|right|bottom" height="600" hidden="false" left="0"     mouse_opaque="true" name="panel_login" width="800"><web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"        name="login_html" right="-1"            start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"        top="-1" />

+<text hidden="true" name="real_url">http://www.secondlifebrasil.com.br/client/capa.aspx?v=1_17_0_12</text>

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="54" drop_shadow_visible="true" follows="left|bottom"            font="SansSerif" h_pad="0" halign="left" height="20" hidden="false"             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">Primeiro nome:</text>

+<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"            follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"         height="20" hidden="false" left="32" max_length="31" mouse_opaque="true"        name="first_name_edit" select_all_on_focus_received="true" width="120" />

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="54" drop_shadow_visible="true" follows="left|bottom"            font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">Sobrenome:</text>

+<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"            follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"         height="20" hidden="false" left="164" max_length="31" mouse_opaque="true"       name="last_name_edit" select_all_on_focus_received="true" width="120" />

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="54" drop_shadow_visible="true" follows="left|bottom"            font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">Senha:</text>

+<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"            follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"         height="20" hidden="false" left="296" max_length="16" mouse_opaque="true"       name="password_edit" select_all_on_focus_received="true" width="120" />

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="10" drop_shadow_visible="true" follows="left|bottom"            font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"      width="85">Localiza��o inicial:</text>

+<combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"      hidden="false" left_delta="97" max_chars="128" mouse_opaque="true"      name="start_location_combo" width="140"><combo_item name="MyHome" value="My Home">Minha casa</combo_item>

+<combo_item name="MyLastLocation" value="My Last Location">Minha �ltima localiza��o</combo_item>

+<combo_item name="Typeregionname" value="&lt;Type region name&gt;">&lt; Digite o nome da regi�o; </combo_item>

+</combo_box>

+<check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"       hidden="false" initial_value="false" label="Lembrar senha"      left_delta="167" mouse_opaque="true" name="remember_check" width="138" />

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="74" drop_shadow_visible="true" follows="left|bottom"            font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"        left="32" mouse_opaque="true" name="full_screen_text" v_pad="0" width="252">O visor indicar� a tela cheia quando entrar. </text>

+

+<button bottom="46" follows="left|bottom" font="SansSerif" halign="center" height="24"       hidden="false" label="Prefer�ncias..." label_selected="Prefer�ncias..."         left="572" mouse_opaque="true" name="preferences_btn" scale_image="TRUE"        width="120" />

+<combo_box allow_text_entry="true" bottom="48" follows="left|bottom" height="18"             hidden="false" left_delta="128" max_chars="20" mouse_opaque="true"      name="server_combo" width="120" />

+<button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center"            height="24" hidden="false" label="Conectar" label_selected="Conectar"           left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"            width="120" />

+<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"      height="24" hidden="false" label="Sair" label_selected="Sair" left="572"        mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />

+<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"           bottom="2" drop_shadow_visible="true" follows="right|bottom"            font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"       left="698" mouse_opaque="true" name="version_text" v_pad="0" width="100">1.23.4 (5)</text>

 </panel>

diff --git a/linden/indra/newview/skins/xui/pt/panel_toolbar.xml b/linden/indra/newview/skins/xui/pt/panel_toolbar.xml
index 173cf35..b790498 100644
--- a/linden/indra/newview/skins/xui/pt/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/pt/panel_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>

-<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="MI" left="0" name="im_btn"       tool_tip="Mensagens Instant�neas para seus amigos" width="50" />

+<panel background_opaque="true" background_visible="true" can_close="true"     can_minimize="false" can_resize="false" follows="left|right|bottom"     height="26" name="toolbar" width="1024"><button bottom="0" font="SansSerif" height="24" label="MI" left="0" name="im_btn"             tool_tip="Mensagens Instant�neas para seus amigos" width="50" />

 <button bottom="0" font="SansSerif" height="24" label="Chat" left="0" name="chat_btn"        tool_tip="Conversar com as pessoas pr�ximas. (Enter)" width="50" />

 <button bottom="0" font="SansSerif" height="24" label="Amigos" left="0"      name="friends_btn" tool_tip="Ache e converse com os seus camaradas."            width="50" />

 <button bottom="0" font="SansSerif" height="24" label="Voar"         label_selected="Parar de voar" left="0" name="fly_btn"          tool_tip="Comece a voar. Use E/C ou PgUp/PgDn para voar para cima e para baixo."        width="50" />

diff --git a/linden/indra/newview/skins/xui/zh/floater_html_help.xml b/linden/indra/newview/skins/xui/zh/floater_html_help.xml
deleted file mode 100644
index 9a4dbee..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_html_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="htmlhelp" title="第二人生帮助">
-        <button label="返回" name="back_btn" />
-        <button label="家" name="home_btn" />
-        <button label="朝向" name="forward_btn" />
-        <button label="关闭" name="close_btn" />
-        <text name="status_text">
-                完成
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml b/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml
index 91aa6bc..8bf05df 100644
--- a/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat">
+<panel name="chat_bar">
         <button label="历史" label_selected="历史" name="History" />
         <line_editor name="Chat Editor" tool_tip="按Enter来输入语音，Ctrl-Enter 来发声" />
         <button label="说" label_selected="说" name="Say" />
diff --git a/linden/indra/newview/skins/xui/zh/panel_login.xml b/linden/indra/newview/skins/xui/zh/panel_login.xml
index 056f2d6..5e78b00 100644
--- a/linden/indra/newview/skins/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_login.xml
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
         <text name="real_url">
-             https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text name="first_name_text">
+                姓:
+        </text>
+        <text name="last_name_text">
+                名:
+        </text>
+        <text name="password_text">
+                密码:
+        </text>
+        <text name="start_location_text">
+                开始定位:
+        </text>
+        <combo_box name="start_location_combo">
+                <combo_item name="MyHome">
+                        我的家
+                </combo_item>
+                <combo_item name="MyLastLocation">
+                        我的上个位置
+                </combo_item>
+                <combo_item name="&lt;Typeregionname&gt;">
+                        &lt;输入地域名&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="记住密码" name="remember_check" />
+        <text name="full_screen_text">
+                登陆后显示器会采用全屏显示。
+        </text>
+        <button label="新帐户..." label_selected="新帐户..." name="new_account_btn" />
+        <button label="连接" label_selected="连接" name="connect_btn" />
+        <button label="参数选择..." label_selected="参数选择..." name="preferences_btn" />
+        <button label="退出" label_selected="退出" name="quit_btn" />
+        <text name="version_text">
+                1.23.4 (5)
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
index 5bd3175..372a2f5 100644
--- a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_toolbar">
+<panel name="toolbar">
         <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
         <button label="聊天" name="chat_btn"
              tool_tip="与附近的人交谈.点击交谈之后点击历史去查找交谈记录。" />